diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-11-01 17:50:54 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2019-11-01 17:22:45 -0500 |
| commit | 5f1fcdd0234d07b54637db05a4e7d658e89e4531 (patch) | |
| tree | a65609912785e76b35e3912b5a2176528f1c3c69 /src | |
| parent | dd01942c4f41d65fb861a42097108e5f5d9b93e9 (diff) | |
Document aqua/magma area scripts
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_tower.c | 8 | ||||
| -rw-r--r-- | src/field_control_avatar.c | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/battle_tower.c b/src/battle_tower.c index 8efee42f7..7b9842c48 100644 --- a/src/battle_tower.c +++ b/src/battle_tower.c @@ -31,8 +31,8 @@ #include "constants/species.h" #include "constants/easy_chat.h" -extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224157[]; -extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_224166[]; +extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer[]; +extern const u8 MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer[]; // EWRAM vars. EWRAM_DATA const struct BattleFrontierTrainer *gFacilityTrainers = NULL; @@ -2349,9 +2349,9 @@ void DoSpecialTrainerBattle(void) gBattleTypeFlags = BATTLE_TYPE_TRAINER | BATTLE_TYPE_DOUBLE | BATTLE_TYPE_TWO_OPPONENTS | BATTLE_TYPE_MULTI | BATTLE_TYPE_INGAME_PARTNER; FillPartnerParty(TRAINER_STEVEN_PARTNER); gApproachingTrainerId = 0; - BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1); + BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_MaxieTrainer + 1); gApproachingTrainerId = 1; - BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_224166 + 1); + BattleSetup_ConfigureTrainerBattle(MossdeepCity_SpaceCenter_2F_EventScript_TabithaTrainer + 1); gPartnerTrainerId = TRAINER_STEVEN_PARTNER; CreateTask(Task_StartBattleAfterTransition, 1); PlayMapChosenOrBattleBGM(0); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c index e868a7b99..bbd2ebda9 100644 --- a/src/field_control_avatar.c +++ b/src/field_control_avatar.c @@ -588,7 +588,7 @@ static bool8 TryStartStepCountScript(u16 metatileBehavior) } if (ShouldDoRivalRayquazaCall() == TRUE) { - ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_224175); + ScriptContext1_SetupScript(MossdeepCity_SpaceCenter_2F_EventScript_RivalRayquazaCall); return TRUE; } } |