Sync with pokered

1 files changed, 75 insertions, 138 deletions

diff --git a/scripts/Route25.asm b/scripts/Route25.asm
index c3c11ed5..400ac9ed 100755
--- a/scripts/Route25.asm
+++ b/scripts/Route25.asm
@@ -65,250 +65,187 @@ Route25_TextPointers:
 	dw Route25Text11
 
 Route25TrainerHeader0:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_0
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_0
-	dw Route25BattleText1 ; TextBeforeBattle
-	dw Route25AfterBattleText1 ; TextAfterBattle
-	dw Route25EndBattleText1 ; TextEndBattle
-	dw Route25EndBattleText1 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_0, 2, Route25BattleText1, Route25EndBattleText1, Route25AfterBattleText1
 Route25TrainerHeader1:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_1
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_1
-	dw Route25BattleText2 ; TextBeforeBattle
-	dw Route25AfterBattleText2 ; TextAfterBattle
-	dw Route25EndBattleText2 ; TextEndBattle
-	dw Route25EndBattleText2 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_1, 3, Route25BattleText2, Route25EndBattleText2, Route25AfterBattleText2
 Route25TrainerHeader2:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_2
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_2
-	dw Route25BattleText3 ; TextBeforeBattle
-	dw Route25AfterBattleText3 ; TextAfterBattle
-	dw Route25EndBattleText3 ; TextEndBattle
-	dw Route25EndBattleText3 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_2, 3, Route25BattleText3, Route25EndBattleText3, Route25AfterBattleText3
 Route25TrainerHeader3:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_3
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_3
-	dw Route25BattleText4 ; TextBeforeBattle
-	dw Route25AfterBattleText4 ; TextAfterBattle
-	dw Route25EndBattleText4 ; TextEndBattle
-	dw Route25EndBattleText4 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_3, 2, Route25BattleText4, Route25EndBattleText4, Route25AfterBattleText4
 Route25TrainerHeader4:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_4
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_4
-	dw Route25BattleText5 ; TextBeforeBattle
-	dw Route25AfterBattleText5 ; TextAfterBattle
-	dw Route25EndBattleText5 ; TextEndBattle
-	dw Route25EndBattleText5 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_4, 4, Route25BattleText5, Route25EndBattleText5, Route25AfterBattleText5
 Route25TrainerHeader5:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_5
