summaryrefslogtreecommitdiff
path: root/data/maps/objects/Museum1F.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/Museum1F.asm
parentd44c7c305c3f94b59e3e2c008408779836a0020a (diff)
parentdf62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff)
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/Museum1F.asm')
-rwxr-xr-xdata/maps/objects/Museum1F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/Museum1F.asm b/data/maps/objects/Museum1F.asm
index 207dfbf2..bc9ef031 100755
--- a/data/maps/objects/Museum1F.asm
+++ b/data/maps/objects/Museum1F.asm
@@ -11,10 +11,10 @@ Museum1F_Object:
db 0 ; signs
db 5 ; objects
- object SPRITE_OAK_AIDE, 12, 4, STAY, LEFT, 1 ; person
+ object SPRITE_SCIENTIST, 12, 4, STAY, LEFT, 1 ; person
object SPRITE_GAMBLER, 1, 4, STAY, NONE, 2 ; person
- object SPRITE_OAK_AIDE, 15, 2, STAY, DOWN, 3 ; person
- object SPRITE_OAK_AIDE, 17, 4, STAY, NONE, 4 ; person
+ object SPRITE_SCIENTIST, 15, 2, STAY, DOWN, 3 ; person
+ object SPRITE_SCIENTIST, 17, 4, STAY, NONE, 4 ; person
object SPRITE_OLD_AMBER, 16, 2, STAY, NONE, 5 ; person
; warp-to