summaryrefslogtreecommitdiff
path: root/data/mapObjects/pokemontower4.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pokemontower4.asm')
-rwxr-xr-xdata/mapObjects/pokemontower4.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/pokemontower4.asm b/data/mapObjects/pokemontower4.asm
index 19f4f4e3..9acea43e 100755
--- a/data/mapObjects/pokemontower4.asm
+++ b/data/mapObjects/pokemontower4.asm
@@ -1,20 +1,20 @@
PokemonTower4Object:
db $1 ; border block
- db $2 ; warps
- db $9, $3, $0, POKEMONTOWER_5
- db $9, $12, $1, POKEMONTOWER_3
+ db 2 ; warps
+ warp 3, 9, 0, POKEMONTOWER_5
+ warp 18, 9, 1, POKEMONTOWER_3
- db $0 ; signs
+ db 0 ; signs
- db $6 ; objects
- object SPRITE_MEDIUM, $5, $a, STAY, RIGHT, $1, OPP_CHANNELER, $9
- object SPRITE_MEDIUM, $f, $7, STAY, DOWN, $2, OPP_CHANNELER, $a
- object SPRITE_MEDIUM, $e, $c, STAY, LEFT, $3, OPP_CHANNELER, $c
- object SPRITE_BALL, $c, $a, STAY, NONE, $4, ELIXER
- object SPRITE_BALL, $9, $a, STAY, NONE, $5, AWAKENING
- object SPRITE_BALL, $c, $10, STAY, NONE, $6, HP_UP
+ db 6 ; objects
+ object SPRITE_MEDIUM, 5, 10, STAY, RIGHT, 1, OPP_CHANNELER, 9
+ object SPRITE_MEDIUM, 15, 7, STAY, DOWN, 2, OPP_CHANNELER, 10
+ object SPRITE_MEDIUM, 14, 12, STAY, LEFT, 3, OPP_CHANNELER, 12
+ object SPRITE_BALL, 12, 10, STAY, NONE, 4, ELIXER
+ object SPRITE_BALL, 9, 10, STAY, NONE, 5, AWAKENING
+ object SPRITE_BALL, 12, 16, STAY, NONE, 6, HP_UP
; warp-to
- EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $3 ; POKEMONTOWER_5
- EVENT_DISP POKEMONTOWER_4_WIDTH, $9, $12 ; POKEMONTOWER_3
+ warp_to 3, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_5
+ warp_to 18, 9, POKEMONTOWER_4_WIDTH ; POKEMONTOWER_3