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/ssanne9.asm | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'data/mapObjects/ssanne9.asm') diff --git a/data/mapObjects/ssanne9.asm b/data/mapObjects/ssanne9.asm index cec21d1b..a9bccafa 100755 --- a/data/mapObjects/ssanne9.asm +++ b/data/mapObjects/ssanne9.asm @@ -18,19 +18,19 @@ SSAnne9Object: ; 0x61c8d (size=188) db $0 ; signs db $d ; objects - object SPRITE_GENTLEMAN, $a, $2, FACE, LEFT, $1, GENTLEMAN + $C8, $3 - object SPRITE_FISHER2, $d, $4, FACE, RIGHT, $2, FISHER + $C8, $1 - object SPRITE_GENTLEMAN, $0, $e, FACE, LEFT, $3, GENTLEMAN + $C8, $5 - object SPRITE_LASS, $2, $b, FACE, DOWN, $4, LASS + $C8, $c - object SPRITE_GENTLEMAN, $1, $2, FACE, DOWN, $5 ; person - object SPRITE_BALL, $c, $1, FACE, STAY, $6, MAX_ETHER - object SPRITE_GENTLEMAN, $15, $2, FACE, DOWN, $7 ; person - object SPRITE_OLD_PERSON, $16, $1, FACE, DOWN, $8 ; person - object SPRITE_BALL, $0, $c, FACE, STAY, $9, RARE_CANDY - object SPRITE_GENTLEMAN, $c, $c, FACE, DOWN, $a ; person - object SPRITE_YOUNG_BOY, $b, $e, FACE, STAY, $b ; person - object SPRITE_BRUNETTE_GIRL, $16, $c, FACE, RIGHT, $c ; person - object SPRITE_FOULARD_WOMAN, $14, $c, FACE, LEFT, $d ; person + object SPRITE_GENTLEMAN, $a, $2, STAY, RIGHT, $1, GENTLEMAN + $C8, $3 + object SPRITE_FISHER2, $d, $4, STAY, LEFT, $2, FISHER + $C8, $1 + object SPRITE_GENTLEMAN, $0, $e, STAY, RIGHT, $3, GENTLEMAN + $C8, $5 + object SPRITE_LASS, $2, $b, STAY, DOWN, $4, LASS + $C8, $c + object SPRITE_GENTLEMAN, $1, $2, STAY, DOWN, $5 ; person + object SPRITE_BALL, $c, $1, STAY, NONE, $6, MAX_ETHER + object SPRITE_GENTLEMAN, $15, $2, STAY, DOWN, $7 ; person + object SPRITE_OLD_PERSON, $16, $1, STAY, DOWN, $8 ; person + object SPRITE_BALL, $0, $c, STAY, NONE, $9, RARE_CANDY + object SPRITE_GENTLEMAN, $c, $c, STAY, DOWN, $a ; person + object SPRITE_YOUNG_BOY, $b, $e, STAY, NONE, $b ; person + object SPRITE_BRUNETTE_GIRL, $16, $c, STAY, LEFT, $c ; person + object SPRITE_FOULARD_WOMAN, $14, $c, STAY, RIGHT, $d ; person ; warp-to EVENT_DISP SS_ANNE_9_WIDTH, $5, $2 ; SS_ANNE_2 -- cgit v1.3.1-sl0p