summaryrefslogtreecommitdiff
path: root/data/maps/objects/RocketHideoutB2F.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-19 23:04:16 -0400
committerGitHub <noreply@github.com>2020-07-19 23:04:16 -0400
commit0177688ad4d923c4970009fa87df48605bb43ed6 (patch)
tree4c44fbb1813e78eb00f7c1690d2c23099a49113b /data/maps/objects/RocketHideoutB2F.asm
parentd44c7c305c3f94b59e3e2c008408779836a0020a (diff)
parentdf62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff)
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/RocketHideoutB2F.asm')
-rwxr-xr-xdata/maps/objects/RocketHideoutB2F.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/RocketHideoutB2F.asm b/data/maps/objects/RocketHideoutB2F.asm
index b0836736..ee4f81cd 100755
--- a/data/maps/objects/RocketHideoutB2F.asm
+++ b/data/maps/objects/RocketHideoutB2F.asm
@@ -12,10 +12,10 @@ RocketHideoutB2F_Object:
db 5 ; objects
object SPRITE_ROCKET, 20, 12, STAY, DOWN, 1, OPP_ROCKET, 13
- object SPRITE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
- object SPRITE_BALL, 16, 8, STAY, NONE, 3, NUGGET
- object SPRITE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL
- object SPRITE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
+ object SPRITE_POKE_BALL, 1, 11, STAY, NONE, 2, MOON_STONE
+ object SPRITE_POKE_BALL, 16, 8, STAY, NONE, 3, NUGGET
+ object SPRITE_POKE_BALL, 6, 12, STAY, NONE, 4, TM_HORN_DRILL
+ object SPRITE_POKE_BALL, 3, 21, STAY, NONE, 5, SUPER_POTION
; warp-to
warp_to 27, 8, ROCKET_HIDEOUT_B2F_WIDTH ; ROCKET_HIDEOUT_B1F