summaryrefslogtreecommitdiff
path: root/engine/std_scripts.asm
diff options
context:
space:
mode:
authoryenatch <yenatch@gmail.com>2015-07-21 23:49:18 -0700
committeryenatch <yenatch@gmail.com>2015-07-21 23:49:18 -0700
commitec10d9dd6f8db685270529b49f0b3007a7242dcc (patch)
tree37b8a2883a5439baf83578eb1456d1145d5a0804 /engine/std_scripts.asm
parentdc620c08ee43a4baee7cb4b04b22661ccf2ad60a (diff)
Add constants for common map object ids.
Diffstat (limited to 'engine/std_scripts.asm')
-rw-r--r--engine/std_scripts.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm
index aa0b879a7..7656cf184 100644
--- a/engine/std_scripts.asm
+++ b/engine/std_scripts.asm
@@ -108,7 +108,7 @@ PokeCenterNurseScript:
farwritetext UnknownText_0x1b01bd
pause 20
special Mobile_HealParty
- spriteface $fe, LEFT
+ spriteface LAST_TALKED, LEFT
pause 10
special HealParty
playmusic MUSIC_NONE
@@ -116,7 +116,7 @@ PokeCenterNurseScript:
special HealMachineAnim
pause 30
special RestartMapMusic
- spriteface $fe, DOWN
+ spriteface LAST_TALKED, DOWN
pause 10
checkphonecall ; elm already called about pokerus
@@ -133,9 +133,9 @@ PokeCenterNurseScript:
.done
farwritetext UnknownText_0x1b020b
- spriteface $fe, UP
+ spriteface LAST_TALKED, UP
pause 10
- spriteface $fe, DOWN
+ spriteface LAST_TALKED, DOWN
pause 10
closetext
@@ -308,7 +308,7 @@ BugContestResultsWarpScript:
clearevent EVENT_ROUTE_36_NATIONAL_PARK_GATE_OFFICER_NOT_CONTEST_DAY
setevent EVENT_WARPED_FROM_ROUTE_35_NATIONAL_PARK_GATE
warp GROUP_ROUTE_36_NATIONAL_PARK_GATE, MAP_ROUTE_36_NATIONAL_PARK_GATE, $0, $4
- applymovement $0, Movement_ContestResults_WalkAfterWarp
+ applymovement PLAYER, Movement_ContestResults_WalkAfterWarp
BugContestResultsScript:
clearflag ENGINE_BUG_CONTEST_TIMER