From 996c6c92ee57887d2bb5c596228c7544a8848259 Mon Sep 17 00:00:00 2001
From: scawful <justin.scofield@outlook.com>
Date: Sun, 10 Nov 2024 17:17:12 -0500
Subject: [PATCH] Add flags for expanded tile16 and tile32 saving

---
 src/app/zelda3/overworld/overworld.cc | 6 ++++--
 src/app/zelda3/overworld/overworld.h  | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/app/zelda3/overworld/overworld.cc b/src/app/zelda3/overworld/overworld.cc
index 7cdf535a..2bf7bc78 100644
--- a/src/app/zelda3/overworld/overworld.cc
+++ b/src/app/zelda3/overworld/overworld.cc
@@ -140,6 +140,7 @@ absl::Status Overworld::AssembleMap32Tiles() {
       }
     }
   } else {
+    expanded_tile32_ = true;
     const uint32_t map32address[4] = {
         rom_.version_constants().kMap32TileTL, kMap32TileTRExpanded,
         kMap32TileBLExpanded, kMap32TileBRExpanded};
@@ -189,6 +190,7 @@ void Overworld::AssembleMap16Tiles() {
       tiles16_.emplace_back(t0, t1, t2, t3);
     }
   } else {
+    expanded_tile16_ = true;
     tpos = kMap16TilesExpanded;
     for (int i = 0; i < NumberOfMap16Ex; ++i) {
       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) {
   rom_ = rom;
-
+  if (expanded_tile16_) RETURN_IF_ERROR(SaveMap16TilesExpanded())
   RETURN_IF_ERROR(SaveMap16Tiles())
+  if (expanded_tile32_) RETURN_IF_ERROR(SaveMap32TilesExpanded())
   RETURN_IF_ERROR(SaveMap32Tiles())
   RETURN_IF_ERROR(SaveOverworldMaps())
   RETURN_IF_ERROR(SaveEntrances())
   RETURN_IF_ERROR(SaveExits())
-
   return absl::OkStatus();
 }
 
diff --git a/src/app/zelda3/overworld/overworld.h b/src/app/zelda3/overworld/overworld.h
index 49c6cdd9..cbfa027f 100644
--- a/src/app/zelda3/overworld/overworld.h
+++ b/src/app/zelda3/overworld/overworld.h
@@ -571,6 +571,8 @@ class Overworld : public SharedRom, public core::ExperimentFlags {
   absl::Status DecompressAllMapTiles();
 
   bool is_loaded_ = false;
+  bool expanded_tile16_ = false;
+  bool expanded_tile32_ = false;
 
   int game_state_ = 0;
   int current_map_ = 0;