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/SaffronCity.asm | |
| parent | Merge pull request #277 from Rangi42/master (diff) | |
| parent | Missingno's Pokédex weight is two bytes like the rest (diff) | |
| download | pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.gz pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.tar.xz pokeyellow-0177688ad4d923c4970009fa87df48605bb43ed6.zip | |
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/SaffronCity.asm')
| -rwxr-xr-x | data/maps/objects/SaffronCity.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/SaffronCity.asm b/data/maps/objects/SaffronCity.asm index b8d3a9cf..332f13af 100755 --- a/data/maps/objects/SaffronCity.asm +++ b/data/maps/objects/SaffronCity.asm @@ -31,8 +31,8 @@ SaffronCity_Object: object SPRITE_ROCKET, 11, 25, WALK, 2, 5 ; person object SPRITE_ROCKET, 32, 13, WALK, 2, 6 ; person object SPRITE_ROCKET, 18, 30, WALK, 2, 7 ; person - object SPRITE_OAK_AIDE, 8, 14, WALK, 0, 8 ; person - object SPRITE_LAPRAS_GIVER, 23, 23, STAY, NONE, 9 ; person + object SPRITE_SCIENTIST, 8, 14, WALK, 0, 8 ; person + object SPRITE_SILPH_WORKER, 23, 23, STAY, NONE, 9 ; person object SPRITE_ERIKA, 17, 30, WALK, 2, 10 ; person object SPRITE_GENTLEMAN, 30, 12, STAY, DOWN, 11 ; person object SPRITE_BIRD, 31, 12, STAY, DOWN, 12 ; person |