summaryrefslogtreecommitdiff
path: root/data/maps/FortreeCity_Gym/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/FortreeCity_Gym/scripts.inc')
-rw-r--r--data/maps/FortreeCity_Gym/scripts.inc9
1 files changed, 3 insertions, 6 deletions
diff --git a/data/maps/FortreeCity_Gym/scripts.inc b/data/maps/FortreeCity_Gym/scripts.inc
index caac72473..1c729bc44 100644
--- a/data/maps/FortreeCity_Gym/scripts.inc
+++ b/data/maps/FortreeCity_Gym/scripts.inc
@@ -18,8 +18,7 @@ FortreeCity_Gym_EventScript_InitRotatingGates::
FortreeCity_Gym_EventScript_Winona::
trainerbattle_single TRAINER_WINONA_1, FortreeCity_Gym_Text_WinonaIntro, FortreeCity_Gym_Text_WinonaDefeat, FortreeCity_Gym_EventScript_WinonaDefeated, NO_MUSIC
specialvar VAR_RESULT, ShouldTryRematchBattle
- compare VAR_RESULT, TRUE
- goto_if_eq FortreeCity_Gym_EventScript_WinonaRematch
+ goto_if_eq VAR_RESULT, TRUE, FortreeCity_Gym_EventScript_WinonaRematch
goto_if_unset FLAG_RECEIVED_TM40, FortreeCity_Gym_EventScript_GiveAerialAce2
msgbox FortreeCity_Gym_Text_WinonaPostBattle, MSGBOX_DEFAULT
release
@@ -50,8 +49,7 @@ FortreeCity_Gym_EventScript_WinonaDefeated::
FortreeCity_Gym_EventScript_GiveAerialAce2::
giveitem ITEM_TM40
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_ShowBagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_ShowBagIsFull
msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM40
release
@@ -59,8 +57,7 @@ FortreeCity_Gym_EventScript_GiveAerialAce2::
FortreeCity_Gym_EventScript_GiveAerialAce::
giveitem ITEM_TM40
- compare VAR_RESULT, FALSE
- goto_if_eq Common_EventScript_BagIsFull
+ goto_if_eq VAR_RESULT, FALSE, Common_EventScript_BagIsFull
msgbox FortreeCity_Gym_Text_ExplainAerialAce, MSGBOX_DEFAULT
setflag FLAG_RECEIVED_TM40
return