aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/ViridianForest.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/ViridianForest.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/ViridianForest.asm')
-rwxr-xr-xdata/maps/objects/ViridianForest.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/ViridianForest.asm b/data/maps/objects/ViridianForest.asm
index cbcb6ff8..beee25c2 100755
--- a/data/maps/objects/ViridianForest.asm
+++ b/data/maps/objects/ViridianForest.asm
@@ -18,14 +18,14 @@ ViridianForest_Object:
sign 2, 1, 14 ; ViridianForestText14
db 8 ; objects
- object SPRITE_BUG_CATCHER, 16, 43, STAY, NONE, 1 ; person
- object SPRITE_BUG_CATCHER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1
- object SPRITE_BUG_CATCHER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2
- object SPRITE_BUG_CATCHER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
- object SPRITE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE
- object SPRITE_BALL, 12, 29, STAY, NONE, 6, POTION
- object SPRITE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL
- object SPRITE_BUG_CATCHER, 27, 40, STAY, NONE, 8 ; person
+ object SPRITE_YOUNGSTER, 16, 43, STAY, NONE, 1 ; person
+ object SPRITE_YOUNGSTER, 30, 33, STAY, LEFT, 2, OPP_BUG_CATCHER, 1
+ object SPRITE_YOUNGSTER, 30, 19, STAY, LEFT, 3, OPP_BUG_CATCHER, 2
+ object SPRITE_YOUNGSTER, 2, 18, STAY, LEFT, 4, OPP_BUG_CATCHER, 3
+ object SPRITE_POKE_BALL, 25, 11, STAY, NONE, 5, ANTIDOTE
+ object SPRITE_POKE_BALL, 12, 29, STAY, NONE, 6, POTION
+ object SPRITE_POKE_BALL, 1, 31, STAY, NONE, 7, POKE_BALL
+ object SPRITE_YOUNGSTER, 27, 40, STAY, NONE, 8 ; person
; warp-to
warp_to 1, 0, VIRIDIAN_FOREST_WIDTH ; VIRIDIAN_FOREST_NORTH_GATE