aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/PokemonMansion3F.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/PokemonMansion3F.asm
parent$c9 was "の" in Japanese (diff)
downloadpokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.tar.gz
pokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.tar.xz
pokeyellow-2454296d32b078123ecfc6434e43d0cb20e12c94.zip
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/PokemonMansion3F.asm')
-rwxr-xr-xdata/maps/objects/PokemonMansion3F.asm10
1 files changed, 5 insertions, 5 deletions
diff --git a/data/maps/objects/PokemonMansion3F.asm b/data/maps/objects/PokemonMansion3F.asm
index 7c8c9c22..fc0149c9 100755
--- a/data/maps/objects/PokemonMansion3F.asm
+++ b/data/maps/objects/PokemonMansion3F.asm
@@ -9,11 +9,11 @@ PokemonMansion3F_Object:
db 0 ; signs
db 5 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8
- object SPRITE_OAK_AIDE, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
- object SPRITE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
- object SPRITE_BALL, 25, 5, STAY, NONE, 4, IRON
- object SPRITE_BOOK_MAP_DEX, 6, 12, STAY, NONE, 5 ; person
+ object SPRITE_SUPER_NERD, 5, 11, WALK, 2, 1, OPP_BURGLAR, 8
+ object SPRITE_SCIENTIST, 20, 11, STAY, LEFT, 2, OPP_SCIENTIST, 12
+ object SPRITE_POKE_BALL, 1, 16, STAY, NONE, 3, MAX_POTION
+ object SPRITE_POKE_BALL, 25, 5, STAY, NONE, 4, IRON
+ object SPRITE_POKEDEX, 6, 12, STAY, NONE, 5 ; person
; warp-to
warp_to 7, 10, POKEMON_MANSION_3F_WIDTH ; POKEMON_MANSION_2F