summaryrefslogtreecommitdiff
path: root/scripts/Route10.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Route10.asm')
-rwxr-xr-xscripts/Route10.asm148
1 files changed, 53 insertions, 95 deletions
diff --git a/scripts/Route10.asm b/scripts/Route10.asm
index 3fffa2c0..93012b9a 100755
--- a/scripts/Route10.asm
+++ b/scripts/Route10.asm
@@ -25,174 +25,132 @@ Route10_TextPointers:
dw Route10Text10
Route10TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_0
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_0
- dw Route10BattleText1 ; TextBeforeBattle
- dw Route10AfterBattleText1 ; TextAfterBattle
- dw Route10EndBattleText1 ; TextEndBattle
- dw Route10EndBattleText1 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_10_TRAINER_0, 4, Route10BattleText1, Route10EndBattleText1, Route10AfterBattleText1
Route10TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_1
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_1
- dw Route10BattleText2 ; TextBeforeBattle
- dw Route10AfterBattleText2 ; TextAfterBattle
- dw Route10EndBattleText2 ; TextEndBattle
- dw Route10EndBattleText2 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_10_TRAINER_1, 3, Route10BattleText2, Route10EndBattleText2, Route10AfterBattleText2
Route10TrainerHeader2:
- dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_2
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_2
- dw Route10BattleText3 ; TextBeforeBattle
- dw Route10AfterBattleText3 ; TextAfterBattle
- dw Route10EndBattleText3 ; TextEndBattle
- dw Route10EndBattleText3 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_10_TRAINER_2, 4, Route10BattleText3, Route10EndBattleText3, Route10AfterBattleText3
Route10TrainerHeader3:
- dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_3
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_3
- dw Route10BattleText4 ; TextBeforeBattle
- dw Route10AfterBattleText4 ; TextAfterBattle
- dw Route10EndBattleText4 ; TextEndBattle
- dw Route10EndBattleText4 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_10_TRAINER_3, 3, Route10BattleText4, Route10EndBattleText4, Route10AfterBattleText4
Route10TrainerHeader4:
- dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_4
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_4
- dw Route10BattleText5 ; TextBeforeBattle
- dw Route10AfterBattleText5 ; TextAfterBattle
- dw Route10EndBattleText5 ; TextEndBattle
- dw Route10EndBattleText5 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_10_TRAINER_4, 2, Route10BattleText5, Route10EndBattleText5, Route10AfterBattleText5
Route10TrainerHeader5:
- dbEventFlagBit EVENT_BEAT_ROUTE_10_TRAINER_5
- db ($2 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_10_TRAINER_5
- dw Route10BattleText6 ; TextBeforeBattle
- dw Route10AfterBattleText6 ; TextAfterBattle
- dw Route10EndBattleText6 ; TextEndBattle
- dw Route10EndBattleText6 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_ROUTE_10_TRAINER_5, 2, Route10BattleText6, Route10EndBattleText6, Route10AfterBattleText6
+ db -1 ; end
Route10Text1:
- TX_ASM
+ text_asm
ld hl, Route10TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Route10BattleText1:
- TX_FAR _Route10BattleText1
- db "@"
+ text_far _Route10BattleText1
+ text_end
Route10EndBattleText1:
- TX_FAR _Route10EndBattleText1
- db "@"
+ text_far _Route10EndBattleText1
+ text_end
Route10AfterBattleText1:
- TX_FAR _Route10AfterBattleText1
- db "@"
+ text_far _Route10AfterBattleText1
+ text_end
Route10Text2:
- TX_ASM
+ text_asm
ld hl, Route10TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
Route10BattleText2:
- TX_FAR _Route10BattleText2
- db "@"
+ text_far _Route10BattleText2
+ text_end
Route10EndBattleText2:
- TX_FAR _Route10EndBattleText2
- db "@"
+ text_far _Route10EndBattleText2
+ text_end
Route10AfterBattleText2:
- TX_FAR _Route10AfterBattleText2
- db "@"
+ text_far _Route10AfterBattleText2
+ text_end
Route10Text3:
- TX_ASM
+ text_asm
ld hl, Route10TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
Route10BattleText3:
- TX_FAR _Route10BattleText3
- db "@"
+ text_far _Route10BattleText3
+ text_end
Route10EndBattleText3:
- TX_FAR _Route10EndBattleText3
- db "@"
+ text_far _Route10EndBattleText3
+ text_end
Route10AfterBattleText3:
- TX_FAR _Route10AfterBattleText3
- db "@"
+ text_far _Route10AfterBattleText3
+ text_end
Route10Text4:
- TX_ASM
+ text_asm
ld hl, Route10TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
Route10BattleText4:
- TX_FAR _Route10BattleText4
- db "@"
+ text_far _Route10BattleText4
+ text_end
Route10EndBattleText4:
- TX_FAR _Route10EndBattleText4
- db "@"
+ text_far _Route10EndBattleText4
+ text_end
Route10AfterBattleText4:
- TX_FAR _Route10AfterBattleText4
- db "@"
+ text_far _Route10AfterBattleText4
+ text_end
Route10Text5:
- TX_ASM
+ text_asm
ld hl, Route10TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
Route10BattleText5:
- TX_FAR _Route10BattleText5
- db "@"
+ text_far _Route10BattleText5
+ text_end
Route10EndBattleText5:
- TX_FAR _Route10EndBattleText5
- db "@"
+ text_far _Route10EndBattleText5
+ text_end
Route10AfterBattleText5:
- TX_FAR _Route10AfterBattleText5
- db "@"
+ text_far _Route10AfterBattleText5
+ text_end
Route10Text6:
- TX_ASM
+ text_asm
ld hl, Route10TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
Route10BattleText6:
- TX_FAR _Route10BattleText6
- db "@"
+ text_far _Route10BattleText6
+ text_end
Route10EndBattleText6:
- TX_FAR _Route10EndBattleText6
- db "@"
+ text_far _Route10EndBattleText6
+ text_end
Route10AfterBattleText6:
- TX_FAR _Route10AfterBattleText6
- db "@"
+ text_far _Route10AfterBattleText6
+ text_end
Route10Text9:
Route10Text7:
- TX_FAR _Route10Text7 ; _Route10Text9
- db "@"
+ text_far _Route10Text7 ; _Route10Text9
+ text_end
Route10Text10:
- TX_FAR _Route10Text10
- db "@"
+ text_far _Route10Text10
+ text_end