aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SafariZoneEast.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/SafariZoneEast.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/SafariZoneEast.asm')
-rwxr-xr-xdata/maps/objects/SafariZoneEast.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/SafariZoneEast.asm b/data/maps/objects/SafariZoneEast.asm
index 31d8861b..fa04087f 100755
--- a/data/maps/objects/SafariZoneEast.asm
+++ b/data/maps/objects/SafariZoneEast.asm
@@ -14,10 +14,10 @@ SafariZoneEast_Object:
sign 5, 23, 7 ; SafariZoneEastText7
db 4 ; objects
- object SPRITE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE
- object SPRITE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION
- object SPRITE_BALL, 20, 13, STAY, NONE, 3, CARBOS
- object SPRITE_BALL, 15, 12, STAY, NONE, 4, TM_EGG_BOMB
+ object SPRITE_POKE_BALL, 21, 10, STAY, NONE, 1, FULL_RESTORE
+ object SPRITE_POKE_BALL, 3, 7, STAY, NONE, 2, MAX_POTION
+ object SPRITE_POKE_BALL, 20, 13, STAY, NONE, 3, CARBOS
+ object SPRITE_POKE_BALL, 15, 12, STAY, NONE, 4, TM_EGG_BOMB
; warp-to
warp_to 0, 4, SAFARI_ZONE_EAST_WIDTH ; SAFARI_ZONE_NORTH