diff options
| author | vulcandth <vulcandth@gmail.com> | 2023-07-13 20:27:56 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-13 21:27:56 -0400 |
| commit | d001ced41b53271373753de835a9c3b3413dc318 (patch) | |
| tree | ff2db7f403bddfcdeb12e50def8411cafedcdd5e /scripts/CeruleanCaveB1F.asm | |
| parent | Make wCurrentBoxNum a byte instead of word (#414) (diff) | |
| download | pokeyellow-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/CeruleanCaveB1F.asm')
| -rw-r--r-- | scripts/CeruleanCaveB1F.asm | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index 0c0ce766..f35ee1e6 100644 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -8,14 +8,16 @@ CeruleanCaveB1F_Script: ret CeruleanCaveB1F_ScriptPointers: - dw CheckFightingMapTrainers - dw DisplayEnemyTrainerTextAndStartBattle - dw EndTrainerBattle + def_script_pointers + dw_const CheckFightingMapTrainers, SCRIPT_CERULEANCAVEB1F_DEFAULT + dw_const DisplayEnemyTrainerTextAndStartBattle, SCRIPT_CERULEANCAVEB1F_START_BATTLE + dw_const EndTrainerBattle, SCRIPT_CERULEANCAVEB1F_END_BATTLE CeruleanCaveB1F_TextPointers: - dw MewtwoText - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const CeruleanCaveB1FMewtwoText, TEXT_CERULEANCAVEB1F_MEWTWO + dw_const PickUpItemText, TEXT_CERULEANCAVEB1F_ULTRA_BALL + dw_const PickUpItemText, TEXT_CERULEANCAVEB1F_MAX_REVIVE CeruleanCaveB1FTrainerHeaders: def_trainers @@ -23,7 +25,7 @@ MewtwoTrainerHeader: trainer EVENT_BEAT_MEWTWO, 0, MewtwoBattleText, MewtwoBattleText, MewtwoBattleText db -1 ; end -MewtwoText: +CeruleanCaveB1FMewtwoText: text_asm ld hl, MewtwoTrainerHeader call TalkToTrainer |