diff options
| author | Rangi <35663410+Rangi42@users.noreply.github.com> | 2020-07-19 23:04:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-19 23:04:16 -0400 |
| commit | 0177688ad4d923c4970009fa87df48605bb43ed6 (patch) | |
| tree | 4c44fbb1813e78eb00f7c1690d2c23099a49113b /data/maps/objects/FuchsiaCity.asm | |
| parent | d44c7c305c3f94b59e3e2c008408779836a0020a (diff) | |
| parent | df62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff) | |
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/FuchsiaCity.asm')
| -rwxr-xr-x | data/maps/objects/FuchsiaCity.asm | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/FuchsiaCity.asm b/data/maps/objects/FuchsiaCity.asm index 09c97b02..5a09f864 100755 --- a/data/maps/objects/FuchsiaCity.asm +++ b/data/maps/objects/FuchsiaCity.asm @@ -29,16 +29,16 @@ FuchsiaCity_Object: sign 7, 7, 24 ; FuchsiaCityText24 db 10 ; objects - object SPRITE_BUG_CATCHER, 10, 12, WALK, 2, 1 ; person + object SPRITE_YOUNGSTER, 10, 12, WALK, 2, 1 ; person object SPRITE_GAMBLER, 28, 17, WALK, 2, 2 ; person - object SPRITE_FISHER2, 30, 14, STAY, DOWN, 3 ; person - object SPRITE_BUG_CATCHER, 24, 8, STAY, UP, 4 ; person - object SPRITE_CLEFAIRY, 31, 5, WALK, 0, 5 ; person - object SPRITE_BALL, 25, 6, STAY, NONE, 6 ; person - object SPRITE_SLOWBRO, 12, 6, WALK, 2, 7 ; person - object SPRITE_SLOWBRO, 30, 12, WALK, 2, 8 ; person + object SPRITE_FISHER, 30, 14, STAY, DOWN, 3 ; person + object SPRITE_YOUNGSTER, 24, 8, STAY, UP, 4 ; person + object SPRITE_FAIRY, 31, 5, WALK, 0, 5 ; person + object SPRITE_POKE_BALL, 25, 6, STAY, NONE, 6 ; person + object SPRITE_MONSTER, 12, 6, WALK, 2, 7 ; person + object SPRITE_MONSTER, 30, 12, WALK, 2, 8 ; person object SPRITE_SEEL, 8, 17, WALK, 0, 9 ; person - object SPRITE_OMANYTE, 6, 5, STAY, NONE, 10 ; person + object SPRITE_FOSSIL, 6, 5, STAY, NONE, 10 ; person ; warp-to warp_to 5, 13, FUCHSIA_CITY_WIDTH ; FUCHSIA_MART |