summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCo5F.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/SilphCo5F.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/SilphCo5F.asm')
-rwxr-xr-xdata/maps/objects/SilphCo5F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/SilphCo5F.asm b/data/maps/objects/SilphCo5F.asm
index 86745b21..9b8c74e5 100755
--- a/data/maps/objects/SilphCo5F.asm
+++ b/data/maps/objects/SilphCo5F.asm
@@ -13,14 +13,14 @@ SilphCo5F_Object:
db 0 ; signs
db 11 ; objects
- object SPRITE_LAPRAS_GIVER, 13, 9, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 13, 9, STAY, NONE, 1 ; person
object SPRITE_ROCKET, 8, 16, STAY, RIGHT, 2, OPP_ROCKET, 28
- object SPRITE_OAK_AIDE, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6
+ object SPRITE_SCIENTIST, 8, 3, STAY, RIGHT, 3, OPP_SCIENTIST, 6
object SPRITE_ROCKER, 18, 10, STAY, UP, 4, OPP_JUGGLER, 1
object SPRITE_ROCKET, 28, 4, STAY, UP, 5, OPP_ROCKET, 29
- object SPRITE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN
- object SPRITE_BALL, 4, 6, STAY, NONE, 7, PROTEIN
- object SPRITE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY
+ object SPRITE_POKE_BALL, 2, 13, STAY, NONE, 6, TM_TAKE_DOWN
+ object SPRITE_POKE_BALL, 4, 6, STAY, NONE, 7, PROTEIN
+ object SPRITE_POKE_BALL, 21, 16, STAY, NONE, 8, CARD_KEY
object SPRITE_CLIPBOARD, 22, 12, STAY, NONE, 9 ; person
object SPRITE_CLIPBOARD, 25, 10, STAY, NONE, 10 ; person
object SPRITE_CLIPBOARD, 24, 6, STAY, NONE, 11 ; person