Merge yenatch:map-objects

2015-07-25 20:18:59 -04:00
parent 6c3000efd2 ec10d9dd6f
commit 594253eb30
85 changed files with 423 additions and 419 deletions
--- 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