Palette fixes

This should fix some issues with map palettes being displayed incorrectly, as well as giving a unique palette to Cerulean Cave.

constants/map_constants.asm

@@ -252,7 +252,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	map_const NAME_RATERS_HOUSE,              4,  4 ; $E6
 	map_const CERULEAN_BADGE_HOUSE,           4,  4 ; $E7
 	map_const CINNABAR_VOLCANO,              14, 12 ; $E8	- Was UNUSED_MAP_E7
-	map_const ROCK_TUNNEL_B1F,               20, 18 ; $E9
+	map_const CINNABAR_VOLCANO_FLOORS,		 20, 20 ; $F8	- Switched with ROCK_TUNNEL_B1F
 	map_const SILPH_CO_9F,                   13,  9 ; $EA
 	map_const SILPH_CO_10F,                   8,  9 ; $EB
 	map_const SILPH_CO_11F,                   9,  9 ; $EC
@@ -266,8 +266,8 @@ DEF FIRST_INDOOR_MAP EQU const_value
 	map_const BILLS_GARDEN,                  10, 10 ; $F4	- Was UNUSED_MAP_F3
 	map_const LORELEIS_ROOM,                  5,  6 ; $F5
 	map_const BRUNOS_ROOM,                    5,  6 ; $F6
-	map_const AGATHAS_ROOM,                   5,  6 ; $F7	- Maps FA - FE currently have no data, bear in mind we need room for everything in citrine
+	map_const AGATHAS_ROOM,                   5,  6 ; $F7
-	map_const CINNABAR_VOLCANO_FLOORS,		 20, 20 ; $F8
+	map_const ROCK_TUNNEL_B1F,               20, 18 ; $E9	- Switched with CINNABAR_VOLCANO_FLOORS
 	map_const GIOVANNIS_ROOM,				 11, 14 ; $F9
 DEF NUM_MAPS EQU const_value
 

data/maps/map_header_banks.asm

@@ -234,7 +234,7 @@ MapHeaderBanks::
 	db BANK(NameRatersHouse_h)
 	db BANK(CeruleanBadgeHouse_h)
 	db BANK(CinnabarVolcano_h) ; $01 UNUSED_MAP_E7
-	db BANK(RockTunnelB1F_h)
+	db BANK(CinnabarVolcanoFloors_h)
 	db BANK(SilphCo9F_h)
 	db BANK(SilphCo10F_h)
 	db BANK(SilphCo11F_h)
@@ -249,6 +249,6 @@ MapHeaderBanks::
 	db BANK(LoreleisRoom_h)
 	db BANK(BrunosRoom_h)
 	db BANK(AgathasRoom_h)
-	db BANK(CinnabarVolcanoFloors_h)
+	db BANK(RockTunnelB1F_h)
 	db BANK(GiovannisRoom_h)
 	assert_table_length NUM_MAPS

data/maps/map_header_pointers.asm

@@ -234,7 +234,7 @@ MapHeaderPointers::
 	dw NameRatersHouse_h
 	dw CeruleanBadgeHouse_h
 	dw CinnabarVolcano_h ; UNUSED_MAP_E7
-	dw RockTunnelB1F_h
+	dw CinnabarVolcanoFloors_h
 	dw SilphCo9F_h
 	dw SilphCo10F_h
 	dw SilphCo11F_h
@@ -249,6 +249,6 @@ MapHeaderPointers::
 	dw LoreleisRoom_h
 	dw BrunosRoom_h
 	dw AgathasRoom_h
-	dw CinnabarVolcanoFloors_h
+	dw RockTunnelB1F_h
 	dw GiovannisRoom_h
 	assert_table_length NUM_MAPS

data/maps/songs.asm

@@ -233,7 +233,7 @@ MapSongBanks::
 	db MUSIC_CITIES2, 0 ; NAME_RATERS_HOUSE
 	db MUSIC_CITIES1, 0 ; CERULEAN_BADGE_HOUSE
 	db MUSIC_DUNGEON3, 0 ; UNUSED_MAP_E7 / Cinnabar Volcano
-	db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
+	db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS
 	db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F
 	db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
 	db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
@@ -248,6 +248,6 @@ MapSongBanks::
 	db MUSIC_GYM, 0 ; LORELEIS_ROOM
 	db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
 	db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM
-	db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS
+	db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_B1F
 	db MUSIC_DUNGEON2, 0 ; GIOVANNIS_ROOM
 	assert_table_length NUM_MAPS

data/maps/sprite_sets.asm

@@ -40,7 +40,7 @@ MapSpriteSets:
 	db SPRITESET_INDIGO          ; ROUTE_23
 	db SPRITESET_PEWTER_CERULEAN ; ROUTE_24
 	db SPRITESET_PEWTER_CERULEAN ; ROUTE_25
-	db SPRITESET_CITRINE         ; CITRINE_CITY
+	db SPRITESET_CITRINE         ; BRUNSWICK_TRAIL
 	assert_table_length FIRST_INDOOR_MAP
 
 ; Format:

data/maps/town_map_entries.asm

@@ -118,12 +118,12 @@ InternalMapEntries:
 	internal_map CERULEAN_CAVE_1F,               9,  1, CeruleanCaveName
 	internal_map NAME_RATERS_HOUSE,             14,  5, LavenderTownName
 	internal_map CERULEAN_BADGE_HOUSE,          10,  2, CeruleanCityName
