summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeruleanCave2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeruleanCave2F.asm')
-rw-r--r--data/maps/objects/CeruleanCave2F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm
index 6622bb77..5d7a3d7d 100644
--- a/data/maps/objects/CeruleanCave2F.asm
+++ b/data/maps/objects/CeruleanCave2F.asm
@@ -1,19 +1,19 @@
CeruleanCave2F_Object:
db $7d ; border block
- def_warps
- warp 29, 1, 2, CERULEAN_CAVE_1F
- warp 22, 6, 3, CERULEAN_CAVE_1F
- warp 19, 7, 4, CERULEAN_CAVE_1F
- warp 9, 1, 5, CERULEAN_CAVE_1F
- warp 1, 3, 6, CERULEAN_CAVE_1F
- warp 3, 11, 7, CERULEAN_CAVE_1F
+ def_warp_events
+ warp_event 29, 1, CERULEAN_CAVE_1F, 2
+ warp_event 22, 6, CERULEAN_CAVE_1F, 3
+ warp_event 19, 7, CERULEAN_CAVE_1F, 4
+ warp_event 9, 1, CERULEAN_CAVE_1F, 5
+ warp_event 1, 3, CERULEAN_CAVE_1F, 6
+ warp_event 3, 11, CERULEAN_CAVE_1F, 7
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP
- object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
- object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
+ 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
def_warps_to CERULEAN_CAVE_2F