summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeladonMart2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonMart2F.asm')
-rw-r--r--data/maps/objects/CeladonMart2F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm
index 19b2aa59..34313385 100644
--- a/data/maps/objects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
@@ -1,18 +1,18 @@
CeladonMart2F_Object:
db $f ; border block
- def_warps
- warp 12, 1, 4, CELADON_MART_1F
- warp 16, 1, 1, CELADON_MART_3F
- warp 1, 1, 0, CELADON_MART_ELEVATOR
+ def_warp_events
+ warp_event 12, 1, CELADON_MART_1F, 4
+ warp_event 16, 1, CELADON_MART_3F, 1
+ warp_event 1, 1, CELADON_MART_ELEVATOR, 0
- def_signs
- sign 14, 1, 5 ; CeladonMart2Text5
+ def_bg_events
+ bg_event 14, 1, 5 ; CeladonMart2Text5
- def_objects
- object SPRITE_CLERK, 5, 3, STAY, DOWN, 1 ; person
- object SPRITE_CLERK, 6, 3, STAY, DOWN, 2 ; person
- object SPRITE_MIDDLE_AGED_MAN, 19, 5, STAY, NONE, 3 ; person
- object SPRITE_GIRL, 14, 4, WALK, UP_DOWN, 4 ; person
+ def_object_events
+ object_event 5, 3, SPRITE_CLERK, STAY, DOWN, 1 ; person
+ object_event 6, 3, SPRITE_CLERK, STAY, DOWN, 2 ; person
+ object_event 19, 5, SPRITE_MIDDLE_AGED_MAN, STAY, NONE, 3 ; person
+ object_event 14, 4, SPRITE_GIRL, WALK, UP_DOWN, 4 ; person
def_warps_to CELADON_MART_2F