summaryrefslogtreecommitdiff
path: root/scripts/route15.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/route15.asm')
-rwxr-xr-xscripts/route15.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/scripts/route15.asm b/scripts/route15.asm
index fe70d2b4..023f859c 100755
--- a/scripts/route15.asm
+++ b/scripts/route15.asm
@@ -28,90 +28,90 @@ Route15TextPointers: ; 597c7 (16:57c7)
Route15TrainerHeaders: ; 597df (16:57df)
Route15TrainerHeader0: ; 597df (16:57df)
- db $1 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_0
db ($2 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_0
dw Route15BattleText1 ; TextBeforeBattle
dw Route15AfterBattleText1 ; TextAfterBattle
dw Route15EndBattleText1 ; TextEndBattle
dw Route15EndBattleText1 ; TextEndBattle
Route15TrainerHeader1: ; 597eb (16:57eb)
- db $2 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_1
db ($3 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_1
dw Route15BattleText2 ; TextBeforeBattle
dw Route15AfterBattleText2 ; TextAfterBattle
dw Route15EndBattleText2 ; TextEndBattle
dw Route15EndBattleText2 ; TextEndBattle
Route15TrainerHeader2: ; 597f7 (16:57f7)
- db $3 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_2
db ($3 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_2
dw Route15BattleText3 ; TextBeforeBattle
dw Route15AfterBattleText3 ; TextAfterBattle
dw Route15EndBattleText3 ; TextEndBattle
dw Route15EndBattleText3 ; TextEndBattle
Route15TrainerHeader3: ; 59803 (16:5803)
- db $4 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_3
db ($3 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_3
dw Route15BattleText4 ; TextBeforeBattle
dw Route15AfterBattleText4 ; TextAfterBattle
dw Route15EndBattleText4 ; TextEndBattle
dw Route15EndBattleText4 ; TextEndBattle
Route15TrainerHeader4: ; 5980f (16:580f)
- db $5 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_4
db ($2 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_4
dw Route15BattleText5 ; TextBeforeBattle
dw Route15AfterBattleText5 ; TextAfterBattle
dw Route15EndBattleText5 ; TextEndBattle
dw Route15EndBattleText5 ; TextEndBattle
Route15TrainerHeader5: ; 5981b (16:581b)
- db $6 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_5
db ($3 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_5
dw Route15BattleText6 ; TextBeforeBattle
dw Route15AfterBattleText6 ; TextAfterBattle
dw Route15EndBattleText6 ; TextEndBattle
dw Route15EndBattleText6 ; TextEndBattle
Route15TrainerHeader6: ; 59827 (16:5827)
- db $7 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_6
db ($3 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_6
dw Route15BattleText7 ; TextBeforeBattle
dw Route15AfterBattleText7 ; TextAfterBattle
dw Route15EndBattleText7 ; TextEndBattle
dw Route15EndBattleText7 ; TextEndBattle
Route15TrainerHeader7: ; 59833 (16:5833)
- db $8 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_7, 1
db ($3 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_7, 1
dw Route15BattleText8 ; TextBeforeBattle
dw Route15AfterBattleText8 ; TextAfterBattle
dw Route15EndBattleText8 ; TextEndBattle
dw Route15EndBattleText8 ; TextEndBattle
Route15TrainerHeader8: ; 5983f (16:583f)
- db $9 ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_8, 1
db ($3 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_8, 1
dw Route15BattleText9 ; TextBeforeBattle
dw Route15AfterBattleText9 ; TextAfterBattle
dw Route15EndBattleText9 ; TextEndBattle
dw Route15EndBattleText9 ; TextEndBattle
Route15TrainerHeader9: ; 5984b (16:584b)
- db $a ; flag's bit
+ dbEventFlagBit EVENT_BEAT_ROUTE_15_TRAINER_9, 1
db ($3 << 4) ; trainer's view range
- dw wd7dd ; flag's byte
+ dwEventFlagAddress EVENT_BEAT_ROUTE_15_TRAINER_9, 1
dw Route15BattleText10 ; TextBeforeBattle
dw Route15AfterBattleText10 ; TextAfterBattle
dw Route15EndBattleText10 ; TextEndBattle