diff options
| author | yenatch <yenatch@gmail.com> | 2017-05-28 14:15:22 -0400 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2017-05-28 14:15:22 -0400 |
| commit | f748d34aa389b9e80fc6cab81e6efb1867327f7b (patch) | |
| tree | 92343b604a0df54d4ecf549ee85d4273a1784352 /engine/std_scripts.asm | |
| parent | fd7cf5987a6e4958d63645c76e994c96b51fcc4c (diff) | |
| parent | 288902139f00a9113ea9b360eb00d3109727dcfe (diff) | |
Merge remote-tracking branch 'origin/master' into c-tools
Diffstat (limited to 'engine/std_scripts.asm')
| -rw-r--r-- | engine/std_scripts.asm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engine/std_scripts.asm b/engine/std_scripts.asm index 9c9542cf4..4b69a4de1 100644 --- a/engine/std_scripts.asm +++ b/engine/std_scripts.asm @@ -107,7 +107,7 @@ PokeCenterNurseScript: farwritetext NurseTakePokemonText pause 20 - special Mobile_HealParty + special TrainerRankings_Healings spriteface LAST_TALKED, LEFT pause 10 special HealParty @@ -1907,8 +1907,8 @@ HappinessCheckScript: end Movement_ContestResults_WalkAfterWarp: ; bcea1 - step_right - step_down - turn_head_up + step RIGHT + step DOWN + turn_head UP step_end ; bcea5 |