aboutsummaryrefslogtreecommitdiffstats
path: root/data/maps/objects/PokemonTower2F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower2F.asm')
-rwxr-xr-xdata/maps/objects/PokemonTower2F.asm10
1 files changed, 4 insertions, 6 deletions
diff --git a/data/maps/objects/PokemonTower2F.asm b/data/maps/objects/PokemonTower2F.asm
index 2b52c1ba..9c0770e9 100755
--- a/data/maps/objects/PokemonTower2F.asm
+++ b/data/maps/objects/PokemonTower2F.asm
@@ -1,16 +1,14 @@
PokemonTower2F_Object:
db $1 ; border block
- db 2 ; warps
+ def_warps
warp 3, 9, 0, POKEMON_TOWER_3F
warp 18, 9, 2, POKEMON_TOWER_1F
- db 0 ; signs
+ def_signs
- db 2 ; objects
+ def_objects
object SPRITE_BLUE, 14, 5, STAY, NONE, 1 ; person
object SPRITE_CHANNELER, 3, 7, STAY, RIGHT, 2 ; person
- ; warp-to
- warp_to 3, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_3F
- warp_to 18, 9, POKEMON_TOWER_2F_WIDTH ; POKEMON_TOWER_1F
+ def_warps_to POKEMON_TOWER_2F