aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/PokemonTower3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower3F.asm')
-rwxr-xr-xdata/maps/objects/PokemonTower3F.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm
index 21322813..3d5272ba 100755
--- a/data/maps/objects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
@@ -1,18 +1,16 @@
PokemonTower3F_Object:
db $1 ; border block
- db 2 ; warps
+ def_warps
warp 3, 9, 0, POKEMON_TOWER_2F
warp 18, 9, 1, POKEMON_TOWER_4F
- db 0 ; signs
+ def_signs
- db 4 ; objects
+ def_objects
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
- warp_to 18, 9, POKEMON_TOWER_3F_WIDTH ; POKEMON_TOWER_4F
+ def_warps_to POKEMON_TOWER_3F