diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-12-15 02:00:00 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-12-15 02:00:00 -0500 |
| commit | 82f55f238125ff42845881189eb9237692c48ba4 (patch) | |
| tree | 7b496125c6e0b644ce535548ec09755fd4f489bb /src/overworld.c | |
| parent | 6556b556dd624964f53d76ff546589e6688412eb (diff) | |
| parent | 6967caefb246f9709032049b0ae2baee71f71eb6 (diff) | |
Merge master into ObjEvent rename
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 bb0f40a56..2d3125fc4 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) LoadBattlePyramidObjectEventTemplates(); else if (InTrainerHill()) LoadTrainerHillObjectEventTemplates(); @@ -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) LoadBattlePyramidFloorObjectEventScripts(); else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) LoadTrainerHillFloorObjectEventScripts(); @@ -1730,7 +1730,7 @@ void CB2_ContinueSavedGame(void) UnfreezeObjectEvents(); 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(); |