summaryrefslogtreecommitdiff
path: root/data/maps/objects/SilphCo6F.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/SilphCo6F.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/SilphCo6F.asm')
-rwxr-xr-xdata/maps/objects/SilphCo6F.asm12
1 files changed, 6 insertions, 6 deletions
diff --git a/data/maps/objects/SilphCo6F.asm b/data/maps/objects/SilphCo6F.asm
index ad2ac32f..fc0787ae 100755
--- a/data/maps/objects/SilphCo6F.asm
+++ b/data/maps/objects/SilphCo6F.asm
@@ -11,16 +11,16 @@ SilphCo6F_Object:
db 0 ; signs
db 10 ; objects
- object SPRITE_LAPRAS_GIVER, 10, 6, STAY, NONE, 1 ; person
- object SPRITE_LAPRAS_GIVER, 20, 6, STAY, NONE, 2 ; person
+ object SPRITE_SILPH_WORKER, 10, 6, STAY, NONE, 1 ; person
+ object SPRITE_SILPH_WORKER, 20, 6, STAY, NONE, 2 ; person
object SPRITE_ERIKA, 21, 6, STAY, DOWN, 3 ; person
object SPRITE_ERIKA, 11, 10, STAY, RIGHT, 4 ; person
- object SPRITE_LAPRAS_GIVER, 18, 13, STAY, UP, 5 ; person
+ object SPRITE_SILPH_WORKER, 18, 13, STAY, UP, 5 ; person
object SPRITE_ROCKET, 17, 3, STAY, RIGHT, 6, OPP_ROCKET, 30
- object SPRITE_OAK_AIDE, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7
+ object SPRITE_SCIENTIST, 7, 8, STAY, DOWN, 7, OPP_SCIENTIST, 7
object SPRITE_ROCKET, 14, 15, STAY, LEFT, 8, OPP_ROCKET, 31
- object SPRITE_BALL, 3, 12, STAY, NONE, 9, HP_UP
- object SPRITE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY
+ object SPRITE_POKE_BALL, 3, 12, STAY, NONE, 9, HP_UP
+ object SPRITE_POKE_BALL, 2, 15, STAY, NONE, 10, X_ACCURACY
; warp-to
warp_to 16, 0, SILPH_CO_6F_WIDTH ; SILPH_CO_7F