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/silphco1.asm | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'data/mapObjects/silphco1.asm') diff --git a/data/mapObjects/silphco1.asm b/data/mapObjects/silphco1.asm index 0ef17156..9a13055d 100755 --- a/data/mapObjects/silphco1.asm +++ b/data/mapObjects/silphco1.asm @@ -1,21 +1,21 @@ SilphCo1Object: - db $2e ; border block + db 46 ; border block - db $5 ; warps - warp $a, $11, $5, $ff - warp $b, $11, $5, $ff - warp $1a, $0, $0, SILPH_CO_2F - warp $14, $0, $0, SILPH_CO_ELEVATOR - warp $10, $a, $6, SILPH_CO_3F + db 5 ; warps + warp 10, 17, 5, -1 + warp 11, 17, 5, -1 + warp 26, 0, 0, SILPH_CO_2F + warp 20, 0, 0, SILPH_CO_ELEVATOR + warp 16, 10, 6, SILPH_CO_3F - db $0 ; signs + db 0 ; signs - db $1 ; objects - object SPRITE_CABLE_CLUB_WOMAN, $4, $2, STAY, DOWN, $1 ; person + db 1 ; objects + object SPRITE_CABLE_CLUB_WOMAN, 4, 2, STAY, DOWN, 1 ; person ; warp-to - warp_to $a, $11, SILPH_CO_1F_WIDTH - warp_to $b, $11, SILPH_CO_1F_WIDTH - warp_to $1a, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F - warp_to $14, $0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR - warp_to $10, $a, SILPH_CO_1F_WIDTH ; SILPH_CO_3F + warp_to 10, 17, SILPH_CO_1F_WIDTH + warp_to 11, 17, SILPH_CO_1F_WIDTH + warp_to 26, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_2F + warp_to 20, 0, SILPH_CO_1F_WIDTH ; SILPH_CO_ELEVATOR + warp_to 16, 10, SILPH_CO_1F_WIDTH ; SILPH_CO_3F -- cgit v1.3.1-sl0p