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/phone_scripts.asm | |
parent | 6c3000efd2818f8d5cb0a01770d1b92991b80340 (diff) | |
parent | ec10d9dd6f8db685270529b49f0b3007a7242dcc (diff) |
Merge yenatch:map-objects
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 db7f79997..5be1c9a77 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 |