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/gary.asm | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'data/mapObjects/gary.asm') diff --git a/data/mapObjects/gary.asm b/data/mapObjects/gary.asm index f26ed787..c16bdec8 100755 --- a/data/mapObjects/gary.asm +++ b/data/mapObjects/gary.asm @@ -1,20 +1,20 @@ GaryObject: - db $3 ; border block + db 3 ; border block - db $4 ; warps - warp $3, $7, $1, LANCES_ROOM - warp $4, $7, $2, LANCES_ROOM - warp $3, $0, $0, HALL_OF_FAME - warp $4, $0, $0, HALL_OF_FAME + db 4 ; warps + warp 3, 7, 1, LANCES_ROOM + warp 4, 7, 2, LANCES_ROOM + warp 3, 0, 0, HALL_OF_FAME + warp 4, 0, 0, HALL_OF_FAME - db $0 ; signs + db 0 ; signs - db $2 ; objects - object SPRITE_BLUE, $4, $2, STAY, DOWN, $1 ; person - object SPRITE_OAK, $3, $7, STAY, UP, $2 ; person + db 2 ; objects + object SPRITE_BLUE, 4, 2, STAY, DOWN, 1 ; person + object SPRITE_OAK, 3, 7, STAY, UP, 2 ; person ; warp-to - warp_to $3, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to $4, $7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM - warp_to $3, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME - warp_to $4, $0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME + warp_to 3, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to 4, 7, CHAMPIONS_ROOM_WIDTH ; LANCES_ROOM + warp_to 3, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME + warp_to 4, 0, CHAMPIONS_ROOM_WIDTH ; HALL_OF_FAME -- cgit v1.3.1-sl0p