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/phone_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/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 |