chore: pass flag to overworld map for loading custom data

2024-08-25 16:50:41 -04:00
parent 57a165bab6
commit 0c9faa7ac4
5 changed files with 21 additions and 7 deletions
--- a/src/app/zelda3/overworld/overworld_map.cc
+++ b/src/app/zelda3/overworld/overworld_map.cc
@@ -19,11 +19,12 @@ namespace zelda3 {
 namespace overworld {

 OverworldMap::OverworldMap(int index, Rom& rom,
-                           std::vector<gfx::Tile16>& tiles16)
+                           std::vector<gfx::Tile16>& tiles16,
+                           bool load_custom_data)
    : index_(index), parent_(index), rom_(rom), tiles16_(tiles16) {
  LoadAreaInfo();

-  if (flags()->kLoadCustomOverworld) {
+  if (load_custom_data) {
    // If the custom overworld ASM has NOT already been applied, manually set
    // the vanilla values.
    uint8_t asm_version = rom_[OverworldCustomASMHasBeenApplied];