aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/SafariZoneWest.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/SafariZoneWest.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/SafariZoneWest.asm')
-rwxr-xr-xdata/maps/objects/SafariZoneWest.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/SafariZoneWest.asm b/data/maps/objects/SafariZoneWest.asm
index 492dd3e2..2e0692c1 100755
--- a/data/maps/objects/SafariZoneWest.asm
+++ b/data/maps/objects/SafariZoneWest.asm
@@ -18,10 +18,10 @@ SafariZoneWest_Object:
sign 24, 22, 8 ; SafariZoneWestText8
db 4 ; objects
- object SPRITE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION
- object SPRITE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM
- object SPRITE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE
- object SPRITE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH
+ object SPRITE_POKE_BALL, 8, 20, STAY, NONE, 1, MAX_POTION
+ object SPRITE_POKE_BALL, 9, 7, STAY, NONE, 2, TM_DOUBLE_TEAM
+ object SPRITE_POKE_BALL, 18, 18, STAY, NONE, 3, MAX_REVIVE
+ object SPRITE_POKE_BALL, 19, 7, STAY, NONE, 4, GOLD_TEETH
; warp-to
warp_to 20, 0, SAFARI_ZONE_WEST_WIDTH ; SAFARI_ZONE_NORTH