diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-13 16:10:05 -0500 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-16 13:02:35 -0600 |
| commit | 5e01871f8b00d6b0ef4921a35e0b2bf18c7b4183 (patch) | |
| tree | 1f13aaa2e3ca31bf6be17aef7bc2c3085d6fdb9f /src/field_control_avatar.c | |
| parent | 2c3726a328e8a1a9dde36796c431d1cd3608bfef (diff) | |
Document Trainer Hill
Diffstat (limited to 'src/field_control_avatar.c')
| -rw-r--r-- | src/field_control_avatar.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index faa906637..41b7a4dbf 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -33,6 +33,7 @@ #include "constants/map_types.h" #include "constants/maps.h" #include "constants/songs.h" +#include "constants/trainer_hill.h" static EWRAM_DATA u8 sWildEncounterImmunitySteps = 0; static EWRAM_DATA u16 sPreviousPlayerMetatileBehavior = 0; @@ -792,20 +793,16 @@ static void SetupWarp(struct MapHeader *unused, s8 warpEventId, struct MapPositi if (trainerHillMapId) { - if (trainerHillMapId == sub_81D6490()) + if (trainerHillMapId == GetNumFloorsInTrainerHillChallenge()) { if (warpEventId == 0) - { warpEvent = &gMapHeader.events->warps[0]; - } else - { - warpEvent = sub_81D6120(); - } + warpEvent = SetWarpDestinationTrainerHill4F(); } - else if (trainerHillMapId == 5) + else if (trainerHillMapId == TRAINER_HILL_ROOF) { - warpEvent = sub_81D6134(warpEventId); + warpEvent = SetWarpDestinationTrainerHillFinalFloor(warpEventId); } else { |