aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/CinnabarLabFossilRoom.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/CinnabarLabFossilRoom.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/CinnabarLabFossilRoom.asm')
-rwxr-xr-xdata/maps/objects/CinnabarLabFossilRoom.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/CinnabarLabFossilRoom.asm b/data/maps/objects/CinnabarLabFossilRoom.asm
index d31502e6..d77c26df 100755
--- a/data/maps/objects/CinnabarLabFossilRoom.asm
+++ b/data/maps/objects/CinnabarLabFossilRoom.asm
@@ -8,8 +8,8 @@ CinnabarLabFossilRoom_Object:
db 0 ; signs
db 2 ; objects
- object SPRITE_OAK_AIDE, 5, 2, WALK, 2, 1 ; person
- object SPRITE_OAK_AIDE, 7, 6, STAY, UP, 2 ; person
+ object SPRITE_SCIENTIST, 5, 2, WALK, 2, 1 ; person
+ object SPRITE_SCIENTIST, 7, 6, STAY, UP, 2 ; person
; warp-to
warp_to 2, 7, CINNABAR_LAB_FOSSIL_ROOM_WIDTH ; CINNABAR_LAB