Move more contiguous related code blocks from main.asm to engine/ and events/

2017-12-15 20:10:54 -05:00
parent 606817f18b
commit 1038ebca5e
41 changed files with 3675 additions and 3704 deletions
--- a/engine/trainer_scripts.asm
+++ b/engine/trainer_scripts.asm
@@ -0,0 +1,31 @@
+TalkToTrainerScript:: ; 0xbe66a
+	faceplayer
+	trainerflagaction CHECK_FLAG
+	iftrue AlreadyBeatenTrainerScript
+	loadmemtrainer
+	encountermusic
+	jump StartBattleWithMapTrainerScript
+
+SeenByTrainerScript:: ; 0xbe675
+	loadmemtrainer
+	encountermusic
+	showemote EMOTE_SHOCK, LAST_TALKED, 30
+	callasm TrainerWalkToPlayer
+	applymovement2 MovementBuffer
+	writepersonxy LAST_TALKED
+	faceperson PLAYER, LAST_TALKED
+	jump StartBattleWithMapTrainerScript
+
+StartBattleWithMapTrainerScript: ; 0xbe68a
+	opentext
+	trainertext $0
+	waitbutton
+	closetext
+	loadmemtrainer
+	startbattle
+	reloadmapafterbattle
+	trainerflagaction SET_FLAG
+	loadvar wRunningTrainerBattleScript, -1
+
+AlreadyBeatenTrainerScript:
+	scripttalkafter