diff options
| author | yenatch <yenatch@gmail.com> | 2015-08-17 00:14:40 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-08-17 00:14:40 -0400 |
| commit | 9974a2c7014cbe7db3d0e516580fea48001ab3df (patch) | |
| tree | 61c015b170efbe7975650f37d0f15cc775242aa0 /engine/std_scripts.asm | |
| parent | b77741ff7020747dbee6b295b87afe6ef0963dd2 (diff) | |
| parent | abf3fc21378ddc6a4028aa1852d256472bc859e0 (diff) | |
Merge pull request #303 from yenatch/map-objects
Add constants for common map object ids.
Diffstat (limited to 'engine/std_scripts.asm')
| -rw-r--r-- | engine/std_scripts.asm | 10 |
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 |