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/SilphCo6F.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/SilphCo6F.asm')
| -rwxr-xr-x | data/maps/objects/SilphCo6F.asm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm index ad2ac32f..fc0787ae 100755 --- a/data/maps/objects/SilphCo6F.asm +++ b/data/maps/objects/SilphCo6F.asm @@ -11,16 +11,16 @@ SilphCo6F_Object: db 0 ; signs db 10 ; objects - object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person - object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person + object SPRITE_SILPH_WORKER, 10, 6, STAY, NONE, 1 ; person + object SPRITE_SILPH_WORKER, 20, 6, STAY, NONE, 2 ; person object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person - object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person + object SPRITE_SILPH_WORKER, 18, 13, STAY, UP, 5 ; person object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30 - object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 + object SPRITE_SCIENTIST, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7 object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31 - object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP - object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY + object SPRITE_POKE_BALL, 3, 12, STAY, NONE, 9, HP_UP + object SPRITE_POKE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY ; warp-to warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F |