summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCo7F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/SilphCo7F.asm')
-rwxr-xr-xdata/maps/objects/SilphCo7F.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/SilphCo7F.asm b/data/maps/objects/SilphCo7F.asm
index 7202a469..1b75e66e 100755
--- a/data/maps/objects/SilphCo7F.asm
+++ b/data/maps/objects/SilphCo7F.asm
@@ -12,17 +12,17 @@ SilphCo7F_Object:
db 0 ; signs
db 11 ; objects
- object SPRITE_LAPRAS_GIVER, 1, 5, STAY, NONE, 1 ; person
- object SPRITE_LAPRAS_GIVER, 13, 13, STAY, UP, 2 ; person
- object SPRITE_LAPRAS_GIVER, 7, 10, STAY, NONE, 3 ; person
+ object SPRITE_SILPH_WORKER, 1, 5, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 13, 13, STAY, UP, 2 ; person
+ object SPRITE_SILPH_WORKER, 7, 10, STAY, NONE, 3 ; person
object SPRITE_ERIKA, 10, 8, STAY, NONE, 4 ; person
object SPRITE_ROCKET, 13, 1, STAY, DOWN, 5, OPP_ROCKET, 32
- object SPRITE_OAK_AIDE, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8
+ object SPRITE_SCIENTIST, 2, 13, STAY, DOWN, 6, OPP_SCIENTIST, 8
object SPRITE_ROCKET, 20, 2, STAY, LEFT, 7, OPP_ROCKET, 33
object SPRITE_ROCKET, 19, 14, STAY, RIGHT, 8, OPP_ROCKET, 34
object SPRITE_BLUE, 3, 7, STAY, UP, 9 ; person
- object SPRITE_BALL, 1, 9, STAY, NONE, 10, CALCIUM
- object SPRITE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE
+ object SPRITE_POKE_BALL, 1, 9, STAY, NONE, 10, CALCIUM
+ object SPRITE_POKE_BALL, 24, 11, STAY, NONE, 11, TM_SWORDS_DANCE
; warp-to
warp_to 16, 0, SILPH_CO_7F_WIDTH ; SILPH_CO_8F