summaryrefslogtreecommitdiff
path: root/data/maps/SafariZone_South/scripts.inc
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/SafariZone_South/scripts.inc')
-rw-r--r--data/maps/SafariZone_South/scripts.inc8
1 files changed, 3 insertions, 5 deletions
diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc
index 791572fe0..6b4c774c2 100644
--- a/data/maps/SafariZone_South/scripts.inc
+++ b/data/maps/SafariZone_South/scripts.inc
@@ -21,8 +21,7 @@ SafariZone_South_EventScript_EnterSafariZone::
end
SafariZone_South_OnTransition:
- compare VAR_SAFARI_ZONE_STATE, 2
- call_if_eq SafariZone_South_EventScript_SetExitAttendantAside
+ call_if_eq VAR_SAFARI_ZONE_STATE, 2, SafariZone_South_EventScript_SetExitAttendantAside
end
SafariZone_South_EventScript_SetExitAttendantAside::
@@ -55,8 +54,7 @@ SafariZone_South_EventScript_ExitAttendant::
faceplayer
goto_if_unset FLAG_GOOD_LUCK_SAFARI_ZONE, SafariZone_South_EventScript_GoodLuck
msgbox SafariZone_South_Text_StillHaveTimeExit, MSGBOX_YESNO
- compare VAR_RESULT, YES
- goto_if_eq SafariZone_South_EventScript_ExitEarly
+ goto_if_eq VAR_RESULT, YES, SafariZone_South_EventScript_ExitEarly
msgbox SafariZone_South_Text_EnjoyTheRestOfYourAdventure, MSGBOX_DEFAULT
release
end
@@ -94,7 +92,7 @@ SafariZone_South_EventScript_ExitEarlyEast::
SafariZone_South_EventScript_Exit::
setvar VAR_SAFARI_ZONE_STATE, 1
special ExitSafariMode
- warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 255, 2, 5
+ warpdoor MAP_ROUTE121_SAFARI_ZONE_ENTRANCE, 2, 5
waitstate
end