summaryrefslogtreecommitdiff
path: root/scripts/Route18.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Route18.asm')
-rwxr-xr-xscripts/Route18.asm29
1 files changed, 4 insertions, 25 deletions
diff --git a/scripts/Route18.asm b/scripts/Route18.asm
index 85d3efd3..f6738fc6 100755
--- a/scripts/Route18.asm
+++ b/scripts/Route18.asm
@@ -20,33 +20,12 @@ Route18_TextPointers:
dw Route18Text5
Route18TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_0
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_0
- dw Route18BattleText1 ; TextBeforeBattle
- dw Route18AfterBattleText1 ; TextAfterBattle
- dw Route18EndBattleText1 ; TextEndBattle
- dw Route18EndBattleText1 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_18_TRAINER_0, 3, Route18BattleText1, Route18EndBattleText1, Route18AfterBattleText1
Route18TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_1
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_1
- dw Route18BattleText2 ; TextBeforeBattle
- dw Route18AfterBattleText2 ; TextAfterBattle
- dw Route18EndBattleText2 ; TextEndBattle
- dw Route18EndBattleText2 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_18_TRAINER_1, 3, Route18BattleText2, Route18EndBattleText2, Route18AfterBattleText2
Route18TrainerHeader2:
- dbEventFlagBit EVENT_BEAT_ROUTE_18_TRAINER_2
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_18_TRAINER_2
- dw Route18BattleText3 ; TextBeforeBattle
- dw Route18AfterBattleText3 ; TextAfterBattle
- dw Route18EndBattleText3 ; TextEndBattle
- dw Route18EndBattleText3 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_ROUTE_18_TRAINER_2, 4, Route18BattleText3, Route18EndBattleText3, Route18AfterBattleText3
+ db -1 ; end
Route18Text1:
text_asm