1 files changed, 86 insertions, 87 deletions
diff --git a/scripts/route10.asm b/scripts/route10.asm
index c587b1df..03a1e818 100755
--- a/scripts/route10.asm
+++ b/scripts/route10.asm
@@ -1,18 +1,18 @@
-Route10Script: ; 59336 (16:5336)
+Route10Script:
 	call EnableAutoTextBoxDrawing
-	ld hl, Route10TrainerHeaders
+	ld hl, Route10TrainerHeader0
 	ld de, Route10ScriptPointers
-	ld a, [W_ROUTE10CURSCRIPT]
+	ld a, [wRoute10CurScript]
 	call ExecuteCurMapScriptInTable
-	ld [W_ROUTE10CURSCRIPT], a
+	ld [wRoute10CurScript], a
 	ret
 
-Route10ScriptPointers: ; 59349 (16:5349)
+Route10ScriptPointers:
 	dw CheckFightingMapTrainers
 	dw DisplayEnemyTrainerTextAndStartBattle
 	dw EndTrainerBattle
 
-Route10TextPointers: ; 5934f (16:534f)
+Route10TextPointers:
 	dw Route10Text1
 	dw Route10Text2
 	dw Route10Text3
@@ -24,176 +24,175 @@ Route10TextPointers: ; 5934f (16:534f)
 	dw Route10Text9
 	dw Route10Text10
 
-Route10TrainerHeaders: ; 59363 (16:5363)
-Route10TrainerHeader0: ; 59363 (16:5363)
-	db $1 ; flag's bit
+Route10TrainerHeader0:
+	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0
 	db ($4 << 4) ; trainer's view range
-	dw wd7d1 ; flag's byte
-	dw Route10BattleText1 ; 0x53b6 TextBeforeBattle
-	dw Route10AfterBattleText1 ; 0x53c0 TextAfterBattle
-	dw Route10EndBattleText1 ; 0x53bb TextEndBattle
-	dw Route10EndBattleText1 ; 0x53bb TextEndBattle
-
-Route10TrainerHeader1: ; 5936f (16:536f)
-	db $2 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_0
+	dw Route10BattleText1 ; TextBeforeBattle
+	dw Route10AfterBattleText1 ; TextAfterBattle
+	dw Route10EndBattleText1 ; TextEndBattle
+	dw Route10EndBattleText1 ; TextEndBattle
+
+Route10TrainerHeader1:
+	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_1
 	db ($3 << 4) ; trainer's view range
-	dw wd7d1 ; flag's byte
-	dw Route10BattleText2 ; 0x53cf TextBeforeBattle
-	dw Route10AfterBattleText2 ; 0x53d9 TextAfterBattle
-	dw Route10EndBattleText2 ; 0x53d4 TextEndBattle
-	dw Route10EndBattleText2 ; 0x53d4 TextEndBattle
-
-Route10TrainerHeader2: ; 5937b (16:537b)
-	db $3 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_1
+	dw Route10BattleText2 ; TextBeforeBattle
+	dw Route10AfterBattleText2 ; TextAfterBattle
+	dw Route10EndBattleText2 ; TextEndBattle
+	dw Route10EndBattleText2 ; TextEndBattle
+
+Route10TrainerHeader2:
+	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dw wd7d1 ; flag's byte
-	dw Route10BattleText3 ; 0x53e8 TextBeforeBattle
-	dw Route10AfterBattleText3 ; 0x53f2 TextAfterBattle
-	dw Route10EndBattleText3 ; 0x53ed TextEndBattle
-	dw Route10EndBattleText3 ; 0x53ed TextEndBattle
-
-Route10TrainerHeader3: ; 59387 (16:5387)
-	db $4 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_2
+	dw Route10BattleText3 ; TextBeforeBattle
+	dw Route10AfterBattleText3 ; TextAfterBattle
+	dw Route10EndBattleText3 ; TextEndBattle
+	dw Route10EndBattleText3 ; TextEndBattle
+
+Route10TrainerHeader3:
+	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dw wd7d1 ; flag's byte
-	dw Route10BattleText4 ; 0x5401 TextBeforeBattle
-	dw Route10AfterBattleText4 ; 0x540b TextAfterBattle
-	dw Route10EndBattleText4 ; 0x5406 TextEndBattle
-	dw Route10EndBattleText4 ; 0x5406 TextEndBattle
-
-Route10TrainerHeader4: ; 59393 (16:5393)
-	db $5 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_3
+	dw Route10BattleText4 ; TextBeforeBattle
+	dw Route10AfterBattleText4 ; TextAfterBattle
+	dw Route10EndBattleText4 ; TextEndBattle
+	dw Route10EndBattleText4 ; TextEndBattle
+
+Route10TrainerHeader4:
+	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_4
 	db ($2 << 4) ; trainer's view range
