diff options
| author | huderlem <huderlem@gmail.com> | 2019-02-04 21:36:18 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-04 21:36:18 -0600 |
| commit | b0ee1009759ed1c46da81b1fb8410e2b75e42bb2 (patch) | |
| tree | ceee3e124b987b8dd24cb3a7bba85d4effe1ef5d /src/overworld.c | |
| parent | 646533cfa3c8c42aee3efedaadfe49e495b64892 (diff) | |
| parent | d4125fef9bc9adb95c7a5fb5b8be903b34adc510 (diff) | |
Merge pull request #543 from pret/mapdata
Convert map data to JSON
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/overworld.c b/src/overworld.c index a67b4b68f..8d4c24ff6 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -55,6 +55,7 @@ #include "wild_encounter.h" #include "frontier_util.h" #include "constants/abilities.h" +#include "constants/layouts.h" #include "constants/map_types.h" #include "constants/maps.h" #include "constants/region_map_sections.h" @@ -886,7 +887,7 @@ static void mli0_load_map(u32 a1) LoadCurrentMapData(); if (!(sUnknown_020322D8 & 1)) { - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) sub_81AA1D8(); else if (InTrainerHill()) sub_81D5DF8(); @@ -914,7 +915,7 @@ static void mli0_load_map(u32 a1) mapheader_run_script_with_tag_x3(); UpdateLocationHistoryForRoamer(); RoamerMoveToOtherLocationSet(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) InitBattlePyramidMap(0); else if (InTrainerHill()) InitTrainerHillMap(); @@ -1753,7 +1754,7 @@ void CB2_ContinueSavedGame(void) LoadSaveblockMapHeader(); ClearDiveAndHoleWarps(); trainerHillMapId = GetCurrentTrainerHillMapId(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) sub_81AA2F8(); else if (trainerHillMapId != 0 && trainerHillMapId != 6) sub_81D5F48(); @@ -1763,7 +1764,7 @@ void CB2_ContinueSavedGame(void) UnfreezeEventObjects(); DoTimeBasedEvents(); sub_8084788(); - if (gMapHeader.mapLayoutId == 0x169) + if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) InitBattlePyramidMap(1); else if (trainerHillMapId != 0) InitTrainerHillMap(); |