aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/VermilionCity.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/VermilionCity.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/VermilionCity.asm')
-rwxr-xr-xdata/maps/objects/VermilionCity.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/VermilionCity.asm b/data/maps/objects/VermilionCity.asm
index b1e1a005..692ef5dd 100755
--- a/data/maps/objects/VermilionCity.asm
+++ b/data/maps/objects/VermilionCity.asm
@@ -22,11 +22,11 @@ VermilionCity_Object:
sign 29, 15, 13 ; VermilionCityText13
db 6 ; objects
- object SPRITE_FOULARD_WOMAN, 19, 7, WALK, 2, 1 ; person
+ object SPRITE_BEAUTY, 19, 7, WALK, 2, 1 ; person
object SPRITE_GAMBLER, 14, 6, STAY, NONE, 2 ; person
object SPRITE_SAILOR, 19, 30, STAY, UP, 3 ; person
object SPRITE_GAMBLER, 30, 7, STAY, NONE, 4 ; person
- object SPRITE_SLOWBRO, 29, 9, WALK, 1, 5 ; person
+ object SPRITE_MONSTER, 29, 9, WALK, 1, 5 ; person
object SPRITE_SAILOR, 25, 27, WALK, 2, 6 ; person
; warp-to