summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonTower3F.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/PokemonTower3F.asm
parentd44c7c305c3f94b59e3e2c008408779836a0020a (diff)
parentdf62b8e81a4b0964d5f21dcc37916f996b5bd241 (diff)
Merge pull request #279 from Rangi42/master
Identify sprite and battle animation data
Diffstat (limited to 'data/maps/objects/PokemonTower3F.asm')
-rwxr-xr-xdata/maps/objects/PokemonTower3F.asm8
1 files changed, 4 insertions, 4 deletions
diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm
index 79b83f88..21322813 100755
--- a/data/maps/objects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
@@ -8,10 +8,10 @@ PokemonTower3F_Object:
db 0 ; signs
db 4 ; objects
- object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
- object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
- object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
- object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
+ object SPRITE_CHANNELER, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
+ object SPRITE_CHANNELER, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
+ object SPRITE_CHANNELER, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
+ object SPRITE_POKE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
; warp-to
warp_to 3, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_2F