aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonCity.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/CeladonCity.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/CeladonCity.asm')
-rwxr-xr-xdata/maps/objects/CeladonCity.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/CeladonCity.asm b/data/maps/objects/CeladonCity.asm
index 005fc61e..446f6754 100755
--- a/data/maps/objects/CeladonCity.asm
+++ b/data/maps/objects/CeladonCity.asm
@@ -29,12 +29,12 @@ CeladonCity_Object:
db 9 ; objects
object SPRITE_LITTLE_GIRL, 8, 17, WALK, 0, 1 ; person
- object SPRITE_OLD_PERSON, 11, 28, STAY, UP, 2 ; person
+ object SPRITE_GRAMPS, 11, 28, STAY, UP, 2 ; person
object SPRITE_GIRL, 14, 19, WALK, 1, 3 ; person
- object SPRITE_OLD_PERSON, 25, 22, STAY, DOWN, 4 ; person
- object SPRITE_OLD_PERSON, 22, 16, STAY, DOWN, 5 ; person
- object SPRITE_FISHER2, 32, 12, STAY, LEFT, 6 ; person
- object SPRITE_SLOWBRO, 30, 12, STAY, RIGHT, 7 ; person
+ object SPRITE_GRAMPS, 25, 22, STAY, DOWN, 4 ; person
+ object SPRITE_GRAMPS, 22, 16, STAY, DOWN, 5 ; person
+ object SPRITE_FISHER, 32, 12, STAY, LEFT, 6 ; person
+ object SPRITE_MONSTER, 30, 12, STAY, RIGHT, 7 ; person
object SPRITE_ROCKET, 32, 29, WALK, 2, 8 ; person
object SPRITE_ROCKET, 42, 14, WALK, 2, 9 ; person