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/victoryroad2.asm | |
| parent | Map object macro (diff) | |
| download | pokeyellow-4452acb021873affd95c92f096d0b1b9e8b50e7a.tar.gz pokeyellow-4452acb021873affd95c92f096d0b1b9e8b50e7a.tar.xz pokeyellow-4452acb021873affd95c92f096d0b1b9e8b50e7a.zip | |
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/victoryroad2.asm')
| -rwxr-xr-x | data/mapObjects/victoryroad2.asm | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/victoryroad2.asm b/data/mapObjects/victoryroad2.asm index 0a17e2e8..3d6cd633 100755 --- a/data/mapObjects/victoryroad2.asm +++ b/data/mapObjects/victoryroad2.asm @@ -13,19 +13,19 @@ VictoryRoad2Object: ; 0x51915 (size=154) db $0 ; signs db $d ; objects - object SPRITE_HIKER, $c, $9, FACE, RIGHT, $1, BLACKBELT + $C8, $9 - object SPRITE_BLACK_HAIR_BOY_2, $15, $d, FACE, RIGHT, $2, JUGGLER + $C8, $2 - object SPRITE_BLACK_HAIR_BOY_1, $13, $8, FACE, DOWN, $3, TAMER + $C8, $5 - object SPRITE_BLACK_HAIR_BOY_2, $4, $2, FACE, DOWN, $4, POKEMANIAC + $C8, $6 - object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, FACE, RIGHT, $5, JUGGLER + $C8, $5 - object SPRITE_BIRD, $b, $5, FACE, UP, $6, MOLTRES, 50 - object SPRITE_BALL, $1b, $5, FACE, STAY, $7, TM_17 - object SPRITE_BALL, $12, $9, FACE, STAY, $8, FULL_HEAL - object SPRITE_BALL, $9, $b, FACE, STAY, $9, TM_05 - object SPRITE_BALL, $b, $0, FACE, STAY, $a, GUARD_SPEC_ - object SPRITE_BOULDER, $4, $e, FACE, BOULDER_MOVEMENT_BYTE_2, $b ; person - object SPRITE_BOULDER, $5, $5, FACE, BOULDER_MOVEMENT_BYTE_2, $c ; person - object SPRITE_BOULDER, $17, $10, FACE, BOULDER_MOVEMENT_BYTE_2, $d ; person + object SPRITE_HIKER, $c, $9, STAY, LEFT, $1, BLACKBELT + $C8, $9 + object SPRITE_BLACK_HAIR_BOY_2, $15, $d, STAY, LEFT, $2, JUGGLER + $C8, $2 + object SPRITE_BLACK_HAIR_BOY_1, $13, $8, STAY, DOWN, $3, TAMER + $C8, $5 + object SPRITE_BLACK_HAIR_BOY_2, $4, $2, STAY, DOWN, $4, POKEMANIAC + $C8, $6 + object SPRITE_BLACK_HAIR_BOY_2, $1a, $3, STAY, LEFT, $5, JUGGLER + $C8, $5 + object SPRITE_BIRD, $b, $5, STAY, UP, $6, MOLTRES, 50 + object SPRITE_BALL, $1b, $5, STAY, NONE, $7, TM_17 + object SPRITE_BALL, $12, $9, STAY, NONE, $8, FULL_HEAL + object SPRITE_BALL, $9, $b, STAY, NONE, $9, TM_05 + object SPRITE_BALL, $b, $0, STAY, NONE, $a, GUARD_SPEC_ + object SPRITE_BOULDER, $4, $e, STAY, BOULDER_MOVEMENT_BYTE_2, $b ; person + object SPRITE_BOULDER, $5, $5, STAY, BOULDER_MOVEMENT_BYTE_2, $c ; person + object SPRITE_BOULDER, $17, $10, STAY, BOULDER_MOVEMENT_BYTE_2, $d ; person ; warp-to EVENT_DISP VICTORY_ROAD_2_WIDTH, $8, $0 ; VICTORY_ROAD_1 |