-	db ($4 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_5
-	dw Route25BattleText6 ; TextBeforeBattle
-	dw Route25AfterBattleText6 ; TextAfterBattle
-	dw Route25EndBattleText6 ; TextEndBattle
-	dw Route25EndBattleText6 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_5, 4, Route25BattleText6, Route25EndBattleText6, Route25AfterBattleText6
 Route25TrainerHeader6:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_6
-	db ($3 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_6
-	dw Route25BattleText7 ; TextBeforeBattle
-	dw Route25AfterBattleText7 ; TextAfterBattle
-	dw Route25EndBattleText7 ; TextEndBattle
-	dw Route25EndBattleText7 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_6, 3, Route25BattleText7, Route25EndBattleText7, Route25AfterBattleText7
 Route25TrainerHeader7:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_7, 1
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_7, 1
-	dw Route25BattleText8 ; TextBeforeBattle
-	dw Route25AfterBattleText8 ; TextAfterBattle
-	dw Route25EndBattleText8 ; TextEndBattle
-	dw Route25EndBattleText8 ; TextEndBattle
-
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_7, 1, 2, Route25BattleText8, Route25EndBattleText8, Route25AfterBattleText8
 Route25TrainerHeader8:
-	dbEventFlagBit EVENT_BEAT_ROUTE_25_TRAINER_8, 1
-	db ($2 << 4) ; trainer's view range
-	dwEventFlagAddress EVENT_BEAT_ROUTE_25_TRAINER_8, 1
-	dw Route25BattleText9 ; TextBeforeBattle
-	dw Route25AfterBattleText9 ; TextAfterBattle
-	dw Route25EndBattleText9 ; TextEndBattle
-	dw Route25EndBattleText9 ; TextEndBattle
-
-	db $ff
+	trainer EVENT_BEAT_ROUTE_25_TRAINER_8, 1, 2, Route25BattleText9, Route25EndBattleText9, Route25AfterBattleText9
+	db -1 ; end
 
 Route25Text1:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text2:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text3:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text4:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text5:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text6:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text7:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text8:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25Text9:
-	TX_ASM
+	text_asm
 	ld hl, Route25TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
 
 Route25BattleText1:
-	TX_FAR _Route25BattleText1
-	db "@"
+	text_far _Route25BattleText1
+	text_end
 
 Route25EndBattleText1:
-	TX_FAR _Route25EndBattleText1
-	db "@"
+	text_far _Route25EndBattleText1
+	text_end
 
 Route25AfterBattleText1:
-	TX_FAR _Route25AfterBattleText1
-	db "@"
+	text_far _Route25AfterBattleText1
+	text_end
 
 Route25BattleText2:
-	TX_FAR _Route25BattleText2
-	db "@"
+	text_far _Route25BattleText2
+	text_end
 
 Route25EndBattleText2:
-	TX_FAR _Route25EndBattleText2
-	db "@"
+	text_far _Route25EndBattleText2
+	text_end
 
 Route25AfterBattleText2:
-	TX_FAR _Route25AfterBattleText2
-	db "@"
+	text_far _Route25AfterBattleText2
+	text_end
 
 Route25BattleText3:
-	TX_FAR _Route25BattleText3
-	db "@"
+	text_far _Route25BattleText3
+	text_end
 
 Route25EndBattleText3:
-	TX_FAR _Route25EndBattleText3
-	db "@"
+	text_far _Route25EndBattleText3
+	text_end
 
 Route25AfterBattleText3:
-	TX_FAR _Route25AfterBattleText3
-	db "@"
+	text_far _Route25AfterBattleText3
+	text_end
 
 Route25BattleText4:
-	TX_FAR _Route25BattleText4
-	db "@"
+	text_far _Route25BattleText4
+	text_end
 
 Route25EndBattleText4:
-	TX_FAR _Route25EndBattleText4
-	db "@"
+	text_far _Route25EndBattleText4
+	text_end
 
 Route25AfterBattleText4:
-	TX_FAR _Route25AfterBattleText4
-	db "@"
+	text_far _Route25AfterBattleText4
+	text_end
 
 Route25BattleText5:
-	TX_FAR _Route25BattleText5
-	db "@"
+	text_far _Route25BattleText5
+	text_end
 
 Route25EndBattleText5:
-	TX_FAR _Route25EndBattleText5
-	db "@"
+	text_far _Route25EndBattleText5
+	text_end
 
 Route25AfterBattleText5:
-	TX_FAR _Route25AfterBattleText5
-	db "@"
+	text_far _Route25AfterBattleText5
+	text_end
 
 Route25BattleText6:
-	TX_FAR _Route25BattleText6
-	db "@"
+	text_far _Route25BattleText6
+	text_end
 
 Route25EndBattleText6:
-	TX_FAR _Route25EndBattleText6
-	db "@"
+	text_far _Route25EndBattleText6
+	text_end
 
 Route25AfterBattleText6:
-	TX_FAR _Route25AfterBattleText6
-	db "@"
+	text_far _Route25AfterBattleText6
+	text_end
 
 Route25BattleText7:
-	TX_FAR _Route25BattleText7
-	db "@"
+	text_far _Route25BattleText7
+	text_end
 
 Route25EndBattleText7:
-	TX_FAR _Route25EndBattleText7
-	db "@"
+	text_far _Route25EndBattleText7
+	text_end
 
 Route25AfterBattleText7:
-	TX_FAR _Route25AfterBattleText7
-	db "@"
+	text_far _Route25AfterBattleText7
+	text_end
 
 Route25BattleText8:
-	TX_FAR _Route25BattleText8
-	db "@"
+	text_far _Route25BattleText8
+	text_end
 
 Route25EndBattleText8:
-	TX_FAR _Route25EndBattleText8
-	db "@"
+	text_far _Route25EndBattleText8
+	text_end
 
 Route25AfterBattleText8:
-	TX_FAR _Route25AfterBattleText8
-	db "@"
+	text_far _Route25AfterBattleText8
+	text_end
 
 Route25BattleText9:
-	TX_FAR _Route25BattleText9
-	db "@"
+	text_far _Route25BattleText9
+	text_end
 
 Route25EndBattleText9:
-	TX_FAR _Route25EndBattleText9
-	db "@"
+	text_far _Route25EndBattleText9
+	text_end
 
 Route25AfterBattleText9:
-	TX_FAR _Route25AfterBattleText9
-	db "@"
+	text_far _Route25AfterBattleText9
+	text_end
 
 Route25Text11:
-	TX_FAR _Route25Text11
-	db "@"
+	text_far _Route25Text11
+	text_end