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

Doesn't build.

1 files changed, 70 insertions, 70 deletions

diff --git a/scripts/route17.asm b/scripts/route17.asm
index ffd00634..28c43627 100755
--- a/scripts/route17.asm
+++ b/scripts/route17.asm
@@ -32,99 +32,99 @@ Route17TextPointers: ; 55b93 (15:5b93)
 
 Route17TrainerHeaders: ; 55bb3 (15:5bb3)
 Route17TrainerHeader0: ; 55bb3 (15:5bb3)
-	db $1 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_0
 	db ($3 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText1 ; 0x5c36 TextBeforeBattle
-	dw Route17AfterBattleText1 ; 0x5c40 TextAfterBattle
-	dw Route17EndBattleText1 ; 0x5c3b TextEndBattle
-	dw Route17EndBattleText1 ; 0x5c3b TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_0
+	dw Route17BattleText1 ; TextBeforeBattle
+	dw Route17AfterBattleText1 ; TextAfterBattle
+	dw Route17EndBattleText1 ; TextEndBattle
+	dw Route17EndBattleText1 ; TextEndBattle
 
 Route17TrainerHeader1: ; 55bbf (15:5bbf)
-	db $2 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText2 ; 0x5c4f TextBeforeBattle
-	dw Route17AfterBattleText2 ; 0x5c59 TextAfterBattle
-	dw Route17EndBattleText2 ; 0x5c54 TextEndBattle
-	dw Route17EndBattleText2 ; 0x5c54 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_1
+	dw Route17BattleText2 ; TextBeforeBattle
+	dw Route17AfterBattleText2 ; TextAfterBattle
+	dw Route17EndBattleText2 ; TextEndBattle
+	dw Route17EndBattleText2 ; TextEndBattle
 
 Route17TrainerHeader2: ; 55bcb (15:5bcb)
-	db $3 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText3 ; 0x5c68 TextBeforeBattle
-	dw Route17AfterBattleText3 ; 0x5c72 TextAfterBattle
-	dw Route17EndBattleText3 ; 0x5c6d TextEndBattle
-	dw Route17EndBattleText3 ; 0x5c6d TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_2
+	dw Route17BattleText3 ; TextBeforeBattle
+	dw Route17AfterBattleText3 ; TextAfterBattle
+	dw Route17EndBattleText3 ; TextEndBattle
+	dw Route17EndBattleText3 ; TextEndBattle
 
 Route17TrainerHeader3: ; 55bd7 (15:5bd7)
-	db $4 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText4 ; 0x5c81 TextBeforeBattle
-	dw Route17AfterBattleText4 ; 0x5c8b TextAfterBattle
-	dw Route17EndBattleText4 ; 0x5c86 TextEndBattle
-	dw Route17EndBattleText4 ; 0x5c86 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_3
+	dw Route17BattleText4 ; TextBeforeBattle
+	dw Route17AfterBattleText4 ; TextAfterBattle
+	dw Route17EndBattleText4 ; TextEndBattle
+	dw Route17EndBattleText4 ; TextEndBattle
 
 Route17TrainerHeader4: ; 55be3 (15:5be3)
-	db $5 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText5 ; 0x5c9a TextBeforeBattle
-	dw Route17AfterBattleText5 ; 0x5ca4 TextAfterBattle
-	dw Route17EndBattleText5 ; 0x5c9f TextEndBattle
-	dw Route17EndBattleText5 ; 0x5c9f TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_4
+	dw Route17BattleText5 ; TextBeforeBattle
+	dw Route17AfterBattleText5 ; TextAfterBattle
+	dw Route17EndBattleText5 ; TextEndBattle
+	dw Route17EndBattleText5 ; TextEndBattle
 
 Route17TrainerHeader5: ; 55bef (15:5bef)
-	db $6 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText6 ; 0x5cb3 TextBeforeBattle
-	dw Route17AfterBattleText6 ; 0x5cbd TextAfterBattle
-	dw Route17EndBattleText6 ; 0x5cb8 TextEndBattle
-	dw Route17EndBattleText6 ; 0x5cb8 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_5
+	dw Route17BattleText6 ; TextBeforeBattle
+	dw Route17AfterBattleText6 ; TextAfterBattle
+	dw Route17EndBattleText6 ; TextEndBattle
+	dw Route17EndBattleText6 ; TextEndBattle
 
 Route17TrainerHeader6: ; 55bfb (15:5bfb)
-	db $7 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_6
 	db ($4 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText7 ; 0x5ccc TextBeforeBattle
-	dw Route17AfterBattleText7 ; 0x5cd6 TextAfterBattle
-	dw Route17EndBattleText7 ; 0x5cd1 TextEndBattle
-	dw Route17EndBattleText7 ; 0x5cd1 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_6
+	dw Route17BattleText7 ; TextBeforeBattle
+	dw Route17AfterBattleText7 ; TextAfterBattle
+	dw Route17EndBattleText7 ; TextEndBattle
+	dw Route17EndBattleText7 ; TextEndBattle
 
 Route17TrainerHeader7: ; 55c07 (15:5c07)
-	db $8 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText8 ; 0x5ce5 TextBeforeBattle
-	dw Route17AfterBattleText8 ; 0x5cef TextAfterBattle
-	dw Route17EndBattleText8 ; 0x5cea TextEndBattle
-	dw Route17EndBattleText8 ; 0x5cea TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_7, 1
+	dw Route17BattleText8 ; TextBeforeBattle
+	dw Route17AfterBattleText8 ; TextAfterBattle
+	dw Route17EndBattleText8 ; TextEndBattle
+	dw Route17EndBattleText8 ; TextEndBattle
 
 Route17TrainerHeader8: ; 55c13 (15:5c13)
-	db $9 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_8, 1
 	db ($3 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText9 ; 0x5cfe TextBeforeBattle
-	dw Route17AfterBattleText9 ; 0x5d08 TextAfterBattle
-	dw Route17EndBattleText9 ; 0x5d03 TextEndBattle
-	dw Route17EndBattleText9 ; 0x5d03 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_8, 1
+	dw Route17BattleText9 ; TextBeforeBattle
+	dw Route17AfterBattleText9 ; TextAfterBattle
+	dw Route17EndBattleText9 ; TextEndBattle
+	dw Route17EndBattleText9 ; TextEndBattle
 
 Route17TrainerHeader9: ; 55c1f (15:5c1f)
-	db $a ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_17_TRAINER_9, 1
 	db ($4 << 4) ; trainer's view range
-	dw wd7e1 ; flag's byte
-	dw Route17BattleText10 ; 0x5d17 TextBeforeBattle
-	dw Route17AfterBattleText10 ; 0x5d21 TextAfterBattle
-	dw Route17EndBattleText10 ; 0x5d1c TextEndBattle
-	dw Route17EndBattleText10 ; 0x5d1c TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_17_TRAINER_9, 1
+	dw Route17BattleText10 ; TextBeforeBattle
+	dw Route17AfterBattleText10 ; TextAfterBattle
+	dw Route17EndBattleText10 ; TextEndBattle
+	dw Route17EndBattleText10 ; TextEndBattle
 
 	db $ff
 
 Route17Text1: ; 55c2c (15:5c2c)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -142,7 +142,7 @@ Route17AfterBattleText1: ; 55c40 (15:5c40)
 	db "@"
 
 Route17Text2: ; 55c45 (15:5c45)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -160,7 +160,7 @@ Route17AfterBattleText2: ; 55c59 (15:5c59)
 	db "@"
 
 Route17Text3: ; 55c5e (15:5c5e)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -178,7 +178,7 @@ Route17AfterBattleText3: ; 55c72 (15:5c72)
 	db "@"
 
 Route17Text4: ; 55c77 (15:5c77)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -196,7 +196,7 @@ Route17AfterBattleText4: ; 55c8b (15:5c8b)
 	db "@"
 
 Route17Text5: ; 55c90 (15:5c90)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -214,7 +214,7 @@ Route17AfterBattleText5: ; 55ca4 (15:5ca4)
 	db "@"
 
 Route17Text6: ; 55ca9 (15:5ca9)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -232,7 +232,7 @@ Route17AfterBattleText6: ; 55cbd (15:5cbd)
 	db "@"
 
 Route17Text7: ; 55cc2 (15:5cc2)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -250,7 +250,7 @@ Route17AfterBattleText7: ; 55cd6 (15:5cd6)
 	db "@"
 
 Route17Text8: ; 55cdb (15:5cdb)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -268,7 +268,7 @@ Route17AfterBattleText8: ; 55cef (15:5cef)
 	db "@"
 
 Route17Text9: ; 55cf4 (15:5cf4)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -286,7 +286,7 @@ Route17AfterBattleText9: ; 55d08 (15:5d08)
 	db "@"
 
 Route17Text10: ; 55d0d (15:5d0d)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route17TrainerHeader9
 	call TalkToTrainer
 	jp TextScriptEnd