Update songs.asm

Just a handful of music changes.
This commit is contained in:
Martha Schilling 2023-11-15 10:15:25 +00:00 committed by GitHub
parent 13beca68e9
commit 7655162dbd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -38,8 +38,8 @@ MapSongBanks::
db MUSIC_INDIGO_PLATEAU, 0 ; ROUTE_23 db MUSIC_INDIGO_PLATEAU, 0 ; ROUTE_23
db MUSIC_ROUTES2, 0 ; ROUTE_24 db MUSIC_ROUTES2, 0 ; ROUTE_24
db MUSIC_ROUTES2, 0 ; ROUTE_25 db MUSIC_ROUTES2, 0 ; ROUTE_25
db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL
db MUSIC_ROUTES2, 0 ; UNUSED_MAP_F3 / Bill's Garden db MUSIC_ROUTES2, 0 ; BILLS_GARDEN
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F
db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE
@ -72,16 +72,16 @@ MapSongBanks::
db MUSIC_CITIES2, 0 ; BIKE_SHOP db MUSIC_CITIES2, 0 ; BIKE_SHOP
db MUSIC_POKECENTER, 0 ; CERULEAN_MART db MUSIC_POKECENTER, 0 ; CERULEAN_MART
db MUSIC_POKECENTER, 0 ; MT_MOON_POKECENTER db MUSIC_POKECENTER, 0 ; MT_MOON_POKECENTER
db MUSIC_GYM, 0 ; VIRIDIAN_PRE_GYM, was CERULEAN_TRASHED_HOUSE_COPY db MUSIC_GYM, 0 ; VIRIDIAN_PRE_GYM
db MUSIC_CITIES1, 0 ; ROUTE_5_GATE db MUSIC_CITIES1, 0 ; ROUTE_5_GATE
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_5 db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_5
db MUSIC_CITIES1, 0 ; DAYCARE db MUSIC_CITIES2, 0 ; DAYCARE
db MUSIC_CITIES1, 0 ; ROUTE_6_GATE db MUSIC_CITIES1, 0 ; ROUTE_6_GATE
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_6 db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_6
db MUSIC_KINCHOU01, 0 ; CELESTE_HILL, was UNDERGROUND_PATH_ROUTE_6_COPY db MUSIC_KINCHOU01, 0 ; CELESTE_HILL
db MUSIC_CITIES1, 0 ; ROUTE_7_GATE db MUSIC_CITIES1, 0 ; ROUTE_7_GATE
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_7 db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_7
db MUSIC_DUNGEON1, 0 ; Rocket House, UNDERGROUND_PATH_ROUTE_7_COPY db MUSIC_DUNGEON1, 0 ; CITRINE_ROCKET_HOUSE
db MUSIC_CITIES1, 0 ; ROUTE_8_GATE db MUSIC_CITIES1, 0 ; ROUTE_8_GATE
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_8 db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_8
db MUSIC_POKECENTER, 0 ; ROCK_TUNNEL_POKECENTER db MUSIC_POKECENTER, 0 ; ROCK_TUNNEL_POKECENTER
@ -108,19 +108,19 @@ MapSongBanks::
db MUSIC_SS_ANNE, 0 ; SS_ANNE_1F_ROOMS db MUSIC_SS_ANNE, 0 ; SS_ANNE_1F_ROOMS
db MUSIC_SS_ANNE, 0 ; SS_ANNE_2F_ROOMS db MUSIC_SS_ANNE, 0 ; SS_ANNE_2F_ROOMS
db MUSIC_SS_ANNE, 0 ; SS_ANNE_B1F_ROOMS db MUSIC_SS_ANNE, 0 ; SS_ANNE_B1F_ROOMS
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_69 / Gauntlet 1F db MUSIC_DUNGEON2, 0 ; SILPH_GAUNTLET_1F
db MUSIC_DUNGEON3, 0 ; UNUSED_MAP_6A / Gauntlet 2F db MUSIC_DUNGEON3, 0 ; SILPH_GAUNTLET_2F
db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_6B / Gauntlet 3F db MUSIC_SS_ANNE, 0 ; SILPH_GAUNTLET_3F
db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F
db MUSIC_POKEMON_TOWER, 0 ; UNUSED_MAP_6D / Gauntlet 4F db MUSIC_POKEMON_TOWER, 0 ; SILPH_GAUNTLET_4F
db MUSIC_SAFARI_ZONE, 0 ; UNUSED_MAP_6E / Gauntlet 5F db MUSIC_SAFARI_ZONE, 0 ; SILPH_GAUNTLET_5F
db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_6F / Gauntlet 6F db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_6F
db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_70 / Gauntlet 7F db MUSIC_SILPH_CO, 0 ; SILPH_GAUNTLET_7F
db MUSIC_INDIGO_PLATEAU, 0 ; LANCES_ROOM db MUSIC_INDIGO_PLATEAU, 0 ; LANCES_ROOM
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE db MUSIC_DUNGEON2, 0 ; FARAWAY_ISLAND_INSIDE
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE db MUSIC_DUNGEON2, 0 ; FARAWAY_ISLAND_OUTSIDE
db MUSIC_CINNABAR_MANSION, 0 ; UNUSED_MAP_74 / POKEMON MANSION B2F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B2F
db MUSIC_AREA_ZERO, 0 ; UNUSED_MAP_75 / MT. MOON CRATER db MUSIC_AREA_ZERO, 0 ; MT_MOON_CRATER
db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME
db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH
db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM
@ -148,8 +148,7 @@ MapSongBanks::
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F
db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO db MUSIC_KINCHOU01, 0 ; BRUNSWICK_GROTTO
;db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_3F db MUSIC_FIELD06, 0 ; CELESTE_HILL_GATE
db MUSIC_FIELD06, 0 ; Celeste Hill Gate, was POKEMON_TOWER_4F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_7F db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_7F
@ -167,8 +166,8 @@ MapSongBanks::
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B2F db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B2F
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B3F db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B3F
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B4F db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B4F
db MUSIC_CITIES2, 0 ; CITRINE_TRADEBACK_HOUSE, was old rod house db MUSIC_CITRINE, 0 ; CITRINE_TRADEBACK_HOUSE
db MUSIC_POKECENTER, 0 ; CITRINE_POKECENTER was good rod house db MUSIC_POKECENTER, 0 ; CITRINE_POKECENTER
db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_1F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_1F
db MUSIC_GYM, 0 ; CINNABAR_GYM db MUSIC_GYM, 0 ; CINNABAR_GYM
db MUSIC_CINNABAR, 0 ; CINNABAR_LAB db MUSIC_CINNABAR, 0 ; CINNABAR_LAB
@ -180,7 +179,7 @@ MapSongBanks::
db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY
db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F
db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F
db MUSIC_CITIES1, 0 ; FIGHTING_DOJO db MUSIC_GYM, 0 ; FIGHTING_DOJO
db MUSIC_GYM, 0 ; SAFFRON_GYM db MUSIC_GYM, 0 ; SAFFRON_GYM
db MUSIC_CITIES1, 0 ; SAFFRON_PIDGEY_HOUSE db MUSIC_CITIES1, 0 ; SAFFRON_PIDGEY_HOUSE
db MUSIC_POKECENTER, 0 ; SAFFRON_MART db MUSIC_POKECENTER, 0 ; SAFFRON_MART
@ -207,16 +206,15 @@ MapSongBanks::
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B3F db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B3F
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR
db MUSIC_POKECENTER, 0 ; CITRINE_MART, was UNUSED_MAP_CC db MUSIC_POKECENTER, 0 ; CITRINE_MART
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_1F, was UNUSED_MAP_CD db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_1F
db MUSIC_KINCHOU01, 0 ; GARNET_CAVERN_B1F, was UNUSED_MAP_CE db MUSIC_KINCHOU01, 0 ; GARNET_CAVERN_B1F
db MUSIC_VERMILION, 0 ; VERMILION_FERRY_DOCK db MUSIC_VERMILION, 0 ; VERMILION_FERRY_DOCK
db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F
db MUSIC_CITRINE, 0 ; CITRINE_FERRY_DOCK db MUSIC_CITRINE, 0 ; CITRINE_FERRY_DOCK
db MUSIC_SILPH_CO, 0 ; SILPH_CO_5F db MUSIC_SILPH_CO, 0 ; SILPH_CO_5F
db MUSIC_VERMILION, 0 ; SEAGALLOP_FERRY db MUSIC_VERMILION, 0 ; SEAGALLOP_FERRY
db MUSIC_SILPH_CO, 0 ; SILPH_CO_7F db MUSIC_SILPH_CO, 0 ; SILPH_CO_7F
;db MUSIC_SILPH_CO, 0 ; SILPH_CO_8F
db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_2F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_2F
db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_3F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_3F
db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B1F db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B1F
@ -232,20 +230,20 @@ MapSongBanks::
db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_2F db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_2F
db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_B1F db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_B1F
db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_1F db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_1F
db MUSIC_CITIES2, 0 ; NAME_RATERS_HOUSE db MUSIC_LAVENDER, 0 ; NAME_RATERS_HOUSE
db MUSIC_CITIES1, 0 ; CERULEAN_BADGE_HOUSE db MUSIC_CITIES2, 0 ; CERULEAN_BADGE_HOUSE
db MUSIC_DUNGEON3, 0 ; UNUSED_MAP_E7 / Cinnabar Volcano db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO
db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS db MUSIC_DUNGEON3, 0 ; CINNABAR_VOLCANO_FLOORS
db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F db MUSIC_SILPH_CO, 0 ; SILPH_CO_9F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR
db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F, was UNUSED_MAP_ED db MUSIC_DUNGEON1, 0 ; GARNET_CAVERN_2F
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_EE / Underwater Tunnel db MUSIC_DUNGEON2, 0 ; UNDERWATER_TUNNEL
db MUSIC_CELADON, 0 ; TRADE_CENTER db MUSIC_CITRINE, 0 ; TRADE_CENTER
db MUSIC_CELADON, 0 ; COLOSSEUM db MUSIC_GYM, 0 ; COLOSSEUM
db MUSIC_OAKS_LAB, 0 ; UNUSED_MAP_F1 / Celadon University Outside db MUSIC_OAKS_LAB, 0 ; CELADON_UNIVERSITY_INSIDE
db MUSIC_POKECENTER, 0 ; UNUSED_MAP_F2 / Celadon University Pokecenter db MUSIC_POKECENTER, 0 ; CELADON_UNIVERSITY_POKECENTER
db MUSIC_GYM, 0 ; LORELEIS_ROOM db MUSIC_GYM, 0 ; LORELEIS_ROOM
db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM db MUSIC_DUNGEON1, 0 ; BRUNOS_ROOM
db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM db MUSIC_POKEMON_TOWER, 0 ; AGATHAS_ROOM