diff options
| author | dannye <corrnondacqb@yahoo.com> | 2015-07-18 22:36:22 -0500 |
|---|---|---|
| committer | dannye <corrnondacqb@yahoo.com> | 2015-07-18 22:36:22 -0500 |
| commit | 4452acb021873affd95c92f096d0b1b9e8b50e7a (patch) | |
| tree | e905b665cfa1ef2eb7c62e475620bc40a9edb10d /data/mapObjects/ceruleancity.asm | |
| parent | 0e48333fb864b0c8b6914fe1b5e57929d5258080 (diff) | |
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
Diffstat (limited to 'data/mapObjects/ceruleancity.asm')
| -rwxr-xr-x | data/mapObjects/ceruleancity.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/ceruleancity.asm b/data/mapObjects/ceruleancity.asm index 5dc51512..0be79c17 100755 --- a/data/mapObjects/ceruleancity.asm +++ b/data/mapObjects/ceruleancity.asm @@ -22,17 +22,17 @@ CeruleanCityObject: ; 0x18786 (size=170) db $15, $1b, $11 ; CeruleanCityText17 db $b ; objects - object SPRITE_BLUE, $14, $2, FACE, DOWN, $1 ; person - object SPRITE_ROCKET, $1e, $8, FACE, STAY, $2, ROCKET + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, FACE, DOWN, $3 ; person + object SPRITE_BLUE, $14, $2, STAY, DOWN, $1 ; person + object SPRITE_ROCKET, $1e, $8, STAY, NONE, $2, ROCKET + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_1, $1f, $14, STAY, DOWN, $3 ; person object SPRITE_BLACK_HAIR_BOY_2, $f, $12, WALK, $1, $4 ; person object SPRITE_BLACK_HAIR_BOY_2, $9, $15, WALK, $2, $5 ; person - object SPRITE_GUARD, $1c, $c, FACE, DOWN, $6 ; person - object SPRITE_LASS, $1d, $1a, FACE, RIGHT, $7 ; person - object SPRITE_SLOWBRO, $1c, $1a, FACE, DOWN, $8 ; person + object SPRITE_GUARD, $1c, $c, STAY, DOWN, $6 ; person + object SPRITE_LASS, $1d, $1a, STAY, LEFT, $7 ; person + object SPRITE_SLOWBRO, $1c, $1a, STAY, DOWN, $8 ; person object SPRITE_LASS, $9, $1b, WALK, $2, $9 ; person - object SPRITE_BLACK_HAIR_BOY_2, $4, $c, FACE, DOWN, $a ; person - object SPRITE_GUARD, $1b, $c, FACE, DOWN, $b ; person + object SPRITE_BLACK_HAIR_BOY_2, $4, $c, STAY, DOWN, $a ; person + object SPRITE_GUARD, $1b, $c, STAY, DOWN, $b ; person ; warp-to EVENT_DISP CERULEAN_CITY_WIDTH, $b, $1b ; TRASHED_HOUSE |