summaryrefslogtreecommitdiff
path: root/data/maps/objects/PokemonTower7F.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/maps/objects/PokemonTower7F.asm')
-rwxr-xr-xdata/maps/objects/PokemonTower7F.asm9
1 files changed, 4 insertions, 5 deletions
diff --git a/data/maps/objects/PokemonTower7F.asm b/data/maps/objects/PokemonTower7F.asm
index 79cb5b0d..427cb39d 100755
--- a/data/maps/objects/PokemonTower7F.asm
+++ b/data/maps/objects/PokemonTower7F.asm
@@ -1,16 +1,15 @@
PokemonTower7F_Object:
db $1 ; border block
- db 1 ; warps
+ def_warps
warp 9, 16, 1, POKEMON_TOWER_6F
- db 0 ; signs
+ def_signs
- db 4 ; objects
+ 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
- ; warp-to
- warp_to 9, 16, POKEMON_TOWER_7F_WIDTH ; POKEMON_TOWER_6F
+ def_warps_to POKEMON_TOWER_7F