A few updates

- Changes Bill's Garden to be a more fitting Overworld-tileset map

- Gives Cinnabar Volcano a unique palette, being a slightly less-bright version of the RedMon palette

- A few small changes/improvements to the Rival teams

- Reduced wild encounter levels in Silph Gauntlet a little

- Adds a 100% chance for a Magmar encounter when fishing in the Cinnabar Volcano lava

- Hides more 'secret' areas off the Pokedex area listing, namely Mt. Moon Crater and Faraway Island

- Improves Jabetta's sprite a little

engine/gfx/palettes.asm

@@ -146,8 +146,6 @@ SetPal_Overworld:
 	jr z, .caveOrBruno
 	cp FOREST
 	jr z, .forest
-	cp SHIP
-	jr z, .ship
 	ld a, [wCurMap]
 	cp BRUNSWICK_TRAIL
 	jr z, .brunswick
@@ -155,6 +153,8 @@ SetPal_Overworld:
 	jr c, .townOrRoute
 	cp POWER_PLANT
 	jr z, .powerPlant
+	cp SILPH_GAUNTLET_3F
+	jr z, .ship
 	cp CELESTE_HILL
 	jr z, .celeste
 	cp CERULEAN_CAVE_2F
@@ -194,8 +194,10 @@ SetPal_Overworld:
 	jr c, .garnet
 	cp CERULEAN_CAVE_1F + 1
 	jr c, .mewtwo
-	cp GARNET_CAVERN_2F + 1
-	jr c, .garnet
+	cp CINNABAR_VOLCANO_FLOORS + 1
+	jr c, .volcano
+	cp GARNET_CAVERN_2F
+	jr z, .garnet
 	cp ROCK_TUNNEL_B1F + 1
 	jr c, .caveDefault
 .caveDefault
@@ -217,15 +219,12 @@ SetPal_Overworld:
 	jr c, .faraway
 	cp SAFARI_ZONE_CENTER + 1
 	jr c, .forestDefault
-.forestDefault
-	ld a, PAL_FUCHSIA - 1
+.brunswick
+	ld a, PAL_BRUNSWICK - 1
 	jr .town
 .powerPlant
 	ld a, PAL_YELLOWMON - 1
 	jr .town
-.brunswick
-	ld a, PAL_BRUNSWICK - 1
-	jr .town
 .faraway
 	ld a, PAL_ROUTE - 1
 	jr .town
@@ -238,6 +237,12 @@ SetPal_Overworld:
 .mewtwo
 	ld a, PAL_MEWMON - 1
 	jr .town
+.volcano
+	ld a, PAL_VOLCANO - 1
+	jr .town
+.forestDefault
+	ld a, PAL_FUCHSIA - 1
+	jr .town
 
 ; used when a Pokemon is the only thing on the screen
 ; such as evolution, trading and the Hall of Fame

engine/items/town_map.asm

@@ -382,10 +382,14 @@ DisplayWildLocations:
 	call LoadTownMapEntry
 	pop hl
 	ld a, [de]
+	cp $16 ; Mt. Moon Crater's coordinates
+	jr z, .nextEntry ; skip
 	cp $19 ; Cerulean Cave's coordinates
 	jr z, .nextEntry ; skip Cerulean Cave
 	cp $5A ; Silph Gauntlet's coordinates
 	jr z, .nextEntry ; skip
+	cp $FF ; Faraway Island's coordinates
+	jr z, .nextEntry ; skip
 	call TownMapCoordsToOAMCoords
 	ld a, $4 ; nest icon tile no.
 	ld [hli], a