summaryrefslogtreecommitdiff
path: root/data/mapObjects/pokemontower5.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/pokemontower5.asm')
-rwxr-xr-xdata/mapObjects/pokemontower5.asm26
1 files changed, 13 insertions, 13 deletions
diff --git a/data/mapObjects/pokemontower5.asm b/data/mapObjects/pokemontower5.asm
index 5a73825c..ac0668b2 100755
--- a/data/mapObjects/pokemontower5.asm
+++ b/data/mapObjects/pokemontower5.asm
@@ -1,20 +1,20 @@
PokemonTower5Object:
db $1 ; border block
- db $2 ; warps
- db $9, $3, $0, POKEMONTOWER_4
- db $9, $12, $0, POKEMONTOWER_6
+ db 2 ; warps
+ warp 3, 9, 0, POKEMONTOWER_4
+ warp 18, 9, 0, POKEMONTOWER_6
- db $0 ; signs
+ db 0 ; signs
- db $6 ; objects
- object SPRITE_MEDIUM, $c, $8, STAY, NONE, $1 ; person
- object SPRITE_MEDIUM, $11, $7, STAY, LEFT, $2, OPP_CHANNELER, $e
- object SPRITE_MEDIUM, $e, $3, STAY, LEFT, $3, OPP_CHANNELER, $10
- object SPRITE_MEDIUM, $6, $a, STAY, RIGHT, $4, OPP_CHANNELER, $11
- object SPRITE_MEDIUM, $9, $10, STAY, RIGHT, $5, OPP_CHANNELER, $12
- object SPRITE_BALL, $6, $e, STAY, NONE, $6, NUGGET
+ db 6 ; objects
+ object SPRITE_MEDIUM, 12, 8, STAY, NONE, 1 ; person
+ object SPRITE_MEDIUM, 17, 7, STAY, LEFT, 2, OPP_CHANNELER, 14
+ object SPRITE_MEDIUM, 14, 3, STAY, LEFT, 3, OPP_CHANNELER, 16
+ object SPRITE_MEDIUM, 6, 10, STAY, RIGHT, 4, OPP_CHANNELER, 17
+ object SPRITE_MEDIUM, 9, 16, STAY, RIGHT, 5, OPP_CHANNELER, 18
+ object SPRITE_BALL, 6, 14, STAY, NONE, 6, NUGGET
; warp-to
- EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $3 ; POKEMONTOWER_4
- EVENT_DISP POKEMONTOWER_5_WIDTH, $9, $12 ; POKEMONTOWER_6
+ warp_to 3, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_4
+ warp_to 18, 9, POKEMONTOWER_5_WIDTH ; POKEMONTOWER_6