summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCo10F.asm
diff options
context:
space:
mode:
authorRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 12:48:15 -0400
committerRangi <remy.oukaour+rangi42@gmail.com>2020-07-17 12:48:15 -0400
commit2454296d32b078123ecfc6434e43d0cb20e12c94 (patch)
tree7d4b064c87d0d9b96d5f035fa8dab3cd8950fdb3 /data/maps/objects/SilphCo10F.asm
parent452803af278648b92cc71af2f714b7689737b969 (diff)
Update sprite names
These are based on the trainers that use them, and synced with pokegold/pokecrysal when possible
Diffstat (limited to 'data/maps/objects/SilphCo10F.asm')
-rwxr-xr-xdata/maps/objects/SilphCo10F.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/SilphCo10F.asm b/data/maps/objects/SilphCo10F.asm
index 0bea3a43..770601ae 100755
--- a/data/maps/objects/SilphCo10F.asm
+++ b/data/maps/objects/SilphCo10F.asm
@@ -13,11 +13,11 @@ SilphCo10F_Object:
db 6 ; objects
object SPRITE_ROCKET, 1, 9, STAY, RIGHT, 1, OPP_ROCKET, 39
- object SPRITE_OAK_AIDE, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11
+ object SPRITE_SCIENTIST, 10, 2, STAY, LEFT, 2, OPP_SCIENTIST, 11
object SPRITE_ERIKA, 9, 15, WALK, 0, 3 ; person
- object SPRITE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE
- object SPRITE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY
- object SPRITE_BALL, 5, 11, STAY, NONE, 6, CARBOS
+ object SPRITE_POKE_BALL, 2, 12, STAY, NONE, 4, TM_EARTHQUAKE
+ object SPRITE_POKE_BALL, 4, 14, STAY, NONE, 5, RARE_CANDY
+ object SPRITE_POKE_BALL, 5, 11, STAY, NONE, 6, CARBOS
; warp-to
warp_to 8, 0, SILPH_CO_10F_WIDTH ; SILPH_CO_9F