aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/ViridianCity.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/ViridianCity.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/ViridianCity.asm')
-rwxr-xr-xdata/maps/objects/ViridianCity.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/ViridianCity.asm b/data/maps/objects/ViridianCity.asm
index 32fe8d3a..02543af8 100755
--- a/data/maps/objects/ViridianCity.asm
+++ b/data/maps/objects/ViridianCity.asm
@@ -17,12 +17,12 @@ ViridianCity_Object:
sign 27, 7, 13 ; ViridianCityText13
db 7 ; objects
- object SPRITE_BUG_CATCHER, 13, 20, WALK, 0, 1 ; person
+ object SPRITE_YOUNGSTER, 13, 20, WALK, 0, 1 ; person
object SPRITE_GAMBLER, 30, 8, STAY, NONE, 2 ; person
- object SPRITE_BUG_CATCHER, 30, 25, WALK, 0, 3 ; person
+ object SPRITE_YOUNGSTER, 30, 25, WALK, 0, 3 ; person
object SPRITE_GIRL, 17, 9, STAY, RIGHT, 4 ; person
- object SPRITE_LYING_OLD_MAN, 18, 9, STAY, NONE, 5 ; person
- object SPRITE_FISHER2, 6, 23, STAY, DOWN, 6 ; person
+ object SPRITE_GAMBLER_ASLEEP, 18, 9, STAY, NONE, 5 ; person
+ object SPRITE_FISHER, 6, 23, STAY, DOWN, 6 ; person
object SPRITE_GAMBLER, 17, 5, WALK, 2, 7 ; person
; warp-to