Palette fixes

This should fix some issues with map palettes being displayed incorrectly, as well as giving a unique palette to Cerulean Cave.
This commit is contained in:
MementoMartha 2023-05-07 10:34:21 +01:00
parent febb20c418
commit 466b1992b1
8 changed files with 41 additions and 39 deletions

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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:

View file

@ -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 ROCK_TUNNEL_B1F, 14, 3, RockTunnelName
internal_map CINNABAR_VOLCANO_FLOORS, 3, 14, CinnabarVolcanoName
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