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 /data/maps/objects/CeruleanCave2F.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 'data/maps/objects/CeruleanCave2F.asm')
| -rw-r--r-- | data/maps/objects/CeruleanCave2F.asm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm index 417c8abc..48a3fd83 100644 --- a/data/maps/objects/CeruleanCave2F.asm +++ b/data/maps/objects/CeruleanCave2F.asm @@ -1,3 +1,9 @@ + object_const_def + const_export CERULEANCAVE2F_RARE_CANDY + const_export CERULEANCAVE2F_ULTRA_BALL + const_export CERULEANCAVE2F_MAX_REVIVE + const_export CERULEANCAVE2F_FULL_RESTORE + CeruleanCave2F_Object: db $7d ; border block @@ -12,9 +18,9 @@ CeruleanCave2F_Object: def_bg_events def_object_events - object_event 0, 11, SPRITE_POKE_BALL, STAY, NONE, 1, RARE_CANDY - object_event 16, 7, SPRITE_POKE_BALL, STAY, NONE, 2, ULTRA_BALL - object_event 19, 11, SPRITE_POKE_BALL, STAY, NONE, 3, MAX_REVIVE - object_event 27, 9, SPRITE_POKE_BALL, STAY, NONE, 4, FULL_RESTORE + object_event 0, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_RARE_CANDY, RARE_CANDY + object_event 16, 7, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_ULTRA_BALL, ULTRA_BALL + object_event 19, 11, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_MAX_REVIVE, MAX_REVIVE + object_event 27, 9, SPRITE_POKE_BALL, STAY, NONE, TEXT_CERULEANCAVE2F_FULL_RESTORE, FULL_RESTORE def_warps_to CERULEAN_CAVE_2F |