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/celadondiner.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/mapObjects/celadondiner.asm') diff --git a/data/mapObjects/celadondiner.asm b/data/mapObjects/celadondiner.asm index f1327612..63426279 100755 --- a/data/mapObjects/celadondiner.asm +++ b/data/mapObjects/celadondiner.asm @@ -1,19 +1,19 @@ CeladonDinerObject: - db $f ; border block + db 15 ; border block - db $2 ; warps - warp $3, $7, $a, $ff - warp $4, $7, $a, $ff + db 2 ; warps + warp 3, 7, 10, -1 + warp 4, 7, 10, -1 - db $0 ; signs + db 0 ; signs - db $5 ; objects - object SPRITE_COOK, $8, $5, WALK, $2, $1 ; person - object SPRITE_MOM_GEISHA, $7, $2, STAY, NONE, $2 ; person - object SPRITE_FAT_BALD_GUY, $1, $4, STAY, DOWN, $3 ; person - object SPRITE_FISHER2, $5, $3, STAY, RIGHT, $4 ; person - object SPRITE_GYM_HELPER, $0, $1, STAY, DOWN, $5 ; person + db 5 ; objects + object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person + object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person + object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person + object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person + object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person ; warp-to - warp_to $3, $7, CELADON_DINER_WIDTH - warp_to $4, $7, CELADON_DINER_WIDTH + warp_to 3, 7, CELADON_DINER_WIDTH + warp_to 4, 7, CELADON_DINER_WIDTH -- cgit v1.3.1-sl0p