Sync with pokered

1 files changed, 75 insertions, 138 deletions

diff --git a/scripts/Route9.asm b/scripts/Route9.asm
index 8b346ee8..e69d4d35 100755
--- a/scripts/Route9.asm
+++ b/scripts/Route9.asm
@@ -26,243 +26,180 @@ Route9_TextPointers:
 	dw Route9Text11
 
 Route9TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_0
-	dw Route9BattleText1 ; TextBeforeBattle
-	dw Route9AfterBattleText1 ; TextAfterBattle
-	dw Route9EndBattleText1 ; TextEndBattle
-	dw Route9EndBattleText1 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_0, 3, Route9BattleText1, Route9EndBattleText1, Route9AfterBattleText1
 Route9TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_1
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_1
-	dw Route9BattleTextAJ ; TextBeforeBattle
-	dw Route9AfterBattleTextAJ ; TextAfterBattle
-	dw Route9EndBattleTextAJ ; TextEndBattle
-	dw Route9EndBattleTextAJ ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_1, 2, Route9BattleTextAJ, Route9EndBattleTextAJ, Route9AfterBattleTextAJ
 Route9TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2
-	dw Route9BattleText3 ; TextBeforeBattle
-	dw Route9AfterBattleText3 ; TextAfterBattle
-	dw Route9EndBattleText3 ; TextEndBattle
-	dw Route9EndBattleText3 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_2, 4, Route9BattleText3, Route9EndBattleText3, Route9AfterBattleText3
 Route9TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3
-	dw Route9BattleText4 ; TextBeforeBattle
-	dw Route9AfterBattleText4 ; TextAfterBattle
-	dw Route9EndBattleText4 ; TextEndBattle
-	dw Route9EndBattleText4 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_3, 2, Route9BattleText4, Route9EndBattleText4, Route9AfterBattleText4
 Route9TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4
-	dw Route9BattleText5 ; TextBeforeBattle
-	dw Route9AfterBattleText5 ; TextAfterBattle
-	dw Route9EndBattleText5 ; TextEndBattle
-	dw Route9EndBattleText5 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_4, 2, Route9BattleText5, Route9EndBattleText5, Route9AfterBattleText5
 Route9TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5
-	dw Route9BattleText6 ; TextBeforeBattle
-	dw Route9AfterBattleText6 ; TextAfterBattle
-	dw Route9EndBattleText6 ; TextEndBattle
-	dw Route9EndBattleText6 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_5, 3, Route9BattleText6, Route9EndBattleText6, Route9AfterBattleText6
 Route9TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6
-	dw Route9BattleText7 ; TextBeforeBattle
-	dw Route9AfterBattleText7 ; TextAfterBattle
-	dw Route9EndBattleText7 ; TextEndBattle
-	dw Route9EndBattleText7 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_6, 4, Route9BattleText7, Route9EndBattleText7, Route9AfterBattleText7
 Route9TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7, 1
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7, 1
-	dw Route9BattleText8 ; TextBeforeBattle
-	dw Route9AfterBattleText8 ; TextAfterBattle
-	dw Route9EndBattleText8 ; TextEndBattle
-	dw Route9EndBattleText8 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_7, 1, 2, Route9BattleText8, Route9EndBattleText8, Route9AfterBattleText8
 Route9TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1
-	dw Route9BattleText9 ; TextBeforeBattle
-	dw Route9AfterBattleText9 ; TextAfterBattle
-	dw Route9EndBattleText9 ; TextEndBattle
-	dw Route9EndBattleText9 ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_ROUTE_9_TRAINER_8, 1, 2, Route9BattleText9, Route9EndBattleText9, Route9AfterBattleText9
+	db -1 ; end
 
 Route9Text1:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader0
 	jr Route9TalkToTrainer
 
 Route9TextAJ:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader1
 	jr Route9TalkToTrainer
 
 Route9Text3:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader2
 	jr Route9TalkToTrainer
 
 Route9Text4:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader3
 	jr Route9TalkToTrainer
 
 Route9Text5:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader4
 	jr Route9TalkToTrainer
 
 Route9Text6:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader5
 	jr Route9TalkToTrainer
 
 Route9Text7:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader6
 	jr Route9TalkToTrainer
 
 Route9Text8:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader7
 	jr Route9TalkToTrainer
 
 Route9Text9:
-	TX_ASM
+	text_asm
 	ld hl, Route9TrainerHeader8
 Route9TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route9BattleText1:
