summaryrefslogtreecommitdiff
path: root/maps/Route29.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/Route29.asm
parent6c3000efd2818f8d5cb0a01770d1b92991b80340 (diff)
parentec10d9dd6f8db685270529b49f0b3007a7242dcc (diff)
Merge yenatch:map-objects
Diffstat (limited to 'maps/Route29.asm')
-rw-r--r--maps/Route29.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/maps/Route29.asm b/maps/Route29.asm
index b2a3c1926..f8d758d61 100644
--- a/maps/Route29.asm
+++ b/maps/Route29.asm
@@ -37,14 +37,14 @@ UnknownScript_0x1a0f6d:
spriteface $2, UP
showemote EMOTE_SHOCK, $2, 15
applymovement $2, MovementData_0x1a108d
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
writetext UnknownText_0x1a10df
yesorno
iffalse UnknownScript_0x1a0fd9
loadmovesprites
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x1a109a
stopfollow
loadpokedata RATTATA, 5
@@ -62,14 +62,14 @@ UnknownScript_0x1a0fa3:
spriteface $2, UP
showemote EMOTE_SHOCK, $2, 15
applymovement $2, MovementData_0x1a1094
- spriteface $0, LEFT
+ spriteface PLAYER, LEFT
setevent EVENT_DUDE_TALKED_TO_YOU
loadfont
writetext UnknownText_0x1a10df
yesorno
iffalse UnknownScript_0x1a0fe5
loadmovesprites
- follow $2, $0
+ follow $2, PLAYER
applymovement $2, MovementData_0x1a10a1
stopfollow
loadpokedata RATTATA, 5