-	internal_map CINNABAR_VOLCANO, 	             3, 14, CinnabarVolcanoName
+	internal_map CINNABAR_VOLCANO_FLOORS,  	     3, 14, CinnabarVolcanoName
-	internal_map ROCK_TUNNEL_B1F,               14,  3, RockTunnelName
 	internal_map SILPH_CO_ELEVATOR,             10,  5, SilphCoName
 	internal_map UNDERWATER_TUNNEL,             14,  1, UnderwaterTunnelName
 	internal_map CELADON_UNIVERSITY_POKECENTER,  7,  4, CeladonUniversityName
 	internal_map BILLS_GARDEN,                  12,  0, SeaCottageName
 	internal_map AGATHAS_ROOM,                   0,  2, PokemonLeagueName
-	internal_map CINNABAR_VOLCANO_FLOORS,  	     3, 14, CinnabarVolcanoName
+	internal_map ROCK_TUNNEL_B1F,               14,  3, RockTunnelName
+	internal_map GIOVANNIS_ROOM,                 2,  8, ViridianCityName
 	db -1 ; end

data/wild/grass_water.asm

@@ -233,7 +233,7 @@ WildDataPointers:
 	dw NothingWildMons
 	dw NothingWildMons
 	dw CinnabarVolcanoWildMons
-	dw RockTunnelB1FWildMons
+	dw CinnabarVolcanoFloorsWildMons
 	dw NothingWildMons
 	dw NothingWildMons
 	dw NothingWildMons
@@ -248,7 +248,7 @@ WildDataPointers:
 	dw NothingWildMons
 	dw NothingWildMons
 	dw NothingWildMons
-	dw CinnabarVolcanoFloorsWildMons
+	dw RockTunnelB1FWildMons
 	dw NothingWildMons
 	assert_table_length NUM_MAPS
 	dw -1 ; end

engine/gfx/palettes.asm

@@ -144,13 +144,13 @@ SetPal_Overworld:
 	jr z, .PokemonTowerOrAgatha
 	cp CAVERN
 	jr z, .caveOrBruno
-	cp CITRINE
-	jr z, .citrine
 	cp FOREST
 	jr z, .forest
 	cp SHIP
 	jr z, .ship
 	ld a, [wCurMap]
+	cp BRUNSWICK_TRAIL
+	jr z, .brunswick
 	cp FIRST_INDOOR_MAP
 	jr c, .townOrRoute
 	cp POWER_PLANT
@@ -180,56 +180,55 @@ SetPal_Overworld:
 	jr .town
 .caveOrBruno
 	ld a, [wCurMap]
-	cp SEAFOAM_ISLANDS_1F
-	jr z, .seafoam
-	cp CINNABAR_VOLCANO
-	jr z, .volcano
 	cp SEAFOAM_ISLANDS_B1F
 	jr c, .caveDefault
 	cp SEAFOAM_ISLANDS_B4F + 1
 	jr c, .seafoam
+	cp SEAFOAM_ISLANDS_1F
+	jr z, .seafoam
+	cp GARNET_CAVERN_1F
+	jr c, .caveDefault
 	cp GARNET_CAVERN_B1F + 1
 	jr c, .garnet
+	cp CERULEAN_CAVE_1F + 1
+	jr c, .mewtwo
+	cp GARNET_CAVERN_2F + 1
+	jr c, .garnet
+	cp ROCK_TUNNEL_B1F + 1
+	jr c, .caveDefault
 .caveDefault
 	ld a, PAL_CAVE - 1
 	jr .town
 .celeste
 	ld a, PAL_CELESTE - 1
 	jr .town
-.citrine
-	ld a, [wCurMap]
-	cp BRUNSWICK_TRAIL
-	jr z, .brunswick
-	cp CITRINE_CITY
-	jr c, .citrineDefault
-.citrineDefault
-	ld a, PAL_CITRINE - 1
-	jr .town
 .ship
 	ld a, PAL_VERMILION - 1
 	jr .town
 .forest
 	ld a, [wCurMap]
-	cp VIRIDIAN_FOREST
+	cp SILPH_GAUNTLET_1F + 1
-	jr z, .faraway
+	jr c, .faraway
-	cp SILPH_GAUNTLET_1F
-	jr z, .faraway
-	cp MT_MOON_CRATER
-	jr z, .faraway
 	cp SILPH_GAUNTLET_5F
+	jr z, .forestDefault
+	cp MT_MOON_CRATER + 1
+	jr c, .faraway
+	cp SAFARI_ZONE_CENTER + 1`
 	jr c, .forestDefault
+	cp BILLS_GARDEN
+	jr z, .faraway
 .forestDefault
 	ld a, PAL_FUCHSIA - 1
 	jr .town
 .powerPlant
 	ld a, PAL_YELLOWMON - 1
 	jr .town
-.faraway
-	ld a, PAL_ROUTE - 1
-	jr .town
 .brunswick
 	ld a, PAL_BRUNSWICK - 1
 	jr .town
+.faraway
+	ld a, PAL_ROUTE - 1
+	jr .town
 .seafoam
 	ld a, PAL_CYANMON - 1
 	jr .town
@@ -239,6 +238,9 @@ SetPal_Overworld:
 .garnet
 	ld a, PAL_GARNET - 1
 	jr .town
+.mewtwo
+	ld a, PAL_MEWMON - 1
+	jr .town
 
 ; used when a Pokemon is the only thing on the screen
 ; such as evolution, trading and the Hall of Fame