summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonTower7F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower7F.asm')
-rw-r--r--data/maps/objects/PokemonTower7F.asm16
1 files changed, 8 insertions, 8 deletions
diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm
index 6d258f0d..a148936b 100644
--- a/data/maps/objects/PokemonTower7F.asm
+++ b/data/maps/objects/PokemonTower7F.asm
@@ -1,15 +1,15 @@
PokemonTower7F_Object:
db $1 ; border block
- def_warps
- warp 9, 16, 1, POKEMON_TOWER_6F
+ def_warp_events
+ warp_event 9, 16, POKEMON_TOWER_6F, 1
- def_signs
+ def_bg_events
- def_objects
- object SPRITE_ROCKET, 9, 11, STAY, RIGHT, 1, OPP_ROCKET, 19
- object SPRITE_ROCKET, 12, 9, STAY, LEFT, 2, OPP_ROCKET, 20
- object SPRITE_ROCKET, 9, 7, STAY, RIGHT, 3, OPP_ROCKET, 21
- object SPRITE_MR_FUJI, 10, 3, STAY, DOWN, 4 ; person
+ def_object_events
+ object_event 9, 11, SPRITE_ROCKET, STAY, RIGHT, 1, OPP_ROCKET, 19
+ object_event 12, 9, SPRITE_ROCKET, STAY, LEFT, 2, OPP_ROCKET, 20
+ object_event 9, 7, SPRITE_ROCKET, STAY, RIGHT, 3, OPP_ROCKET, 21
+ object_event 10, 3, SPRITE_MR_FUJI, STAY, DOWN, 4 ; person
def_warps_to POKEMON_TOWER_7F