summaryrefslogtreecommitdiff
path: root/data/maps/GraniteCave_StevensRoom
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-08-16 05:59:10 -0400
committerGriffinR <griffin.g.richards@gmail.com>2020-08-16 05:59:10 -0400
commit65bd2faf9460d4e5986c30e54b283d7674d77c55 (patch)
tree250c345d17b8d8f910d327d98f577afddfb3a64a /data/maps/GraniteCave_StevensRoom
parent2749948eebe65aa8b55738d820e4a0252dd45c1a (diff)
parent25f45ffa8441b0f0a999355c9755782ccb4809dc (diff)
Merge branch 'master' of https://github.com/pret/pokeemerald into doc-contest
Diffstat (limited to 'data/maps/GraniteCave_StevensRoom')
-rw-r--r--data/maps/GraniteCave_StevensRoom/scripts.inc10
1 files changed, 6 insertions, 4 deletions
diff --git a/data/maps/GraniteCave_StevensRoom/scripts.inc b/data/maps/GraniteCave_StevensRoom/scripts.inc
index 01ce14588..7d0b275a5 100644
--- a/data/maps/GraniteCave_StevensRoom/scripts.inc
+++ b/data/maps/GraniteCave_StevensRoom/scripts.inc
@@ -1,3 +1,5 @@
+.set LOCALID_STEVEN, 1
+
GraniteCave_StevensRoom_MapScripts:: @ 822DC7A
.byte 0
@@ -32,24 +34,24 @@ GraniteCave_StevensRoom_EventScript_Steven:: @ 822DC7B
compare VAR_FACING, DIR_EAST
call_if_eq GraniteCave_StevensRoom_EventScript_StevenExitWestEast
playse SE_KAIDAN
- removeobject 1
+ removeobject LOCALID_STEVEN
release
end
GraniteCave_StevensRoom_EventScript_StevenExitNorth:: @ 822DD0D
- applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit
+ applymovement LOCALID_STEVEN, GraniteCave_StevensRoom_Movement_StevenExit
waitmovement 0
return
GraniteCave_StevensRoom_EventScript_StevenExitWestEast:: @ 822DD18
applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit
- applymovement 1, GraniteCave_StevensRoom_Movement_StevenExit
+ applymovement LOCALID_STEVEN, GraniteCave_StevensRoom_Movement_StevenExit
waitmovement 0
return
GraniteCave_StevensRoom_EventScript_StevenExitSouth:: @ 822DD2A
applymovement OBJ_EVENT_ID_PLAYER, GraniteCave_StevensRoom_Movement_PlayerTurnTowardExit
- applymovement 1, GraniteCave_StevensRoom_Movement_StevenExitSouth
+ applymovement LOCALID_STEVEN, GraniteCave_StevensRoom_Movement_StevenExitSouth
waitmovement 0
return