aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/PokemonTower4F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower4F.asm')
-rwxr-xr-xdata/maps/objects/PokemonTower4F.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm
index 25ef7cb1..675a1407 100755
--- a/data/maps/objects/PokemonTower4F.asm
+++ b/data/maps/objects/PokemonTower4F.asm
@@ -1,13 +1,13 @@
PokemonTower4F_Object:
db $1 ; border block
- db 2 ; warps
+ def_warps
warp 3, 9, 0, POKEMON_TOWER_5F
warp 18, 9, 1, POKEMON_TOWER_3F
- db 0 ; signs
+ def_signs
- db 6 ; objects
+ def_objects
object SPRITE_CHANNELER, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9
object SPRITE_CHANNELER, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10
object SPRITE_CHANNELER, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12
@@ -15,6 +15,4 @@ PokemonTower4F_Object:
object SPRITE_POKE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
object SPRITE_POKE_BALL, 12, 16, STAY, NONE, 6, HP_UP
- ; warp-to
- warp_to 3, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_5F
- warp_to 18, 9, POKEMON_TOWER_4F_WIDTH ; POKEMON_TOWER_3F
+ def_warps_to POKEMON_TOWER_4F