Merge branch 'master' of https://github.com/iimarckus/pokered

Doesn't build.

1 files changed, 70 insertions, 70 deletions

diff --git a/scripts/route11.asm b/scripts/route11.asm
index 629a6efd..3a9f1e0d 100755
--- a/scripts/route11.asm
+++ b/scripts/route11.asm
@@ -27,99 +27,99 @@ Route11TextPointers: ; 59465 (16:5465)
 
 Route11TrainerHeaders: ; 5947b (16:547b)
 Route11TrainerHeader0: ; 5947b (16:547b)
-	db $1 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_0
 	db ($3 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText1 ; 0x54fe TextBeforeBattle
-	dw Route11AfterBattleText1 ; 0x5508 TextAfterBattle
-	dw Route11EndBattleText1 ; 0x5503 TextEndBattle
-	dw Route11EndBattleText1 ; 0x5503 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_0
+	dw Route11BattleText1 ; TextBeforeBattle
+	dw Route11AfterBattleText1 ; TextAfterBattle
+	dw Route11EndBattleText1 ; TextEndBattle
+	dw Route11EndBattleText1 ; TextEndBattle
 
 Route11TrainerHeader1: ; 59487 (16:5487)
-	db $2 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_1
 	db ($2 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText2 ; 0x5517 TextBeforeBattle
-	dw Route11AfterBattleText2 ; 0x5521 TextAfterBattle
-	dw Route11EndBattleText2 ; 0x551c TextEndBattle
-	dw Route11EndBattleText2 ; 0x551c TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_1
+	dw Route11BattleText2 ; TextBeforeBattle
+	dw Route11AfterBattleText2 ; TextAfterBattle
+	dw Route11EndBattleText2 ; TextEndBattle
+	dw Route11EndBattleText2 ; TextEndBattle
 
 Route11TrainerHeader2: ; 59493 (16:5493)
-	db $3 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_2
 	db ($3 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText3 ; 0x5530 TextBeforeBattle
-	dw Route11AfterBattleText3 ; 0x553a TextAfterBattle
-	dw Route11EndBattleText3 ; 0x5535 TextEndBattle
-	dw Route11EndBattleText3 ; 0x5535 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_2
+	dw Route11BattleText3 ; TextBeforeBattle
+	dw Route11AfterBattleText3 ; TextAfterBattle
+	dw Route11EndBattleText3 ; TextEndBattle
+	dw Route11EndBattleText3 ; TextEndBattle
 
 Route11TrainerHeader3: ; 5949f (16:549f)
-	db $4 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_3
 	db ($3 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText4 ; 0x5549 TextBeforeBattle
-	dw Route11AfterBattleText4 ; 0x5553 TextAfterBattle
-	dw Route11EndBattleText4 ; 0x554e TextEndBattle
-	dw Route11EndBattleText4 ; 0x554e TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_3
+	dw Route11BattleText4 ; TextBeforeBattle
+	dw Route11AfterBattleText4 ; TextAfterBattle
+	dw Route11EndBattleText4 ; TextEndBattle
+	dw Route11EndBattleText4 ; TextEndBattle
 
 Route11TrainerHeader4: ; 594ab (16:54ab)
-	db $5 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_4
 	db ($4 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText5 ; 0x5562 TextBeforeBattle
-	dw Route11AfterBattleText5 ; 0x556c TextAfterBattle
-	dw Route11EndBattleText5 ; 0x5567 TextEndBattle
-	dw Route11EndBattleText5 ; 0x5567 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_4
+	dw Route11BattleText5 ; TextBeforeBattle
+	dw Route11AfterBattleText5 ; TextAfterBattle
+	dw Route11EndBattleText5 ; TextEndBattle
+	dw Route11EndBattleText5 ; TextEndBattle
 
 Route11TrainerHeader5: ; 594b7 (16:54b7)
-	db $6 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_5
 	db ($3 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText6 ; 0x557b TextBeforeBattle
-	dw Route11AfterBattleText6 ; 0x5585 TextAfterBattle
-	dw Route11EndBattleText6 ; 0x5580 TextEndBattle
-	dw Route11EndBattleText6 ; 0x5580 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_5
+	dw Route11BattleText6 ; TextBeforeBattle
+	dw Route11AfterBattleText6 ; TextAfterBattle
+	dw Route11EndBattleText6 ; TextEndBattle
+	dw Route11EndBattleText6 ; TextEndBattle
 
 Route11TrainerHeader6: ; 594c3 (16:54c3)
-	db $7 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText7 ; 0x5594 TextBeforeBattle
-	dw Route11AfterBattleText7 ; 0x559e TextAfterBattle
-	dw Route11EndBattleText7 ; 0x5599 TextEndBattle
-	dw Route11EndBattleText7 ; 0x5599 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_6
+	dw Route11BattleText7 ; TextBeforeBattle
+	dw Route11AfterBattleText7 ; TextAfterBattle
+	dw Route11EndBattleText7 ; TextEndBattle
+	dw Route11EndBattleText7 ; TextEndBattle
 
 Route11TrainerHeader7: ; 594cf (16:54cf)
-	db $8 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_7, 1
 	db ($4 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText8 ; 0x55ad TextBeforeBattle
-	dw Route11AfterBattleText8 ; 0x55b7 TextAfterBattle
-	dw Route11EndBattleText8 ; 0x55b2 TextEndBattle
-	dw Route11EndBattleText8 ; 0x55b2 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_7, 1
+	dw Route11BattleText8 ; TextBeforeBattle
+	dw Route11AfterBattleText8 ; TextAfterBattle
+	dw Route11EndBattleText8 ; TextEndBattle
+	dw Route11EndBattleText8 ; TextEndBattle
 
 Route11TrainerHeader8: ; 594db (16:54db)
-	db $9 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText9 ; 0x55c6 TextBeforeBattle
-	dw Route11AfterBattleText9 ; 0x55d0 TextAfterBattle
-	dw Route11EndBattleText9 ; 0x55cb TextEndBattle
-	dw Route11EndBattleText9 ; 0x55cb TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_8, 1
+	dw Route11BattleText9 ; TextBeforeBattle
+	dw Route11AfterBattleText9 ; TextAfterBattle
+	dw Route11EndBattleText9 ; TextEndBattle
+	dw Route11EndBattleText9 ; TextEndBattle
 
 Route11TrainerHeader9: ; 594e7 (16:54e7)
-	db $a ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_11_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
-	dw wd7d5 ; flag's byte
-	dw Route11BattleText10 ; 0x55df TextBeforeBattle
-	dw Route11AfterBattleText10 ; 0x55e9 TextAfterBattle
-	dw Route11EndBattleText10 ; 0x55e4 TextEndBattle
-	dw Route11EndBattleText10 ; 0x55e4 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_11_TRAINER_9, 1
+	dw Route11BattleText10 ; TextBeforeBattle
+	dw Route11AfterBattleText10 ; TextAfterBattle
+	dw Route11EndBattleText10 ; TextEndBattle
+	dw Route11EndBattleText10 ; TextEndBattle
 
 	db $ff
 
 Route11Text1: ; 594f4 (16:54f4)
-	db $8
+	TX_ASM
 	ld hl, Route11TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -137,7 +137,7 @@ Route11AfterBattleText1: ; 59508 (16:5508)
 	db "@"
 
 Route11Text2: ; 5950d (16:550d)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -155,7 +155,7 @@ Route11AfterBattleText2: ; 59521 (16:5521)
 	db "@"
 
 Route11Text3: ; 59526 (16:5526)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -173,7 +173,7 @@ Route11AfterBattleText3: ; 5953a (16:553a)
 	db "@"
 
 Route11Text4: ; 5953f (16:553f)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -191,7 +191,7 @@ Route11AfterBattleText4: ; 59553 (16:5553)
 	db "@"
 
 Route11Text5: ; 59558 (16:5558)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -209,7 +209,7 @@ Route11AfterBattleText5: ; 5956c (16:556c)
 	db "@"
 
 Route11Text6: ; 59571 (16:5571)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -227,7 +227,7 @@ Route11AfterBattleText6: ; 59585 (16:5585)
 	db "@"
 
 Route11Text7: ; 5958a (16:558a)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -245,7 +245,7 @@ Route11AfterBattleText7: ; 5959e (16:559e)
 	db "@"
 
 Route11Text8: ; 595a3 (16:55a3)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -263,7 +263,7 @@ Route11AfterBattleText8: ; 595b7 (16:55b7)
 	db "@"
 
 Route11Text9: ; 595bc (16:55bc)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -281,7 +281,7 @@ Route11AfterBattleText9: ; 595d0 (16:55d0)
 	db "@"
 
 Route11Text10: ; 595d5 (16:55d5)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route11TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd