summaryrefslogtreecommitdiff
path: root/data/mapObjects/saffronmart.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/saffronmart.asm')
-rwxr-xr-xdata/mapObjects/saffronmart.asm20
1 files changed, 10 insertions, 10 deletions
diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm
index 113a1ea9..6293b901 100755
--- a/data/mapObjects/saffronmart.asm
+++ b/data/mapObjects/saffronmart.asm
@@ -1,17 +1,17 @@
SaffronMartObject:
db $0 ; border block
- db $2 ; warps
- db $7, $3, $4, $ff
- db $7, $4, $4, $ff
+ db 2 ; warps
+ warp 3, 7, 4, -1
+ warp 4, 7, 4, -1
- db $0 ; signs
+ db 0 ; signs
- db $3 ; objects
- object SPRITE_MART_GUY, $0, $5, STAY, RIGHT, $1 ; person
- object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, NONE, $2 ; person
- object SPRITE_LASS, $6, $5, WALK, $0, $3 ; person
+ db 3 ; objects
+ object SPRITE_MART_GUY, 0, 5, STAY, RIGHT, 1 ; person
+ object SPRITE_BLACK_HAIR_BOY_2, 4, 2, STAY, NONE, 2 ; person
+ object SPRITE_LASS, 6, 5, WALK, 0, 3 ; person
; warp-to
- EVENT_DISP SAFFRON_MART_WIDTH, $7, $3
- EVENT_DISP SAFFRON_MART_WIDTH, $7, $4
+ warp_to 3, 7, SAFFRON_MART_WIDTH
+ warp_to 4, 7, SAFFRON_MART_WIDTH