summaryrefslogtreecommitdiff
path: root/scripts/route8.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/route8.asm')
-rwxr-xr-xscripts/route8.asm36
1 files changed, 18 insertions, 18 deletions
diff --git a/scripts/route8.asm b/scripts/route8.asm
index 8d589c90..c734c62d 100755
--- a/scripts/route8.asm
+++ b/scripts/route8.asm
@@ -26,81 +26,81 @@ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ 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
+ dwEventFlagAddress EVENT_BEAT_ROUTE_8_TRAINER_8, 1
dw Route8BattleText9 ; TextBeforeBattle
dw Route8AfterBattleText9 ; TextAfterBattle
dw Route8EndBattleText9 ; TextEndBattle