Sync with pokered

1 files changed, 83 insertions, 153 deletions

diff --git a/scripts/Route19.asm b/scripts/Route19.asm
index febeb9a4..7e09c5e3 100755
--- a/scripts/Route19.asm
+++ b/scripts/Route19.asm
@@ -26,269 +26,199 @@ Route19_TextPointers:
 	dw Route19Text11
 
 Route19TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_0
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_0
-	dw Route19BattleText1 ; TextBeforeBattle
-	dw Route19AfterBattleText1 ; TextAfterBattle
-	dw Route19EndBattleText1 ; TextEndBattle
-	dw Route19EndBattleText1 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_0, 4, Route19BattleText1, Route19EndBattleText1, Route19AfterBattleText1
 Route19TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_1
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_1
-	dw Route19BattleText2 ; TextBeforeBattle
-	dw Route19AfterBattleText2 ; TextAfterBattle
-	dw Route19EndBattleText2 ; TextEndBattle
-	dw Route19EndBattleText2 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_1, 4, Route19BattleText2, Route19EndBattleText2, Route19AfterBattleText2
 Route19TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_2
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_2
-	dw Route19BattleText3 ; TextBeforeBattle
-	dw Route19AfterBattleText3 ; TextAfterBattle
-	dw Route19EndBattleText3 ; TextEndBattle
-	dw Route19EndBattleText3 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_2, 3, Route19BattleText3, Route19EndBattleText3, Route19AfterBattleText3
 Route19TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_3
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_3
-	dw Route19BattleText4 ; TextBeforeBattle
-	dw Route19AfterBattleText4 ; TextAfterBattle
-	dw Route19EndBattleText4 ; TextEndBattle
-	dw Route19EndBattleText4 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_3, 4, Route19BattleText4, Route19EndBattleText4, Route19AfterBattleText4
 Route19TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_4
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_4
-	dw Route19BattleText5 ; TextBeforeBattle
-	dw Route19AfterBattleText5 ; TextAfterBattle
-	dw Route19EndBattleText5 ; TextEndBattle
-	dw Route19EndBattleText5 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_4, 4, Route19BattleText5, Route19EndBattleText5, Route19AfterBattleText5
 Route19TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_5
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_5
-	dw Route19BattleText6 ; TextBeforeBattle
-	dw Route19AfterBattleText6 ; TextAfterBattle
-	dw Route19EndBattleText6 ; TextEndBattle
-	dw Route19EndBattleText6 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_5, 4, Route19BattleText6, Route19EndBattleText6, Route19AfterBattleText6
 Route19TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_6
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_6
-	dw Route19BattleText7 ; TextBeforeBattle
-	dw Route19AfterBattleText7 ; TextAfterBattle
-	dw Route19EndBattleText7 ; TextEndBattle
-	dw Route19EndBattleText7 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_6, 3, Route19BattleText7, Route19EndBattleText7, Route19AfterBattleText7
 Route19TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_7, 1
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_7, 1
-	dw Route19BattleText8 ; TextBeforeBattle
-	dw Route19AfterBattleText8 ; TextAfterBattle
-	dw Route19EndBattleText8 ; TextEndBattle
-	dw Route19EndBattleText8 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_7, 1, 4, Route19BattleText8, Route19EndBattleText8, Route19AfterBattleText8
 Route19TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_8, 1
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_8, 1
-	dw Route19BattleText9 ; TextBeforeBattle
-	dw Route19AfterBattleText9 ; TextAfterBattle
-	dw Route19EndBattleText9 ; TextEndBattle
-	dw Route19EndBattleText9 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_8, 1, 4, Route19BattleText9, Route19EndBattleText9, Route19AfterBattleText9
 Route19TrainerHeader9:
-	dbEventFlagBit EVENT_BEAT_ROUTE_19_TRAINER_9, 1
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_19_TRAINER_9, 1
-	dw Route19BattleText10 ; TextBeforeBattle
-	dw Route19AfterBattleText10 ; TextAfterBattle
-	dw Route19EndBattleText10 ; TextEndBattle
-	dw Route19EndBattleText10 ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_ROUTE_19_TRAINER_9, 1, 4, Route19BattleText10, Route19EndBattleText10, Route19AfterBattleText10
+	db -1 ; end
 
 Route19Text1:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader0
 	jr Route19_TalkToTrainer
 
 Route19Text2:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader1
 	jr Route19_TalkToTrainer
 
 Route19Text3:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader2
 	jr Route19_TalkToTrainer
 
 Route19Text4:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader3
 	jr Route19_TalkToTrainer
 
 Route19Text5:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader4
 	jr Route19_TalkToTrainer
 
 Route19Text6:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader5
 	jr Route19_TalkToTrainer
 
 Route19Text7:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader6
 	jr Route19_TalkToTrainer
 
 Route19Text8:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader7
 	jr Route19_TalkToTrainer
 
 Route19Text9:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader8
 	jr Route19_TalkToTrainer
 
 Route19Text10:
