summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCo8F.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/SilphCo8F.asm
parentd44c7c305c3f94b59e3e2c008408779836a0020a (diff)
parentdf62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff)
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/SilphCo8F.asm')
-rwxr-xr-xdata/maps/objects/SilphCo8F.asm4
1 files changed, 2 insertions, 2 deletions
diff --git a/data/maps/objects/SilphCo8F.asm b/data/maps/objects/SilphCo8F.asm
index d05c7844..12470f55 100755
--- a/data/maps/objects/SilphCo8F.asm
+++ b/data/maps/objects/SilphCo8F.asm
@@ -13,9 +13,9 @@ SilphCo8F_Object:
db 0 ; signs
db 4 ; objects
- object SPRITE_LAPRAS_GIVER, 4, 2, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 4, 2, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 19, 2, STAY, LEFT, 2, OPP_ROCKET, 35
- object SPRITE_OAK_AIDE, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9
+ object SPRITE_SCIENTIST, 10, 2, STAY, DOWN, 3, OPP_SCIENTIST, 9
object SPRITE_ROCKET, 12, 15, STAY, RIGHT, 4, OPP_ROCKET, 36
; warp-to