From dd4f0a0064921f74fd68750848fca87ae21c4545 Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 11:12:59 -0500 Subject: Use base 10 (note, the previous commit resolves #173) --- data/mapObjects/saffronmart.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/mapObjects/saffronmart.asm') diff --git a/data/mapObjects/saffronmart.asm b/data/mapObjects/saffronmart.asm index 93c5aa2d..0a1551ea 100755 --- a/data/mapObjects/saffronmart.asm +++ b/data/mapObjects/saffronmart.asm @@ -1,17 +1,17 @@ SaffronMartObject: - db $0 ; border block + db 0 ; border block - db $2 ; warps - warp $3, $7, $4, $ff - warp $4, $7, $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 - warp_to $3, $7, SAFFRON_MART_WIDTH - warp_to $4, $7, SAFFRON_MART_WIDTH + warp_to 3, 7, SAFFRON_MART_WIDTH + warp_to 4, 7, SAFFRON_MART_WIDTH -- cgit v1.3.1-sl0p