-	dw wd7d1 ; flag's byte
-	dw Route10BattleText5 ; 0x541a TextBeforeBattle
-	dw Route10AfterBattleText5 ; 0x5424 TextAfterBattle
-	dw Route10EndBattleText5 ; 0x541f TextEndBattle
-	dw Route10EndBattleText5 ; 0x541f TextEndBattle
-
-Route10TrainerHeader5: ; 5939f (16:539f)
-	db $6 ; flag's bit
+	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_4
+	dw Route10BattleText5 ; TextBeforeBattle
+	dw Route10AfterBattleText5 ; TextAfterBattle
+	dw Route10EndBattleText5 ; TextEndBattle
+	dw Route10EndBattleText5 ; TextEndBattle
+
+Route10TrainerHeader5:
+	dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dw wd7d1 ; flag's byte
-	dw Route10BattleText6 ; 0x5433 TextBeforeBattle
-	dw Route10AfterBattleText6 ; 0x543d TextAfterBattle
-	dw Route10EndBattleText6 ; 0x5438 TextEndBattle
-	dw Route10EndBattleText6 ; 0x5438 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_5
+	dw Route10BattleText6 ; TextBeforeBattle
+	dw Route10AfterBattleText6 ; TextAfterBattle
+	dw Route10EndBattleText6 ; TextEndBattle
+	dw Route10EndBattleText6 ; TextEndBattle
 
 	db $ff
 
-Route10Text1: ; 593ac (16:53ac)
-	db $08 ; asm
+Route10Text1:
+	TX_ASM
 	ld hl, Route10TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText1: ; 593b6 (16:53b6)
+Route10BattleText1:
 	TX_FAR _Route10BattleText1
 	db "@"
 
-Route10EndBattleText1: ; 593bb (16:53bb)
+Route10EndBattleText1:
 	TX_FAR _Route10EndBattleText1
 	db "@"
 
-Route10AfterBattleText1: ; 593c0 (16:53c0)
+Route10AfterBattleText1:
 	TX_FAR _Route10AfterBattleText1
 	db "@"
 
-Route10Text2: ; 593c5 (16:53c5)
-	db $08 ; asm
+Route10Text2:
+	TX_ASM
 	ld hl, Route10TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText2: ; 593cf (16:53cf)
+Route10BattleText2:
 	TX_FAR _Route10BattleText2
 	db "@"
 
-Route10EndBattleText2: ; 593d4 (16:53d4)
+Route10EndBattleText2:
 	TX_FAR _Route10EndBattleText2
 	db "@"
 
-Route10AfterBattleText2: ; 593d9 (16:53d9)
+Route10AfterBattleText2:
 	TX_FAR _Route10AfterBattleText2
 	db "@"
 
-Route10Text3: ; 593de (16:53de)
-	db $08 ; asm
+Route10Text3:
+	TX_ASM
 	ld hl, Route10TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText3: ; 593e8 (16:53e8)
+Route10BattleText3:
 	TX_FAR _Route10BattleText3
 	db "@"
 
-Route10EndBattleText3: ; 593ed (16:53ed)
+Route10EndBattleText3:
 	TX_FAR _Route10EndBattleText3
 	db "@"
 
-Route10AfterBattleText3: ; 593f2 (16:53f2)
+Route10AfterBattleText3:
 	TX_FAR _Route10AfterBattleText3
 	db "@"
 
-Route10Text4: ; 593f7 (16:53f7)
-	db $08 ; asm
+Route10Text4:
+	TX_ASM
 	ld hl, Route10TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText4: ; 59401 (16:5401)
+Route10BattleText4:
 	TX_FAR _Route10BattleText4
 	db "@"
 
-Route10EndBattleText4: ; 59406 (16:5406)
+Route10EndBattleText4:
 	TX_FAR _Route10EndBattleText4
 	db "@"
 
-Route10AfterBattleText4: ; 5940b (16:540b)
+Route10AfterBattleText4:
 	TX_FAR _Route10AfterBattleText4
 	db "@"
 
-Route10Text5: ; 59410 (16:5410)
-	db $08 ; asm
+Route10Text5:
+	TX_ASM
 	ld hl, Route10TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText5: ; 5941a (16:541a)
+Route10BattleText5:
 	TX_FAR _Route10BattleText5
 	db "@"
 
-Route10EndBattleText5: ; 5941f (16:541f)
+Route10EndBattleText5:
 	TX_FAR _Route10EndBattleText5
 	db "@"
 
-Route10AfterBattleText5: ; 59424 (16:5424)
+Route10AfterBattleText5:
 	TX_FAR _Route10AfterBattleText5
 	db "@"
 
-Route10Text6: ; 59429 (16:5429)
-	db $08 ; asm
+Route10Text6:
+	TX_ASM
 	ld hl, Route10TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
 
-Route10BattleText6: ; 59433 (16:5433)
+Route10BattleText6:
 	TX_FAR _Route10BattleText6
 	db "@"
 
-Route10EndBattleText6: ; 59438 (16:5438)
+Route10EndBattleText6:
 	TX_FAR _Route10EndBattleText6
 	db "@"
 
-Route10AfterBattleText6: ; 5943d (16:543d)
+Route10AfterBattleText6:
 	TX_FAR _Route10AfterBattleText6
 	db "@"
 
-Route10Text9: ; 59442 (16:5442)
-Route10Text7: ; 59442 (16:5442)
+Route10Text9:
+Route10Text7:
 	TX_FAR _Route10Text7 ; _Route10Text9
 	db "@"
 
-Route10Text10: ; 59447 (16:5447)
+Route10Text10:
 	TX_FAR _Route10Text10
 	db "@"