summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeladonMart4F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonMart4F.asm')
-rwxr-xr-xdata/maps/objects/CeladonMart4F.asm11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/CeladonMart4F.asm b/data/maps/objects/CeladonMart4F.asm
index 3949529b..adfe5efd 100755
--- a/data/maps/objects/CeladonMart4F.asm
+++ b/data/maps/objects/CeladonMart4F.asm
@@ -1,20 +1,17 @@
CeladonMart4F_Object:
db $f ; border block
- db 3 ; warps
+ def_warps
warp 12, 1, 0, CELADON_MART_3F
warp 16, 1, 1, CELADON_MART_5F
warp 1, 1, 0, CELADON_MART_ELEVATOR
- db 1 ; signs
+ def_signs
sign 14, 1, 4 ; CeladonMart4Text4
- db 3 ; objects
+ def_objects
object SPRITE_CLERK, 5, 7, STAY, NONE, 1 ; person
object SPRITE_SUPER_NERD, 15, 5, WALK, LEFT_RIGHT, 2 ; person
object SPRITE_YOUNGSTER, 5, 2, WALK, LEFT_RIGHT, 3 ; person
- ; warp-to
- warp_to 12, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_3F
- warp_to 16, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_5F
- warp_to 1, 1, CELADON_MART_4F_WIDTH ; CELADON_MART_ELEVATOR
+ def_warps_to CELADON_MART_4F