summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeladonMart1F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonMart1F.asm')
-rw-r--r--data/maps/objects/CeladonMart1F.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/maps/objects/CeladonMart1F.asm b/data/maps/objects/CeladonMart1F.asm
index 3edcbe3f..4b40b1c5 100644
--- a/data/maps/objects/CeladonMart1F.asm
+++ b/data/maps/objects/CeladonMart1F.asm
@@ -1,19 +1,19 @@
CeladonMart1F_Object:
db $f ; border block
- def_warps
- warp 2, 7, 0, LAST_MAP
- warp 3, 7, 0, LAST_MAP
- warp 16, 7, 1, LAST_MAP
- warp 17, 7, 1, LAST_MAP
- warp 12, 1, 0, CELADON_MART_2F
- warp 1, 1, 0, CELADON_MART_ELEVATOR
+ def_warp_events
+ warp_event 2, 7, LAST_MAP, 0
+ warp_event 3, 7, LAST_MAP, 0
+ warp_event 16, 7, LAST_MAP, 1
+ warp_event 17, 7, LAST_MAP, 1
+ warp_event 12, 1, CELADON_MART_2F, 0
+ warp_event 1, 1, CELADON_MART_ELEVATOR, 0
- def_signs
- sign 11, 4, 2 ; CeladonMart1Text2
- sign 14, 1, 3 ; CeladonMart1Text3
+ def_bg_events
+ bg_event 11, 4, 2 ; CeladonMart1Text2
+ bg_event 14, 1, 3 ; CeladonMart1Text3
- def_objects
- object SPRITE_LINK_RECEPTIONIST, 8, 3, STAY, DOWN, 1 ; person
+ def_object_events
+ object_event 8, 3, SPRITE_LINK_RECEPTIONIST, STAY, DOWN, 1 ; person
def_warps_to CELADON_MART_1F