aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonMart2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/CeladonMart2F.asm')
-rwxr-xr-xdata/maps/objects/CeladonMart2F.asm11
1 files changed, 4 insertions, 7 deletions
diff --git a/data/maps/objects/CeladonMart2F.asm b/data/maps/objects/CeladonMart2F.asm
index dfd12d3c..061a030c 100755
--- a/data/maps/objects/CeladonMart2F.asm
+++ b/data/maps/objects/CeladonMart2F.asm
@@ -1,21 +1,18 @@
CeladonMart2F_Object:
db $f ; border block
- db 3 ; warps
+ def_warps
warp 12, 1, 4, CELADON_MART_1F
warp 16, 1, 1, CELADON_MART_3F
warp 1, 1, 0, CELADON_MART_ELEVATOR
- db 1 ; signs
+ def_signs
sign 14, 1, 5 ; CeladonMart2Text5
- db 4 ; objects
+ 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
- ; warp-to
- warp_to 12, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_1F
- warp_to 16, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_3F
- warp_to 1, 1, CELADON_MART_2F_WIDTH ; CELADON_MART_ELEVATOR
+ def_warps_to CELADON_MART_2F