aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/RocketHideoutB4F.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/RocketHideoutB4F.asm
parentMerge pull request #277 from Rangi42/master (diff)
parentMissingno's Pokédex weight is two bytes like the rest (diff)
downloadpokeyellow-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/RocketHideoutB4F.asm')
-rwxr-xr-xdata/maps/objects/RocketHideoutB4F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/RocketHideoutB4F.asm b/data/maps/objects/RocketHideoutB4F.asm
index 9ca7aeed..1f095595 100755
--- a/data/maps/objects/RocketHideoutB4F.asm
+++ b/data/maps/objects/RocketHideoutB4F.asm
@@ -13,11 +13,11 @@ RocketHideoutB4F_Object:
object SPRITE_ROCKET, 23, 12, STAY, DOWN, 2, OPP_ROCKET, 16
object SPRITE_ROCKET, 26, 12, STAY, DOWN, 3, OPP_ROCKET, 17
object SPRITE_ROCKET, 11, 2, STAY, DOWN, 4, OPP_ROCKET, 18
- object SPRITE_BALL, 10, 12, STAY, NONE, 5, HP_UP
- object SPRITE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND
- object SPRITE_BALL, 12, 20, STAY, NONE, 7, IRON
- object SPRITE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE
- object SPRITE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
+ object SPRITE_POKE_BALL, 10, 12, STAY, NONE, 5, HP_UP
+ object SPRITE_POKE_BALL, 9, 4, STAY, NONE, 6, TM_RAZOR_WIND
+ object SPRITE_POKE_BALL, 12, 20, STAY, NONE, 7, IRON
+ object SPRITE_POKE_BALL, 25, 2, STAY, NONE, 8, SILPH_SCOPE
+ object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 9, LIFT_KEY
; warp-to
warp_to 19, 10, ROCKET_HIDEOUT_B4F_WIDTH ; ROCKET_HIDEOUT_B3F