summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonTower1F.asm
diff options
context:
space:
mode:
authorRangi <35663410+Rangi42@users.noreply.github.com>2020-07-19 23:04:16 -0400
committerGitHub <noreply@github.com>2020-07-19 23:04:16 -0400
commit0177688ad4d923c4970009fa87df48605bb43ed6 (patch)
tree4c44fbb1813e78eb00f7c1690d2c23099a49113b /data/maps/objects/PokemonTower1F.asm
parentd44c7c305c3f94b59e3e2c008408779836a0020a (diff)
parentdf62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff)
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/PokemonTower1F.asm')
-rwxr-xr-xdata/maps/objects/PokemonTower1F.asm6
1 files changed, 3 insertions, 3 deletions
diff --git a/data/maps/objects/PokemonTower1F.asm b/data/maps/objects/PokemonTower1F.asm
index f92969e1..a9d48594 100755
--- a/data/maps/objects/PokemonTower1F.asm
+++ b/data/maps/objects/PokemonTower1F.asm
@@ -9,11 +9,11 @@ PokemonTower1F_Object:
db 0 ; signs
db 5 ; objects
- object SPRITE_CABLE_CLUB_WOMAN, 15, 13, STAY, UP, 1 ; person
- object SPRITE_MOM_GEISHA, 6, 8, STAY, NONE, 2 ; person
+ object SPRITE_LINK_RECEPTIONIST, 15, 13, STAY, UP, 1 ; person
+ object SPRITE_MIDDLE_AGED_WOMAN, 6, 8, STAY, NONE, 2 ; person
object SPRITE_BALDING_GUY, 8, 12, STAY, NONE, 3 ; person
object SPRITE_GIRL, 13, 7, STAY, NONE, 4 ; person
- object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 5 ; person
+ object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 5 ; person
; warp-to
warp_to 10, 17, POKEMON_TOWER_1F_WIDTH