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

Add flags for expanded tile16 and tile32 saving

Browse Source
This commit is contained in:
scawful
2024-11-10 17:17:12 -05:00
parent 0035176f86
commit 996c6c92ee
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/app/zelda3/overworld/overworld.cc
View File

@@ -140,6 +140,7 @@ absl::Status Overworld::AssembleMap32Tiles() {
} }
} }
} else { } else {
expanded_tile32_ = true;
const uint32_t map32address[4] = { const uint32_t map32address[4] = {
rom_.version_constants().kMap32TileTL, kMap32TileTRExpanded, rom_.version_constants().kMap32TileTL, kMap32TileTRExpanded,
kMap32TileBLExpanded, kMap32TileBRExpanded}; kMap32TileBLExpanded, kMap32TileBRExpanded};
@@ -189,6 +190,7 @@ void Overworld::AssembleMap16Tiles() {
tiles16_.emplace_back(t0, t1, t2, t3); tiles16_.emplace_back(t0, t1, t2, t3);
} }
} else { } else {
expanded_tile16_ = true;
tpos = kMap16TilesExpanded; tpos = kMap16TilesExpanded;
for (int i = 0; i < NumberOfMap16Ex; ++i) { for (int i = 0; i < NumberOfMap16Ex; ++i) {
gfx::TileInfo t0 = gfx::GetTilesInfo(rom()->toint16(tpos)); gfx::TileInfo t0 = gfx::GetTilesInfo(rom()->toint16(tpos));
@@ -525,13 +527,13 @@ absl::Status Overworld::LoadSpritesFromMap(int sprites_per_gamestate_ptr,
absl::Status Overworld::Save(Rom &rom) { absl::Status Overworld::Save(Rom &rom) {
rom_ = rom; rom_ = rom;
if (expanded_tile16_) RETURN_IF_ERROR(SaveMap16TilesExpanded())
RETURN_IF_ERROR(SaveMap16Tiles()) RETURN_IF_ERROR(SaveMap16Tiles())
if (expanded_tile32_) RETURN_IF_ERROR(SaveMap32TilesExpanded())
RETURN_IF_ERROR(SaveMap32Tiles()) RETURN_IF_ERROR(SaveMap32Tiles())
RETURN_IF_ERROR(SaveOverworldMaps()) RETURN_IF_ERROR(SaveOverworldMaps())
RETURN_IF_ERROR(SaveEntrances()) RETURN_IF_ERROR(SaveEntrances())
RETURN_IF_ERROR(SaveExits()) RETURN_IF_ERROR(SaveExits())
return absl::OkStatus(); return absl::OkStatus();
} }

2
src/app/zelda3/overworld/overworld.h
View File

@@ -571,6 +571,8 @@ class Overworld : public SharedRom, public core::ExperimentFlags {
absl::Status DecompressAllMapTiles(); absl::Status DecompressAllMapTiles();
bool is_loaded_ = false; bool is_loaded_ = false;
bool expanded_tile16_ = false;
bool expanded_tile32_ = false;
int game_state_ = 0; int game_state_ = 0;
int current_map_ = 0; int current_map_ = 0;