summaryrefslogtreecommitdiff
path: root/data/maps/RusturfTunnel/scripts.inc
diff options
context:
space:
mode:
authorPhlosioneer <mattmdrr2@gmail.com>2019-02-25 02:24:20 -0500
committerPhlosioneer <mattmdrr2@gmail.com>2019-02-25 02:24:20 -0500
commit4e5fae008625d236d98d4958594c938bc17f83da (patch)
tree38d9d2e8215684ff90f8e50c7dd2efd40a2cbc71 /data/maps/RusturfTunnel/scripts.inc
parent87859a655b810aeaad7e7e1f5b066731f7e79ece (diff)
parenta589d4a630a130e78bdf0819b807a133562d4449 (diff)
Merge branch 'master' into event-vars
Diffstat (limited to 'data/maps/RusturfTunnel/scripts.inc')
-rw-r--r--data/maps/RusturfTunnel/scripts.inc20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/maps/RusturfTunnel/scripts.inc b/data/maps/RusturfTunnel/scripts.inc
index f10ae75ba..5b22520bf 100644
--- a/data/maps/RusturfTunnel/scripts.inc
+++ b/data/maps/RusturfTunnel/scripts.inc
@@ -23,7 +23,7 @@ RusturfTunnel_EventScript_22CE5F:: @ 822CE5F
faceplayer
msgbox RusturfTunnel_Text_22D7A3, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -35,7 +35,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76
setflag FLAG_TEMP_1
msgbox RusturfTunnel_Text_22D510, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -43,7 +43,7 @@ RusturfTunnel_EventScript_22CE76:: @ 822CE76
RusturfTunnel_EventScript_22CE99:: @ 822CE99
msgbox RusturfTunnel_Text_22D5F3, MSGBOX_DEFAULT
closemessage
- applymovement VAR_LAST_TALKED, RusturfTunnel_Movement_2725A2
+ applymovement VAR_LAST_TALKED, Common_Movement_FaceOriginalDirection
waitmovement 0
release
end
@@ -94,7 +94,7 @@ RusturfTunnel_EventScript_22CF6F:: @ 822CF6F
applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
applymovement 1, RusturfTunnel_Movement_22D06C
waitmovement 0
- applymovement 10, RusturfTunnel_Movement_2725AA
+ applymovement 10, Common_Movement_WalkInPlaceDown
waitmovement 0
return
@@ -102,14 +102,14 @@ RusturfTunnel_EventScript_22CF8B:: @ 822CF8B
applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_22D045
applymovement 1, RusturfTunnel_Movement_22D06C
waitmovement 0
- applymovement 10, RusturfTunnel_Movement_2725AA
+ applymovement 10, Common_Movement_WalkInPlaceDown
waitmovement 0
return
RusturfTunnel_EventScript_22CFA7:: @ 822CFA7
- applymovement 1, RusturfTunnel_Movement_2725A6
+ applymovement 1, Common_Movement_WalkInPlaceUp
waitmovement 0
- applymovement EVENT_OBJ_ID_PLAYER, RusturfTunnel_Movement_2725AA
+ applymovement EVENT_OBJ_ID_PLAYER, Common_Movement_WalkInPlaceDown
waitmovement 0
return
@@ -142,9 +142,9 @@ RusturfTunnel_EventScript_22CFE6:: @ 822CFE6
RusturfTunnel_EventScript_22CFFF:: @ 822CFFF
playse SE_PIN
- applymovement 1, RusturfTunnel_Movement_272598
+ applymovement 1, Common_Movement_ExclamationMark
waitmovement 0
- applymovement 1, RusturfTunnel_Movement_27259A
+ applymovement 1, Common_Movement_Delay48
waitmovement 0
return
@@ -328,7 +328,7 @@ RusturfTunnel_EventScript_22D0C2:: @ 822D0C2
applymovement 5, RusturfTunnel_Movement_22D1A4
waitmovement 0
msgbox RusturfTunnel_Text_22D395, MSGBOX_DEFAULT
- applymovement 5, RusturfTunnel_Movement_27259E
+ applymovement 5, Common_Movement_FacePlayer
waitmovement 0
message RusturfTunnel_Text_22D3BA
waitmessage