summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonTower6F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower6F.asm')
-rwxr-xr-xdata/maps/objects/PokemonTower6F.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/PokemonTower6F.asm b/data/maps/objects/PokemonTower6F.asm
index 361e4e86..c90e57f2 100755
--- a/data/maps/objects/PokemonTower6F.asm
+++ b/data/maps/objects/PokemonTower6F.asm
@@ -1,19 +1,17 @@
PokemonTower6F_Object:
db $1 ; border block
- db 2 ; warps
+ def_warps
warp 18, 9, 1, POKEMON_TOWER_5F
warp 9, 16, 0, POKEMON_TOWER_7F
- db 0 ; signs
+ def_signs
- db 5 ; objects
+ def_objects
object SPRITE_CHANNELER, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
object SPRITE_CHANNELER, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
object SPRITE_CHANNELER, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
object SPRITE_POKE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
object SPRITE_POKE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
- ; warp-to
- warp_to 18, 9, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_5F
- warp_to 9, 16, POKEMON_TOWER_6F_WIDTH ; POKEMON_TOWER_7F
+ def_warps_to POKEMON_TOWER_6F