summaryrefslogtreecommitdiff
path: root/data/maps/objects/OaksLab.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/OaksLab.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/OaksLab.asm')
-rwxr-xr-xdata/maps/objects/OaksLab.asm14
1 files changed, 7 insertions, 7 deletions
diff --git a/data/maps/objects/OaksLab.asm b/data/maps/objects/OaksLab.asm
index 676683b4..168595c0 100755
--- a/data/maps/objects/OaksLab.asm
+++ b/data/maps/objects/OaksLab.asm
@@ -9,16 +9,16 @@ OaksLab_Object:
db 11 ; objects
object SPRITE_BLUE, 4, 3, STAY, NONE, 1, OPP_SONY1, 1
- object SPRITE_BALL, 6, 3, STAY, NONE, 2 ; person
- object SPRITE_BALL, 7, 3, STAY, NONE, 3 ; person
- object SPRITE_BALL, 8, 3, STAY, NONE, 4 ; person
+ object SPRITE_POKE_BALL, 6, 3, STAY, NONE, 2 ; person
+ object SPRITE_POKE_BALL, 7, 3, STAY, NONE, 3 ; person
+ object SPRITE_POKE_BALL, 8, 3, STAY, NONE, 4 ; person
object SPRITE_OAK, 5, 2, STAY, DOWN, 5 ; person
- object SPRITE_BOOK_MAP_DEX, 2, 1, STAY, NONE, 6 ; person
- object SPRITE_BOOK_MAP_DEX, 3, 1, STAY, NONE, 7 ; person
+ object SPRITE_POKEDEX, 2, 1, STAY, NONE, 6 ; person
+ object SPRITE_POKEDEX, 3, 1, STAY, NONE, 7 ; person
object SPRITE_OAK, 5, 10, STAY, UP, 8 ; person
object SPRITE_GIRL, 1, 9, WALK, 1, 9 ; person
- object SPRITE_OAK_AIDE, 2, 10, STAY, NONE, 10 ; person
- object SPRITE_OAK_AIDE, 8, 10, STAY, NONE, 11 ; person
+ object SPRITE_SCIENTIST, 2, 10, STAY, NONE, 10 ; person
+ object SPRITE_SCIENTIST, 8, 10, STAY, NONE, 11 ; person
; warp-to
warp_to 4, 11, OAKS_LAB_WIDTH