summaryrefslogtreecommitdiff
path: root/data/mapObjects/route16.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route16.asm')
-rwxr-xr-xdata/mapObjects/route16.asm60
1 files changed, 30 insertions, 30 deletions
diff --git a/data/mapObjects/route16.asm b/data/mapObjects/route16.asm
index a342d106..35ffea17 100755
--- a/data/mapObjects/route16.asm
+++ b/data/mapObjects/route16.asm
@@ -1,37 +1,37 @@
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
+ db 9 ; warps
+ warp 17, 10, 0, ROUTE_16_GATE_1F
+ warp 17, 11, 1, ROUTE_16_GATE_1F
+ warp 24, 10, 2, ROUTE_16_GATE_1F
+ warp 24, 11, 3, ROUTE_16_GATE_1F
+ warp 17, 4, 4, ROUTE_16_GATE_1F
+ warp 17, 5, 5, ROUTE_16_GATE_1F
+ warp 24, 4, 6, ROUTE_16_GATE_1F
+ warp 24, 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
+ db 2 ; signs
+ sign 27, 11, 8 ; Route16Text8
+ sign 5, 17, 9 ; Route16Text9
- db $7 ; objects
- object SPRITE_BIKER, $11, $c, STAY, LEFT, $1, OPP_BIKER, $5
- object SPRITE_BIKER, $e, $d, STAY, RIGHT, $2, OPP_CUE_BALL, $1
- object SPRITE_BIKER, $b, $c, STAY, UP, $3, OPP_CUE_BALL, $2
- object SPRITE_BIKER, $9, $b, STAY, LEFT, $4, OPP_BIKER, $6
- object SPRITE_BIKER, $6, $a, STAY, RIGHT, $5, OPP_CUE_BALL, $3
- object SPRITE_BIKER, $3, $c, STAY, RIGHT, $6, OPP_BIKER, $7
- object SPRITE_SNORLAX, $1a, $a, STAY, DOWN, $7 ; person
+ db 7 ; objects
+ object SPRITE_BIKER, 17, 12, STAY, LEFT, 1, OPP_BIKER, 5
+ object SPRITE_BIKER, 14, 13, STAY, RIGHT, 2, OPP_CUE_BALL, 1
+ object SPRITE_BIKER, 11, 12, STAY, UP, 3, OPP_CUE_BALL, 2
+ object SPRITE_BIKER, 9, 11, STAY, LEFT, 4, OPP_BIKER, 6
+ object SPRITE_BIKER, 6, 10, STAY, RIGHT, 5, OPP_CUE_BALL, 3
+ object SPRITE_BIKER, 3, 12, STAY, RIGHT, 6, OPP_BIKER, 7
+ object SPRITE_SNORLAX, 26, 10, 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 17, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 17, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 24, 10, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 24, 11, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 17, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 17, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 24, 4, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 24, 5, ROUTE_16_WIDTH ; ROUTE_16_GATE_1F
+ warp_to 7, 5, ROUTE_16_WIDTH ; ROUTE_16_HOUSE