From d271d6917549074e721f3e5064b77e1ad1dbe44a Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 02:31:32 -0500 Subject: Add warp, sign, and warp_to macros for data/mapObjects definitions --- data/mapObjects/lab2.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/mapObjects/lab2.asm') diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index ed541ada..77d1eef6 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -2,8 +2,8 @@ Lab2Object: db $17 ; border block db $2 ; warps - db $7, $2, $2, CINNABAR_LAB_1 - db $7, $3, $2, CINNABAR_LAB_1 + warp $2, $7, $2, CINNABAR_LAB_1 + warp $3, $7, $2, CINNABAR_LAB_1 db $0 ; signs @@ -13,5 +13,5 @@ Lab2Object: object SPRITE_FOULARD_WOMAN, $5, $5, STAY, UP, $3 ; person ; warp-to - EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $2 ; CINNABAR_LAB_1 - EVENT_DISP CINNABAR_LAB_2_WIDTH, $7, $3 ; 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.2.3 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.2.3 From 2e0183fc2745c9f450a751d82569de52e8a5e6ea Mon Sep 17 00:00:00 2001 From: Remy Oukaour Date: Mon, 29 Jan 2018 11:46:45 -0500 Subject: Block IDs use hex; zero connections use dec --- data/mapObjects/lab2.asm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/mapObjects/lab2.asm') diff --git a/data/mapObjects/lab2.asm b/data/mapObjects/lab2.asm index 81fdbc8a..3062fcae 100755 --- a/data/mapObjects/lab2.asm +++ b/data/mapObjects/lab2.asm @@ -1,5 +1,5 @@ Lab2Object: - db 23 ; border block + db $17 ; border block db 2 ; warps warp 2, 7, 2, CINNABAR_LAB_1 -- cgit v1.2.3