summaryrefslogtreecommitdiff
path: root/scripts/Route21.asm
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/Route21.asm')
-rwxr-xr-xscripts/Route21.asm209
1 files changed, 73 insertions, 136 deletions
diff --git a/scripts/Route21.asm b/scripts/Route21.asm
index 15dacd5d..7afe350f 100755
--- a/scripts/Route21.asm
+++ b/scripts/Route21.asm
@@ -24,246 +24,183 @@ Route21_TextPointers:
dw Route21Text9
Route21TrainerHeader0:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_0
- db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_0
- dw Route21BattleText1 ; TextBeforeBattle
- dw Route21AfterBattleText1 ; TextAfterBattle
- dw Route21EndBattleText1 ; TextEndBattle
- dw Route21EndBattleText1 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_0, 0, Route21BattleText1, Route21EndBattleText1, Route21AfterBattleText1
Route21TrainerHeader1:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_1
- db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_1
- dw Route21BattleText2 ; TextBeforeBattle
- dw Route21AfterBattleText2 ; TextAfterBattle
- dw Route21EndBattleText2 ; TextEndBattle
- dw Route21EndBattleText2 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_1, 0, Route21BattleText2, Route21EndBattleText2, Route21AfterBattleText2
Route21TrainerHeader2:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_2
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_2
- dw Route21BattleText3 ; TextBeforeBattle
- dw Route21AfterBattleText3 ; TextAfterBattle
- dw Route21EndBattleText3 ; TextEndBattle
- dw Route21EndBattleText3 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_2, 4, Route21BattleText3, Route21EndBattleText3, Route21AfterBattleText3
Route21TrainerHeader3:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_3
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_3
- dw Route21BattleText4 ; TextBeforeBattle
- dw Route21AfterBattleText4 ; TextAfterBattle
- dw Route21EndBattleText4 ; TextEndBattle
- dw Route21EndBattleText4 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_3, 4, Route21BattleText4, Route21EndBattleText4, Route21AfterBattleText4
Route21TrainerHeader4:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_4
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_4
- dw Route21BattleText5 ; TextBeforeBattle
- dw Route21AfterBattleText5 ; TextAfterBattle
- dw Route21EndBattleText5 ; TextEndBattle
- dw Route21EndBattleText5 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_4, 4, Route21BattleText5, Route21EndBattleText5, Route21AfterBattleText5
Route21TrainerHeader5:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_5
- db ($4 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_5
- dw Route21BattleText6 ; TextBeforeBattle
- dw Route21AfterBattleText6 ; TextAfterBattle
- dw Route21EndBattleText6 ; TextEndBattle
- dw Route21EndBattleText6 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_5, 4, Route21BattleText6, Route21EndBattleText6, Route21AfterBattleText6
Route21TrainerHeader6:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_6
- db ($3 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_6
- dw Route21BattleText7 ; TextBeforeBattle
- dw Route21AfterBattleText7 ; TextAfterBattle
- dw Route21EndBattleText7 ; TextEndBattle
- dw Route21EndBattleText7 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_6, 3, Route21BattleText7, Route21EndBattleText7, Route21AfterBattleText7
Route21TrainerHeader7:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_7, 1
- db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_7, 1
- dw Route21BattleText8 ; TextBeforeBattle
- dw Route21AfterBattleText8 ; TextAfterBattle
- dw Route21EndBattleText8 ; TextEndBattle
- dw Route21EndBattleText8 ; TextEndBattle
-
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_7, 1, 0, Route21BattleText8, Route21EndBattleText8, Route21AfterBattleText8
Route21TrainerHeader8:
- dbEventFlagBit EVENT_BEAT_ROUTE_21_TRAINER_8, 1
- db ($0 << 4) ; trainer's view range
- dwEventFlagAddress EVENT_BEAT_ROUTE_21_TRAINER_8, 1
- dw Route21BattleText9 ; TextBeforeBattle
- dw Route21AfterBattleText9 ; TextAfterBattle
- dw Route21EndBattleText9 ; TextEndBattle
- dw Route21EndBattleText9 ; TextEndBattle
-
- db $ff
+ trainer EVENT_BEAT_ROUTE_21_TRAINER_8, 1, 0, Route21BattleText9, Route21EndBattleText9, Route21AfterBattleText9
+ db -1 ; end
Route21Text1:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
Route21Text2:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
Route21Text3:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
Route21Text4:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
Route21Text5:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
Route21Text6:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
Route21Text7:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
Route21Text8:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
Route21Text9:
- TX_ASM
+ text_asm
ld hl, Route21TrainerHeader8
call TalkToTrainer
jp TextScriptEnd
Route21BattleText1:
- TX_FAR _Route21BattleText1
- db "@"
+ text_far _Route21BattleText1
+ text_end
Route21EndBattleText1:
- TX_FAR _Route21EndBattleText1
- db "@"
+ text_far _Route21EndBattleText1
+ text_end
Route21AfterBattleText1:
- TX_FAR _Route21AfterBattleText1
- db "@"
+ text_far _Route21AfterBattleText1
+ text_end
Route21BattleText2:
- TX_FAR _Route21BattleText2
- db "@"
+ text_far _Route21BattleText2
+ text_end
Route21EndBattleText2:
- TX_FAR _Route21EndBattleText2
- db "@"
+ text_far _Route21EndBattleText2
+ text_end
Route21AfterBattleText2:
- TX_FAR _Route21AfterBattleText2
- db "@"
+ text_far _Route21AfterBattleText2
+ text_end
Route21BattleText3:
- TX_FAR _Route21BattleText3
- db "@"
+ text_far _Route21BattleText3
+ text_end
Route21EndBattleText3:
- TX_FAR _Route21EndBattleText3
- db "@"
+ text_far _Route21EndBattleText3
+ text_end
Route21AfterBattleText3:
- TX_FAR _Route21AfterBattleText3
- db "@"
+ text_far _Route21AfterBattleText3
+ text_end
Route21BattleText4:
- TX_FAR _Route21BattleText4
- db "@"
+ text_far _Route21BattleText4
+ text_end
Route21EndBattleText4:
- TX_FAR _Route21EndBattleText4
- db "@"
+ text_far _Route21EndBattleText4
+ text_end
Route21AfterBattleText4:
- TX_FAR _Route21AfterBattleText4
- db "@"
+ text_far _Route21AfterBattleText4
+ text_end
Route21BattleText5:
- TX_FAR _Route21BattleText5
- db "@"
+ text_far _Route21BattleText5
+ text_end
Route21EndBattleText5:
- TX_FAR _Route21EndBattleText5
- db "@"
+ text_far _Route21EndBattleText5
+ text_end
Route21AfterBattleText5:
- TX_FAR _Route21AfterBattleText5
- db "@"
+ text_far _Route21AfterBattleText5
+ text_end
Route21BattleText6:
- TX_FAR _Route21BattleText6
- db "@"
+ text_far _Route21BattleText6
+ text_end
Route21EndBattleText6:
- TX_FAR _Route21EndBattleText6
- db "@"
+ text_far _Route21EndBattleText6
+ text_end
Route21AfterBattleText6:
- TX_FAR _Route21AfterBattleText6
- db "@"
+ text_far _Route21AfterBattleText6
+ text_end
Route21BattleText7:
- TX_FAR _Route21BattleText7
- db "@"
+ text_far _Route21BattleText7
+ text_end
Route21EndBattleText7:
- TX_FAR _Route21EndBattleText7
- db "@"
+ text_far _Route21EndBattleText7
+ text_end
Route21AfterBattleText7:
- TX_FAR _Route21AfterBattleText7
- db "@"
+ text_far _Route21AfterBattleText7
+ text_end
Route21BattleText8:
- TX_FAR _Route21BattleText8
- db "@"
+ text_far _Route21BattleText8
+ text_end
Route21EndBattleText8:
- TX_FAR _Route21EndBattleText8
- db "@"
+ text_far _Route21EndBattleText8
+ text_end
Route21AfterBattleText8:
- TX_FAR _Route21AfterBattleText8
- db "@"
+ text_far _Route21AfterBattleText8
+ text_end
Route21BattleText9:
- TX_FAR _Route21BattleText9
- db "@"
+ text_far _Route21BattleText9
+ text_end
Route21EndBattleText9:
- TX_FAR _Route21EndBattleText9
- db "@"
+ text_far _Route21EndBattleText9
+ text_end
Route21AfterBattleText9:
- TX_FAR _Route21AfterBattleText9
- db "@"
+ text_far _Route21AfterBattleText9
+ text_end