summaryrefslogtreecommitdiff
path: root/data/scripts/safari_zone.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/scripts/safari_zone.inc')
-rw-r--r--data/scripts/safari_zone.inc12
1 files changed, 4 insertions, 8 deletions
diff --git a/data/scripts/safari_zone.inc b/data/scripts/safari_zone.inc
index 3b7d85a67..eb6a90abd 100644
--- a/data/scripts/safari_zone.inc
+++ b/data/scripts/safari_zone.inc
@@ -14,8 +14,7 @@ SafariZone_EventScript_Exit::
SafariZone_EventScript_RetirePrompt::
lockall
msgbox SafariZone_Text_WouldYouLikeToExit, MSGBOX_YESNO
- compare VAR_RESULT, YES
- goto_if_eq SafariZone_EventScript_Retire
+ goto_if_eq VAR_RESULT, YES, SafariZone_EventScript_Retire
releaseall
end
@@ -43,11 +42,9 @@ SafariZone_EventScript_OutOfBalls::
EventScript_PokeBlockFeeder::
lockall
special GetPokeblockFeederInFront
- compare VAR_RESULT, 0xFFFF
- goto_if_ne SafariZone_EventScript_PokeblockPresent
+ goto_if_ne VAR_RESULT, 0xFFFF, SafariZone_EventScript_PokeblockPresent
msgbox SafariZone_Text_PlacePokeblockOnFeeder, MSGBOX_YESNO
- compare VAR_RESULT, YES
- goto_if_eq SafariZone_EventScript_ChoosePokeblock
+ goto_if_eq VAR_RESULT, YES, SafariZone_EventScript_ChoosePokeblock
releaseall
end
@@ -55,8 +52,7 @@ SafariZone_EventScript_ChoosePokeblock::
fadescreen FADE_TO_BLACK
special OpenPokeblockCaseOnFeeder
waitstate
- compare VAR_RESULT, 0xFFFF
- goto_if_ne SafariZone_EventScript_PokeblockPlaced
+ goto_if_ne VAR_RESULT, 0xFFFF, SafariZone_EventScript_PokeblockPlaced
end
SafariZone_EventScript_PokeblockPlaced::