diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-17 21:17:46 -0500 |
| commit | 23f952b34ecc3d527b2bfee86ee1f35e1abe8246 (patch) | |
| tree | 9e276d9e08c46e9fe4f92af636d53f1dda33190a /src/overworld.c | |
| parent | ddfa0c6298f4c4dcde9b40782bbdf41867bff761 (diff) | |
| parent | f8cef9a6a86fb85634e21370e5a7a0d2ac4a9ba2 (diff) | |
Merge master into doc-tower
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/overworld.c b/src/overworld.c index c288f2e00..e837ed902 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -852,7 +852,7 @@ static void mli0_load_map(u32 a1) LoadCurrentMapData(); if (!(sUnknown_020322D8 & 1)) { - if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR) LoadBattlePyramidEventObjectTemplates(); else if (InTrainerHill()) LoadTrainerHillEventObjectTemplates(); @@ -880,7 +880,7 @@ static void mli0_load_map(u32 a1) RunOnTransitionMapScript(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); - if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR) InitBattlePyramidMap(FALSE); else if (InTrainerHill()) InitTrainerHillMap(); @@ -1720,7 +1720,7 @@ void CB2_ContinueSavedGame(void) LoadSaveblockMapHeader(); ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); - if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR) LoadBattlePyramidFloorEventObjectScripts(); else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) LoadTrainerHillFloorEventObjectScripts(); @@ -1730,7 +1730,7 @@ void CB2_ContinueSavedGame(void) UnfreezeEventObjects(); DoTimeBasedEvents(); sub_8084788(); - if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_FLOOR) InitBattlePyramidMap(TRUE); else if (trainerHillMapId != 0) InitTrainerHillMap(); |