A few small fixes

- Brunswick Trail and Faraway Island now use correct palettes.
- Faraway Island has been altered slightly with the same tileset as Celeste Hill
- It's now possible to fly from Citrine locations, as well as Faraway Island, and the roof of both Celadon's Mart and Mansion.

data/maps/headers/FarawayIslandInside.asm

@@ -1,2 +1,2 @@
-	map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, FOREST, 0
+	map_header FarawayIslandInside, FARAWAY_ISLAND_INSIDE, CELESTE, 0
 	end_map_header

data/maps/headers/FarawayIslandOutside.asm

@@ -1,2 +1,2 @@
-	map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, FOREST, 0
+	map_header FarawayIslandOutside, FARAWAY_ISLAND_OUTSIDE, CELESTE, 0
 	end_map_header

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 14, 12, FARAWAY_ISLAND_INSIDE, 1
+	warp_event 18,  8, FARAWAY_ISLAND_INSIDE, 1
-	warp_event 15, 12, FARAWAY_ISLAND_INSIDE, 2
+	warp_event 19,  8, FARAWAY_ISLAND_INSIDE, 2
 
 	def_bg_events
-	bg_event  2, 28, 1 ; Sign
+	bg_event  3, 27, 1 ; Sign
 
 	def_object_events
 

engine/gfx/palettes.asm

@@ -146,6 +146,8 @@ SetPal_Overworld:
 	jr z, .caveOrBruno
 	cp CELESTE
 	jr z, .celeste
+	cp CITRINE
+	jr z, .citrine
 	ld a, [wCurMap]
 	cp FIRST_INDOOR_MAP
 	jr c, .townOrRoute
@@ -155,8 +157,8 @@ SetPal_Overworld:
 	jr z, .Lorelei
 	cp CELESTE_HILL
 	jr z, .celeste
-	cp BRUNSWICK_TRAIL
+	cp CITRINE_CITY
-	jr z, .brunswick
+	jr z, .citrine
 	cp BRUNOS_ROOM
 	jr z, .caveOrBruno
 .normalDungeonOrBuilding
@@ -173,6 +175,29 @@ SetPal_Overworld:
 	ld a, SET_PAL_OVERWORLD
 	ld [wDefaultPaletteCommand], a
 	ret
+.citrine
+	ld a, [wCurMap]
+	cp BRUNSWICK_TRAIL
+	jr z, .brunswick
+	cp CITRINE_CITY
+	jr c, .citrineDefault
+.citrineDefault
+	ld a, PAL_CITRINE - 1
+	jr .town
+.celeste
+	ld a, [wCurMap]
+	cp FARAWAY_ISLAND_OUTSIDE
+	jr z, .faraway
+	cp FARAWAY_ISLAND_INSIDE
+	jr z, .faraway
+	cp CELESTE_HILL
+	jr c, .celesteDefault
+.celesteDefault
+	ld a, PAL_CELESTE - 1
+	jr .town
+.faraway
+	ld a, PAL_ROUTE - 1
+	jr .town
 .brunswick
 	ld a, PAL_BRUNSWICK - 1
 	jr .town
@@ -192,9 +217,6 @@ SetPal_Overworld:
 .caveDefault
 	ld a, PAL_CAVE - 1
 	jr .town
-.celeste
-	ld a, PAL_CELESTE - 1
-	jr .town
 .Lorelei
 	jr c, .gbcLorelei
 	jr .seafoam

engine/menus/start_sub_menus.asm

@@ -132,7 +132,7 @@ StartMenu_Pokemon::
 .fly
 	bit BIT_THUNDERBADGE, a
 	jp z, .newBadgeRequired
-	call CheckIfInOutsideMap
+	call CheckIfInFlyMap
 	jr z, .canFly
 	ld a, [wWhichPokemon]
 	ld hl, wPartyMonNicks

home/overworld.asm

@@ -725,6 +725,19 @@ PlayMapChangeSound::
 	ret nz
 	jp GBFadeOutToBlack
 	
+CheckIfInFlyMap::
+	call CheckIfInOutsideMap
+	ret z
+	cp CITRINE
+	ret z
+	cp CELESTE
+	ret z
+	ld a, [wCurMap]
+	cp CELADON_MART_ROOF
+	ret z
+	cp CELADON_MANSION_ROOF
+	ret
+
 CheckIfInOutsideMap::
 ; If the player is in an outside map (a town or route), set the z flag
 	ld a, [wCurMapTileset]

maps/FarawayIslandInside.blk

@@ -1 +1 @@
-


\QR
 
((

(





(
b 




b
b(((
b




 \R 





 \RZ[(


b
(Z[02
 (
((
Z[


(( 

02Y
+


\QR
 
((

(





(
b 




b
b(((
bU




 PR 





o PRT[(


b
(T[T[
 (
((
T[


(( 



Y

maps/FarawayIslandOutside.blk

@@ -1,3 +1 @@
-@BB-@BB-@BB-@BB-@BB-@BB-<===>XB-@ACGF

CEFB-DGF



CEFcCF-@AA
+@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
-


BbAAB--@AC?
-BACEF--DGF@AAABAB----@AB@CG?CFCF-c--@AB@BA@BEF---<=@aF@BA@B-----@@BADFADF--c--@DFEEEEGF-----@'Y&----c-DE

text/SilphCo11F.asm

@@ -1,5 +1,5 @@
 _SilphCoPresidentText::
-	text "PRESIDENT: Thank"
+	text "CHIEF: Thank"
 	line "you for saving"
 	cont "SILPH!"
 
@@ -27,7 +27,7 @@ _ReceivedSilphCoMasterBallText::
 	text_end
 
 _SilphCo10Text_6231c::
-	text "PRESIDENT: You"
+	text "CHIEF: You"
 	line "can't buy that"
 	cont "anywhere!"
 
@@ -62,7 +62,7 @@ _SilphCo11Text3::
 	text "Ah <PLAYER>!"
 	line "So we meet again!"
 
-	para "The PRESIDENT and"
+	para "The CHIEF and"
 	line "I are discussing"
 	cont "a vital business"
 	cont "proposition."

text/SilphGauntlet7F.asm

@@ -1,5 +1,5 @@
 _ChiefMonologue::
-	text "<PLAYER>!"
+	text "CHIEF: <PLAYER>!"
 	line "Congratulations"
 	cont "for making it"
 	cont "this far. I'm" 
@@ -21,11 +21,12 @@ _ChiefMonologue::
 	cont "MEWTWO loose and"
 	cont "GIOVANNI gone,"
 	cont "our company is"
-	cont "going under! Now"
+	cont "going under!"
-	cont "there is only one" 
+
-	cont "way to catch"
+	para "Now there's only"
+	line "one way to catch" 
 	cont "MEWTWO, and it's"
-	cont "in your hand!" 
+	cont "in your hands!" 
 	
 	para "<PLAYER>! Give me"
 	line "that BALL!"
@@ -42,14 +43,14 @@ _ChiefVictoryText::
 	prompt
 
 _ChiefAfterBattleText::
-	text "I suppose the"
+	text "CHIEF: I suppose"
-	line "child to bring"
+	line "the child that"
-	cont "down GIOVANNI has"
+	cont "brought down"
-	cont "to be stronger"
+	cont "GIOVANNI has to"
-	cont "than me. There is"
+	cont "be stronger than"
-	cont "no product I have"
+	cont "me. No product"
-	cont "that can trounce"
+	cont "I have can"
-	cont "you."
+	cont "trounce you."
 
 	para "I wanted to make"
 	line "an ultimate BALL"