summaryrefslogtreecommitdiff
path: root/data/mapObjects/pokemontower6.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pokemontower6.asm')
-rwxr-xr-xdata/mapObjects/pokemontower6.asm24
1 files changed, 12 insertions, 12 deletions
diff --git a/data/mapObjects/pokemontower6.asm b/data/mapObjects/pokemontower6.asm
index d0035faa..1dd66629 100755
--- a/data/mapObjects/pokemontower6.asm
+++ b/data/mapObjects/pokemontower6.asm
@@ -1,19 +1,19 @@
PokemonTower6Object:
db $1 ; border block
- db $2 ; warps
- db $9, $12, $1, POKEMONTOWER_5
- db $10, $9, $0, POKEMONTOWER_7
+ db 2 ; warps
+ warp 18, 9, 1, POKEMONTOWER_5
+ warp 9, 16, 0, POKEMONTOWER_7
- db $0 ; signs
+ db 0 ; signs
- db $5 ; objects
- object SPRITE_MEDIUM, $c, $a, STAY, RIGHT, $1, OPP_CHANNELER, $13
- object SPRITE_MEDIUM, $9, $5, STAY, DOWN, $2, OPP_CHANNELER, $14
- object SPRITE_MEDIUM, $10, $5, STAY, LEFT, $3, OPP_CHANNELER, $15
- object SPRITE_BALL, $6, $8, STAY, NONE, $4, RARE_CANDY
- object SPRITE_BALL, $e, $e, STAY, NONE, $5, X_ACCURACY
+ db 5 ; objects
+ object SPRITE_MEDIUM, 12, 10, STAY, RIGHT, 1, OPP_CHANNELER, 19
+ object SPRITE_MEDIUM, 9, 5, STAY, DOWN, 2, OPP_CHANNELER, 20
+ object SPRITE_MEDIUM, 16, 5, STAY, LEFT, 3, OPP_CHANNELER, 21
+ object SPRITE_BALL, 6, 8, STAY, NONE, 4, RARE_CANDY
+ object SPRITE_BALL, 14, 14, STAY, NONE, 5, X_ACCURACY
; warp-to
- EVENT_DISP POKEMONTOWER_6_WIDTH, $9, $12 ; POKEMONTOWER_5
- EVENT_DISP POKEMONTOWER_6_WIDTH, $10, $9 ; POKEMONTOWER_7
+ warp_to 18, 9, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_5
+ warp_to 9, 16, POKEMONTOWER_6_WIDTH ; POKEMONTOWER_7