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/rocktunnel2.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/rocktunnel2.asm')
-rwxr-xr-x | data/mapObjects/rocktunnel2.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/mapObjects/rocktunnel2.asm b/data/mapObjects/rocktunnel2.asm index 61014d31..7da2c3d1 100755 --- a/data/mapObjects/rocktunnel2.asm +++ b/data/mapObjects/rocktunnel2.asm @@ -10,14 +10,14 @@ RockTunnel2Object: ; 0x4613d (size=100) db $0 ; signs db $8 ; objects - object SPRITE_LASS, $b, $d, FACE, DOWN, $1, JR__TRAINER_F + $C8, $9 - object SPRITE_HIKER, $6, $a, FACE, DOWN, $2, HIKER + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $3, $5, FACE, DOWN, $3, POKEMANIAC + $C8, $3 - object SPRITE_BLACK_HAIR_BOY_2, $14, $15, FACE, LEFT, $4, POKEMANIAC + $C8, $4 - object SPRITE_HIKER, $1e, $a, FACE, DOWN, $5, HIKER + $C8, $a - object SPRITE_LASS, $e, $1c, FACE, LEFT, $6, JR__TRAINER_F + $C8, $a - object SPRITE_HIKER, $21, $5, FACE, LEFT, $7, HIKER + $C8, $b - object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, FACE, DOWN, $8, POKEMANIAC + $C8, $5 + object SPRITE_LASS, $b, $d, STAY, DOWN, $1, JR__TRAINER_F + $C8, $9 + object SPRITE_HIKER, $6, $a, STAY, DOWN, $2, HIKER + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $3, $5, STAY, DOWN, $3, POKEMANIAC + $C8, $3 + object SPRITE_BLACK_HAIR_BOY_2, $14, $15, STAY, RIGHT, $4, POKEMANIAC + $C8, $4 + object SPRITE_HIKER, $1e, $a, STAY, DOWN, $5, HIKER + $C8, $a + object SPRITE_LASS, $e, $1c, STAY, RIGHT, $6, JR__TRAINER_F + $C8, $a + object SPRITE_HIKER, $21, $5, STAY, RIGHT, $7, HIKER + $C8, $b + object SPRITE_BLACK_HAIR_BOY_2, $1a, $1e, STAY, DOWN, $8, POKEMANIAC + $C8, $5 ; warp-to EVENT_DISP ROCK_TUNNEL_2_WIDTH, $19, $21 ; ROCK_TUNNEL_1 |