aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CeladonDiner.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/CeladonDiner.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/CeladonDiner.asm')
-rwxr-xr-xdata/maps/objects/CeladonDiner.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/CeladonDiner.asm b/data/maps/objects/CeladonDiner.asm
index b2f42e48..c0925ca2 100755
--- a/data/maps/objects/CeladonDiner.asm
+++ b/data/maps/objects/CeladonDiner.asm
@@ -9,10 +9,10 @@ CeladonDiner_Object:
db 5 ; objects
object SPRITE_COOK, 8, 5, WALK, 2, 1 ; person
- object SPRITE_MOM_GEISHA, 7, 2, STAY, NONE, 2 ; person
- object SPRITE_FAT_BALD_GUY, 1, 4, STAY, DOWN, 3 ; person
- object SPRITE_FISHER2, 5, 3, STAY, RIGHT, 4 ; person
- object SPRITE_GYM_HELPER, 0, 1, STAY, DOWN, 5 ; person
+ object SPRITE_MIDDLE_AGED_WOMAN, 7, 2, STAY, NONE, 2 ; person
+ object SPRITE_MIDDLE_AGED_MAN, 1, 4, STAY, DOWN, 3 ; person
+ object SPRITE_FISHER, 5, 3, STAY, RIGHT, 4 ; person
+ object SPRITE_GYM_GUIDE, 0, 1, STAY, DOWN, 5 ; person
; warp-to
warp_to 3, 7, CELADON_DINER_WIDTH