summaryrefslogtreecommitdiff
path: root/data/mapObjects/pokemontower3.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pokemontower3.asm')
-rwxr-xr-xdata/mapObjects/pokemontower3.asm22
1 files changed, 11 insertions, 11 deletions
diff --git a/data/mapObjects/pokemontower3.asm b/data/mapObjects/pokemontower3.asm
index 9899276a..0e7f5e1f 100755
--- a/data/mapObjects/pokemontower3.asm
+++ b/data/mapObjects/pokemontower3.asm
@@ -1,18 +1,18 @@
PokemonTower3Object:
db $1 ; border block
- db $2 ; warps
- db $9, $3, $0, POKEMONTOWER_2
- db $9, $12, $1, POKEMONTOWER_4
+ db 2 ; warps
+ warp 3, 9, 0, POKEMONTOWER_2
+ warp 18, 9, 1, POKEMONTOWER_4
- db $0 ; signs
+ db 0 ; signs
- db $4 ; objects
- object SPRITE_MEDIUM, $c, $3, STAY, LEFT, $1, OPP_CHANNELER, $5
- object SPRITE_MEDIUM, $9, $8, STAY, DOWN, $2, OPP_CHANNELER, $6
- object SPRITE_MEDIUM, $a, $d, STAY, DOWN, $3, OPP_CHANNELER, $8
- object SPRITE_BALL, $c, $1, STAY, NONE, $4, ESCAPE_ROPE
+ db 4 ; objects
+ object SPRITE_MEDIUM, 12, 3, STAY, LEFT, 1, OPP_CHANNELER, 5
+ object SPRITE_MEDIUM, 9, 8, STAY, DOWN, 2, OPP_CHANNELER, 6
+ object SPRITE_MEDIUM, 10, 13, STAY, DOWN, 3, OPP_CHANNELER, 8
+ object SPRITE_BALL, 12, 1, STAY, NONE, 4, ESCAPE_ROPE
; warp-to
- EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $3 ; POKEMONTOWER_2
- EVENT_DISP POKEMONTOWER_3_WIDTH, $9, $12 ; POKEMONTOWER_4
+ warp_to 3, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_2
+ warp_to 18, 9, POKEMONTOWER_3_WIDTH ; POKEMONTOWER_4