diff options
| author | dannye <33dannye@gmail.com> | 2023-11-20 00:33:27 -0600 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2023-11-20 20:23:27 -0600 |
| commit | 298e99d3776580585c3f434e5d93137ae431bdd3 (patch) | |
| tree | a808c4ffd0fd0f9bd28972bae5236e0d3345c8e5 /scripts/CeruleanCaveB1F.asm | |
| parent | Add sound bits documentation for wOptions (#110) (diff) | |
| parent | Name 2 unnamed labels I missed in SeafoamIslandsB4F and PokemonMansion3F (#437) (diff) | |
| download | pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.gz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.tar.xz pokeyellow-298e99d3776580585c3f434e5d93137ae431bdd3.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'scripts/CeruleanCaveB1F.asm')
| -rw-r--r-- | scripts/CeruleanCaveB1F.asm | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/scripts/CeruleanCaveB1F.asm b/scripts/CeruleanCaveB1F.asm index 03d6f38c..401ba44f 100644 --- a/scripts/CeruleanCaveB1F.asm +++ b/scripts/CeruleanCaveB1F.asm @@ -8,16 +8,18 @@ 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 - dw PickUpItemText - dw PickUpItemText + def_text_pointers + dw_const CeruleanCaveB1FMewtwoText, TEXT_CERULEANCAVEB1F_MEWTWO + dw_const PickUpItemText, TEXT_CERULEANCAVEB1F_ULTRA_BALL1 + dw_const PickUpItemText, TEXT_CERULEANCAVEB1F_ULTRA_BALL2 + dw_const PickUpItemText, TEXT_CERULEANCAVEB1F_MAX_REVIVE + dw_const PickUpItemText, TEXT_CERULEANCAVEB1F_MAX_ELIXER CeruleanCaveB1FTrainerHeaders: def_trainers @@ -25,7 +27,7 @@ MewtwoTrainerHeader: trainer EVENT_BEAT_MEWTWO, 0, MewtwoBattleText, MewtwoBattleText, MewtwoBattleText db -1 ; end -MewtwoText: +CeruleanCaveB1FMewtwoText: text_asm ld hl, MewtwoTrainerHeader call TalkToTrainer |