aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/PokemonMansionB1F.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/PokemonMansionB1F.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/PokemonMansionB1F.asm')
-rwxr-xr-xdata/maps/objects/PokemonMansionB1F.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/PokemonMansionB1F.asm b/data/maps/objects/PokemonMansionB1F.asm
index 1a6d6f32..0cb994ed 100755
--- a/data/maps/objects/PokemonMansionB1F.asm
+++ b/data/maps/objects/PokemonMansionB1F.asm
@@ -7,14 +7,14 @@ PokemonMansionB1F_Object:
db 0 ; signs
db 8 ; objects
- object SPRITE_BLACK_HAIR_BOY_2, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
- object SPRITE_OAK_AIDE, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
- object SPRITE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
- object SPRITE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
- object SPRITE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD
- object SPRITE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM
- object SPRITE_BOOK_MAP_DEX, 16, 20, STAY, NONE, 7 ; person
- object SPRITE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
+ object SPRITE_SUPER_NERD, 16, 23, STAY, NONE, 1, OPP_BURGLAR, 9
+ object SPRITE_SCIENTIST, 27, 11, STAY, DOWN, 2, OPP_SCIENTIST, 13
+ object SPRITE_POKE_BALL, 10, 2, STAY, NONE, 3, RARE_CANDY
+ object SPRITE_POKE_BALL, 1, 22, STAY, NONE, 4, FULL_RESTORE
+ object SPRITE_POKE_BALL, 19, 25, STAY, NONE, 5, TM_BLIZZARD
+ object SPRITE_POKE_BALL, 5, 4, STAY, NONE, 6, TM_SOLARBEAM
+ object SPRITE_POKEDEX, 16, 20, STAY, NONE, 7 ; person
+ object SPRITE_POKE_BALL, 5, 13, STAY, NONE, 8, SECRET_KEY
; warp-to
warp_to 23, 22, POKEMON_MANSION_B1F_WIDTH ; POKEMON_MANSION_1F