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

Doesn't build.

1 files changed, 73 insertions, 73 deletions

diff --git a/scripts/route9.asm b/scripts/route9.asm
index 77b216c6..9d26ee96 100755
--- a/scripts/route9.asm
+++ b/scripts/route9.asm
@@ -22,137 +22,137 @@ Route9TextPointers: ; 556d5 (15:56d5)
 	dw Route9Text7
 	dw Route9Text8
 	dw Route9Text9
-	dw Predef5CText
+	dw PickUpItemText
 	dw Route9Text11
 
 Route9TrainerHeaders: ; 556eb (15:56eb)
 Route9TrainerHeader0: ; 556eb (15:56eb)
-	db $1 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_0
 	db ($3 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText1 ; 0x5792 TextBeforeBattle
-	dw Route9AfterBattleText1 ; 0x579c TextAfterBattle
-	dw Route9EndBattleText1 ; 0x5797 TextEndBattle
-	dw Route9EndBattleText1 ; 0x5797 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_0
+	dw Route9BattleText1 ; TextBeforeBattle
+	dw Route9AfterBattleText1 ; TextAfterBattle
+	dw Route9EndBattleText1 ; TextEndBattle
+	dw Route9EndBattleText1 ; TextEndBattle
 
 Route9TrainerHeader2: ; 556f7 (15:56f7)
-	db $2 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_2
 	db ($2 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText2 ; 0x57a1 TextBeforeBattle
-	dw Route9AfterBattleText2 ; 0x57ab TextAfterBattle
-	dw Route9EndBattleText2 ; 0x57a6 TextEndBattle
-	dw Route9EndBattleText2 ; 0x57a6 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_2
+	dw Route9BattleText2 ; TextBeforeBattle
+	dw Route9AfterBattleText2 ; TextAfterBattle
+	dw Route9EndBattleText2 ; TextEndBattle
+	dw Route9EndBattleText2 ; TextEndBattle
 
 Route9TrainerHeader3: ; 55703 (15:5703)
-	db $3 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_3
 	db ($4 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText3 ; 0x57b0 TextBeforeBattle
-	dw Route9AfterBattleText3 ; 0x57ba TextAfterBattle
-	dw Route9EndBattleText3 ; 0x57b5 TextEndBattle
-	dw Route9EndBattleText3 ; 0x57b5 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_3
+	dw Route9BattleText3 ; TextBeforeBattle
+	dw Route9AfterBattleText3 ; TextAfterBattle
+	dw Route9EndBattleText3 ; TextEndBattle
+	dw Route9EndBattleText3 ; TextEndBattle
 
 Route9TrainerHeader4: ; 5570f (15:570f)
-	db $4 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_4
 	db ($2 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText4 ; 0x57bf TextBeforeBattle
-	dw Route9AfterBattleText4 ; 0x57c9 TextAfterBattle
-	dw Route9EndBattleText4 ; 0x57c4 TextEndBattle
-	dw Route9EndBattleText4 ; 0x57c4 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_4
+	dw Route9BattleText4 ; TextBeforeBattle
+	dw Route9AfterBattleText4 ; TextAfterBattle
+	dw Route9EndBattleText4 ; TextEndBattle
+	dw Route9EndBattleText4 ; TextEndBattle
 
 Route9TrainerHeader5: ; 5571b (15:571b)
-	db $5 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_5
 	db ($2 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText5 ; 0x57ce TextBeforeBattle
-	dw Route9AfterBattleText5 ; 0x57d8 TextAfterBattle
-	dw Route9EndBattleText5 ; 0x57d3 TextEndBattle
-	dw Route9EndBattleText5 ; 0x57d3 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_5
+	dw Route9BattleText5 ; TextBeforeBattle
+	dw Route9AfterBattleText5 ; TextAfterBattle
+	dw Route9EndBattleText5 ; TextEndBattle
+	dw Route9EndBattleText5 ; TextEndBattle
 
 Route9TrainerHeader6: ; 55727 (15:5727)
-	db $6 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_6
 	db ($3 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText6 ; 0x57dd TextBeforeBattle
-	dw Route9AfterBattleText6 ; 0x57e7 TextAfterBattle
-	dw Route9EndBattleText6 ; 0x57e2 TextEndBattle
-	dw Route9EndBattleText6 ; 0x57e2 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_6
+	dw Route9BattleText6 ; TextBeforeBattle
+	dw Route9AfterBattleText6 ; TextAfterBattle
+	dw Route9EndBattleText6 ; TextEndBattle
+	dw Route9EndBattleText6 ; TextEndBattle
 
 Route9TrainerHeader7: ; 55733 (15:5733)
-	db $7 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_7
 	db ($4 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText7 ; 0x57ec TextBeforeBattle
-	dw Route9AfterBattleText7 ; 0x57f6 TextAfterBattle
-	dw Route9EndBattleText7 ; 0x57f1 TextEndBattle
-	dw Route9EndBattleText7 ; 0x57f1 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_7
+	dw Route9BattleText7 ; TextBeforeBattle
+	dw Route9AfterBattleText7 ; TextAfterBattle
+	dw Route9EndBattleText7 ; TextEndBattle
+	dw Route9EndBattleText7 ; TextEndBattle
 
 Route9TrainerHeader8: ; 5573f (15:573f)
-	db $8 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_8, 1
 	db ($2 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText8 ; 0x57fb TextBeforeBattle
-	dw Route9AfterBattleText8 ; 0x5805 TextAfterBattle
-	dw Route9EndBattleText8 ; 0x5800 TextEndBattle
-	dw Route9EndBattleText8 ; 0x5800 TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_8, 1
+	dw Route9BattleText8 ; TextBeforeBattle
+	dw Route9AfterBattleText8 ; TextAfterBattle
+	dw Route9EndBattleText8 ; TextEndBattle
+	dw Route9EndBattleText8 ; TextEndBattle
 
 Route9TrainerHeader9: ; 5574b (15:574b)
-	db $9 ; flag's bit
+	dbEventFlagBit EVENT_BEAT_ROUTE_9_TRAINER_9, 1
 	db ($2 << 4) ; trainer's view range
-	dw wd7cf ; flag's byte
-	dw Route9BattleText9 ; 0x580a TextBeforeBattle
-	dw Route9AfterBattleText9 ; 0x5814 TextAfterBattle
-	dw Route9EndBattleText9 ; 0x580f TextEndBattle
-	dw Route9EndBattleText9 ; 0x580f TextEndBattle
+	dwEventFlagAddress EVENT_BEAT_ROUTE_9_TRAINER_9, 1
+	dw Route9BattleText9 ; TextBeforeBattle
+	dw Route9AfterBattleText9 ; TextAfterBattle
+	dw Route9EndBattleText9 ; TextEndBattle
+	dw Route9EndBattleText9 ; TextEndBattle
 
 	db $ff
 
 Route9Text1: ; 55758 (15:5758)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader0
-	jr asm_8be3d ; 0x5575c $2e
+	jr Route9TalkToTrainer
 
 Route9Text2: ; 5575e (15:575e)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader2
-	jr asm_8be3d ; 0x55762 $28
+	jr Route9TalkToTrainer
 
 Route9Text3: ; 55764 (15:5764)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader3
-	jr asm_8be3d ; 0x55768 $22
+	jr Route9TalkToTrainer
 
 Route9Text4: ; 5576a (15:576a)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader4
-	jr asm_8be3d ; 0x5576e $1c
+	jr Route9TalkToTrainer
 
 Route9Text5: ; 55770 (15:5770)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader5
-	jr asm_8be3d ; 0x55774 $16
+	jr Route9TalkToTrainer
 
 Route9Text6: ; 55776 (15:5776)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader6
-	jr asm_8be3d ; 0x5577a $10
+	jr Route9TalkToTrainer
 
 Route9Text7: ; 5577c (15:577c)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader7
-	jr asm_8be3d ; 0x55780 $a
+	jr Route9TalkToTrainer
 
 Route9Text8: ; 55782 (15:5782)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader8
-	jr asm_8be3d ; 0x55786 $4
+	jr Route9TalkToTrainer
 
 Route9Text9: ; 55788 (15:5788)
-	db $8 ; asm
+	TX_ASM
 	ld hl, Route9TrainerHeader9
-asm_8be3d: ; 5578c (15:578c)
+Route9TalkToTrainer: ; 5578c (15:578c)
 	call TalkToTrainer
 	jp TextScriptEnd