aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/Route3.asm
diff options
context:
space:
mode:
authorvulcandth <vulcandth@gmail.com>2023-07-13 20:27:56 -0500
committerGitHub <noreply@github.com>2023-07-13 21:27:56 -0400
commitd001ced41b53271373753de835a9c3b3413dc318 (patch)
treeff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/Route3.asm
parentMake wCurrentBoxNum a byte instead of word (#414) (diff)
downloadpokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.gz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.tar.xz
pokeyellow-d001ced41b53271373753de835a9c3b3413dc318.zip
Add macros, constants, and labels for map scripts and text (#367)
This introduces `def_script_pointers`, `def_text_pointers`, and `object_const_def` macros, and applies them to all maps. Most other map labels have also been identified.
Diffstat (limited to 'scripts/Route3.asm')
-rw-r--r--scripts/Route3.asm162
1 files changed, 82 insertions, 80 deletions
diff --git a/scripts/Route3.asm b/scripts/Route3.asm
index ecc16a0c..19a8a0eb 100644
--- a/scripts/Route3.asm
+++ b/scripts/Route3.asm
@@ -8,190 +8,192 @@ Route3_Script:
ret
Route3_ScriptPointers:
- dw CheckFightingMapTrainers
- dw DisplayEnemyTrainerTextAndStartBattle
- dw EndTrainerBattle
+ def_script_pointers
+ dw_const CheckFightingMapTrainers, SCRIPT_ROUTE3_DEFAULT
+ dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_ROUTE3_START_BATTLE
+ dw_const EndTrainerBattle, SCRIPT_ROUTE3_END_BATTLE
Route3_TextPointers:
- dw Route3Text1
- dw Route3Text2
- dw Route3Text3
- dw Route3Text4
- dw Route3Text5
- dw Route3Text6
- dw Route3Text7
- dw Route3Text8
- dw Route3Text9
- dw Route3Text10
+ def_text_pointers
+ dw_const Route3SuperNerdText, TEXT_ROUTE3_SUPER_NERD
+ dw_const Route3Youngster1Text, TEXT_ROUTE3_YOUNGSTER1
+ dw_const Route3Youngster2Text, TEXT_ROUTE3_YOUNGSTER2
+ dw_const Route3CooltrainerF1Text, TEXT_ROUTE3_COOLTRAINER_F1
+ dw_const Route3Youngster3Text, TEXT_ROUTE3_YOUNGSTER3
+ dw_const Route3CooltrainerF2Text, TEXT_ROUTE3_COOLTRAINER_F2
+ dw_const Route3Youngster4Text, TEXT_ROUTE3_YOUNGSTER4
+ dw_const Route3Youngster5Text, TEXT_ROUTE3_YOUNGSTER5
+ dw_const Route3CooltrainerF3Text, TEXT_ROUTE3_COOLTRAINER_F3
+ dw_const Route3SignText, TEXT_ROUTE3_SIGN
Route3TrainerHeaders:
def_trainers 2
Route3TrainerHeader0:
- trainer EVENT_BEAT_ROUTE_3_TRAINER_0, 2, Route3BattleText1, Route3EndBattleText1, Route3AfterBattleText1
+ trainer EVENT_BEAT_ROUTE_3_TRAINER_0, 2, Route3Youngster1BattleText, Route3Youngster1EndBattleText, Route3Youngster1AfterBattleText
Route3TrainerHeader1:
- trainer EVENT_BEAT_ROUTE_3_TRAINER_1, 3, Route3BattleText2, Route3EndBattleText2, Route3AfterBattleText2
+ trainer EVENT_BEAT_ROUTE_3_TRAINER_1, 3, Route3Youngster2BattleText, Route3Youngster2EndBattleText, Route3Youngster2AfterBattleText
Route3TrainerHeader2:
- trainer EVENT_BEAT_ROUTE_3_TRAINER_2, 2, Route3BattleText3, Route3EndBattleText3, Route3AfterBattleText3
+ trainer EVENT_BEAT_ROUTE_3_TRAINER_2, 2, Route3CooltrainerF1BattleText, Route3CooltrainerF1EndBattleText, Route3CooltrainerF1AfterBattleText
Route3TrainerHeader3:
- trainer EVENT_BEAT_ROUTE_3_TRAINER_3, 1, Route3BattleText4, Route3EndBattleText4, Route3AfterBattleText4
+ trainer EVENT_BEAT_ROUTE_3_TRAINER_3, 1, Route3Youngster3BattleText, Route3Youngster3EndBattleText, Route3Youngster3AfterBattleText
Route3TrainerHeader4:
- trainer EVENT_BEAT_ROUTE_3_TRAINER_4, 4, Route3BattleText5, Route3EndBattleText5, Route3AfterBattleText5
+ trainer EVENT_BEAT_ROUTE_3_TRAINER_4, 4, Route3CooltrainerF2BattleText, Route3CooltrainerF2EndBattleText, Route3CooltrainerF2AfterBattleText
Route3TrainerHeader5:
- trainer EVENT_BEAT_ROUTE_3_TRAINER_5, 3, Route3BattleText6, Route3EndBattleText6, Route3AfterBattleText6
+ trainer EVENT_BEAT_ROUTE_3_TRAINER_5, 3, Route3Youngster4BattleText, Route3Youngster4EndBattleText, Route3Youngster4AfterBattleText
Route3TrainerHeader6:
- trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 3, Route3BattleText7, Route3EndBattleText7, Route3AfterBattleText7
+ trainer EVENT_BEAT_ROUTE_3_TRAINER_6, 3, Route3Youngster5BattleText, Route3Youngster5EndBattleText, Route3Youngster5AfterBattleText
Route3TrainerHeader7:
- trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 2, Route3BattleText8, Route3EndBattleText8, Route3AfterBattleText8
+ trainer EVENT_BEAT_ROUTE_3_TRAINER_7, 2, Route3CooltrainerF3BattleText, Route3CooltrainerF3EndBattleText, Route3CooltrainerF3AfterBattleText
db -1 ; end
-Route3Text1:
+Route3SuperNerdText:
text_far _Route3Text1
text_end
-Route3Text2:
+Route3Youngster1Text:
text_asm
ld hl, Route3TrainerHeader0
call TalkToTrainer
jp TextScriptEnd
-Route3BattleText1:
- text_far _Route3BattleText1
+Route3Youngster1BattleText:
+ text_far _Route3Youngster1BattleText
text_end
-Route3EndBattleText1:
- text_far _Route3EndBattleText1
+Route3Youngster1EndBattleText:
+ text_far _Route3Youngster1EndBattleText
text_end
-Route3AfterBattleText1:
- text_far _Route3AfterBattleText1
+Route3Youngster1AfterBattleText:
+ text_far _Route3Youngster1AfterBattleText
text_end
-Route3Text3:
+Route3Youngster2Text:
text_asm
ld hl, Route3TrainerHeader1
call TalkToTrainer
jp TextScriptEnd
-Route3BattleText2:
- text_far _Route3BattleText2
+Route3Youngster2BattleText:
+ text_far _Route3Youngster2BattleText
text_end
-Route3EndBattleText2:
- text_far _Route3EndBattleText2
+Route3Youngster2EndBattleText:
+ text_far _Route3Youngster2EndBattleText
text_end
-Route3AfterBattleText2:
- text_far _Route3AfterBattleText2
+Route3Youngster2AfterBattleText:
+ text_far _Route3Youngster2AfterBattleText
text_end
-Route3Text4:
+Route3CooltrainerF1Text:
text_asm
ld hl, Route3TrainerHeader2
call TalkToTrainer
jp TextScriptEnd
-Route3BattleText3:
- text_far _Route3BattleText3
+Route3CooltrainerF1BattleText:
+ text_far _Route3CooltrainerF1BattleText
text_end
-Route3EndBattleText3:
- text_far _Route3EndBattleText3
+Route3CooltrainerF1EndBattleText:
+ text_far _Route3CooltrainerF1EndBattleText
text_end
-Route3AfterBattleText3:
- text_far _Route3AfterBattleText3
+Route3CooltrainerF1AfterBattleText:
+ text_far _Route3CooltrainerF1AfterBattleText
text_end
-Route3Text5:
+Route3Youngster3Text:
text_asm
ld hl, Route3TrainerHeader3
call TalkToTrainer
jp TextScriptEnd
-Route3BattleText4:
- text_far _Route3BattleText4
+Route3Youngster3BattleText:
+ text_far _Route3Youngster3BattleText
text_end
-Route3EndBattleText4:
- text_far _Route3EndBattleText4
+Route3Youngster3EndBattleText:
+ text_far _Route3Youngster3EndBattleText
text_end
-Route3AfterBattleText4:
- text_far _Route3AfterBattleText4
+Route3Youngster3AfterBattleText:
+ text_far _Route3Youngster3AfterBattleText
text_end
-Route3Text6:
+Route3CooltrainerF2Text:
text_asm
ld hl, Route3TrainerHeader4
call TalkToTrainer
jp TextScriptEnd
-Route3BattleText5:
- text_far _Route3BattleText5
+Route3CooltrainerF2BattleText:
+ text_far _Route3CooltrainerF2BattleText
text_end
-Route3EndBattleText5:
- text_far _Route3EndBattleText5
+Route3CooltrainerF2EndBattleText:
+ text_far _Route3CooltrainerF2EndBattleText
text_end
-Route3AfterBattleText5:
- text_far _Route3AfterBattleText5
+Route3CooltrainerF2AfterBattleText:
+ text_far _Route3CooltrainerF2AfterBattleText
text_end
-Route3Text7:
+Route3Youngster4Text:
text_asm
ld hl, Route3TrainerHeader5
call TalkToTrainer
jp TextScriptEnd
-Route3BattleText6:
- text_far _Route3BattleText6
+Route3Youngster4BattleText:
+ text_far _Route3Youngster4BattleText
text_end
-Route3EndBattleText6:
- text_far _Route3EndBattleText6
+Route3Youngster4EndBattleText:
+ text_far _Route3Youngster4EndBattleText
text_end
-Route3AfterBattleText6:
- text_far _Route3AfterBattleText6
+Route3Youngster4AfterBattleText:
+ text_far _Route3Youngster4AfterBattleText
text_end
-Route3Text8:
+Route3Youngster5Text:
text_asm
ld hl, Route3TrainerHeader6
call TalkToTrainer
jp TextScriptEnd
-Route3BattleText7:
- text_far _Route3BattleText7
+Route3Youngster5BattleText:
+ text_far _Route3Youngster5BattleText
text_end
-Route3EndBattleText7:
- text_far _Route3EndBattleText7
+Route3Youngster5EndBattleText:
+ text_far _Route3Youngster5EndBattleText
text_end
-Route3AfterBattleText7:
- text_far _Route3AfterBattleText7
+Route3Youngster5AfterBattleText:
+ text_far _Route3Youngster5AfterBattleText
text_end
-Route3Text9:
+Route3CooltrainerF3Text:
text_asm
ld hl, Route3TrainerHeader7
call TalkToTrainer
jp TextScriptEnd
-Route3BattleText8:
- text_far _Route3BattleText8
+Route3CooltrainerF3BattleText:
+ text_far _Route3CooltrainerF3BattleText
text_end
-Route3EndBattleText8:
- text_far _Route3EndBattleText8
+Route3CooltrainerF3EndBattleText:
+ text_far _Route3CooltrainerF3EndBattleText
text_end
-Route3AfterBattleText8:
- text_far _Route3AfterBattleText8
+Route3CooltrainerF3AfterBattleText:
+ text_far _Route3CooltrainerF3AfterBattleText
text_end
-Route3Text10:
- text_far _Route3Text10
+Route3SignText:
+ text_far _Route3SignText
text_end