aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeruleanCave1F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-08-17 16:54:59 -0400
commite2c99f19103856426966e30cf1910d07995bb936 (patch)
tree513ecaba5794061a71ffcc9dbff5b3d426eade21 /data/maps/objects/CeruleanCave1F.asm
parentUse ANY_DIR, UP_DOWN, and LEFT_RIGHT for map objects (diff)
downloadpokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.gz
pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.tar.xz
pokeyellow-e2c99f19103856426966e30cf1910d07995bb936.zip
Use def_* macros for automatic map event counts
Diffstat (limited to 'data/maps/objects/CeruleanCave1F.asm')
-rwxr-xr-xdata/maps/objects/CeruleanCave1F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm
index 80283f09..b9ffd3fc 100755
--- a/data/maps/objects/CeruleanCave1F.asm
+++ b/data/maps/objects/CeruleanCave1F.asm
@@ -1,7 +1,7 @@
CeruleanCave1F_Object:
db $7d ; border block
- db 9 ; warps
+ def_warps
warp 24, 17, 6, LAST_MAP
warp 25, 17, 6, LAST_MAP
warp 27, 1, 0, CERULEAN_CAVE_2F
@@ -12,9 +12,9 @@ CeruleanCave1F_Object:
warp 3, 11, 5, CERULEAN_CAVE_2F
warp 0, 6, 0, CERULEAN_CAVE_B1F
- db 0 ; signs
+ def_signs
- db 3 ; objects
+ def_objects
object SPRITE_POKE_BALL, 7, 13, STAY, NONE, 1, FULL_RESTORE
object SPRITE_POKE_BALL, 19, 3, STAY, NONE, 2, MAX_ELIXER
object SPRITE_POKE_BALL, 5, 0, STAY, NONE, 3, NUGGET