diff options
| author | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
|---|---|---|
| committer | PikalaxALT <PikalaxALT@gmail.com> | 2015-07-25 20:18:59 -0400 |
| commit | 594253eb30e8e2ee8b4b9e0cfe7442eba0e3d3b4 (patch) | |
| tree | a2e0a3d80436e1d2279beb1aa07bf8217a586c32 /engine/std_scripts.asm | |
| parent | 6c3000efd2818f8d5cb0a01770d1b92991b80340 (diff) | |
| parent | ec10d9dd6f8db685270529b49f0b3007a7242dcc (diff) | |
Merge yenatch:map-objects
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 b1d6d0f08..95c91b647 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 ROUTE_36_NATIONAL_PARK_GATE, $0, $4 - applymovement $0, Movement_ContestResults_WalkAfterWarp + applymovement PLAYER, Movement_ContestResults_WalkAfterWarp BugContestResultsScript: clearflag ENGINE_BUG_CONTEST_TIMER |