mirror of
https://github.com/thornAvery/kep-hack.git
synced 2025-09-16 18:30:50 +12:00
b6dc6896c3
This adds a map for Cinnabar Volcano's floors in the run-up to Moltres. I used a S.S. Anne style compression technique here, having 4 floors on a decently sized map that are just far enough apart for a player to never actually see them. This maintains their suspension of disbelief while giving us way more space to work with. I want to compress a lot of RBY maps like this if push comes to shove - there's a lot of places where this is possible. In the interests of compression, I started using the Agatha bank again, as I removed a lot of maps from there when making bank 22. There's some space for maps. Also I made 3 more blocks for cavern which caused it to overflow the bank it was in - fixed that by swapping with PreGym, which is probably much smaller. Cinnabar Volcano hasn't been changed yet in the interest of Martha finishing that bit up.
253 lines
10 KiB
NASM
253 lines
10 KiB
NASM
MapSongBanks::
|
|
table_width 2, MapSongBanks
|
|
db MUSIC_PALLET_TOWN, 0 ; PALLET_TOWN
|
|
db MUSIC_CITIES1, 0 ; VIRIDIAN_CITY
|
|
db MUSIC_CITIES1, 0 ; PEWTER_CITY
|
|
db MUSIC_CITIES2, 0 ; CERULEAN_CITY
|
|
db MUSIC_VERMILION, 0 ; VERMILION_CITY
|
|
db MUSIC_LAVENBAR, 0 ; LAVENDER_TOWN
|
|
db MUSIC_CELADON, 0 ; CELADON_CITY
|
|
db MUSIC_CELADON, 0 ; CELADON_UNIVERSITY_OUTSIDE
|
|
db MUSIC_CITIES2, 0 ; FUCHSIA_CITY
|
|
db MUSIC_CITIES1, 0 ; SAFFRON_CITY
|
|
db MUSIC_CINNABAR, 0 ; CINNABAR_ISLAND
|
|
db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU
|
|
db MUSIC_CITIES1, 0 ; CITRINE_CITY
|
|
db MUSIC_ROUTES1, 0 ; ROUTE_1
|
|
db MUSIC_ROUTES1, 0 ; ROUTE_2
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_3
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_4
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_5
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_6
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_7
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_8
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_9
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_10
|
|
db MUSIC_ROUTES4, 0 ; ROUTE_11
|
|
db MUSIC_ROUTES4, 0 ; ROUTE_12
|
|
db MUSIC_ROUTES4, 0 ; ROUTE_13
|
|
db MUSIC_ROUTES4, 0 ; ROUTE_14
|
|
db MUSIC_ROUTES4, 0 ; ROUTE_15
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_16
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_17
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_18
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_19
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_20
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_21
|
|
db MUSIC_ROUTES3, 0 ; ROUTE_22
|
|
db MUSIC_INDIGO_PLATEAU, 0 ; ROUTE_23
|
|
db MUSIC_ROUTES2, 0 ; ROUTE_24
|
|
db MUSIC_ROUTES2, 0 ; ROUTE_25
|
|
db MUSIC_FIELD06, 0 ; BRUNSWICK_TRAIL, was CINNABAR_MART_COPY
|
|
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_1F
|
|
db MUSIC_PALLET_TOWN, 0 ; REDS_HOUSE_2F
|
|
db MUSIC_PALLET_TOWN, 0 ; BLUES_HOUSE
|
|
db MUSIC_OAKS_LAB, 0 ; OAKS_LAB
|
|
db MUSIC_POKECENTER, 0 ; VIRIDIAN_POKECENTER
|
|
db MUSIC_POKECENTER, 0 ; VIRIDIAN_MART
|
|
db MUSIC_CITIES1, 0 ; VIRIDIAN_SCHOOL_HOUSE
|
|
db MUSIC_CITIES1, 0 ; VIRIDIAN_NICKNAME_HOUSE
|
|
db MUSIC_GYM, 0 ; VIRIDIAN_GYM
|
|
db MUSIC_DIGDA01, 0 ; DIGLETTS_CAVE_ROUTE_2
|
|
db MUSIC_CITIES1, 0 ; VIRIDIAN_FOREST_NORTH_GATE
|
|
db MUSIC_CITIES1, 0 ; ROUTE_2_TRADE_HOUSE
|
|
db MUSIC_CITIES1, 0 ; ROUTE_2_GATE
|
|
db MUSIC_CITIES1, 0 ; VIRIDIAN_FOREST_SOUTH_GATE
|
|
db MUSIC_DUNGEON2, 0 ; VIRIDIAN_FOREST
|
|
db MUSIC_CITIES1, 0 ; MUSEUM_1F
|
|
db MUSIC_CITIES1, 0 ; MUSEUM_2F
|
|
db MUSIC_GYM, 0 ; PEWTER_GYM
|
|
db MUSIC_CITIES1, 0 ; PEWTER_NIDORAN_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; PEWTER_MART
|
|
db MUSIC_CITIES1, 0 ; PEWTER_SPEECH_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; PEWTER_POKECENTER
|
|
db MUSIC_DUNGEON3, 0 ; MT_MOON_1F
|
|
db MUSIC_DUNGEON3, 0 ; MT_MOON_B1F
|
|
db MUSIC_DUNGEON3, 0 ; MT_MOON_B2F
|
|
db MUSIC_CITIES2, 0 ; CERULEAN_TRASHED_HOUSE
|
|
db MUSIC_CITIES2, 0 ; CERULEAN_TRADE_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; CERULEAN_POKECENTER
|
|
db MUSIC_GYM, 0 ; CERULEAN_GYM
|
|
db MUSIC_CITIES2, 0 ; BIKE_SHOP
|
|
db MUSIC_POKECENTER, 0 ; CERULEAN_MART
|
|
db MUSIC_POKECENTER, 0 ; MT_MOON_POKECENTER
|
|
db MUSIC_GYM, 0 ; VIRIDIAN_PRE_GYM, was CERULEAN_TRASHED_HOUSE_COPY
|
|
db MUSIC_CITIES1, 0 ; ROUTE_5_GATE
|
|
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_5
|
|
db MUSIC_CITIES1, 0 ; DAYCARE
|
|
db MUSIC_CITIES1, 0 ; ROUTE_6_GATE
|
|
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_6
|
|
db MUSIC_DUNGEON2, 0 ; CELESTE_HILL, was UNDERGROUND_PATH_ROUTE_6_COPY
|
|
db MUSIC_CITIES1, 0 ; ROUTE_7_GATE
|
|
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_7
|
|
db MUSIC_DUNGEON1, 0 ; Rocket House, UNDERGROUND_PATH_ROUTE_7_COPY
|
|
db MUSIC_CITIES1, 0 ; ROUTE_8_GATE
|
|
db MUSIC_CITIES1, 0 ; UNDERGROUND_PATH_ROUTE_8
|
|
db MUSIC_POKECENTER, 0 ; ROCK_TUNNEL_POKECENTER
|
|
db MUSIC_DUNGEON3, 0 ; ROCK_TUNNEL_1F
|
|
db MUSIC_DUNGEON1, 0 ; POWER_PLANT
|
|
db MUSIC_VERMILION, 0 ; ROUTE_11_GATE_1F
|
|
db MUSIC_DIGDA01, 0 ; DIGLETTS_CAVE_ROUTE_11
|
|
db MUSIC_VERMILION, 0 ; ROUTE_11_GATE_2F
|
|
db MUSIC_CITIES1, 0 ; ROUTE_12_GATE_1F
|
|
db MUSIC_CITIES2, 0 ; BILLS_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; VERMILION_POKECENTER
|
|
db MUSIC_VERMILION, 0 ; POKEMON_FAN_CLUB
|
|
db MUSIC_POKECENTER, 0 ; VERMILION_MART
|
|
db MUSIC_GYM, 0 ; VERMILION_GYM
|
|
db MUSIC_VERMILION, 0 ; VERMILION_PIDGEY_HOUSE
|
|
db MUSIC_SS_ANNE, 0 ; VERMILION_DOCK
|
|
db MUSIC_SS_ANNE, 0 ; SS_ANNE_1F
|
|
db MUSIC_SS_ANNE, 0 ; SS_ANNE_2F
|
|
db MUSIC_SS_ANNE, 0 ; SS_ANNE_3F
|
|
db MUSIC_SS_ANNE, 0 ; SS_ANNE_B1F
|
|
db MUSIC_SS_ANNE, 0 ; SS_ANNE_BOW
|
|
db MUSIC_SS_ANNE, 0 ; SS_ANNE_KITCHEN
|
|
db MUSIC_SS_ANNE, 0 ; SS_ANNE_CAPTAINS_ROOM
|
|
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_B1F_ROOMS
|
|
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_69 / Gauntlet 1F
|
|
db MUSIC_DUNGEON3, 0 ; UNUSED_MAP_6A / Gauntlet 2F
|
|
db MUSIC_SS_ANNE, 0 ; UNUSED_MAP_6B / Gauntlet 3F
|
|
db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_1F
|
|
db MUSIC_POKEMON_TOWER, 0 ; UNUSED_MAP_6D / Gauntlet 4F
|
|
db MUSIC_SAFARI_ZONE, 0 ; UNUSED_MAP_6E / Gauntlet 5F
|
|
db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_6F / Gauntlet 6F
|
|
db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_70 / Gauntlet 7F
|
|
db MUSIC_INDIGO_PLATEAU, 0 ; LANCES_ROOM
|
|
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_72 / FARAWAY ISLAND INSIDE
|
|
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_73 / FARAWAY ISLAND OUTSIDE
|
|
db MUSIC_CINNABAR_MANSION, 0 ; UNUSED_MAP_74 / POKEMON MANSION B2F
|
|
db MUSIC_MTMOONSQUARE, 0 ; UNUSED_MAP_75 / MT. MOON CRATER
|
|
db MUSIC_PALLET_TOWN, 0 ; HALL_OF_FAME
|
|
db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_NORTH_SOUTH
|
|
db MUSIC_INDIGO_PLATEAU, 0 ; CHAMPIONS_ROOM
|
|
db MUSIC_ROUTES1, 0 ; UNDERGROUND_PATH_WEST_EAST
|
|
db MUSIC_POKECENTER, 0 ; CELADON_MART_1F
|
|
db MUSIC_POKECENTER, 0 ; CELADON_MART_2F
|
|
db MUSIC_POKECENTER, 0 ; CELADON_MART_3F
|
|
db MUSIC_POKECENTER, 0 ; CELADON_MART_4F
|
|
db MUSIC_POKECENTER, 0 ; CELADON_MART_ROOF
|
|
db MUSIC_POKECENTER, 0 ; CELADON_MART_ELEVATOR
|
|
db MUSIC_CELADON, 0 ; CELADON_MANSION_1F
|
|
db MUSIC_CELADON, 0 ; CELADON_MANSION_2F
|
|
db MUSIC_CELADON, 0 ; CELADON_MANSION_3F
|
|
db MUSIC_CELADON, 0 ; CELADON_MANSION_ROOF
|
|
db MUSIC_CELADON, 0 ; CELADON_MANSION_ROOF_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; CELADON_POKECENTER
|
|
db MUSIC_GYM, 0 ; CELADON_GYM
|
|
db MUSIC_GAME_CORNER, 0 ; GAME_CORNER
|
|
db MUSIC_POKECENTER, 0 ; CELADON_MART_5F
|
|
db MUSIC_CELADON, 0 ; GAME_CORNER_PRIZE_ROOM
|
|
db MUSIC_CELADON, 0 ; CELADON_DINER
|
|
db MUSIC_CELADON, 0 ; CELADON_CHIEF_HOUSE
|
|
db MUSIC_CELADON, 0 ; CELADON_HOTEL
|
|
db MUSIC_POKECENTER, 0 ; LAVENDER_POKECENTER
|
|
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_1F
|
|
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_2F
|
|
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_3F
|
|
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_4F
|
|
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_5F
|
|
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_6F
|
|
db MUSIC_POKEMON_TOWER, 0 ; POKEMON_TOWER_7F
|
|
db MUSIC_LAVENDER, 0 ; MR_FUJIS_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; LAVENDER_MART
|
|
db MUSIC_LAVENDER, 0 ; LAVENDER_CUBONE_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; FUCHSIA_MART
|
|
db MUSIC_CITIES2, 0 ; FUCHSIA_BILLS_GRANDPAS_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; FUCHSIA_POKECENTER
|
|
db MUSIC_CITIES2, 0 ; WARDENS_HOUSE
|
|
db MUSIC_CITIES2, 0 ; SAFARI_ZONE_GATE
|
|
db MUSIC_GYM, 0 ; FUCHSIA_GYM
|
|
db MUSIC_CITIES2, 0 ; FUCHSIA_MEETING_ROOM
|
|
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B1F
|
|
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B2F
|
|
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B3F
|
|
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_B4F
|
|
db MUSIC_CITIES2, 0 ; CITRINE_TRADEBACK_HOUSE, was old rod house
|
|
db MUSIC_POKECENTER, 0 ; CITRINE_POKECENTER was good rod house
|
|
db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_1F
|
|
db MUSIC_GYM, 0 ; CINNABAR_GYM
|
|
db MUSIC_CINNABAR, 0 ; CINNABAR_LAB
|
|
db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_TRADE_ROOM
|
|
db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_METRONOME_ROOM
|
|
db MUSIC_CINNABAR, 0 ; CINNABAR_LAB_FOSSIL_ROOM
|
|
db MUSIC_POKECENTER, 0 ; CINNABAR_POKECENTER
|
|
db MUSIC_POKECENTER, 0 ; CINNABAR_MART
|
|
db MUSIC_INDIGO_PLATEAU, 0 ; INDIGO_PLATEAU_LOBBY
|
|
db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_1F
|
|
db MUSIC_CITIES1, 0 ; COPYCATS_HOUSE_2F
|
|
db MUSIC_CITIES1, 0 ; FIGHTING_DOJO
|
|
db MUSIC_GYM, 0 ; SAFFRON_GYM
|
|
db MUSIC_CITIES1, 0 ; SAFFRON_PIDGEY_HOUSE
|
|
db MUSIC_POKECENTER, 0 ; SAFFRON_MART
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_1F
|
|
db MUSIC_POKECENTER, 0 ; SAFFRON_POKECENTER
|
|
db MUSIC_CITIES1, 0 ; MR_PSYCHICS_HOUSE
|
|
db MUSIC_CITIES1, 0 ; ROUTE_15_GATE_1F
|
|
db MUSIC_CITIES1, 0 ; ROUTE_15_GATE_2F
|
|
db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_1F
|
|
db MUSIC_CITIES1, 0 ; ROUTE_16_GATE_2F
|
|
db MUSIC_CELADON, 0 ; ROUTE_16_FLY_HOUSE
|
|
db MUSIC_CITIES1, 0 ; ROUTE_12_SUPER_ROD_HOUSE
|
|
db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_1F
|
|
db MUSIC_CITIES1, 0 ; ROUTE_18_GATE_2F
|
|
db MUSIC_DUNGEON2, 0 ; SEAFOAM_ISLANDS_1F
|
|
db MUSIC_DUNGEON2, 0 ; ROUTE_22_GATE
|
|
db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_2F
|
|
db MUSIC_CITIES1, 0 ; ROUTE_12_GATE_2F
|
|
db MUSIC_VERMILION, 0 ; VERMILION_TRADE_HOUSE
|
|
db MUSIC_DIGDA01, 0 ; DIGLETTS_CAVE
|
|
db MUSIC_DUNGEON3, 0 ; VICTORY_ROAD_3F
|
|
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B1F
|
|
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B2F
|
|
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B3F
|
|
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_B4F
|
|
db MUSIC_DUNGEON1, 0 ; ROCKET_HIDEOUT_ELEVATOR
|
|
db MUSIC_POKECENTER, 0 ; CITRINE_MART, was UNUSED_MAP_CC
|
|
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_1F, was UNUSED_MAP_CD
|
|
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_2F, was UNUSED_MAP_CE
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_2F
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_3F
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_4F
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_5F
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_6F
|
|
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_3F
|
|
db MUSIC_CINNABAR_MANSION, 0 ; POKEMON_MANSION_B1F
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_EAST
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_NORTH
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_WEST
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_CENTER
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_CENTER_REST_HOUSE
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_SECRET_HOUSE
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_WEST_REST_HOUSE
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_EAST_REST_HOUSE
|
|
db MUSIC_SAFARI_ZONE, 0 ; SAFARI_ZONE_NORTH_REST_HOUSE
|
|
db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_2F
|
|
db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_B1F
|
|
db MUSIC_DUNGEON1, 0 ; CERULEAN_CAVE_1F
|
|
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_SILPH_CO, 0 ; SILPH_CO_9F
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_10F
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_11F
|
|
db MUSIC_SILPH_CO, 0 ; SILPH_CO_ELEVATOR
|
|
db MUSIC_DUNGEON3, 0 ; GARNET_CAVERN_2F, was UNUSED_MAP_ED
|
|
db MUSIC_DUNGEON2, 0 ; UNUSED_MAP_EE / Underwater Tunnel
|
|
db MUSIC_CELADON, 0 ; TRADE_CENTER
|
|
db MUSIC_CELADON, 0 ; COLOSSEUM
|
|
db MUSIC_OAKS_LAB, 0 ; UNUSED_MAP_F1 / Celadon University Outside
|
|
db MUSIC_POKECENTER, 0 ; UNUSED_MAP_F2 / Celadon University Pokecenter
|
|
db MUSIC_SILPH_CO, 0 ; UNUSED_MAP_F3
|
|
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
|
|
assert_table_length NUM_MAPS
|