aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/LavenderTown.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/LavenderTown.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/LavenderTown.asm')
-rwxr-xr-xdata/maps/objects/LavenderTown.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/LavenderTown.asm b/data/maps/objects/LavenderTown.asm
index 4aead666..3c7b2965 100755
--- a/data/maps/objects/LavenderTown.asm
+++ b/data/maps/objects/LavenderTown.asm
@@ -19,8 +19,8 @@ LavenderTown_Object:
db 3 ; objects
object SPRITE_LITTLE_GIRL, 15, 9, WALK, 0, 1 ; person
- object SPRITE_BLACK_HAIR_BOY_1, 9, 10, STAY, NONE, 2 ; person
- object SPRITE_BLACK_HAIR_BOY_2, 8, 7, WALK, 2, 3 ; person
+ object SPRITE_COOLTRAINER_M, 9, 10, STAY, NONE, 2 ; person
+ object SPRITE_SUPER_NERD, 8, 7, WALK, 2, 3 ; person
; warp-to
warp_to 3, 5, LAVENDER_TOWN_WIDTH ; LAVENDER_POKECENTER