aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SaffronMart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SaffronMart.asm')
-rwxr-xr-xdata/maps/objects/SaffronMart.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/SaffronMart.asm b/data/maps/objects/SaffronMart.asm
index 4680f018..5d172ea7 100755
--- a/data/maps/objects/SaffronMart.asm
+++ b/data/maps/objects/SaffronMart.asm
@@ -1,17 +1,15 @@
SaffronMart_Object:
db $0 ; border block
- db 2 ; warps
+ def_warps
warp 3, 7, 4, LAST_MAP
warp 4, 7, 4, LAST_MAP
- db 0 ; signs
+ def_signs
- db 3 ; objects
+ def_objects
object SPRITE_CLERK, 0, 5, STAY, RIGHT, 1 ; person
object SPRITE_SUPER_NERD, 4, 2, STAY, NONE, 2 ; person
object SPRITE_COOLTRAINER_F, 6, 5, WALK, ANY_DIR, 3 ; person
- ; warp-to
- warp_to 3, 7, SAFFRON_MART_WIDTH
- warp_to 4, 7, SAFFRON_MART_WIDTH
+ def_warps_to SAFFRON_MART