summaryrefslogtreecommitdiff
path: root/data/mapObjects/rocktunnel1.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/rocktunnel1.asm')
-rwxr-xr-xdata/mapObjects/rocktunnel1.asm34
1 files changed, 17 insertions, 17 deletions
diff --git a/data/mapObjects/rocktunnel1.asm b/data/mapObjects/rocktunnel1.asm
index 932efb87..945f419d 100755
--- a/data/mapObjects/rocktunnel1.asm
+++ b/data/mapObjects/rocktunnel1.asm
@@ -2,17 +2,17 @@ RockTunnel1Object:
db $3 ; border block
db $8 ; warps
- db $3, $f, $1, $ff
- db $0, $f, $1, $ff
- db $21, $f, $2, $ff
- db $23, $f, $2, $ff
- db $3, $25, $0, ROCK_TUNNEL_2
- db $3, $5, $1, ROCK_TUNNEL_2
- db $b, $11, $2, ROCK_TUNNEL_2
- db $11, $25, $3, ROCK_TUNNEL_2
+ warp $f, $3, $1, $ff
+ warp $f, $0, $1, $ff
+ warp $f, $21, $2, $ff
+ warp $f, $23, $2, $ff
+ warp $25, $3, $0, ROCK_TUNNEL_2
+ warp $5, $3, $1, ROCK_TUNNEL_2
+ warp $11, $b, $2, ROCK_TUNNEL_2
+ warp $25, $11, $3, ROCK_TUNNEL_2
db $1 ; signs
- db $1d, $b, $8 ; RockTunnel1Text8
+ sign $b, $1d, $8 ; RockTunnel1Text8
db $7 ; objects
object SPRITE_HIKER, $7, $5, STAY, DOWN, $1, OPP_HIKER, $c
@@ -24,11 +24,11 @@ RockTunnel1Object:
object SPRITE_LASS, $20, $18, STAY, RIGHT, $7, OPP_JR_TRAINER_F, $13
; warp-to
- EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $f
- EVENT_DISP ROCK_TUNNEL_1_WIDTH, $0, $f
- EVENT_DISP ROCK_TUNNEL_1_WIDTH, $21, $f
- EVENT_DISP ROCK_TUNNEL_1_WIDTH, $23, $f
- EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $25 ; ROCK_TUNNEL_2
- EVENT_DISP ROCK_TUNNEL_1_WIDTH, $3, $5 ; ROCK_TUNNEL_2
- EVENT_DISP ROCK_TUNNEL_1_WIDTH, $b, $11 ; ROCK_TUNNEL_2
- EVENT_DISP ROCK_TUNNEL_1_WIDTH, $11, $25 ; ROCK_TUNNEL_2
+ warp_to $f, $3, ROCK_TUNNEL_1_WIDTH
+ warp_to $f, $0, ROCK_TUNNEL_1_WIDTH
+ warp_to $f, $21, ROCK_TUNNEL_1_WIDTH
+ warp_to $f, $23, ROCK_TUNNEL_1_WIDTH
+ warp_to $25, $3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2
+ warp_to $5, $3, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2
+ warp_to $11, $b, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2
+ warp_to $25, $11, ROCK_TUNNEL_1_WIDTH ; ROCK_TUNNEL_2