summaryrefslogtreecommitdiff
path: root/data/scripts/trainer_hill.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/trainer_hill.inc')
-rw-r--r--data/scripts/trainer_hill.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/scripts/trainer_hill.inc b/data/scripts/trainer_hill.inc
index 8804b71b0..b7f815351 100644
--- a/data/scripts/trainer_hill.inc
+++ b/data/scripts/trainer_hill.inc
@@ -2,12 +2,9 @@ TrainerHill_OnResume:
setvar VAR_TEMP_2, 0
trainerhill_resumetimer
frontier_get FRONTIER_DATA_BATTLE_OUTCOME
- compare VAR_RESULT, B_OUTCOME_LOST
- goto_if_eq TrainerHill_1F_EventScript_Lost
- compare VAR_RESULT, B_OUTCOME_DREW
- goto_if_eq TrainerHill_1F_EventScript_Lost
- compare VAR_RESULT, B_OUTCOME_FORFEITED
- goto_if_eq TrainerHill_1F_EventScript_Lost
+ goto_if_eq VAR_RESULT, B_OUTCOME_LOST, TrainerHill_1F_EventScript_Lost
+ goto_if_eq VAR_RESULT, B_OUTCOME_DREW, TrainerHill_1F_EventScript_Lost
+ goto_if_eq VAR_RESULT, B_OUTCOME_FORFEITED, TrainerHill_1F_EventScript_Lost
end
TrainerHill_OnWarp:
@@ -35,8 +32,7 @@ EventScript_TrainerHillTimer::
TrainerHill_1F_EventScript_DummyWarpToEntranceCounter::
setvar VAR_TEMP_2, 1
trainerhill_getusingereader
- compare VAR_RESULT, TRUE @ VAR_RESULT always FALSE here
- goto_if_eq TrainerHill_1F_EventScript_WarpSilentToEntranceCounter
+ goto_if_eq VAR_RESULT, TRUE, TrainerHill_1F_EventScript_WarpSilentToEntranceCounter @ VAR_RESULT always FALSE here
end
@ Never reached