diff --git a/data/maps/headers/FarawayIslandInside.asm b/data/maps/headers/FarawayIslandInside.asm
index ec5eefa0..b60263ce 100644
--- a/data/maps/headers/FarawayIslandInside.asm
+++ b/data/maps/headers/FarawayIslandInside.asm
@@ -1,2 +1,2 @@
-	map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, CELESTE, 0
+	map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, FOREST, 0
 	end_map_header
\ No newline at end of file
diff --git a/data/maps/headers/FarawayIslandOutside.asm b/data/maps/headers/FarawayIslandOutside.asm
index c122a938..a9f14384 100644
--- a/data/maps/headers/FarawayIslandOutside.asm
+++ b/data/maps/headers/FarawayIslandOutside.asm
@@ -1,2 +1,2 @@
-	map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, CELESTE, 0
+	map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, FOREST, 0
 	end_map_header
\ No newline at end of file
diff --git a/data/maps/objects/FarawayIslandOutside.asm b/data/maps/objects/FarawayIslandOutside.asm
index 112d7ab1..3acbdab4 100644
--- a/data/maps/objects/FarawayIslandOutside.asm
+++ b/data/maps/objects/FarawayIslandOutside.asm
@@ -4,11 +4,11 @@ FarawayIslandOutside_Object:
 	def_warp_events
 	warp_event  2, 35, VERMILION_CITY, 10
 	warp_event  3, 35, VERMILION_CITY, 9
-	warp_event 18,  8, FARAWAY_ISLAND_INSIDE, 1
-	warp_event 19,  8, FARAWAY_ISLAND_INSIDE, 2
+	warp_event 14, 12, FARAWAY_ISLAND_INSIDE, 1
+	warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2
 
 	def_bg_events
-	bg_event  3, 27, 1 ; Sign
+	bg_event  2, 28, 1 ; Sign
 
 	def_object_events
 
diff --git a/maps/FarawayIslandInside.blk b/maps/FarawayIslandInside.blk
index ce587a3f..97b28876 100644
--- a/maps/FarawayIslandInside.blk
+++ b/maps/FarawayIslandInside.blk
@@ -1 +1 @@
-


\QR
 
((

(





(
b 




b
b(((
bU




 PR 





o PRT[(


b
(T[T[
 (
((
T[


(( 



Y
\ No newline at end of file
+


\QR
 
((

(





(
b 




b
b(((
b




 \R 





 \RZ[(


b
(Z[02
 (
((
Z[


(( 

02Y
\ No newline at end of file
diff --git a/maps/FarawayIslandOutside.blk b/maps/FarawayIslandOutside.blk
index 6118e512..e76560a8 100644
--- a/maps/FarawayIslandOutside.blk
+++ b/maps/FarawayIslandOutside.blk
@@ -1 +1,3 @@
-@BB-@BB-@BB-@BZB-@BU
_XB-@B_

_B-@BU_U


B-@A>_
„�‡B-DEF
U„�‡bCF-ƒ(_…bAAB--ƒ(„‚
…ACEF--†€‡ƒ(((…AB----ƒ(…ƒ„€‚„‡CF-c--ƒŠ…ƒ…Aƒ…EF---<=ƒ(…ƒ…Aƒ…-----@ƒ„‡†‡A†‡--c--@†‡EEEEGF-----@Y|||||---c-DE
\ No newline at end of file
+@BB-@BB-@BB-@BB-@BB-@BB-<===>XB-@ACGF

CEFB-DGF



CEFcCF-@AA
+


BbAAB--@AC?
+BACEF--DGF@AAABAB----@AB@CG?CFCF-c--@AB@BA@BEF---<=@aF@BA@B-----@@BADFADF--c--@DFEEEEGF-----@'Y&----c-DE
\ No newline at end of file