-	TX_FAR _Route9BattleText1
-	db "@"
+	text_far _Route9BattleText1
+	text_end
 
 Route9EndBattleText1:
-	TX_FAR _Route9EndBattleText1
-	db "@"
+	text_far _Route9EndBattleText1
+	text_end
 
 Route9AfterBattleText1:
-	TX_FAR _Route9AfterBattleText1
-	db "@"
+	text_far _Route9AfterBattleText1
+	text_end
 
 Route9BattleTextAJ:
-	TX_FAR _Route9BattleTextAJ
-	db "@"
+	text_far _Route9BattleTextAJ
+	text_end
 
 Route9EndBattleTextAJ:
-	TX_FAR _Route9EndBattleTextAJ
-	db "@"
+	text_far _Route9EndBattleTextAJ
+	text_end
 
 Route9AfterBattleTextAJ:
-	TX_FAR _Route9AfterBattleTextAJ
-	db "@"
+	text_far _Route9AfterBattleTextAJ
+	text_end
 
 Route9BattleText3:
-	TX_FAR _Route9BattleText3
-	db "@"
+	text_far _Route9BattleText3
+	text_end
 
 Route9EndBattleText3:
-	TX_FAR _Route9EndBattleText3
-	db "@"
+	text_far _Route9EndBattleText3
+	text_end
 
 Route9AfterBattleText3:
-	TX_FAR _Route9AfterBattleText3
-	db "@"
+	text_far _Route9AfterBattleText3
+	text_end
 
 Route9BattleText4:
-	TX_FAR _Route9BattleText4
-	db "@"
+	text_far _Route9BattleText4
+	text_end
 
 Route9EndBattleText4:
-	TX_FAR _Route9EndBattleText4
-	db "@"
+	text_far _Route9EndBattleText4
+	text_end
 
 Route9AfterBattleText4:
-	TX_FAR _Route9AfterBattleText4
-	db "@"
+	text_far _Route9AfterBattleText4
+	text_end
 
 Route9BattleText5:
-	TX_FAR _Route9BattleText5
-	db "@"
+	text_far _Route9BattleText5
+	text_end
 
 Route9EndBattleText5:
-	TX_FAR _Route9EndBattleText5
-	db "@"
+	text_far _Route9EndBattleText5
+	text_end
 
 Route9AfterBattleText5:
-	TX_FAR _Route9AfterBattleText5
-	db "@"
+	text_far _Route9AfterBattleText5
+	text_end
 
 Route9BattleText6:
-	TX_FAR _Route9BattleText6
-	db "@"
+	text_far _Route9BattleText6
+	text_end
 
 Route9EndBattleText6:
-	TX_FAR _Route9EndBattleText6
-	db "@"
+	text_far _Route9EndBattleText6
+	text_end
 
 Route9AfterBattleText6:
-	TX_FAR _Route9AfterBattleText6
-	db "@"
+	text_far _Route9AfterBattleText6
+	text_end
 
 Route9BattleText7:
-	TX_FAR _Route9BattleText7
-	db "@"
+	text_far _Route9BattleText7
+	text_end
 
 Route9EndBattleText7:
-	TX_FAR _Route9EndBattleText7
-	db "@"
+	text_far _Route9EndBattleText7
+	text_end
 
 Route9AfterBattleText7:
-	TX_FAR _Route9AfterBattleText7
-	db "@"
+	text_far _Route9AfterBattleText7
+	text_end
 
 Route9BattleText8:
-	TX_FAR _Route9BattleText8
-	db "@"
+	text_far _Route9BattleText8
+	text_end
 
 Route9EndBattleText8:
-	TX_FAR _Route9EndBattleText8
-	db "@"
+	text_far _Route9EndBattleText8
+	text_end
 
 Route9AfterBattleText8:
-	TX_FAR _Route9AfterBattleText8
-	db "@"
+	text_far _Route9AfterBattleText8
+	text_end
 
 Route9BattleText9:
-	TX_FAR _Route9BattleText9
-	db "@"
+	text_far _Route9BattleText9
+	text_end
 
 Route9EndBattleText9:
-	TX_FAR _Route9EndBattleText9
-	db "@"
+	text_far _Route9EndBattleText9
+	text_end
 
 Route9AfterBattleText9:
-	TX_FAR _Route9AfterBattleText9
-	db "@"
+	text_far _Route9AfterBattleText9
+	text_end
 
 Route9Text11:
-	TX_FAR _Route9Text11
-	db "@"
+	text_far _Route9Text11
+	text_end