scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor overworld_map

Browse Source
This commit is contained in:
Justin Scofield
2022-07-19 15:48:45 +00:00
parent 64590d1a19
commit 532c0c2572
2 changed files with 10 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/app/zelda3/overworld_map.cc
View File

@@ -26,14 +26,11 @@ OverworldMap::OverworldMap(ROM& rom, const std::vector<gfx::Tile16>& tiles16,
if (index_ < 64) { if (index_ < 64) {
sprite_graphics_[0] = rom_.data()[core::overworldSpriteset + parent_]; sprite_graphics_[0] = rom_.data()[core::overworldSpriteset + parent_];
sprite_graphics_[1] = sprite_graphics_[1] = rom_.data()[core::overworldSpriteset + parent_ + 64];
rom_.data()[core::overworldSpriteset + parent_ + 64]; sprite_graphics_[2] = rom_.data()[core::overworldSpriteset + parent_ + 128];
sprite_graphics_[2] =
rom_.data()[core::overworldSpriteset + parent_ + 128];
gfx_ = rom_.data()[core::mapGfx + parent_]; gfx_ = rom_.data()[core::mapGfx + parent_];
palette_ = rom_.data()[core::overworldMapPalette + parent_]; palette_ = rom_.data()[core::overworldMapPalette + parent_];
sprite_palette_[0] = sprite_palette_[0] = rom_.data()[core::overworldSpritePalette + parent_];
rom_.data()[core::overworldSpritePalette + parent_];
sprite_palette_[1] = sprite_palette_[1] =
rom_.data()[core::overworldSpritePalette + parent_ + 64]; rom_.data()[core::overworldSpritePalette + parent_ + 64];
sprite_palette_[2] = sprite_palette_[2] =
@@ -43,12 +40,9 @@ OverworldMap::OverworldMap(ROM& rom, const std::vector<gfx::Tile16>& tiles16,
musics[2] = rom_.data()[core::overworldMusicMasterSword + parent_]; musics[2] = rom_.data()[core::overworldMusicMasterSword + parent_];
musics[3] = rom_.data()[core::overworldMusicAgahim + parent_]; musics[3] = rom_.data()[core::overworldMusicAgahim + parent_];
} else if (index_ < 128) { } else if (index_ < 128) {
sprite_graphics_[0] = sprite_graphics_[0] = rom_.data()[core::overworldSpriteset + parent_ + 128];
rom_.data()[core::overworldSpriteset + parent_ + 128]; sprite_graphics_[1] = rom_.data()[core::overworldSpriteset + parent_ + 128];
sprite_graphics_[1] = sprite_graphics_[2] = rom_.data()[core::overworldSpriteset + parent_ + 128];
rom_.data()[core::overworldSpriteset + parent_ + 128];
sprite_graphics_[2] =
rom_.data()[core::overworldSpriteset + parent_ + 128];
gfx_ = rom_.data()[core::mapGfx + parent_]; gfx_ = rom_.data()[core::mapGfx + parent_];
palette_ = rom_.data()[core::overworldMapPalette + parent_]; palette_ = rom_.data()[core::overworldMapPalette + parent_];
sprite_palette_[0] = sprite_palette_[0] =
@@ -84,12 +78,9 @@ OverworldMap::OverworldMap(ROM& rom, const std::vector<gfx::Tile16>& tiles16,
message_id_ = rom_.data()[core::overworldMessages + parent_]; message_id_ = rom_.data()[core::overworldMessages + parent_];
sprite_graphics_[0] = sprite_graphics_[0] = rom_.data()[core::overworldSpriteset + parent_ + 128];
rom_.data()[core::overworldSpriteset + parent_ + 128]; sprite_graphics_[1] = rom_.data()[core::overworldSpriteset + parent_ + 128];
sprite_graphics_[1] = sprite_graphics_[2] = rom_.data()[core::overworldSpriteset + parent_ + 128];
rom_.data()[core::overworldSpriteset + parent_ + 128];
sprite_graphics_[2] =
rom_.data()[core::overworldSpriteset + parent_ + 128];
sprite_palette_[0] = sprite_palette_[0] =
rom_.data()[core::overworldSpritePalette + parent_ + 128]; rom_.data()[core::overworldSpritePalette + parent_ + 128];
sprite_palette_[1] = sprite_palette_[1] =
@@ -119,8 +110,7 @@ void OverworldMap::BuildMap(int count, int game_state, uchar* map_parent,
if (parent_ != index_ && !initialized_) { if (parent_ != index_ && !initialized_) {
if (index_ >= 0x80 && index_ <= 0x8A && index_ != 0x88) { if (index_ >= 0x80 && index_ <= 0x8A && index_ != 0x88) {
gfx_ = rom_.data()[core::overworldSpecialGFXGroup + gfx_ = rom_.data()[core::overworldSpecialGFXGroup + (parent_ - 128)];
(parent_ - 128)];
palette_ = rom_.data()[core::overworldSpecialPALGroup + 1]; palette_ = rom_.data()[core::overworldSpecialPALGroup + 1];
} else if (index_ == 0x88) { } else if (index_ == 0x88) {
gfx_ = 81; gfx_ = 81;

9
src/app/zelda3/overworld_map.h
View File

@@ -48,20 +48,11 @@ class OverworldMap {
private: private:
void BuildTiles16Gfx(int count); void BuildTiles16Gfx(int count);
// void ReloadPalettes() { LoadPalette(); }
void CopyTile(int x, int y, int xx, int yy, int offset, gfx::TileInfo tile, void CopyTile(int x, int y, int xx, int yy, int offset, gfx::TileInfo tile,
uchar* gfx16Pointer, uchar* gfx8Pointer); uchar* gfx16Pointer, uchar* gfx8Pointer);
void CopyTileToMap(int x, int y, int xx, int yy, int offset, void CopyTileToMap(int x, int y, int xx, int yy, int offset,
gfx::TileInfo tile, uchar* gfx16Pointer, gfx::TileInfo tile, uchar* gfx16Pointer,
uchar* gfx8Pointer); uchar* gfx8Pointer);
void LoadPalette();
void SetColorsPalette(int index, ImVec4 main, ImVec4 animated, ImVec4 aux1,
ImVec4 aux2, ImVec4 hud, ImVec4 bgrcolor, ImVec4 spr,
ImVec4 spr2);
void BuildTileset(int gameState); void BuildTileset(int gameState);
}; };