aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeruleanCaveB1F.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 /data/maps/objects/CeruleanCaveB1F.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 'data/maps/objects/CeruleanCaveB1F.asm')
-rw-r--r--data/maps/objects/CeruleanCaveB1F.asm11
1 files changed, 8 insertions, 3 deletions
diff --git a/data/maps/objects/CeruleanCaveB1F.asm b/data/maps/objects/CeruleanCaveB1F.asm
index 5173fee6..81e2b880 100644
--- a/data/maps/objects/CeruleanCaveB1F.asm
+++ b/data/maps/objects/CeruleanCaveB1F.asm
@@ -1,3 +1,8 @@
+ object_const_def
+ const CERULEANCAVE_B1F_MEWTWO
+ const CERULEANCAVE_B1F_ULTRA_BALL
+ const CERULEANCAVE_B1F_MAX_REVIVE
+
CeruleanCaveB1F_Object:
db $7d ; border block
@@ -7,8 +12,8 @@ CeruleanCaveB1F_Object:
def_bg_events
def_object_events
- object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, 1, MEWTWO, 70
- object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL
- object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE
+ object_event 27, 13, SPRITE_MONSTER, STAY, DOWN, TEXT_CERULEANCAVEB1F_MEWTWO, MEWTWO, 70
+ object_event 16, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVEB1F_ULTRA_BALL, ULTRA_BALL
+ object_event 18, 1, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVEB1F_MAX_REVIVE, MAX_REVIVE
def_warps_to CERULEAN_CAVE_B1F