summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonTower3F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower3F.asm')
-rw-r--r--data/maps/objects/PokemonTower3F.asm18
1 files changed, 9 insertions, 9 deletions
diff --git a/data/maps/objects/PokemonTower3F.asm b/data/maps/objects/PokemonTower3F.asm
index af1b17dc..09c8719e 100644
--- a/data/maps/objects/PokemonTower3F.asm
+++ b/data/maps/objects/PokemonTower3F.asm
@@ -1,16 +1,16 @@
PokemonTower3F_Object:
db $1 ; border block
- def_warps
- warp 3, 9, 0, POKEMON_TOWER_2F
- warp 18, 9, 1, POKEMON_TOWER_4F
+ def_warp_events
+ warp_event 3, 9, POKEMON_TOWER_2F, 0
+ warp_event 18, 9, POKEMON_TOWER_4F, 1
- def_signs
+ def_bg_events
- 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
+ def_object_events
+ object_event 12, 3, SPRITE_CHANNELER, STAY, LEFT, 1, OPP_CHANNELER, 5
+ object_event 9, 8, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 6
+ object_event 10, 13, SPRITE_CHANNELER, STAY, DOWN, 3, OPP_CHANNELER, 8
+ object_event 12, 1, SPRITE_POKE_BALL, STAY, NONE, 4, ESCAPE_ROPE
def_warps_to POKEMON_TOWER_3F