diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-18 12:45:56 -0500 |
|---|---|---|
| committer | GriffinR <griffin.richards@comcast.net> | 2019-11-18 12:47:10 -0500 |
| commit | a486c8affd35bec6e3b71c8c1bfbaba2dc94ec4b (patch) | |
| tree | 062ac919817dbfa142929167da4e131c2dc58d49 /src/overworld.c | |
| parent | fc3783b7395b25d290ec650d79fbdc80518046cd (diff) | |
| parent | 5393b42f7ccfd10986a9a253e29ce54fae847a78 (diff) | |
Begin documenting Apprentice, merge with master
Diffstat (limited to 'src/overworld.c')
| -rw-r--r-- | src/overworld.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/overworld.c b/src/overworld.c index 42a39d03e..c2e3d2789 100644 --- a/src/overworld.c +++ b/src/overworld.c @@ -64,6 +64,7 @@ #include "constants/region_map_sections.h" #include "constants/songs.h" #include "constants/species.h" +#include "constants/trainer_hill.h" #include "constants/weather.h" #define PLAYER_TRADING_STATE_IDLE 0x80 @@ -854,7 +855,7 @@ static void mli0_load_map(u32 a1) if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) LoadBattlePyramidEventObjectTemplates(); else if (InTrainerHill()) - sub_81D5DF8(); + LoadTrainerHillEventObjectTemplates(); else LoadEventObjTemplatesFromHeader(); } @@ -1721,8 +1722,8 @@ void CB2_ContinueSavedGame(void) trainerHillMapId = GetCurrentTrainerHillMapId(); if (gMapHeader.mapLayoutId == LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE) LoadBattlePyramidFloorEventObjectScripts(); - else if (trainerHillMapId != 0 && trainerHillMapId != 6) - sub_81D5F48(); + else if (trainerHillMapId != 0 && trainerHillMapId != TRAINER_HILL_ENTRANCE) + LoadTrainerHillFloorEventObjectScripts(); else LoadSaveblockEventObjScripts(); |