summaryrefslogtreecommitdiff
path: root/data/maps/Route103/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/Route103/scripts.inc')
-rw-r--r--data/maps/Route103/scripts.inc15
1 files changed, 5 insertions, 10 deletions
diff --git a/data/maps/Route103/scripts.inc b/data/maps/Route103/scripts.inc
index cf7bc72b5..e2b75e0c3 100644
--- a/data/maps/Route103/scripts.inc
+++ b/data/maps/Route103/scripts.inc
@@ -22,10 +22,8 @@ Route103_EventScript_OpenAlteringCave::
Route103_EventScript_Rival::
lockall
checkplayergender
- compare VAR_RESULT, MALE
- goto_if_eq Route103_EventScript_RivalMay
- compare VAR_RESULT, FEMALE
- goto_if_eq Route103_EventScript_RivalBrendan
+ goto_if_eq VAR_RESULT, MALE, Route103_EventScript_RivalMay
+ goto_if_eq VAR_RESULT, FEMALE, Route103_EventScript_RivalBrendan
end
Route103_EventScript_RivalMay::
@@ -211,8 +209,7 @@ Route103_EventScript_Daisy::
Route103_EventScript_Amy::
trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_AmyIntro, Route103_Text_AmyDefeated, Route103_Text_AmyNotEnoughPokemon, Route102_EventScript_AmyRegisterMatchCallAfterBattle
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route102_EventScript_AmyRematch
+ goto_if_eq VAR_RESULT, TRUE, Route102_EventScript_AmyRematch
msgbox Route103_Text_AmyPostBattle, MSGBOX_AUTOCLOSE
end
@@ -230,8 +227,7 @@ Route102_EventScript_AmyRematch::
Route103_EventScript_Liv::
trainerbattle_double TRAINER_AMY_AND_LIV_1, Route103_Text_LivIntro, Route103_Text_LivDefeated, Route103_Text_LivNotEnoughPokemon, Route102_EventScript_LivRegisterMatchCallAfterBattle
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route102_EventScript_LivRematch
+ goto_if_eq VAR_RESULT, TRUE, Route102_EventScript_LivRematch
msgbox Route103_Text_LivPostBattle, MSGBOX_AUTOCLOSE
end
@@ -254,8 +250,7 @@ Route103_EventScript_Andrew::
Route103_EventScript_Miguel::
trainerbattle_single TRAINER_MIGUEL_1, Route103_Text_MiguelIntro, Route103_Text_MiguelDefeated, Route102_EventScript_MiguelRegisterMatchCallAfterBattle
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq Route103_EventScript_MiguelRematch
+ goto_if_eq VAR_RESULT, TRUE, Route103_EventScript_MiguelRematch
msgbox Route103_Text_MiguelPostBattle, MSGBOX_DEFAULT
release
end