aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeruleanCave2F.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/CeruleanCave2F.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/CeruleanCave2F.asm')
-rwxr-xr-xdata/maps/objects/CeruleanCave2F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/CeruleanCave2F.asm b/data/maps/objects/CeruleanCave2F.asm
index f8312da0..26dee8ef 100755
--- a/data/maps/objects/CeruleanCave2F.asm
+++ b/data/maps/objects/CeruleanCave2F.asm
@@ -12,9 +12,9 @@ CeruleanCave2F_Object:
db 0 ; signs
db 3 ; objects
- object SPRITE_BALL, 29, 9, STAY, NONE, 1, PP_UP
- object SPRITE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
- object SPRITE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
+ object SPRITE_POKE_BALL, 29, 9, STAY, NONE, 1, PP_UP
+ object SPRITE_POKE_BALL, 4, 15, STAY, NONE, 2, ULTRA_BALL
+ object SPRITE_POKE_BALL, 13, 6, STAY, NONE, 3, FULL_RESTORE
; warp-to
warp_to 29, 1, CERULEAN_CAVE_2F_WIDTH ; CERULEAN_CAVE_1F