aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonMart5F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonMart5F.asm')
-rw-r--r--data/maps/objects/CeladonMart5F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm
index 2583526c..3fe6232c 100644
--- a/data/maps/objects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -1,18 +1,18 @@
CeladonMart5F_Object:
db $f ; border block
- def_warps
- warp 12, 1, 0, CELADON_MART_ROOF
- warp 16, 1, 1, CELADON_MART_4F
- warp 1, 1, 0, CELADON_MART_ELEVATOR
+ def_warp_events
+ warp_event 12, 1, CELADON_MART_ROOF, 0
+ warp_event 16, 1, CELADON_MART_4F, 1
+ warp_event 1, 1, CELADON_MART_ELEVATOR, 0
- def_signs
- sign 14, 1, 5 ; CeladonMart5Text5
+ def_bg_events
+ bg_event 14, 1, 5 ; CeladonMart5Text5
- def_objects
- object SPRITE_GENTLEMAN, 14, 5, WALK, UP_DOWN, 1 ; person
- object SPRITE_SAILOR, 2, 6, STAY, NONE, 2 ; person
- object SPRITE_CLERK, 5, 3, STAY, DOWN, 3 ; person
- object SPRITE_CLERK, 6, 3, STAY, DOWN, 4 ; person
+ def_object_events
+ object_event 14, 5, SPRITE_GENTLEMAN, WALK, UP_DOWN, 1 ; person
+ object_event 2, 6, SPRITE_SAILOR, STAY, NONE, 2 ; person
+ object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 3 ; person
+ object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 4 ; person
def_warps_to CELADON_MART_5F