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/lab2.asm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'data/mapObjects/lab2.asm') diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 77d1eef6..81fdbc8a 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -1,17 +1,17 @@ Lab2Object: - db $17 ; border block + db 23 ; border block - db $2 ; warps - warp $2, $7, $2, CINNABAR_LAB_1 - warp $3, $7, $2, CINNABAR_LAB_1 + db 2 ; warps + warp 2, 7, 2, CINNABAR_LAB_1 + warp 3, 7, 2, CINNABAR_LAB_1 - db $0 ; signs + db 0 ; signs - db $3 ; objects - object SPRITE_BLACK_HAIR_BOY_2, $3, $2, STAY, DOWN, $1 ; person - object SPRITE_OLD_PERSON, $1, $4, STAY, NONE, $2 ; person - object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person + db 3 ; objects + object SPRITE_BLACK_HAIR_BOY_2, 3, 2, STAY, DOWN, 1 ; person + object SPRITE_OLD_PERSON, 1, 4, STAY, NONE, 2 ; person + object SPRITE_FOULARD_WOMAN, 5, 5, STAY, UP, 3 ; person ; warp-to - warp_to $2, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 - warp_to $3, $7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 + warp_to 2, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 + warp_to 3, 7, CINNABAR_LAB_2_WIDTH ; CINNABAR_LAB_1 -- cgit v1.3.1-sl0p