1 files changed, 24 insertions, 24 deletions
diff --git a/data/mapObjects/route2.asm b/data/mapObjects/route2.asm
index 7db8fe09..b62f9fdb 100755
--- a/data/mapObjects/route2.asm
+++ b/data/mapObjects/route2.asm
@@ -1,33 +1,33 @@
 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
+	db 6 ; warps
+	warp 12, 9, 0, DIGLETTS_CAVE_EXIT
+	warp 3, 11, 1, VIRIDIAN_FOREST_EXIT
+	warp 15, 19, 0, ROUTE_2_HOUSE
+	warp 16, 35, 1, ROUTE_2_GATE
+	warp 15, 39, 2, ROUTE_2_GATE
+	warp 3, 43, 2, VIRIDIAN_FOREST_ENTRANCE
 
-	db $2 ; signs
-	db $41, $5, $3 ; Route2Text3
-	db $b, $b, $4 ; Route2Text4
+	db 2 ; signs
+	sign 5, 65, 3 ; Route2Text3
+	sign 11, 11, 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
+	db 2 ; objects
+	object SPRITE_BALL, 13, 54, STAY, NONE, 1, MOON_STONE
+	object SPRITE_BALL, 13, 45, 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 12, 9, ROUTE_2_WIDTH ; DIGLETTS_CAVE_EXIT
+	warp_to 3, 11, ROUTE_2_WIDTH ; VIRIDIAN_FOREST_EXIT
+	warp_to 15, 19, ROUTE_2_WIDTH ; ROUTE_2_HOUSE
+	warp_to 16, 35, ROUTE_2_WIDTH ; ROUTE_2_GATE
+	warp_to 15, 39, ROUTE_2_WIDTH ; ROUTE_2_GATE
+	warp_to 3, 43, 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