diff options
Diffstat (limited to 'data/scripts')
| -rw-r--r-- | data/scripts/field_poison.inc | 5 | ||||
| -rw-r--r-- | data/scripts/trainer_hill.inc | 18 |
2 files changed, 8 insertions, 15 deletions
diff --git a/data/scripts/field_poison.inc b/data/scripts/field_poison.inc index d45b480d1..f33292fe6 100644 --- a/data/scripts/field_poison.inc +++ b/data/scripts/field_poison.inc @@ -39,9 +39,8 @@ EventScript_FrontierFieldWhiteOut:: @ 82736F8 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 compare VAR_RESULT, 2 goto_if_eq BattleFrontier_BattlePyramidTop_EventScript_252B42 - setvar VAR_0x8004, TRAINER_HILL_FUNC_IN_CHALLENGE - special CallTrainerHillFunction - compare VAR_RESULT, 1 + trainerhill_inchallenge + compare VAR_RESULT, TRUE goto_if_eq TrainerHill_1F_EventScript_Lost special Script_FadeOutMapMusic waitstate diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc index c655a3c9c..e57cf923b 100644 --- a/data/scripts/trainer_hill.inc +++ b/data/scripts/trainer_hill.inc @@ -1,7 +1,6 @@ TrainerHill_OnResume: @ 82C8336 setvar VAR_TEMP_2, 0 - setvar VAR_0x8004, TRAINER_HILL_FUNC_RESUME_TIMER - special CallTrainerHillFunction + trainerhill_resumetimer frontier_getbattleoutcome compare VAR_RESULT, B_OUTCOME_LOST goto_if_eq TrainerHill_1F_EventScript_Lost @@ -26,16 +25,14 @@ TrainerHill_OnFrame: @ 82C8381 EventScript_TrainerHillTimer:: @ 82C8393 lockall - setvar VAR_0x8004, TRAINER_HILL_FUNC_GET_CHALLENGE_TIME - special CallTrainerHillFunction + trainerhill_gettime msgbox TrainerHill_Entrance_Text_ChallengeTime, MSGBOX_DEFAULT releaseall end TrainerHill_1F_EventScript_DummyWarpToEntranceCounter:: @ 82C83A6 setvar VAR_TEMP_2, 1 - setvar VAR_0x8004, TRAINER_HILL_FUNC_CLEAR_RESULT - special CallTrainerHillFunction + trainerhill_clearresult compare VAR_RESULT, 1 @ VAR_RESULT always 0 here goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter end @@ -47,10 +44,8 @@ TrainerHill_1F_EventScript_WarpSilentToEntranceCounter:: @ 82C83BF end TrainerHill_1F_EventScript_Lost:: @ 82C83C9 - setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_ALL_TRAINER_FLAGS - special CallTrainerHillFunction - setvar VAR_0x8004, TRAINER_HILL_FUNC_SET_LOST - special CallTrainerHillFunction + trainerhill_settrainerflags + trainerhill_lost setvar VAR_TEMP_1, 1 end @@ -68,8 +63,7 @@ TrainerHill_1F_Movement_SetInvisible:: @ 82C83EE @ TRAINER_PHILLIP is an actual Trainer on the SS Tidal, but is used as a placeholder here TrainerHill_EventScript_TrainerBattle:: @ 82C83F0 trainerbattle TRAINER_BATTLE_HILL, TRAINER_PHILLIP, 0, BattleFacility_TrainerBattle_PlaceholderText, BattleFacility_TrainerBattle_PlaceholderText - setvar VAR_0x8004, TRAINER_HILL_FUNC_POST_BATTLE_TEXT - special CallTrainerHillFunction + trainerhill_postbattletext waitmessage waitbuttonpress closemessage |