summaryrefslogtreecommitdiff
path: root/maps/Route36.asm
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2015-07-25 20:18:59 -0400
committerPikalaxALT <PikalaxALT@gmail.com>2015-07-25 20:18:59 -0400
commit594253eb30e8e2ee8b4b9e0cfe7442eba0e3d3b4 (patch)
treea2e0a3d80436e1d2279beb1aa07bf8217a586c32 /maps/Route36.asm
parent6c3000efd2818f8d5cb0a01770d1b92991b80340 (diff)
parentec10d9dd6f8db685270529b49f0b3007a7242dcc (diff)
Merge yenatch:map-objects
Diffstat (limited to 'maps/Route36.asm')
-rw-r--r--maps/Route36.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/maps/Route36.asm b/maps/Route36.asm
index ceb5cb119..12b21699b 100644
--- a/maps/Route36.asm
+++ b/maps/Route36.asm
@@ -30,13 +30,13 @@ ArthurCallback:
return
UnknownScript_0x19401b:
- showemote EMOTE_SHOCK, $0, 15
+ showemote EMOTE_SHOCK, PLAYER, 15
pause 15
playsound SFX_WARP_FROM
- spriteface $0, UP
+ spriteface PLAYER, UP
applymovement $a, MovementData_0x194262
disappear $a
- spriteface $0, DOWN
+ spriteface PLAYER, DOWN
pause 10
dotrigger $0
clearevent EVENT_SAW_SUICUNE_AT_CIANWOOD_CITY