summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeruleanCave1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeruleanCave1F.asm')
-rwxr-xr-xdata/maps/objects/CeruleanCave1F.asm17
1 files changed, 4 insertions, 13 deletions
diff --git a/data/maps/objects/CeruleanCave1F.asm b/data/maps/objects/CeruleanCave1F.asm
index 80283f09..badf1a8b 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,20 +12,11 @@ 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
- ; warp-to
- warp_to 24, 17, CERULEAN_CAVE_1F_WIDTH
- warp_to 25, 17, CERULEAN_CAVE_1F_WIDTH
- warp_to 27, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 23, 7, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 18, 9, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 7, 1, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 1, 3, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 3, 11, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_2F
- warp_to 0, 6, CERULEAN_CAVE_1F_WIDTH ; CERULEAN_CAVE_B1F
+ def_warps_to CERULEAN_CAVE_1F