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

Doesn't build.

1 files changed, 63 insertions, 63 deletions

diff --git a/scripts/route8.asm b/scripts/route8.asm
index eed57c7b..c734c62d 100755
--- a/scripts/route8.asm
+++ b/scripts/route8.asm
@@ -26,90 +26,90 @@ Route8TextPointers: ; 591cf (16:51cf)
 
 Route8TrainerHeaders: ; 591e3 (16:51e3)
 Route8TrainerHeader0: ; 591e3 (16:51e3)
-	db $1 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_0
 	db ($4 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText1 ; 0x525a TextBeforeBattle
-	dw Route8AfterBattleText1 ; 0x5264 TextAfterBattle
-	dw Route8EndBattleText1 ; 0x525f TextEndBattle
-	dw Route8EndBattleText1 ; 0x525f TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_0
+	dw Route8BattleText1 ; TextBeforeBattle
+	dw Route8AfterBattleText1 ; TextAfterBattle
+	dw Route8EndBattleText1 ; TextEndBattle
+	dw Route8EndBattleText1 ; TextEndBattle
 
 Route8TrainerHeader1: ; 591ef (16:51ef)
-	db $2 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_1
 	db ($4 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText2 ; 0x5273 TextBeforeBattle
-	dw Route8AfterBattleText2 ; 0x527d TextAfterBattle
-	dw Route8EndBattleText2 ; 0x5278 TextEndBattle
-	dw Route8EndBattleText2 ; 0x5278 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_1
+	dw Route8BattleText2 ; TextBeforeBattle
+	dw Route8AfterBattleText2 ; TextAfterBattle
+	dw Route8EndBattleText2 ; TextEndBattle
+	dw Route8EndBattleText2 ; TextEndBattle
 
 Route8TrainerHeader2: ; 591fb (16:51fb)
-	db $3 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_2
 	db ($4 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText3 ; 0x528c TextBeforeBattle
-	dw Route8AfterBattleText3 ; 0x5296 TextAfterBattle
-	dw Route8EndBattleText3 ; 0x5291 TextEndBattle
-	dw Route8EndBattleText3 ; 0x5291 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_2
+	dw Route8BattleText3 ; TextBeforeBattle
+	dw Route8AfterBattleText3 ; TextAfterBattle
+	dw Route8EndBattleText3 ; TextEndBattle
+	dw Route8EndBattleText3 ; TextEndBattle
 
 Route8TrainerHeader3: ; 59207 (16:5207)
-	db $4 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_3
 	db ($2 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText4 ; 0x52a5 TextBeforeBattle
-	dw Route8AfterBattleText4 ; 0x52af TextAfterBattle
-	dw Route8EndBattleText4 ; 0x52aa TextEndBattle
-	dw Route8EndBattleText4 ; 0x52aa TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_3
+	dw Route8BattleText4 ; TextBeforeBattle
+	dw Route8AfterBattleText4 ; TextAfterBattle
+	dw Route8EndBattleText4 ; TextEndBattle
+	dw Route8EndBattleText4 ; TextEndBattle
 
 Route8TrainerHeader4: ; 59213 (16:5213)
-	db $5 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_4
 	db ($3 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText5 ; 0x52be TextBeforeBattle
-	dw Route8AfterBattleText5 ; 0x52c8 TextAfterBattle
-	dw Route8EndBattleText5 ; 0x52c3 TextEndBattle
-	dw Route8EndBattleText5 ; 0x52c3 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_4
+	dw Route8BattleText5 ; TextBeforeBattle
+	dw Route8AfterBattleText5 ; TextAfterBattle
+	dw Route8EndBattleText5 ; TextEndBattle
+	dw Route8EndBattleText5 ; TextEndBattle
 
 Route8TrainerHeader5: ; 5921f (16:521f)
-	db $6 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_5
 	db ($3 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText6 ; 0x52d7 TextBeforeBattle
-	dw Route8AfterBattleText6 ; 0x52e1 TextAfterBattle
-	dw Route8EndBattleText6 ; 0x52dc TextEndBattle
-	dw Route8EndBattleText6 ; 0x52dc TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_5
+	dw Route8BattleText6 ; TextBeforeBattle
+	dw Route8AfterBattleText6 ; TextAfterBattle
+	dw Route8EndBattleText6 ; TextEndBattle
+	dw Route8EndBattleText6 ; TextEndBattle
 
 Route8TrainerHeader6: ; 5922b (16:522b)
-	db $7 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_6
 	db ($2 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText7 ; 0x52f0 TextBeforeBattle
-	dw Route8AfterBattleText7 ; 0x52fa TextAfterBattle
-	dw Route8EndBattleText7 ; 0x52f5 TextEndBattle
-	dw Route8EndBattleText7 ; 0x52f5 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_6
+	dw Route8BattleText7 ; TextBeforeBattle
+	dw Route8AfterBattleText7 ; TextAfterBattle
+	dw Route8EndBattleText7 ; TextEndBattle
+	dw Route8EndBattleText7 ; TextEndBattle
 
 Route8TrainerHeader7: ; 59237 (16:5237)
-	db $8 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_7, 1
 	db ($2 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText8 ; 0x5309 TextBeforeBattle
-	dw Route8AfterBattleText8 ; 0x5313 TextAfterBattle
-	dw Route8EndBattleText8 ; 0x530e TextEndBattle
-	dw Route8EndBattleText8 ; 0x530e TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_7, 1
+	dw Route8BattleText8 ; TextBeforeBattle
+	dw Route8AfterBattleText8 ; TextAfterBattle
+	dw Route8EndBattleText8 ; TextEndBattle
+	dw Route8EndBattleText8 ; TextEndBattle
 
 Route8TrainerHeader8: ; 59243 (16:5243)
-	db $9 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_8_TRAINER_8, 1
 	db ($4 << 4) ; trainer's view range
-	dw wd7cd ; flag's byte
-	dw Route8BattleText9 ; 0x5322 TextBeforeBattle
-	dw Route8AfterBattleText9 ; 0x532c TextAfterBattle
-	dw Route8EndBattleText9 ; 0x5327 TextEndBattle
-	dw Route8EndBattleText9 ; 0x5327 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_8, 1
+	dw Route8BattleText9 ; TextBeforeBattle
+	dw Route8AfterBattleText9 ; TextAfterBattle
+	dw Route8EndBattleText9 ; TextEndBattle
+	dw Route8EndBattleText9 ; TextEndBattle
 
 	db $ff
 
 Route8Text1: ; 59250 (16:5250)
-	db $8
+	TX_ASM
 	ld hl, Route8TrainerHeader0
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -127,7 +127,7 @@ Route8AfterBattleText1: ; 59264 (16:5264)
 	db "@"
 
 Route8Text2: ; 59269 (16:5269)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route8TrainerHeader1
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -145,7 +145,7 @@ Route8AfterBattleText2: ; 5927d (16:527d)
 	db "@"
 
 Route8Text3: ; 59282 (16:5282)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route8TrainerHeader2
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -163,7 +163,7 @@ Route8AfterBattleText3: ; 59296 (16:5296)
 	db "@"
 
 Route8Text4: ; 5929b (16:529b)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route8TrainerHeader3
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -181,7 +181,7 @@ Route8AfterBattleText4: ; 592af (16:52af)
 	db "@"
 
 Route8Text5: ; 592b4 (16:52b4)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route8TrainerHeader4
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -199,7 +199,7 @@ Route8AfterBattleText5: ; 592c8 (16:52c8)
 	db "@"
 
 Route8Text6: ; 592cd (16:52cd)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route8TrainerHeader5
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -217,7 +217,7 @@ Route8AfterBattleText6: ; 592e1 (16:52e1)
 	db "@"
 
 Route8Text7: ; 592e6 (16:52e6)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route8TrainerHeader6
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -235,7 +235,7 @@ Route8AfterBattleText7: ; 592fa (16:52fa)
 	db "@"
 
 Route8Text8: ; 592ff (16:52ff)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route8TrainerHeader7
 	call TalkToTrainer
 	jp TextScriptEnd
@@ -253,7 +253,7 @@ Route8AfterBattleText8: ; 59313 (16:5313)
 	db "@"
 
 Route8Text9: ; 59318 (16:5318)
-	db $08 ; asm
+	TX_ASM
 	ld hl, Route8TrainerHeader8
 	call TalkToTrainer
 	jp TextScriptEnd