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.inc13
1 files changed, 6 insertions, 7 deletions
diff --git a/data/maps/SafariZone_South/scripts.inc b/data/maps/SafariZone_South/scripts.inc
index 6579b6571..06b050f67 100644
--- a/data/maps/SafariZone_South/scripts.inc
+++ b/data/maps/SafariZone_South/scripts.inc
@@ -9,7 +9,7 @@ SafariZone_South_MapScript2_23D284: @ 823D284
SafariZone_South_EventScript_23D28E:: @ 823D28E
lockall
- applymovement 255, SafariZone_South_Movement_23D2C5
+ applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D2C5
waitmovement 0
applymovement 1, SafariZone_South_Movement_23D2C7
waitmovement 0
@@ -20,7 +20,7 @@ SafariZone_South_EventScript_23D28E:: @ 823D28E
SafariZone_South_MapScript1_23D2B1: @ 823D2B1
compare VAR_0x40A4, 2
- call_if 1, SafariZone_South_EventScript_23D2BD
+ call_if_eq SafariZone_South_EventScript_23D2BD
end
SafariZone_South_EventScript_23D2BD:: @ 823D2BD
@@ -51,11 +51,10 @@ SafariZone_South_EventScript_23D2DC:: @ 823D2DC
SafariZone_South_EventScript_23D2E5:: @ 823D2E5
lock
faceplayer
- checkflag FLAG_0x05D
- goto_if 0, SafariZone_South_EventScript_23D30D
+ goto_if_unset FLAG_0x05D, SafariZone_South_EventScript_23D30D
msgbox SafariZone_South_Text_2A51D4, MSGBOX_YESNO
compare VAR_RESULT, 1
- goto_eq SafariZone_South_EventScript_23D31A
+ goto_if_eq SafariZone_South_EventScript_23D31A
msgbox SafariZone_South_Text_2A521A, MSGBOX_DEFAULT
release
end
@@ -77,7 +76,7 @@ SafariZone_South_EventScript_23D31A:: @ 823D31A
SafariZone_South_EventScript_23D33F:: @ 823D33F
applymovement 1, SafariZone_South_Movement_23D38A
waitmovement 0
- applymovement 255, SafariZone_South_Movement_23D385
+ applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D385
waitmovement 0
goto SafariZone_South_EventScript_23D373
end
@@ -85,7 +84,7 @@ SafariZone_South_EventScript_23D33F:: @ 823D33F
SafariZone_South_EventScript_23D359:: @ 823D359
applymovement 1, SafariZone_South_Movement_23D38D
waitmovement 0
- applymovement 255, SafariZone_South_Movement_23D387
+ applymovement EVENT_OBJ_ID_PLAYER, SafariZone_South_Movement_23D387
waitmovement 0
goto SafariZone_South_EventScript_23D373
end