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/PokemonMansion1F.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/PokemonMansion1F.asm')
| -rwxr-xr-x | data/maps/objects/PokemonMansion1F.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/PokemonMansion1F.asm b/data/maps/objects/PokemonMansion1F.asm index 5830cb28..7d89e914 100755 --- a/data/maps/objects/PokemonMansion1F.asm +++ b/data/maps/objects/PokemonMansion1F.asm @@ -14,9 +14,9 @@ PokemonMansion1F_Object: db 0 ; signs db 3 ; objects - object SPRITE_OAK_AIDE, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 - object SPRITE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE - object SPRITE_BALL, 18, 21, STAY, NONE, 3, CARBOS + object SPRITE_SCIENTIST, 17, 17, STAY, LEFT, 1, OPP_SCIENTIST, 4 + object SPRITE_POKE_BALL, 14, 3, STAY, NONE, 2, ESCAPE_ROPE + object SPRITE_POKE_BALL, 18, 21, STAY, NONE, 3, CARBOS ; warp-to warp_to 4, 27, POKEMON_MANSION_1F_WIDTH |