chore: pass flag to overworld map for loading custom data

This commit is contained in:
scawful
2024-08-25 16:50:41 -04:00
parent 57a165bab6
commit 0c9faa7ac4
5 changed files with 21 additions and 7 deletions

View File

@@ -86,8 +86,10 @@ absl::Status Overworld::Load(Rom &rom) {
AssembleMap16Tiles();
RETURN_IF_ERROR(DecompressAllMapTiles())
const bool load_custom_overworld = flags()->overworld.kLoadCustomOverworld;
for (int map_index = 0; map_index < kNumOverworldMaps; ++map_index)
overworld_maps_.emplace_back(map_index, rom_, tiles16_);
overworld_maps_.emplace_back(map_index, rom_, tiles16_,
load_custom_overworld);
FetchLargeMaps();
LoadEntrances();
@@ -1516,8 +1518,10 @@ absl::Status Overworld::LoadPrototype(Rom &rom,
AssembleMap16Tiles();
RETURN_IF_ERROR(DecompressProtoMapTiles(tilemap_filename))
const bool load_custom_overworld = flags()->overworld.kLoadCustomOverworld;
for (int map_index = 0; map_index < kNumOverworldMaps; ++map_index)
overworld_maps_.emplace_back(map_index, rom_, tiles16_);
overworld_maps_.emplace_back(map_index, rom_, tiles16_,
load_custom_overworld);
FetchLargeMaps();
LoadEntrances();