summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonTower5F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower5F.asm')
-rwxr-xr-xdata/maps/objects/PokemonTower5F.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/PokemonTower5F.asm b/data/maps/objects/PokemonTower5F.asm
index 4dc7d13b..bf7ff716 100755
--- a/data/maps/objects/PokemonTower5F.asm
+++ b/data/maps/objects/PokemonTower5F.asm
@@ -1,13 +1,13 @@
PokemonTower5F_Object:
db $1 ; border block
- db 2 ; warps
+ def_warps
warp 3, 9, 0, POKEMON_TOWER_4F
warp 18, 9, 0, POKEMON_TOWER_6F
- db 0 ; signs
+ def_signs
- db 6 ; objects
+ def_objects
object SPRITE_CHANNELER, 12, 8, STAY, NONE, 1 ; person
object SPRITE_CHANNELER, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
object SPRITE_CHANNELER, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
@@ -15,6 +15,4 @@ PokemonTower5F_Object:
object SPRITE_CHANNELER, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
object SPRITE_POKE_BALL, 6, 14, STAY, NONE, 6, NUGGET
- ; warp-to
- warp_to 3, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_4F
- warp_to 18, 9, POKEMON_TOWER_5F_WIDTH ; POKEMON_TOWER_6F
+ def_warps_to POKEMON_TOWER_5F