Mark unknown houses as unused and name some unnamed script labels (#1198)

This commit is contained in:
Viperio
2026-06-14 03:32:21 +02:00
committed by GitHub
parent 71cc6e51da
commit f17eaeb7cf
48 changed files with 241 additions and 241 deletions

View File

@@ -141,17 +141,17 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = FALSE,
},
[MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_1] = {
[MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_1] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0x14,
.mapMatrixID = map_matrix_123,
.scriptsArchiveID = scripts_jubilife_city_unknown_house_1,
.initScriptsArchiveID = scripts_init_jubilife_city_unknown_house_1,
.msgArchiveID = TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_1,
.scriptsArchiveID = scripts_unused_jubilife_city_house_1,
.initScriptsArchiveID = scripts_init_unused_jubilife_city_house_1,
.msgArchiveID = TEXT_BANK_UNUSED_JUBILIFE_CITY_HOUSE_1,
.dayMusicID = SEQ_GYM,
.nightMusicID = SEQ_GYM,
.wildEncountersArchiveID = ENCOUNTERS_NONE,
.eventsArchiveID = events_jubilife_city_unknown_house_1,
.eventsArchiveID = events_unused_jubilife_city_house_1,
.mapLabelTextID = LocationNames_Text_JubilifeCity,
.mapLabelWindowID = MAP_LABEL_WINDOW_WATER,
.weather = OVERWORLD_WEATHER_CLEAR,
@@ -537,17 +537,17 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = FALSE,
},
[MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_2] = {
[MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_2] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0x14,
.mapMatrixID = map_matrix_125,
.scriptsArchiveID = scripts_jubilife_city_unknown_house_2,
.initScriptsArchiveID = scripts_init_jubilife_city_unknown_house_2,
.msgArchiveID = TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_2,
.scriptsArchiveID = scripts_unused_jubilife_city_house_2,
.initScriptsArchiveID = scripts_init_unused_jubilife_city_house_2,
.msgArchiveID = TEXT_BANK_UNUSED_JUBILIFE_CITY_HOUSE_2,
.dayMusicID = SEQ_DUMMY,
.nightMusicID = SEQ_DUMMY,
.wildEncountersArchiveID = ENCOUNTERS_NONE,
.eventsArchiveID = events_jubilife_city_unknown_house_2,
.eventsArchiveID = events_unused_jubilife_city_house_2,
.mapLabelTextID = LocationNames_Text_JubilifeCity,
.mapLabelWindowID = MAP_LABEL_WINDOW_WATER,
.weather = OVERWORLD_WEATHER_CLEAR,
@@ -713,17 +713,17 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = FALSE,
},
[MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_3] = {
[MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_3] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0x14,
.mapMatrixID = map_matrix_125,
.scriptsArchiveID = scripts_jubilife_city_unknown_house_3,
.initScriptsArchiveID = scripts_init_jubilife_city_unknown_house_3,
.msgArchiveID = TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_3,
.scriptsArchiveID = scripts_unused_jubilife_city_house_3,
.initScriptsArchiveID = scripts_init_unused_jubilife_city_house_3,
.msgArchiveID = TEXT_BANK_UNUSED_JUBILIFE_CITY_HOUSE_3,
.dayMusicID = SEQ_DUMMY,
.nightMusicID = SEQ_DUMMY,
.wildEncountersArchiveID = ENCOUNTERS_NONE,
.eventsArchiveID = events_jubilife_city_unknown_house_3,
.eventsArchiveID = events_unused_jubilife_city_house_3,
.mapLabelTextID = LocationNames_Text_JubilifeCity,
.mapLabelWindowID = MAP_LABEL_WINDOW_WATER,
.weather = OVERWORLD_WEATHER_CLEAR,
@@ -735,17 +735,17 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = FALSE,
},
[MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_4] = {
[MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_4] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0x14,
.mapMatrixID = map_matrix_125,
.scriptsArchiveID = scripts_jubilife_city_unknown_house_4,
.initScriptsArchiveID = scripts_init_jubilife_city_unknown_house_4,
.msgArchiveID = TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_4,
.scriptsArchiveID = scripts_unused_jubilife_city_house_4,
.initScriptsArchiveID = scripts_init_unused_jubilife_city_house_4,
.msgArchiveID = TEXT_BANK_UNUSED_JUBILIFE_CITY_HOUSE_4,
.dayMusicID = SEQ_DUMMY,
.nightMusicID = SEQ_DUMMY,
.wildEncountersArchiveID = ENCOUNTERS_NONE,
.eventsArchiveID = events_jubilife_city_unknown_house_4,
.eventsArchiveID = events_unused_jubilife_city_house_4,
.mapLabelTextID = LocationNames_Text_JubilifeCity,
.mapLabelWindowID = MAP_LABEL_WINDOW_WATER,
.weather = OVERWORLD_WEATHER_CLEAR,
@@ -1901,7 +1901,7 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = FALSE,
},
[MAP_HEADER_ETERNA_CITY_UNKNOWN_HOUSE] = {
[MAP_HEADER_UNUSED_ETERNA_CITY_HOUSE] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0x14,
.mapMatrixID = map_matrix_123,
@@ -1911,7 +1911,7 @@ static const MapHeader sMapHeaders[] = {
.dayMusicID = SEQ_DUMMY,
.nightMusicID = SEQ_DUMMY,
.wildEncountersArchiveID = ENCOUNTERS_NONE,
.eventsArchiveID = events_eterna_city_unknown_house,
.eventsArchiveID = events_unused_eterna_city_house,
.mapLabelTextID = LocationNames_Text_EternaCity,
.mapLabelWindowID = MAP_LABEL_WINDOW_WATER,
.weather = OVERWORLD_WEATHER_CLEAR,
@@ -3573,17 +3573,17 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = FALSE,
},
[MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_1] = {
[MAP_HEADER_UNUSED_SUNYSHORE_CITY_HOUSE_1] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0xF,
.mapMatrixID = map_matrix_243,
.scriptsArchiveID = scripts_sunyshore_city_unknown_house_1,
.initScriptsArchiveID = scripts_init_sunyshore_city_unknown_house_1,
.msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_UNKNOWN_HOUSE_1,
.scriptsArchiveID = scripts_unused_sunyshore_city_house_1,
.initScriptsArchiveID = scripts_init_unused_sunyshore_city_house_1,
.msgArchiveID = TEXT_BANK_UNUSED_SUNYSHORE_CITY_HOUSE_1,
.dayMusicID = SEQ_CITY08_D,
.nightMusicID = SEQ_CITY08_N,
.wildEncountersArchiveID = ENCOUNTERS_NONE,
.eventsArchiveID = events_sunyshore_city_unknown_house_1,
.eventsArchiveID = events_unused_sunyshore_city_house_1,
.mapLabelTextID = LocationNames_Text_SunyshoreCity,
.mapLabelWindowID = MAP_LABEL_WINDOW_WATER,
.weather = OVERWORLD_WEATHER_CLEAR,
@@ -3595,17 +3595,17 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = FALSE,
},
[MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_2] = {
[MAP_HEADER_UNUSED_SUNYSHORE_CITY_HOUSE_2] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0xF,
.mapMatrixID = map_matrix_243,
.scriptsArchiveID = scripts_sunyshore_city_unknown_house_2,
.initScriptsArchiveID = scripts_init_sunyshore_city_unknown_house_2,
.msgArchiveID = TEXT_BANK_SUNYSHORE_CITY_UNKNOWN_HOUSE_2,
.scriptsArchiveID = scripts_unused_sunyshore_city_house_2,
.initScriptsArchiveID = scripts_init_unused_sunyshore_city_house_2,
.msgArchiveID = TEXT_BANK_UNUSED_SUNYSHORE_CITY_HOUSE_2,
.dayMusicID = SEQ_CITY08_D,
.nightMusicID = SEQ_CITY08_N,
.wildEncountersArchiveID = ENCOUNTERS_NONE,
.eventsArchiveID = events_sunyshore_city_unknown_house_2,
.eventsArchiveID = events_unused_sunyshore_city_house_2,
.mapLabelTextID = LocationNames_Text_SunyshoreCity,
.mapLabelWindowID = MAP_LABEL_WINDOW_WATER,
.weather = OVERWORLD_WEATHER_CLEAR,
@@ -4343,7 +4343,7 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = FALSE,
},
[MAP_HEADER_FIGHT_AREA_UNKNOWN_HOUSE] = {
[MAP_HEADER_UNUSED_FIGHT_AREA_HOUSE] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0xF,
.mapMatrixID = map_matrix_123,
@@ -7401,17 +7401,17 @@ static const MapHeader sMapHeaders[] = {
.isEscapeRopeAllowed = FALSE,
.isFlyAllowed = TRUE,
},
[MAP_HEADER_VERITY_LAKEFRONT_UNKNOWN_HOUSE] = {
[MAP_HEADER_UNUSED_VERITY_LAKEFRONT_HOUSE] = {
.areaDataArchiveID = area_data_020,
.unk_01 = 0x14,
.mapMatrixID = map_matrix_123,
.scriptsArchiveID = scripts_verity_lakefront_unknown_house,
.initScriptsArchiveID = scripts_init_verity_lakefront_unknown_house,
.msgArchiveID = TEXT_BANK_VERITY_LAKEFRONT_UNKNOWN_HOUSE,
.scriptsArchiveID = scripts_unused_verity_lakefront_house,
.initScriptsArchiveID = scripts_init_unused_verity_lakefront_house,
.msgArchiveID = TEXT_BANK_UNUSED_VERITY_LAKEFRONT_HOUSE,
.dayMusicID = SEQ_ROAD_A_D,
.nightMusicID = SEQ_ROAD_A_N,
.wildEncountersArchiveID = ENCOUNTERS_NONE,
.eventsArchiveID = events_verity_lakefront_unknown_house,
.eventsArchiveID = events_unused_verity_lakefront_house,
.mapLabelTextID = LocationNames_Text_VerityLakefront,
.mapLabelWindowID = MAP_LABEL_WINDOW_WATER,
.weather = OVERWORLD_WEATHER_CLEAR,