From 0e48333fb864b0c8b6914fe1b5e57929d5258080 Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 22:22:51 -0500 Subject: Map object macro closes https://github.com/iimarckus/pokered/issues/89 --- data/mapObjects/silphco8.asm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data/mapObjects/silphco8.asm') diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index be802791..7aaf3c1a 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -12,11 +12,11 @@ SilphCo8Object: ; 0x56613 (size=90) db $0 ; signs - db $4 ; people - db SPRITE_LAPRAS_GIVER, $2 + 4, $4 + 4, $ff, $ff, $1 ; person - db SPRITE_ROCKET, $2 + 4, $13 + 4, $ff, $d2, TRAINER | $2, ROCKET + $C8, $23 - db SPRITE_OAK_AIDE, $2 + 4, $a + 4, $ff, $d0, TRAINER | $3, SCIENTIST + $C8, $9 - db SPRITE_ROCKET, $f + 4, $c + 4, $ff, $d3, TRAINER | $4, ROCKET + $C8, $24 + db $4 ; objects + object SPRITE_LAPRAS_GIVER, $4, $2, FACE, STAY, $1 ; person + object SPRITE_ROCKET, $13, $2, FACE, RIGHT, $2, ROCKET + $C8, $23 + object SPRITE_OAK_AIDE, $a, $2, FACE, DOWN, $3, SCIENTIST + $C8, $9 + object SPRITE_ROCKET, $c, $f, FACE, LEFT, $4, ROCKET + $C8, $24 ; warp-to EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F -- cgit v1.2.3 From 4452acb021873affd95c92f096d0b1b9e8b50e7a Mon Sep 17 00:00:00 2001 From: dannye Date: Sat, 18 Jul 2015 22:36:22 -0500 Subject: Fix object constant names swap LEFT and RIGHT FACE is better named STAY because sprites that have no range do not necessarily face any direction STAY has been renamed to NONE because sprites that use this will spin randomly, except for the item/voltorb/electrode sprite I never should have listened to https://github.com/iimarckus/pokered/issues/89 --- data/mapObjects/silphco8.asm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'data/mapObjects/silphco8.asm') diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index 7aaf3c1a..6b7541ad 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -13,10 +13,10 @@ SilphCo8Object: ; 0x56613 (size=90) db $0 ; signs db $4 ; objects - object SPRITE_LAPRAS_GIVER, $4, $2, FACE, STAY, $1 ; person - object SPRITE_ROCKET, $13, $2, FACE, RIGHT, $2, ROCKET + $C8, $23 - object SPRITE_OAK_AIDE, $a, $2, FACE, DOWN, $3, SCIENTIST + $C8, $9 - object SPRITE_ROCKET, $c, $f, FACE, LEFT, $4, ROCKET + $C8, $24 + object SPRITE_LAPRAS_GIVER, $4, $2, STAY, NONE, $1 ; person + object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, ROCKET + $C8, $23 + object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, SCIENTIST + $C8, $9 + object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, ROCKET + $C8, $24 ; warp-to EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F -- cgit v1.2.3 From dfc152d667e3695f83eb0fbabb839b0fad275ceb Mon Sep 17 00:00:00 2001 From: dannye Date: Mon, 10 Aug 2015 11:09:16 -0500 Subject: No more $C8 Use OPP_ constants separate from trainer constants since valid opponents can be all Pokemon and trainers --- data/mapObjects/silphco8.asm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'data/mapObjects/silphco8.asm') diff --git a/data/mapObjects/silphco8.asm b/data/mapObjects/silphco8.asm index 6b7541ad..a4b97a91 100755 --- a/data/mapObjects/silphco8.asm +++ b/data/mapObjects/silphco8.asm @@ -14,9 +14,9 @@ SilphCo8Object: ; 0x56613 (size=90) db $4 ; objects object SPRITE_LAPRAS_GIVER, $4, $2, STAY, NONE, $1 ; person - object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, ROCKET + $C8, $23 - object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, SCIENTIST + $C8, $9 - object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, ROCKET + $C8, $24 + object SPRITE_ROCKET, $13, $2, STAY, LEFT, $2, OPP_ROCKET, $23 + object SPRITE_OAK_AIDE, $a, $2, STAY, DOWN, $3, OPP_SCIENTIST, $9 + object SPRITE_ROCKET, $c, $f, STAY, RIGHT, $4, OPP_ROCKET, $24 ; warp-to EVENT_DISP SILPH_CO_8F_WIDTH, $0, $10 ; SILPH_CO_9F -- cgit v1.2.3