summaryrefslogtreecommitdiff
path: root/data/mapObjects/route23.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route23.asm')
-rwxr-xr-xdata/mapObjects/route23.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/data/mapObjects/route23.asm b/data/mapObjects/route23.asm
index 3995e510..2fd3e3d7 100755
--- a/data/mapObjects/route23.asm
+++ b/data/mapObjects/route23.asm
@@ -1,26 +1,26 @@
Route23Object:
db $f ; border block
- db $4 ; warps
- db $8b, $7, $2, ROUTE_22_GATE
- db $8b, $8, $3, ROUTE_22_GATE
- db $1f, $4, $0, VICTORY_ROAD_1
- db $1f, $e, $1, VICTORY_ROAD_2
+ db 4 ; warps
+ warp 7, 139, 2, ROUTE_22_GATE
+ warp 8, 139, 3, ROUTE_22_GATE
+ warp 4, 31, 0, VICTORY_ROAD_1
+ warp 14, 31, 1, VICTORY_ROAD_2
- db $1 ; signs
- db $21, $3, $8 ; Route23Text8
+ db 1 ; signs
+ sign 3, 33, 8 ; Route23Text8
- db $7 ; objects
- object SPRITE_GUARD, $4, $23, STAY, DOWN, $1 ; person
- object SPRITE_GUARD, $a, $38, STAY, DOWN, $2 ; person
- object SPRITE_SWIMMER, $8, $55, STAY, DOWN, $3 ; person
- object SPRITE_SWIMMER, $b, $60, STAY, DOWN, $4 ; person
- object SPRITE_GUARD, $c, $69, STAY, DOWN, $5 ; person
- object SPRITE_GUARD, $8, $77, STAY, DOWN, $6 ; person
- object SPRITE_GUARD, $8, $88, STAY, DOWN, $7 ; person
+ db 7 ; objects
+ object SPRITE_GUARD, 4, 35, STAY, DOWN, 1 ; person
+ object SPRITE_GUARD, 10, 56, STAY, DOWN, 2 ; person
+ object SPRITE_SWIMMER, 8, 85, STAY, DOWN, 3 ; person
+ object SPRITE_SWIMMER, 11, 96, STAY, DOWN, 4 ; person
+ object SPRITE_GUARD, 12, 105, STAY, DOWN, 5 ; person
+ object SPRITE_GUARD, 8, 119, STAY, DOWN, 6 ; person
+ object SPRITE_GUARD, 8, 136, STAY, DOWN, 7 ; person
; warp-to
- EVENT_DISP ROUTE_23_WIDTH, $8b, $7 ; ROUTE_22_GATE
- EVENT_DISP ROUTE_23_WIDTH, $8b, $8 ; ROUTE_22_GATE
- EVENT_DISP ROUTE_23_WIDTH, $1f, $4 ; VICTORY_ROAD_1
- EVENT_DISP ROUTE_23_WIDTH, $1f, $e ; VICTORY_ROAD_2
+ warp_to 7, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE
+ warp_to 8, 139, ROUTE_23_WIDTH ; ROUTE_22_GATE
+ warp_to 4, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_1
+ warp_to 14, 31, ROUTE_23_WIDTH ; VICTORY_ROAD_2