summaryrefslogtreecommitdiff
path: root/data/mapObjects/route16.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route16.asm')
-rwxr-xr-xdata/mapObjects/route16.asm40
1 files changed, 20 insertions, 20 deletions
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm
index a342d106..d65ea9c8 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -2,19 +2,19 @@ Route16Object:
db $f ; border block
db $9 ; warps
- db $a, $11, $0, ROUTE_16_GATE_1F
- db $b, $11, $1, ROUTE_16_GATE_1F
- db $a, $18, $2, ROUTE_16_GATE_1F
- db $b, $18, $3, ROUTE_16_GATE_1F
- db $4, $11, $4, ROUTE_16_GATE_1F
- db $5, $11, $5, ROUTE_16_GATE_1F
- db $4, $18, $6, ROUTE_16_GATE_1F
- db $5, $18, $7, ROUTE_16_GATE_1F
- db $5, $7, $0, ROUTE_16_HOUSE
+ warp $11, $a, $0, ROUTE_16_GATE_1F
+ warp $11, $b, $1, ROUTE_16_GATE_1F
+ warp $18, $a, $2, ROUTE_16_GATE_1F
+ warp $18, $b, $3, ROUTE_16_GATE_1F
+ warp $11, $4, $4, ROUTE_16_GATE_1F
+ warp $11, $5, $5, ROUTE_16_GATE_1F
+ warp $18, $4, $6, ROUTE_16_GATE_1F
+ warp $18, $5, $7, ROUTE_16_GATE_1F
+ warp $7, $5, $0, ROUTE_16_HOUSE
db $2 ; signs
- db $b, $1b, $8 ; Route16Text8
- db $11, $5, $9 ; Route16Text9
+ sign $1b, $b, $8 ; Route16Text8
+ sign $5, $11, $9 ; Route16Text9
db $7 ; objects
object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5
@@ -26,12 +26,12 @@ Route16Object:
object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person
; warp-to
- EVENT_DISP ROUTE_16_WIDTH, $a, $11 ; ROUTE_16_GATE_1F
- EVENT_DISP ROUTE_16_WIDTH, $b, $11 ; ROUTE_16_GATE_1F
- EVENT_DISP ROUTE_16_WIDTH, $a, $18 ; ROUTE_16_GATE_1F
- EVENT_DISP ROUTE_16_WIDTH, $b, $18 ; ROUTE_16_GATE_1F
- EVENT_DISP ROUTE_16_WIDTH, $4, $11 ; ROUTE_16_GATE_1F
- EVENT_DISP ROUTE_16_WIDTH, $5, $11 ; ROUTE_16_GATE_1F
- EVENT_DISP ROUTE_16_WIDTH, $4, $18 ; ROUTE_16_GATE_1F
- EVENT_DISP ROUTE_16_WIDTH, $5, $18 ; ROUTE_16_GATE_1F
- EVENT_DISP ROUTE_16_WIDTH, $5, $7 ; ROUTE_16_HOUSE
+ warp_to $11, $a, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to $11, $b, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to $18, $a, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to $18, $b, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to $11, $4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to $11, $5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to $18, $4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to $18, $5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to $7, $5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE