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/CeladonGym.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/CeladonGym.asm')
| -rwxr-xr-x | data/maps/objects/CeladonGym.asm | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/CeladonGym.asm b/data/maps/objects/CeladonGym.asm index a38ef4e8..be186d55 100755 --- a/data/maps/objects/CeladonGym.asm +++ b/data/maps/objects/CeladonGym.asm @@ -9,13 +9,13 @@ CeladonGym_Object: db 8 ; objects object SPRITE_ERIKA, 4, 3, STAY, DOWN, 1, OPP_ERIKA, 1 - object SPRITE_LASS, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 - object SPRITE_FOULARD_WOMAN, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 - object SPRITE_LASS, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 - object SPRITE_FOULARD_WOMAN, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 - object SPRITE_LASS, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 - object SPRITE_FOULARD_WOMAN, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 - object SPRITE_LASS, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 + object SPRITE_COOLTRAINER_F, 2, 11, STAY, RIGHT, 2, OPP_LASS, 17 + object SPRITE_BEAUTY, 7, 10, STAY, LEFT, 3, OPP_BEAUTY, 1 + object SPRITE_COOLTRAINER_F, 9, 5, STAY, DOWN, 4, OPP_JR_TRAINER_F, 11 + object SPRITE_BEAUTY, 1, 5, STAY, DOWN, 5, OPP_BEAUTY, 2 + object SPRITE_COOLTRAINER_F, 6, 3, STAY, DOWN, 6, OPP_LASS, 18 + object SPRITE_BEAUTY, 3, 3, STAY, DOWN, 7, OPP_BEAUTY, 3 + object SPRITE_COOLTRAINER_F, 5, 3, STAY, DOWN, 8, OPP_COOLTRAINER_F, 1 ; warp-to warp_to 4, 17, CELADON_GYM_WIDTH |