summaryrefslogtreecommitdiff
path: root/data/maps/objects/CeladonMart5F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonMart5F.asm')
-rwxr-xr-xdata/maps/objects/CeladonMart5F.asm11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/CeladonMart5F.asm b/data/maps/objects/CeladonMart5F.asm
index 61a7428e..74af3db9 100755
--- a/data/maps/objects/CeladonMart5F.asm
+++ b/data/maps/objects/CeladonMart5F.asm
@@ -1,21 +1,18 @@
CeladonMart5F_Object:
db $f ; border block
- db 3 ; warps
+ def_warps
warp 12, 1, 0, CELADON_MART_ROOF
warp 16, 1, 1, CELADON_MART_4F
warp 1, 1, 0, CELADON_MART_ELEVATOR
- db 1 ; signs
+ def_signs
sign 14, 1, 5 ; CeladonMart5Text5
- db 4 ; objects
+ 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
- ; warp-to
- warp_to 12, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ROOF
- warp_to 16, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_4F
- warp_to 1, 1, CELADON_MART_5F_WIDTH ; CELADON_MART_ELEVATOR
+ def_warps_to CELADON_MART_5F