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/viridiangym.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/viridiangym.asm')
| -rwxr-xr-x | data/mapObjects/viridiangym.asm | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/viridiangym.asm b/data/mapObjects/viridiangym.asm index 63fe3eee..fb81788d 100755 --- a/data/mapObjects/viridiangym.asm +++ b/data/mapObjects/viridiangym.asm @@ -8,17 +8,17 @@ ViridianGymObject: ; 0x74bde (size=105) db $0 ; signs db $b ; objects - object SPRITE_GIOVANNI, $2, $1, FACE, DOWN, $1, GIOVANNI + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_1, $c, $7, FACE, DOWN, $2, COOLTRAINER_M + $C8, $9 - object SPRITE_HIKER, $b, $b, FACE, UP, $3, BLACKBELT + $C8, $6 - object SPRITE_ROCKER, $a, $7, FACE, DOWN, $4, TAMER + $C8, $3 - object SPRITE_HIKER, $3, $7, FACE, RIGHT, $5, BLACKBELT + $C8, $7 - object SPRITE_BLACK_HAIR_BOY_1, $d, $5, FACE, LEFT, $6, COOLTRAINER_M + $C8, $a - object SPRITE_HIKER, $a, $1, FACE, DOWN, $7, BLACKBELT + $C8, $8 - object SPRITE_ROCKER, $2, $10, FACE, LEFT, $8, TAMER + $C8, $4 - object SPRITE_BLACK_HAIR_BOY_1, $6, $5, FACE, DOWN, $9, COOLTRAINER_M + $C8, $1 - object SPRITE_GYM_HELPER, $10, $f, FACE, DOWN, $a ; person - object SPRITE_BALL, $10, $9, FACE, STAY, $b, REVIVE + object SPRITE_GIOVANNI, $2, $1, STAY, DOWN, $1, GIOVANNI + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_1, $c, $7, STAY, DOWN, $2, COOLTRAINER_M + $C8, $9 + object SPRITE_HIKER, $b, $b, STAY, UP, $3, BLACKBELT + $C8, $6 + object SPRITE_ROCKER, $a, $7, STAY, DOWN, $4, TAMER + $C8, $3 + object SPRITE_HIKER, $3, $7, STAY, LEFT, $5, BLACKBELT + $C8, $7 + object SPRITE_BLACK_HAIR_BOY_1, $d, $5, STAY, RIGHT, $6, COOLTRAINER_M + $C8, $a + object SPRITE_HIKER, $a, $1, STAY, DOWN, $7, BLACKBELT + $C8, $8 + object SPRITE_ROCKER, $2, $10, STAY, RIGHT, $8, TAMER + $C8, $4 + object SPRITE_BLACK_HAIR_BOY_1, $6, $5, STAY, DOWN, $9, COOLTRAINER_M + $C8, $1 + object SPRITE_GYM_HELPER, $10, $f, STAY, DOWN, $a ; person + object SPRITE_BALL, $10, $9, STAY, NONE, $b, REVIVE ; warp-to EVENT_DISP VIRIDIAN_GYM_WIDTH, $11, $10 |