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 /data/maps/objects/CeruleanCave2F.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 'data/maps/objects/CeruleanCave2F.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCave2F.asm | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 18765fe8..6eea42a0 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,3 +1,8 @@ + object_const_def + const CERULEANCAVE2F_PP_UP + const CERULEANCAVE2F_ULTRA_BALL + const CERULEANCAVE2F_FULL_RESTORE + CeruleanCave2F_Object: db $7d ; border block @@ -12,8 +17,8 @@ CeruleanCave2F_Object: def_bg_events def_object_events - object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, 1, PP_UP - object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL - object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, 3, FULL_RESTORE + object_event 29, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_PP_UP, PP_UP + object_event 4, 15, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_ULTRA_BALL, ULTRA_BALL + object_event 13, 6, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_FULL_RESTORE, FULL_RESTORE def_warps_to CERULEAN_CAVE_2F |