diff options
| author | yenatch <yenatch@gmail.com> | 2015-07-21 23:49:18 -0700 |
|---|---|---|
| committer | yenatch <yenatch@gmail.com> | 2015-07-21 23:49:18 -0700 |
| commit | ec10d9dd6f8db685270529b49f0b3007a7242dcc (patch) | |
| tree | 37b8a2883a5439baf83578eb1456d1145d5a0804 /engine/phone_scripts.asm | |
| parent | dc620c08ee43a4baee7cb4b04b22661ccf2ad60a (diff) | |
Add constants for common map object ids.
Diffstat (limited to 'engine/phone_scripts.asm')
| -rw-r--r-- | engine/phone_scripts.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engine/phone_scripts.asm b/engine/phone_scripts.asm index 9aba26450..597ee8372 100644 --- a/engine/phone_scripts.asm +++ b/engine/phone_scripts.asm @@ -3167,11 +3167,11 @@ TalkToTrainerScript:: ; 0xbe66a SeenByTrainerScript:: ; 0xbe675 loadtrainerdata playrammusic - showemote EMOTE_SHOCK, -2, 30 + showemote EMOTE_SHOCK, LAST_TALKED, 30 callasm Function831e applymovement2 MovementBuffer - writepersonxy -2 - faceperson $0, -2 + writepersonxy LAST_TALKED + faceperson PLAYER, LAST_TALKED jump StartBattleWithMapTrainerScript ; 0xbe68a |