diff --git a/data/maps/objects/Route25.asm b/data/maps/objects/Route25.asm
index f3a8f105..bbb7b58e 100644
--- a/data/maps/objects/Route25.asm
+++ b/data/maps/objects/Route25.asm
@@ -3,10 +3,10 @@ Route25_Object:
 
 	def_warp_events
 	warp_event 49,  5, BILLS_HOUSE, 1
-	warp_event 60,   1, UNDERWATER_TUNNEL, 1
+	warp_event 64,  1, UNDERWATER_TUNNEL, 1
 
 	def_bg_events
-	bg_event 51,  7, 11 ; Route25Text11
+	bg_event 47,  5, 11 ; Route25Text11
 
 	def_object_events
 	object_event 14,  2, SPRITE_YOUNGSTER, STAY, DOWN, 1, OPP_YOUNGSTER, 5
diff --git a/engine/gfx/palettes.asm b/engine/gfx/palettes.asm
index a070a0e4..663e67b2 100644
--- a/engine/gfx/palettes.asm
+++ b/engine/gfx/palettes.asm
@@ -213,7 +213,7 @@ SetPal_Overworld:
 	jr z, .forestDefault
 	cp MT_MOON_CRATER + 1
 	jr c, .faraway
-	cp SAFARI_ZONE_CENTER + 1`
+	cp SAFARI_ZONE_CENTER + 1
 	jr c, .forestDefault
 	cp BILLS_GARDEN
 	jr z, .faraway
@@ -232,9 +232,6 @@ SetPal_Overworld:
 .seafoam
 	ld a, PAL_CYANMON - 1
 	jr .town
-.volcano
-	ld a, PAL_REDMON - 1
-	jr .town
 .garnet
 	ld a, PAL_GARNET - 1
 	jr .town
diff --git a/maps/Route25.blk b/maps/Route25.blk
index 2fa6a8b6..4a4ea99b 100644
--- a/maps/Route25.blk
+++ b/maps/Route25.blk
@@ -1,27 +1,29 @@
-,,,,+WWWWWWWWWWWWWWWWWW%hiWWWWWWWW%WWWW%n
+,,,,+WWWWWWWWWWWWWWWWWW%hiWWWWWWWW%WWWW%n
 n
 
 n
 
 `ttt
-6CCCCdhied11eCCCC
+6eCdNthitMed11eCC
 
 
 LLL
 nlnttnt
-nCCCCd|}~e-.CCCCLlL
+neCdPR|}~ROe-.CCLlL
 mln
-ttottt
-CCdUUUUUUUeCCCCCC11111ml
+ttotttneCdUUUUUUUeCCCCCC11111ml
 mL
 
 ttmtt
 
-TTT
+
+
+
+
 T
-eCCCCCCQQQQQQQQQQQQQQQQQ
-nxxxteCTCdted1eCCC??????????????????;CCd
+eCCCCCCQQQQQQQQQQQQQQQQQ
+nteCTCdted1eCCC??????????????????;eCd
 t
 T
 t
-e-.CCC,,,,,,,,,,,,,,,,,,)CC-.CCCCCC,,,,,,,,,,,,,,,,,,,??????????????????
\ No newline at end of file
+e-.CCC,,,,,,,,,,,,,,,,,,)eC-x.CCCCCC,,,,,,,,,,,,,,,,,,,??????????????????
\ No newline at end of file