summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonTower4F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower4F.asm')
-rw-r--r--data/maps/objects/PokemonTower4F.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/maps/objects/PokemonTower4F.asm b/data/maps/objects/PokemonTower4F.asm
index 64801e23..7c762912 100644
--- a/data/maps/objects/PokemonTower4F.asm
+++ b/data/maps/objects/PokemonTower4F.asm
@@ -1,18 +1,18 @@
PokemonTower4F_Object:
db $1 ; border block
- def_warps
- warp 3, 9, 0, POKEMON_TOWER_5F
- warp 18, 9, 1, POKEMON_TOWER_3F
+ def_warp_events
+ warp_event 3, 9, POKEMON_TOWER_5F, 0
+ warp_event 18, 9, POKEMON_TOWER_3F, 1
- def_signs
+ def_bg_events
- 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
- object SPRITE_POKE_BALL, 12, 10, STAY, NONE, 4, ELIXER
- object SPRITE_POKE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
- object SPRITE_POKE_BALL, 12, 16, STAY, NONE, 6, HP_UP
+ def_object_events
+ object_event 5, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 9
+ object_event 15, 7, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 10
+ object_event 14, 12, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 12
+ object_event 12, 10, SPRITE_POKE_BALL, STAY, NONE, 4, ELIXER
+ object_event 9, 10, SPRITE_POKE_BALL, STAY, NONE, 5, AWAKENING
+ object_event 12, 16, SPRITE_POKE_BALL, STAY, NONE, 6, HP_UP
def_warps_to POKEMON_TOWER_4F