-	TX_ASM
+	text_asm
 	ld hl, Route19TrainerHeader9
 Route19_TalkToTrainer:
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route19BattleText1:
-	TX_FAR _Route19BattleText1
-	db "@"
+	text_far _Route19BattleText1
+	text_end
 
 Route19EndBattleText1:
-	TX_FAR _Route19EndBattleText1
-	db "@"
+	text_far _Route19EndBattleText1
+	text_end
 
 Route19AfterBattleText1:
-	TX_FAR _Route19AfterBattleText1
-	db "@"
+	text_far _Route19AfterBattleText1
+	text_end
 
 Route19BattleText2:
-	TX_FAR _Route19BattleText2
-	db "@"
+	text_far _Route19BattleText2
+	text_end
 
 Route19EndBattleText2:
-	TX_FAR _Route19EndBattleText2
-	db "@"
+	text_far _Route19EndBattleText2
+	text_end
 
 Route19AfterBattleText2:
-	TX_FAR _Route19AfterBattleText2
-	db "@"
+	text_far _Route19AfterBattleText2
+	text_end
 
 Route19BattleText3:
-	TX_FAR _Route19BattleText3
-	db "@"
+	text_far _Route19BattleText3
+	text_end
 
 Route19EndBattleText3:
-	TX_FAR _Route19EndBattleText3
-	db "@"
+	text_far _Route19EndBattleText3
+	text_end
 
 Route19AfterBattleText3:
-	TX_FAR _Route19AfterBattleText3
-	db "@"
+	text_far _Route19AfterBattleText3
+	text_end
 
 Route19BattleText4:
-	TX_FAR _Route19BattleText4
-	db "@"
+	text_far _Route19BattleText4
+	text_end
 
 Route19EndBattleText4:
-	TX_FAR _Route19EndBattleText4
-	db "@"
+	text_far _Route19EndBattleText4
+	text_end
 
 Route19AfterBattleText4:
-	TX_FAR _Route19AfterBattleText4
-	db "@"
+	text_far _Route19AfterBattleText4
+	text_end
 
 Route19BattleText5:
-	TX_FAR _Route19BattleText5
-	db "@"
+	text_far _Route19BattleText5
+	text_end
 
 Route19EndBattleText5:
-	TX_FAR _Route19EndBattleText5
-	db "@"
+	text_far _Route19EndBattleText5
+	text_end
 
 Route19AfterBattleText5:
-	TX_FAR _Route19AfterBattleText5
-	db "@"
+	text_far _Route19AfterBattleText5
+	text_end
 
 Route19BattleText6:
-	TX_FAR _Route19BattleText6
-	db "@"
+	text_far _Route19BattleText6
+	text_end
 
 Route19EndBattleText6:
-	TX_FAR _Route19EndBattleText6
-	db "@"
+	text_far _Route19EndBattleText6
+	text_end
 
 Route19AfterBattleText6:
-	TX_FAR _Route19AfterBattleText6
-	db "@"
+	text_far _Route19AfterBattleText6
+	text_end
 
 Route19BattleText7:
-	TX_FAR _Route19BattleText7
-	db "@"
+	text_far _Route19BattleText7
+	text_end
 
 Route19EndBattleText7:
-	TX_FAR _Route19EndBattleText7
-	db "@"
+	text_far _Route19EndBattleText7
+	text_end
 
 Route19AfterBattleText7:
-	TX_FAR _Route19AfterBattleText7
-	db "@"
+	text_far _Route19AfterBattleText7
+	text_end
 
 Route19BattleText8:
-	TX_FAR _Route19BattleText8
-	db "@"
+	text_far _Route19BattleText8
+	text_end
 
 Route19EndBattleText8:
-	TX_FAR _Route19EndBattleText8
-	db "@"
+	text_far _Route19EndBattleText8
+	text_end
 
 Route19AfterBattleText8:
-	TX_FAR _Route19AfterBattleText8
-	db "@"
+	text_far _Route19AfterBattleText8
+	text_end
 
 Route19BattleText9:
-	TX_FAR _Route19BattleText9
-	db "@"
+	text_far _Route19BattleText9
+	text_end
 
 Route19EndBattleText9:
-	TX_FAR _Route19EndBattleText9
-	db "@"
+	text_far _Route19EndBattleText9
+	text_end
 
 Route19AfterBattleText9:
-	TX_FAR _Route19AfterBattleText9
-	db "@"
+	text_far _Route19AfterBattleText9
+	text_end
 
 Route19BattleText10:
-	TX_FAR _Route19BattleText10
-	db "@"
+	text_far _Route19BattleText10
+	text_end
 
 Route19EndBattleText10:
-	TX_FAR _Route19EndBattleText10
-	db "@"
+	text_far _Route19EndBattleText10
+	text_end
 
 Route19AfterBattleText10:
-	TX_FAR _Route19AfterBattleText10
-	db "@"
+	text_far _Route19AfterBattleText10
+	text_end
 
 Route19Text11:
-	TX_FAR _Route19Text11
-	db "@"
+	text_far _Route19Text11
+	text_end