summaryrefslogtreecommitdiff
path: root/data/mapObjects/route2.asm
diff options
context:
space:
mode:
Diffstat (limited to 'data/mapObjects/route2.asm')
-rwxr-xr-xdata/mapObjects/route2.asm38
1 files changed, 19 insertions, 19 deletions
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm
index 7db8fe09..0c14d76f 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/route2.asm
@@ -2,32 +2,32 @@ Route2Object:
db $f ; border block
db $6 ; warps
- db $9, $c, $0, DIGLETTS_CAVE_EXIT
- db $b, $3, $1, VIRIDIAN_FOREST_EXIT
- db $13, $f, $0, ROUTE_2_HOUSE
- db $23, $10, $1, ROUTE_2_GATE
- db $27, $f, $2, ROUTE_2_GATE
- db $2b, $3, $2, VIRIDIAN_FOREST_ENTRANCE
+ warp $c, $9, $0, DIGLETTS_CAVE_EXIT
+ warp $3, $b, $1, VIRIDIAN_FOREST_EXIT
+ warp $f, $13, $0, ROUTE_2_HOUSE
+ warp $10, $23, $1, ROUTE_2_GATE
+ warp $f, $27, $2, ROUTE_2_GATE
+ warp $3, $2b, $2, VIRIDIAN_FOREST_ENTRANCE
db $2 ; signs
- db $41, $5, $3 ; Route2Text3
- db $b, $b, $4 ; Route2Text4
+ sign $5, $41, $3 ; Route2Text3
+ sign $b, $b, $4 ; Route2Text4
db $2 ; objects
object SPRITE_BALL, $d, $36, STAY, NONE, $1, MOON_STONE
object SPRITE_BALL, $d, $2d, STAY, NONE, $2, HP_UP
; warp-to
- EVENT_DISP ROUTE_2_WIDTH, $9, $c ; DIGLETTS_CAVE_EXIT
- EVENT_DISP ROUTE_2_WIDTH, $b, $3 ; VIRIDIAN_FOREST_EXIT
- EVENT_DISP ROUTE_2_WIDTH, $13, $f ; ROUTE_2_HOUSE
- EVENT_DISP ROUTE_2_WIDTH, $23, $10 ; ROUTE_2_GATE
- EVENT_DISP ROUTE_2_WIDTH, $27, $f ; ROUTE_2_GATE
- EVENT_DISP ROUTE_2_WIDTH, $2b, $3 ; VIRIDIAN_FOREST_ENTRANCE
+ warp_to $c, $9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT
+ warp_to $3, $b, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT
+ warp_to $f, $13, ROUTE_2_WIDTH ; ROUTE_2_HOUSE
+ warp_to $10, $23, ROUTE_2_WIDTH ; ROUTE_2_GATE
+ warp_to $f, $27, ROUTE_2_WIDTH ; ROUTE_2_GATE
+ warp_to $3, $2b, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_ENTRANCE
; unused
- EVENT_DISP $4, $7, $2
- db $12, $c7, $9, $7
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $2
- EVENT_DISP $4, $7, $2
+ warp_to $2, $7, $4
+ db $12, $c7, $9, $7
+ warp_to $2, $7, $4
+ warp_to $2, $7, $4
+ warp_to $2, $7, $4