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/MtMoonB2F.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/MtMoonB2F.asm')
| -rwxr-xr-x | data/maps/objects/MtMoonB2F.asm | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/MtMoonB2F.asm b/data/maps/objects/MtMoonB2F.asm index 6c90514d..0303406d 100755 --- a/data/maps/objects/MtMoonB2F.asm +++ b/data/maps/objects/MtMoonB2F.asm @@ -10,15 +10,15 @@ MtMoonB2F_Object: db 0 ; signs db 9 ; objects - object SPRITE_BLACK_HAIR_BOY_2, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 + object SPRITE_SUPER_NERD, 12, 8, STAY, RIGHT, 1, OPP_SUPER_NERD, 2 object SPRITE_ROCKET, 11, 16, STAY, DOWN, 2, OPP_ROCKET, 1 object SPRITE_ROCKET, 15, 22, STAY, DOWN, 3, OPP_ROCKET, 2 object SPRITE_ROCKET, 29, 11, STAY, UP, 4, OPP_ROCKET, 3 object SPRITE_ROCKET, 29, 17, STAY, LEFT, 5, OPP_ROCKET, 4 - object SPRITE_OMANYTE, 12, 6, STAY, NONE, 6 ; person - object SPRITE_OMANYTE, 13, 6, STAY, NONE, 7 ; person - object SPRITE_BALL, 25, 21, STAY, NONE, 8, HP_UP - object SPRITE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH + object SPRITE_FOSSIL, 12, 6, STAY, NONE, 6 ; person + object SPRITE_FOSSIL, 13, 6, STAY, NONE, 7 ; person + object SPRITE_POKE_BALL, 25, 21, STAY, NONE, 8, HP_UP + object SPRITE_POKE_BALL, 29, 5, STAY, NONE, 9, TM_MEGA_PUNCH ; warp-to warp_to 25, 9, MT_MOON_B2F_WIDTH ; MT_MOON_B1F |