diff --git a/generated/map_headers.txt b/generated/map_headers.txt index 9abcbe2f9f..b389d7a440 100644 --- a/generated/map_headers.txt +++ b/generated/map_headers.txt @@ -3,7 +3,7 @@ MAP_HEADER_NOTHING MAP_HEADER_UNDERGROUND MAP_HEADER_JUBILIFE_CITY MAP_HEADER_JUBILIFE_CITY_MART -MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_1 +MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_1 MAP_HEADER_JUBILIFE_CITY_POKECENTER_1F MAP_HEADER_JUBILIFE_CITY_POKECENTER_2F MAP_HEADER_POKETCH_CO_1F @@ -21,7 +21,7 @@ MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_1F MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_2F MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_3F MAP_HEADER_JUBILIFE_CITY_SOUTH_HOUSE_4F -MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_2 +MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_2 MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_1F MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_2F MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_3F @@ -29,8 +29,8 @@ MAP_HEADER_JUBILIFE_CITY_CONDOMINIUMS_4F MAP_HEADER_GLOBAL_TERMINAL_1F MAP_HEADER_TRAINERS_SCHOOL MAP_HEADER_JUBILIFE_CITY_SOUTHWEST_HOUSE_1F -MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_3 -MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_4 +MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_3 +MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_4 MAP_HEADER_CANALAVE_CITY MAP_HEADER_CANALAVE_CITY_MART MAP_HEADER_CANALAVE_CITY_GYM @@ -83,7 +83,7 @@ MAP_HEADER_ETERNA_CITY_HERB_SHOP MAP_HEADER_ETERNA_CITY_SOUTH_HOUSE MAP_HEADER_ETERNA_CITY_EAST_HOUSE MAP_HEADER_ETERNA_CITY_UNDERGROUND_MAN_HOUSE -MAP_HEADER_ETERNA_CITY_UNKNOWN_HOUSE +MAP_HEADER_UNUSED_ETERNA_CITY_HOUSE MAP_HEADER_HEARTHOME_CITY MAP_HEADER_HEARTHOME_CITY_MART MAP_HEADER_HEARTHOME_CITY_GYM_ENTRANCE_ROOM @@ -159,8 +159,8 @@ MAP_HEADER_SUNYSHORE_MARKET MAP_HEADER_SUNYSHORE_CITY_NORTHEAST_HOUSE MAP_HEADER_SUNYSHORE_CITY_WEST_HOUSE MAP_HEADER_SUNYSHORE_CITY_NORTHWEST_HOUSE -MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_1 -MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_2 +MAP_HEADER_UNUSED_SUNYSHORE_CITY_HOUSE_1 +MAP_HEADER_UNUSED_SUNYSHORE_CITY_HOUSE_2 MAP_HEADER_SUNYSHORE_CITY_EAST_HOUSE MAP_HEADER_VISTA_LIGHTHOUSE MAP_HEADER_SNOWPOINT_CITY @@ -194,7 +194,7 @@ MAP_HEADER_UNUSED_BATTLE_PARK_GATE_TO_FIGHT_AREA MAP_HEADER_ROUTE_225_GATE_TO_FIGHT_AREA MAP_HEADER_FIGHT_AREA_MIDDLE_HOUSE MAP_HEADER_FIGHT_AREA_SOUTH_HOUSE -MAP_HEADER_FIGHT_AREA_UNKNOWN_HOUSE +MAP_HEADER_UNUSED_FIGHT_AREA_HOUSE MAP_HEADER_UNKNOWN_197 MAP_HEADER_OREBURGH_MINE_B1F MAP_HEADER_OREBURGH_MINE_B2F @@ -333,7 +333,7 @@ MAP_HEADER_BATTLE_TOWER_MULTI_BATTLE_ROOM MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_2P MAP_HEADER_COMMUNICATION_CLUB_COLOSSEUM_4P MAP_HEADER_VERITY_LAKEFRONT -MAP_HEADER_VERITY_LAKEFRONT_UNKNOWN_HOUSE +MAP_HEADER_UNUSED_VERITY_LAKEFRONT_HOUSE MAP_HEADER_VALOR_LAKEFRONT MAP_HEADER_RESTAURANT MAP_HEADER_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE diff --git a/generated/text_banks.txt b/generated/text_banks.txt index 67f64120ea..bbedd98212 100644 --- a/generated/text_banks.txt +++ b/generated/text_banks.txt @@ -23,7 +23,7 @@ TEXT_BANK_FRONTIER_TRAINER_NAMES TEXT_BANK_UNK_0022 TEXT_BANK_JUBILIFE_CITY TEXT_BANK_JUBILIFE_CITY_MART -TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_1 +TEXT_BANK_UNUSED_JUBILIFE_CITY_HOUSE_1 TEXT_BANK_JUBILIFE_CITY_POKECENTER_1F TEXT_BANK_POKETCH_CO_1F TEXT_BANK_POKETCH_CO_2F @@ -39,7 +39,7 @@ TEXT_BANK_JUBILIFE_TV_ELEVATOR TEXT_BANK_JUBILIFE_CITY_SOUTH_HOUSE_1F TEXT_BANK_JUBILIFE_CITY_SOUTH_HOUSE_2F TEXT_BANK_JUBILIFE_CITY_SOUTH_HOUSE_3F -TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_2 +TEXT_BANK_UNUSED_JUBILIFE_CITY_HOUSE_2 TEXT_BANK_JUBILIFE_CITY_CONDOMINIUMS_1F TEXT_BANK_JUBILIFE_CITY_CONDOMINIUMS_2F TEXT_BANK_JUBILIFE_CITY_CONDOMINIUMS_3F @@ -50,8 +50,8 @@ TEXT_BANK_GLOBAL_TERMINAL_3F TEXT_BANK_TRAINERS_SCHOOL TEXT_BANK_JUBILIFE_CITY_SOUTHWEST_HOUSE_1F TEXT_BANK_JUBILIFE_CITY_SOUTHWEST_HOUSE_2F -TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_3 -TEXT_BANK_JUBILIFE_CITY_UNKNOWN_HOUSE_4 +TEXT_BANK_UNUSED_JUBILIFE_CITY_HOUSE_3 +TEXT_BANK_UNUSED_JUBILIFE_CITY_HOUSE_4 TEXT_BANK_CANALAVE_CITY TEXT_BANK_CANALAVE_CITY_MART TEXT_BANK_CANALAVE_CITY_GYM @@ -169,8 +169,8 @@ TEXT_BANK_SUNYSHORE_MARKET TEXT_BANK_SUNYSHORE_CITY_NORTHEAST_HOUSE TEXT_BANK_SUNYSHORE_CITY_WEST_HOUSE TEXT_BANK_SUNYSHORE_CITY_NORTHWEST_HOUSE -TEXT_BANK_SUNYSHORE_CITY_UNKNOWN_HOUSE_1 -TEXT_BANK_SUNYSHORE_CITY_UNKNOWN_HOUSE_2 +TEXT_BANK_UNUSED_SUNYSHORE_CITY_HOUSE_1 +TEXT_BANK_UNUSED_SUNYSHORE_CITY_HOUSE_2 TEXT_BANK_SUNYSHORE_CITY_EAST_HOUSE TEXT_BANK_VISTA_LIGHTHOUSE TEXT_BANK_SUNYSHORE_CITY_EAST_HOUSE_UNUSED @@ -398,7 +398,7 @@ TEXT_BANK_BAG_POCKET_NAMES_WITH_ICONS TEXT_BANK_BERRY_TREES TEXT_BANK_BERRY_TAGS TEXT_BANK_VERITY_LAKEFRONT -TEXT_BANK_VERITY_LAKEFRONT_UNKNOWN_HOUSE +TEXT_BANK_UNUSED_VERITY_LAKEFRONT_HOUSE TEXT_BANK_VALOR_LAKEFRONT TEXT_BANK_RESTAURANT TEXT_BANK_GRAND_LAKE_VALOR_LAKEFRONT_EAST_HOUSE diff --git a/include/data/map_headers.h b/include/data/map_headers.h index 29961937bb..742073849f 100644 --- a/include/data/map_headers.h +++ b/include/data/map_headers.h @@ -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, diff --git a/res/field/events/events_jubilife_city.json b/res/field/events/events_jubilife_city.json index 7b37902bcd..8bff281f4d 100644 --- a/res/field/events/events_jubilife_city.json +++ b/res/field/events/events_jubilife_city.json @@ -584,13 +584,13 @@ { "x": 129, "z": 736, - "dest_header_id": "MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_3", + "dest_header_id": "MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_3", "dest_warp_id": 0 }, { "x": 128, "z": 736, - "dest_header_id": "MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_4", + "dest_header_id": "MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_4", "dest_warp_id": 0 }, { diff --git a/res/field/events/events_sunyshore_city.json b/res/field/events/events_sunyshore_city.json index eac0207179..2b6bc0788c 100644 --- a/res/field/events/events_sunyshore_city.json +++ b/res/field/events/events_sunyshore_city.json @@ -382,13 +382,13 @@ { "x": 832, "z": 751, - "dest_header_id": "MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_1", + "dest_header_id": "MAP_HEADER_UNUSED_SUNYSHORE_CITY_HOUSE_1", "dest_warp_id": 0 }, { "x": 832, "z": 750, - "dest_header_id": "MAP_HEADER_SUNYSHORE_CITY_UNKNOWN_HOUSE_2", + "dest_header_id": "MAP_HEADER_UNUSED_SUNYSHORE_CITY_HOUSE_2", "dest_warp_id": 0 }, { diff --git a/res/field/events/events_eterna_city_unknown_house.json b/res/field/events/events_unused_eterna_city_house.json similarity index 100% rename from res/field/events/events_eterna_city_unknown_house.json rename to res/field/events/events_unused_eterna_city_house.json diff --git a/res/field/events/events_jubilife_city_unknown_house_1.json b/res/field/events/events_unused_jubilife_city_house_1.json similarity index 100% rename from res/field/events/events_jubilife_city_unknown_house_1.json rename to res/field/events/events_unused_jubilife_city_house_1.json diff --git a/res/field/events/events_jubilife_city_unknown_house_2.json b/res/field/events/events_unused_jubilife_city_house_2.json similarity index 100% rename from res/field/events/events_jubilife_city_unknown_house_2.json rename to res/field/events/events_unused_jubilife_city_house_2.json diff --git a/res/field/events/events_jubilife_city_unknown_house_3.json b/res/field/events/events_unused_jubilife_city_house_3.json similarity index 100% rename from res/field/events/events_jubilife_city_unknown_house_3.json rename to res/field/events/events_unused_jubilife_city_house_3.json diff --git a/res/field/events/events_jubilife_city_unknown_house_4.json b/res/field/events/events_unused_jubilife_city_house_4.json similarity index 100% rename from res/field/events/events_jubilife_city_unknown_house_4.json rename to res/field/events/events_unused_jubilife_city_house_4.json diff --git a/res/field/events/events_sunyshore_city_unknown_house_1.json b/res/field/events/events_unused_sunyshore_city_house_1.json similarity index 100% rename from res/field/events/events_sunyshore_city_unknown_house_1.json rename to res/field/events/events_unused_sunyshore_city_house_1.json diff --git a/res/field/events/events_sunyshore_city_unknown_house_2.json b/res/field/events/events_unused_sunyshore_city_house_2.json similarity index 100% rename from res/field/events/events_sunyshore_city_unknown_house_2.json rename to res/field/events/events_unused_sunyshore_city_house_2.json diff --git a/res/field/events/events_verity_lakefront_unknown_house.json b/res/field/events/events_unused_verity_lakefront_house.json similarity index 100% rename from res/field/events/events_verity_lakefront_unknown_house.json rename to res/field/events/events_unused_verity_lakefront_house.json diff --git a/res/field/events/meson.build b/res/field/events/meson.build index d69d41f046..bdb9f1fedd 100644 --- a/res/field/events/meson.build +++ b/res/field/events/meson.build @@ -10,7 +10,7 @@ events_files = files( 'events_underground.json', 'events_jubilife_city.json', 'events_jubilife_city_mart.json', - 'events_jubilife_city_unknown_house_1.json', + 'events_unused_jubilife_city_house_1.json', 'events_jubilife_city_pokecenter_1f.json', 'events_jubilife_city_pokecenter_2f.json', 'events_poketch_co_1f.json', @@ -28,7 +28,7 @@ events_files = files( 'events_jubilife_city_south_house_2f.json', 'events_jubilife_city_south_house_3f.json', 'events_jubilife_city_south_house_4f.json', - 'events_jubilife_city_unknown_house_2.json', + 'events_unused_jubilife_city_house_2.json', 'events_jubilife_city_condominiums_1f.json', 'events_jubilife_city_condominiums_2f.json', 'events_jubilife_city_condominiums_3f.json', @@ -36,8 +36,8 @@ events_files = files( 'events_global_terminal_1f.json', 'events_trainers_school.json', 'events_jubilife_city_southwest_house_1f.json', - 'events_jubilife_city_unknown_house_3.json', - 'events_jubilife_city_unknown_house_4.json', + 'events_unused_jubilife_city_house_3.json', + 'events_unused_jubilife_city_house_4.json', 'events_canalave_city.json', 'events_canalave_city_mart.json', 'events_canalave_city_gym.json', @@ -90,7 +90,7 @@ events_files = files( 'events_eterna_city_south_house.json', 'events_eterna_city_east_house.json', 'events_eterna_city_underground_man_house.json', - 'events_eterna_city_unknown_house.json', + 'events_unused_eterna_city_house.json', 'events_hearthome_city.json', 'events_hearthome_city_mart.json', 'events_hearthome_city_gym_entrance_room.json', @@ -166,8 +166,8 @@ events_files = files( 'events_sunyshore_city_northeast_house.json', 'events_sunyshore_city_west_house.json', 'events_sunyshore_city_northwest_house.json', - 'events_sunyshore_city_unknown_house_1.json', - 'events_sunyshore_city_unknown_house_2.json', + 'events_unused_sunyshore_city_house_1.json', + 'events_unused_sunyshore_city_house_2.json', 'events_sunyshore_city_east_house.json', 'events_vista_lighthouse.json', 'events_snowpoint_city.json', @@ -327,7 +327,7 @@ events_files = files( 'events_communication_club_colosseum_2p.json', 'events_communication_club_colosseum_4p.json', 'events_verity_lakefront.json', - 'events_verity_lakefront_unknown_house.json', + 'events_unused_verity_lakefront_house.json', 'events_valor_lakefront.json', 'events_restaurant.json', 'events_grand_lake_valor_lakefront_east_house.json', diff --git a/res/field/events/zone_event.order b/res/field/events/zone_event.order index 28fa7ea1f2..5b68881422 100644 --- a/res/field/events/zone_event.order +++ b/res/field/events/zone_event.order @@ -2,7 +2,7 @@ events_empty events_underground events_jubilife_city events_jubilife_city_mart -events_jubilife_city_unknown_house_1 +events_unused_jubilife_city_house_1 events_jubilife_city_pokecenter_1f events_jubilife_city_pokecenter_2f events_poketch_co_1f @@ -20,7 +20,7 @@ events_jubilife_city_south_house_1f events_jubilife_city_south_house_2f events_jubilife_city_south_house_3f events_jubilife_city_south_house_4f -events_jubilife_city_unknown_house_2 +events_unused_jubilife_city_house_2 events_jubilife_city_condominiums_1f events_jubilife_city_condominiums_2f events_jubilife_city_condominiums_3f @@ -28,8 +28,8 @@ events_jubilife_city_condominiums_4f events_global_terminal_1f events_trainers_school events_jubilife_city_southwest_house_1f -events_jubilife_city_unknown_house_3 -events_jubilife_city_unknown_house_4 +events_unused_jubilife_city_house_3 +events_unused_jubilife_city_house_4 events_canalave_city events_canalave_city_mart events_canalave_city_gym @@ -82,7 +82,7 @@ events_eterna_city_herb_shop events_eterna_city_south_house events_eterna_city_east_house events_eterna_city_underground_man_house -events_eterna_city_unknown_house +events_unused_eterna_city_house events_hearthome_city events_hearthome_city_mart events_hearthome_city_gym_entrance_room @@ -158,8 +158,8 @@ events_sunyshore_market events_sunyshore_city_northeast_house events_sunyshore_city_west_house events_sunyshore_city_northwest_house -events_sunyshore_city_unknown_house_1 -events_sunyshore_city_unknown_house_2 +events_unused_sunyshore_city_house_1 +events_unused_sunyshore_city_house_2 events_sunyshore_city_east_house events_vista_lighthouse events_snowpoint_city @@ -319,7 +319,7 @@ events_battle_tower_multi_battle_room events_communication_club_colosseum_2p events_communication_club_colosseum_4p events_verity_lakefront -events_verity_lakefront_unknown_house +events_unused_verity_lakefront_house events_valor_lakefront events_restaurant events_grand_lake_valor_lakefront_east_house diff --git a/res/field/scripts/meson.build b/res/field/scripts/meson.build index 7231181a59..ce53160340 100644 --- a/res/field/scripts/meson.build +++ b/res/field/scripts/meson.build @@ -37,7 +37,7 @@ scr_seq_files = files( 'scripts_bg_events.s', 'scripts_jubilife_city.s', 'scripts_jubilife_city_mart.s', - 'scripts_jubilife_city_unknown_house_1.s', + 'scripts_unused_jubilife_city_house_1.s', 'scripts_jubilife_city_pokecenter_1f.s', 'scripts_jubilife_city_pokecenter_2f.s', 'scripts_jubilife_city_pokecenter_b1f.s', @@ -56,7 +56,7 @@ scr_seq_files = files( 'scripts_jubilife_city_south_house_2f.s', 'scripts_jubilife_city_south_house_3f.s', 'scripts_unk_0022.s', - 'scripts_jubilife_city_unknown_house_2.s', + 'scripts_unused_jubilife_city_house_2.s', 'scripts_jubilife_city_condominiums_1f.s', 'scripts_jubilife_city_condominiums_2f.s', 'scripts_jubilife_city_condominiums_3f.s', @@ -67,8 +67,8 @@ scr_seq_files = files( 'scripts_trainers_school.s', 'scripts_jubilife_city_southwest_house_1f.s', 'scripts_jubilife_city_southwest_house_2f.s', - 'scripts_jubilife_city_unknown_house_3.s', - 'scripts_jubilife_city_unknown_house_4.s', + 'scripts_unused_jubilife_city_house_3.s', + 'scripts_unused_jubilife_city_house_4.s', 'scripts_canalave_city.s', 'scripts_canalave_city_mart.s', 'scripts_canalave_city_gym.s', @@ -201,8 +201,8 @@ scr_seq_files = files( 'scripts_sunyshore_city_northeast_house.s', 'scripts_sunyshore_city_west_house.s', 'scripts_sunyshore_city_northwest_house.s', - 'scripts_sunyshore_city_unknown_house_1.s', - 'scripts_sunyshore_city_unknown_house_2.s', + 'scripts_unused_sunyshore_city_house_1.s', + 'scripts_unused_sunyshore_city_house_2.s', 'scripts_sunyshore_city_east_house.s', 'scripts_vista_lighthouse.s', 'scripts_vista_lighthouse_elevator.s', @@ -448,7 +448,7 @@ scr_seq_files = files( 'scripts_init_new_game.s', 'scripts_berry_tree_interaction.s', 'scripts_verity_lakefront.s', - 'scripts_verity_lakefront_unknown_house.s', + 'scripts_unused_verity_lakefront_house.s', 'scripts_valor_lakefront.s', 'scripts_restaurant.s', 'scripts_grand_lake_valor_lakefront_east_house.s', @@ -537,7 +537,7 @@ scr_seq_files = files( 'scripts_day_care_common.s', 'scripts_init_jubilife_city.s', 'scripts_init_jubilife_city_mart.s', - 'scripts_init_jubilife_city_unknown_house_1.s', + 'scripts_init_unused_jubilife_city_house_1.s', 'scripts_init_jubilife_city_pokecenter_1f.s', 'scripts_init_jubilife_city_pokecenter_2f.s', 'scripts_init_jubilife_city_pokecenter_b1f.s', @@ -556,7 +556,7 @@ scr_seq_files = files( 'scripts_init_jubilife_city_south_house_2f.s', 'scripts_init_jubilife_city_south_house_3f.s', 'scripts_init_unk_0522.s', - 'scripts_init_jubilife_city_unknown_house_2.s', + 'scripts_init_unused_jubilife_city_house_2.s', 'scripts_init_jubilife_city_condominiums_1f.s', 'scripts_init_jubilife_city_condominiums_2f.s', 'scripts_init_jubilife_city_condominiums_3f.s', @@ -567,8 +567,8 @@ scr_seq_files = files( 'scripts_init_trainers_school.s', 'scripts_init_jubilife_city_southwest_house_1f.s', 'scripts_init_jubilife_city_southwest_house_2f.s', - 'scripts_init_jubilife_city_unknown_house_3.s', - 'scripts_init_jubilife_city_unknown_house_4.s', + 'scripts_init_unused_jubilife_city_house_3.s', + 'scripts_init_unused_jubilife_city_house_4.s', 'scripts_init_canalave_city.s', 'scripts_init_canalave_city_mart.s', 'scripts_init_canalave_city_gym.s', @@ -701,8 +701,8 @@ scr_seq_files = files( 'scripts_init_sunyshore_city_northeast_house.s', 'scripts_init_sunyshore_city_west_house.s', 'scripts_init_sunyshore_city_northwest_house.s', - 'scripts_init_sunyshore_city_unknown_house_1.s', - 'scripts_init_sunyshore_city_unknown_house_2.s', + 'scripts_init_unused_sunyshore_city_house_1.s', + 'scripts_init_unused_sunyshore_city_house_2.s', 'scripts_init_sunyshore_city_east_house.s', 'scripts_init_vista_lighthouse.s', 'scripts_init_vista_lighthouse_elevator.s', @@ -935,7 +935,7 @@ scr_seq_files = files( 'scripts_init_wifi_plaza_entrance.s', 'scripts_init_unk_0900.s', 'scripts_init_verity_lakefront.s', - 'scripts_init_verity_lakefront_unknown_house.s', + 'scripts_init_unused_verity_lakefront_house.s', 'scripts_init_valor_lakefront.s', 'scripts_init_restaurant.s', 'scripts_init_grand_lake_valor_lakefront_east_house.s', diff --git a/res/field/scripts/scripts.order b/res/field/scripts/scripts.order index 501ab88f22..a9be0e6491 100644 --- a/res/field/scripts/scripts.order +++ b/res/field/scripts/scripts.order @@ -2,7 +2,7 @@ scripts_communication_club scripts_bg_events scripts_jubilife_city scripts_jubilife_city_mart -scripts_jubilife_city_unknown_house_1 +scripts_unused_jubilife_city_house_1 scripts_jubilife_city_pokecenter_1f scripts_jubilife_city_pokecenter_2f scripts_jubilife_city_pokecenter_b1f @@ -21,7 +21,7 @@ scripts_jubilife_city_south_house_1f scripts_jubilife_city_south_house_2f scripts_jubilife_city_south_house_3f scripts_unk_0022 -scripts_jubilife_city_unknown_house_2 +scripts_unused_jubilife_city_house_2 scripts_jubilife_city_condominiums_1f scripts_jubilife_city_condominiums_2f scripts_jubilife_city_condominiums_3f @@ -32,8 +32,8 @@ scripts_global_terminal_3f scripts_trainers_school scripts_jubilife_city_southwest_house_1f scripts_jubilife_city_southwest_house_2f -scripts_jubilife_city_unknown_house_3 -scripts_jubilife_city_unknown_house_4 +scripts_unused_jubilife_city_house_3 +scripts_unused_jubilife_city_house_4 scripts_canalave_city scripts_canalave_city_mart scripts_canalave_city_gym @@ -166,8 +166,8 @@ scripts_sunyshore_market scripts_sunyshore_city_northeast_house scripts_sunyshore_city_west_house scripts_sunyshore_city_northwest_house -scripts_sunyshore_city_unknown_house_1 -scripts_sunyshore_city_unknown_house_2 +scripts_unused_sunyshore_city_house_1 +scripts_unused_sunyshore_city_house_2 scripts_sunyshore_city_east_house scripts_vista_lighthouse scripts_vista_lighthouse_elevator @@ -413,7 +413,7 @@ scripts_pokedex_ratings scripts_init_new_game scripts_berry_tree_interaction scripts_verity_lakefront -scripts_verity_lakefront_unknown_house +scripts_unused_verity_lakefront_house scripts_valor_lakefront scripts_restaurant scripts_grand_lake_valor_lakefront_east_house @@ -502,7 +502,7 @@ scripts_battle_frontier_records scripts_day_care_common scripts_init_jubilife_city scripts_init_jubilife_city_mart -scripts_init_jubilife_city_unknown_house_1 +scripts_init_unused_jubilife_city_house_1 scripts_init_jubilife_city_pokecenter_1f scripts_init_jubilife_city_pokecenter_2f scripts_init_jubilife_city_pokecenter_b1f @@ -521,7 +521,7 @@ scripts_init_jubilife_city_south_house_1f scripts_init_jubilife_city_south_house_2f scripts_init_jubilife_city_south_house_3f scripts_init_unk_0522 -scripts_init_jubilife_city_unknown_house_2 +scripts_init_unused_jubilife_city_house_2 scripts_init_jubilife_city_condominiums_1f scripts_init_jubilife_city_condominiums_2f scripts_init_jubilife_city_condominiums_3f @@ -532,8 +532,8 @@ scripts_init_global_terminal_3f scripts_init_trainers_school scripts_init_jubilife_city_southwest_house_1f scripts_init_jubilife_city_southwest_house_2f -scripts_init_jubilife_city_unknown_house_3 -scripts_init_jubilife_city_unknown_house_4 +scripts_init_unused_jubilife_city_house_3 +scripts_init_unused_jubilife_city_house_4 scripts_init_canalave_city scripts_init_canalave_city_mart scripts_init_canalave_city_gym @@ -666,8 +666,8 @@ scripts_init_sunyshore_market scripts_init_sunyshore_city_northeast_house scripts_init_sunyshore_city_west_house scripts_init_sunyshore_city_northwest_house -scripts_init_sunyshore_city_unknown_house_1 -scripts_init_sunyshore_city_unknown_house_2 +scripts_init_unused_sunyshore_city_house_1 +scripts_init_unused_sunyshore_city_house_2 scripts_init_sunyshore_city_east_house scripts_init_vista_lighthouse scripts_init_vista_lighthouse_elevator @@ -900,7 +900,7 @@ scripts_init_unk_0898 scripts_init_wifi_plaza_entrance scripts_init_unk_0900 scripts_init_verity_lakefront -scripts_init_verity_lakefront_unknown_house +scripts_init_unused_verity_lakefront_house scripts_init_valor_lakefront scripts_init_restaurant scripts_init_grand_lake_valor_lakefront_east_house diff --git a/res/field/scripts/scripts_battle_frontier_records.s b/res/field/scripts/scripts_battle_frontier_records.s index 3a18ded0cf..43029371cf 100644 --- a/res/field/scripts/scripts_battle_frontier_records.s +++ b/res/field/scripts/scripts_battle_frontier_records.s @@ -77,41 +77,41 @@ FrontierRecords_BattleHallMenus: GoToIfEq VAR_0x8008, 3, FrontierRecords_CloseAndExit GoToIfEq VAR_0x8008, MENU_CANCEL, FrontierRecords_CloseAndExit ScrCmd_2CC 1, VAR_0x8001, VAR_RESULT - GoToIfEq VAR_RESULT, 0, _0174 + GoToIfEq VAR_RESULT, 0, FrontierRecords_WhichPokemon ScrCmd_2CC 2, VAR_0x8001, VAR_RESULT BufferSpeciesNameFromVar 0, VAR_RESULT, 0, 0 Message BattleFrontierRecords_Text_OnChallengeNow - GoTo _017F + GoTo FrontierRecords_InitVarsSelectStartingLetters End -_0174: +FrontierRecords_WhichPokemon: Message BattleFrontierRecords_Text_WhichPokemon - GoTo _017F + GoTo FrontierRecords_InitVarsSelectStartingLetters End -_017F: +FrontierRecords_InitVarsSelectStartingLetters: SetVar VAR_0x8002, 0 SetVar VAR_0x8004, 0 SetVar VAR_0x8005, 0 - GoTo _0199 + GoTo FrontierRecords_SelectStartingLetters End -_0199: - Call FrontierRecords_SelectStartingLetters +FrontierRecords_SelectStartingLetters: + Call FrontierRecords_InitMenuStartingLetters GoToIfEq VAR_0x8002, 9, FrontierRecords_BattleHallMenus GoToIfEq VAR_0x8002, MENU_CANCEL, FrontierRecords_BattleHallMenus SetVar VAR_0x8003, 0 SetVar VAR_0x8006, 0 SetVar VAR_0x8007, 0 - GoTo _01D3 + GoTo FrontierRecords_SelectPokemonWithStartingLetter End -_01D3: +FrontierRecords_SelectPokemonWithStartingLetter: ShowBattleHallRecordMonSelectionMenu VAR_0x8001, VAR_0x8002, VAR_0x8003, VAR_0x8006, VAR_0x8007 - GoToIfEq VAR_0x8003, MENU_CANCEL, _0199 + GoToIfEq VAR_0x8003, MENU_CANCEL, FrontierRecords_SelectStartingLetters Call FrontierRecords_OpenRecordDisplay Message BattleFrontierRecords_Text_WhichPokemon - GoTo _01D3 + GoTo FrontierRecords_SelectPokemonWithStartingLetter End FrontierRecords_BattleCastle: @@ -162,7 +162,7 @@ FrontierRecords_SelectChallengeType: ShowMenu Return -FrontierRecords_SelectStartingLetters: +FrontierRecords_InitMenuStartingLetters: InitLocalTextListMenu 25, 1, 0, VAR_0x8002 AddListMenuEntry BattleFrontierRecords_Text_ABC, 0 AddListMenuEntry BattleFrontierRecords_Text_DEF, 1 diff --git a/res/field/scripts/scripts_init_jubilife_city_unknown_house_1.s b/res/field/scripts/scripts_init_unused_jubilife_city_house_1.s similarity index 100% rename from res/field/scripts/scripts_init_jubilife_city_unknown_house_1.s rename to res/field/scripts/scripts_init_unused_jubilife_city_house_1.s diff --git a/res/field/scripts/scripts_init_jubilife_city_unknown_house_2.s b/res/field/scripts/scripts_init_unused_jubilife_city_house_2.s similarity index 100% rename from res/field/scripts/scripts_init_jubilife_city_unknown_house_2.s rename to res/field/scripts/scripts_init_unused_jubilife_city_house_2.s diff --git a/res/field/scripts/scripts_init_jubilife_city_unknown_house_3.s b/res/field/scripts/scripts_init_unused_jubilife_city_house_3.s similarity index 100% rename from res/field/scripts/scripts_init_jubilife_city_unknown_house_3.s rename to res/field/scripts/scripts_init_unused_jubilife_city_house_3.s diff --git a/res/field/scripts/scripts_init_jubilife_city_unknown_house_4.s b/res/field/scripts/scripts_init_unused_jubilife_city_house_4.s similarity index 100% rename from res/field/scripts/scripts_init_jubilife_city_unknown_house_4.s rename to res/field/scripts/scripts_init_unused_jubilife_city_house_4.s diff --git a/res/field/scripts/scripts_init_sunyshore_city_unknown_house_1.s b/res/field/scripts/scripts_init_unused_sunyshore_city_house_1.s similarity index 100% rename from res/field/scripts/scripts_init_sunyshore_city_unknown_house_1.s rename to res/field/scripts/scripts_init_unused_sunyshore_city_house_1.s diff --git a/res/field/scripts/scripts_init_sunyshore_city_unknown_house_2.s b/res/field/scripts/scripts_init_unused_sunyshore_city_house_2.s similarity index 100% rename from res/field/scripts/scripts_init_sunyshore_city_unknown_house_2.s rename to res/field/scripts/scripts_init_unused_sunyshore_city_house_2.s diff --git a/res/field/scripts/scripts_init_verity_lakefront_unknown_house.s b/res/field/scripts/scripts_init_unused_verity_lakefront_house.s similarity index 100% rename from res/field/scripts/scripts_init_verity_lakefront_unknown_house.s rename to res/field/scripts/scripts_init_unused_verity_lakefront_house.s diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_1.s b/res/field/scripts/scripts_jubilife_city_unknown_house_1.s deleted file mode 100644 index 45c3869557..0000000000 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_1.s +++ /dev/null @@ -1,12 +0,0 @@ -#include "macros/scrcmd.inc" -#include "res/text/bank/jubilife_city_unknown_house_1.h" - - - ScriptEntry _0006 - ScriptEntryEnd - -_0006: - NPCMessage 0 - End - - .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_2.s b/res/field/scripts/scripts_jubilife_city_unknown_house_2.s deleted file mode 100644 index 27a07f49f0..0000000000 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_2.s +++ /dev/null @@ -1,12 +0,0 @@ -#include "macros/scrcmd.inc" -#include "res/text/bank/jubilife_city_unknown_house_2.h" - - - ScriptEntry _0006 - ScriptEntryEnd - -_0006: - NPCMessage 0 - End - - .balign 4, 0 diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_3.s b/res/field/scripts/scripts_jubilife_city_unknown_house_3.s deleted file mode 100644 index 67dc52480d..0000000000 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_3.s +++ /dev/null @@ -1,15 +0,0 @@ -#include "macros/scrcmd.inc" -#include "res/text/bank/jubilife_city_unknown_house_3.h" - - - ScriptEntry _000A - ScriptEntry _001D - ScriptEntryEnd - -_000A: - NPCMessage 0 - End - -_001D: - NPCMessage 1 - End diff --git a/res/field/scripts/scripts_jubilife_city_unknown_house_4.s b/res/field/scripts/scripts_jubilife_city_unknown_house_4.s deleted file mode 100644 index a760672854..0000000000 --- a/res/field/scripts/scripts_jubilife_city_unknown_house_4.s +++ /dev/null @@ -1,12 +0,0 @@ -#include "macros/scrcmd.inc" -#include "res/text/bank/jubilife_city_unknown_house_4.h" - - - ScriptEntry _0006 - ScriptEntryEnd - -_0006: - NPCMessage 0 - End - - .balign 4, 0 diff --git a/res/field/scripts/scripts_route_202.s b/res/field/scripts/scripts_route_202.s index de75c4983f..266bc60580 100644 --- a/res/field/scripts/scripts_route_202.s +++ b/res/field/scripts/scripts_route_202.s @@ -370,7 +370,7 @@ Route202_Counterpart: CloseMessage PlayMusic SEQ_POKERADAR AddCameraOverrideObject 189, 818 - ApplyFreeCameraMovement _06F8 + ApplyFreeCameraMovement Route202_Movement_CameraMoveEast WaitMovement RemoveCameraOverrideObject ApplyMovement LOCALID_COUNTERPART, Route202_Movement_CounterpartFaceGrassPatchEast @@ -541,6 +541,6 @@ Route202_UnusedMovement4: EndMovement .balign 4, 0 -_06F8: +Route202_Movement_CameraMoveEast: WalkNormalEast EndMovement diff --git a/res/field/scripts/scripts_underground.s b/res/field/scripts/scripts_underground.s index 357ea3967a..e8ac95c2fd 100644 --- a/res/field/scripts/scripts_underground.s +++ b/res/field/scripts/scripts_underground.s @@ -142,32 +142,32 @@ Underground_GoodsVendorNeedAnythingElse_Unused: Underground_TreasuresVendor_Unused: UndergroundNPCMessage UndergroundNPCs_Text_IllTradeSpheresForTreasures - GoTo _0231 + GoTo Underground_TreasuresVendorShopMenu_Unused End -_0231: +Underground_TreasuresVendorShopMenu_Unused: Dummy19E 2, VAR_RESULT SetVar VAR_0x8004, VAR_RESULT SetVar VAR_0x8008, VAR_RESULT - GoToIfEq VAR_0x8008, -4, _0265 + GoToIfEq VAR_0x8008, -4, Underground_TreasuresVendorNoRoom_Unused GoToIfEq VAR_0x8008, -1, Underground_VendorSeeYou_Unused - GoTo _0271 + GoTo Underground_TreasuresVendorWaitABPress_Unused End -_0265: +Underground_TreasuresVendorNoRoom_Unused: UndergroundNPCMessage UndergroundNPCs_Text_YouDontHaveRoom - GoTo _027B + GoTo Underground_TreasuresVendorNeedAnythingElse_Unused End -_0271: +Underground_TreasuresVendorWaitABPress_Unused: WaitABPress - GoTo _027B + GoTo Underground_TreasuresVendorNeedAnythingElse_Unused End -_027B: +Underground_TreasuresVendorNeedAnythingElse_Unused: WaitABPress UndergroundNPCMessage UndergroundNPCs_Text_DoYouNeedAnythingElse - GoTo _0231 + GoTo Underground_TreasuresVendorShopMenu_Unused End Underground_RoarkIntro: diff --git a/res/field/scripts/scripts_unused_jubilife_city_house_1.s b/res/field/scripts/scripts_unused_jubilife_city_house_1.s new file mode 100644 index 0000000000..8a061ac05b --- /dev/null +++ b/res/field/scripts/scripts_unused_jubilife_city_house_1.s @@ -0,0 +1,12 @@ +#include "macros/scrcmd.inc" +#include "res/text/bank/unused_jubilife_city_house_1.h" + + + ScriptEntry JubilifeCityHouse1_UnusedEntry1 + ScriptEntryEnd + +JubilifeCityHouse1_UnusedEntry1: + NPCMessage JubilifeCityHouse1_Text_Dummy0 + End + + .balign 4, 0 diff --git a/res/field/scripts/scripts_unused_jubilife_city_house_2.s b/res/field/scripts/scripts_unused_jubilife_city_house_2.s new file mode 100644 index 0000000000..f2e7bae125 --- /dev/null +++ b/res/field/scripts/scripts_unused_jubilife_city_house_2.s @@ -0,0 +1,12 @@ +#include "macros/scrcmd.inc" +#include "res/text/bank/unused_jubilife_city_house_2.h" + + + ScriptEntry JubilifeCityHouse2_UnusedEntry1 + ScriptEntryEnd + +JubilifeCityHouse2_UnusedEntry1: + NPCMessage JubilifeCityHouse2_Text_Dummy0 + End + + .balign 4, 0 diff --git a/res/field/scripts/scripts_unused_jubilife_city_house_3.s b/res/field/scripts/scripts_unused_jubilife_city_house_3.s new file mode 100644 index 0000000000..2991fd7cb7 --- /dev/null +++ b/res/field/scripts/scripts_unused_jubilife_city_house_3.s @@ -0,0 +1,15 @@ +#include "macros/scrcmd.inc" +#include "res/text/bank/unused_jubilife_city_house_3.h" + + + ScriptEntry JubilifeCityHouse3_UnusedEntry1 + ScriptEntry JubilifeCityHouse3_UnusedEntry2 + ScriptEntryEnd + +JubilifeCityHouse3_UnusedEntry1: + NPCMessage JubilifeCityHouse3_Text_Dummy0 + End + +JubilifeCityHouse3_UnusedEntry2: + NPCMessage JubilifeCityHouse3_Text_Dummy1 + End diff --git a/res/field/scripts/scripts_unused_jubilife_city_house_4.s b/res/field/scripts/scripts_unused_jubilife_city_house_4.s new file mode 100644 index 0000000000..c92484941f --- /dev/null +++ b/res/field/scripts/scripts_unused_jubilife_city_house_4.s @@ -0,0 +1,12 @@ +#include "macros/scrcmd.inc" +#include "res/text/bank/unused_jubilife_city_house_4.h" + + + ScriptEntry JubilifeCityHouse4_UnusedEntry1 + ScriptEntryEnd + +JubilifeCityHouse4_UnusedEntry1: + NPCMessage JubilifeCityHouse4_Text_Dummy0 + End + + .balign 4, 0 diff --git a/res/field/scripts/scripts_sunyshore_city_unknown_house_1.s b/res/field/scripts/scripts_unused_sunyshore_city_house_1.s similarity index 100% rename from res/field/scripts/scripts_sunyshore_city_unknown_house_1.s rename to res/field/scripts/scripts_unused_sunyshore_city_house_1.s diff --git a/res/field/scripts/scripts_sunyshore_city_unknown_house_2.s b/res/field/scripts/scripts_unused_sunyshore_city_house_2.s similarity index 100% rename from res/field/scripts/scripts_sunyshore_city_unknown_house_2.s rename to res/field/scripts/scripts_unused_sunyshore_city_house_2.s diff --git a/res/field/scripts/scripts_unused_verity_lakefront_house.s b/res/field/scripts/scripts_unused_verity_lakefront_house.s new file mode 100644 index 0000000000..96d97295d0 --- /dev/null +++ b/res/field/scripts/scripts_unused_verity_lakefront_house.s @@ -0,0 +1,11 @@ +#include "macros/scrcmd.inc" +#include "res/text/bank/unused_verity_lakefront_house.h" + + + ScriptEntry VerityLakefrontHouse_UnusedEntry1 + ScriptEntryEnd + +VerityLakefrontHouse_UnusedEntry1: + BufferPlayerName 0 + NPCMessage VerityLakefrontHouse1_Text_Dummy0 + End diff --git a/res/field/scripts/scripts_verity_lakefront_unknown_house.s b/res/field/scripts/scripts_verity_lakefront_unknown_house.s deleted file mode 100644 index 3be12a9067..0000000000 --- a/res/field/scripts/scripts_verity_lakefront_unknown_house.s +++ /dev/null @@ -1,11 +0,0 @@ -#include "macros/scrcmd.inc" -#include "res/text/bank/verity_lakefront_unknown_house.h" - - - ScriptEntry _0006 - ScriptEntryEnd - -_0006: - BufferPlayerName 0 - NPCMessage 0 - End diff --git a/res/text/sunyshore_city_unknown_house_2.json b/res/text/sunyshore_city_unknown_house_2.json deleted file mode 100644 index 332cd23f3d..0000000000 --- a/res/text/sunyshore_city_unknown_house_2.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "key": 21562, - "messages": [ - { - "id": "pl_msg_00000172_00000", - "garbage": 51 - }, - { - "id": "pl_msg_00000172_00001", - "garbage": 71 - }, - { - "id": "pl_msg_00000172_00002", - "garbage": 34 - }, - { - "id": "pl_msg_00000172_00003", - "garbage": 65 - }, - { - "id": "pl_msg_00000172_00004", - "garbage": 59 - }, - { - "id": "pl_msg_00000172_00005", - "garbage": 38 - }, - { - "id": "pl_msg_00000172_00006", - "garbage": 33 - }, - { - "id": "pl_msg_00000172_00007", - "garbage": 67 - } - ] -} diff --git a/res/text/jubilife_city_unknown_house_1.json b/res/text/unused_jubilife_city_house_1.json similarity index 61% rename from res/text/jubilife_city_unknown_house_1.json rename to res/text/unused_jubilife_city_house_1.json index 3e0f9326c1..6f5f3ce074 100644 --- a/res/text/jubilife_city_unknown_house_1.json +++ b/res/text/unused_jubilife_city_house_1.json @@ -2,7 +2,7 @@ "key": 39278, "messages": [ { - "id": "pl_msg_00000025_00000", + "id": "JubilifeCityHouse1_Text_Dummy0", "garbage": 40 } ] diff --git a/res/text/jubilife_city_unknown_house_2.json b/res/text/unused_jubilife_city_house_2.json similarity index 61% rename from res/text/jubilife_city_unknown_house_2.json rename to res/text/unused_jubilife_city_house_2.json index b032dbf64d..6a167e0ef2 100644 --- a/res/text/jubilife_city_unknown_house_2.json +++ b/res/text/unused_jubilife_city_house_2.json @@ -2,7 +2,7 @@ "key": 17451, "messages": [ { - "id": "pl_msg_00000041_00000", + "id": "JubilifeCityHouse2_Text_Dummy0", "garbage": 32 } ] diff --git a/res/text/jubilife_city_unknown_house_3.json b/res/text/unused_jubilife_city_house_3.json similarity index 53% rename from res/text/jubilife_city_unknown_house_3.json rename to res/text/unused_jubilife_city_house_3.json index df7e794732..7131a686d7 100644 --- a/res/text/jubilife_city_unknown_house_3.json +++ b/res/text/unused_jubilife_city_house_3.json @@ -2,11 +2,11 @@ "key": 50242, "messages": [ { - "id": "pl_msg_00000052_00000", + "id": "JubilifeCityHouse3_Text_Dummy0", "garbage": 26 }, { - "id": "pl_msg_00000052_00001", + "id": "JubilifeCityHouse3_Text_Dummy1", "garbage": 34 } ] diff --git a/res/text/jubilife_city_unknown_house_4.json b/res/text/unused_jubilife_city_house_4.json similarity index 61% rename from res/text/jubilife_city_unknown_house_4.json rename to res/text/unused_jubilife_city_house_4.json index 4394893508..9c87e43f86 100644 --- a/res/text/jubilife_city_unknown_house_4.json +++ b/res/text/unused_jubilife_city_house_4.json @@ -2,7 +2,7 @@ "key": 19467, "messages": [ { - "id": "pl_msg_00000053_00000", + "id": "JubilifeCityHouse4_Text_Dummy0", "garbage": 81 } ] diff --git a/res/text/sunyshore_city_unknown_house_1.json b/res/text/unused_sunyshore_city_house_1.json similarity index 75% rename from res/text/sunyshore_city_unknown_house_1.json rename to res/text/unused_sunyshore_city_house_1.json index 0356a31068..80d7b34789 100644 --- a/res/text/sunyshore_city_unknown_house_1.json +++ b/res/text/unused_sunyshore_city_house_1.json @@ -2,7 +2,7 @@ "key": 21538, "messages": [ { - "id": "pl_msg_00000171_00000", + "id": "SunyshoreCityHouse1_Text_BurmyInterestingExample", "en_US": [ "Hmmm... The Pokémon BURMY is an\n", "interesting example...\r", @@ -11,7 +11,7 @@ ] }, { - "id": "pl_msg_00000171_00001", + "id": "SunyshoreCityHouse1_Text_DoYouHaveAllBurmy", "en_US": [ "You know that Pokémon BURMY, and how\n", "it comes in different forms?\r", @@ -20,7 +20,7 @@ ] }, { - "id": "pl_msg_00000171_00002", + "id": "SunyshoreCityHouse1_Text_NotASingleBurmy", "en_US": [ "Aww, you don’t even have a single\n", "BURMY?\r", @@ -29,7 +29,7 @@ ] }, { - "id": "pl_msg_00000171_00003", + "id": "SunyshoreCityHouse1_Text_CoolIfDifferentBurmy", "en_US": [ "Hmm...\r", "It’d be cool if you had all the\n", @@ -37,7 +37,7 @@ ] }, { - "id": "pl_msg_00000171_00004", + "id": "SunyshoreCityHouse1_Text_ThatsAllBurmy", "en_US": [ "Cool! That’s all the different kinds\n", "of BURMY! I feel giddy!\r", @@ -46,14 +46,14 @@ ] }, { - "id": "pl_msg_00000171_00005", + "id": "SunyshoreCityHouse1_Text_BagIsCrammedFull", "en_US": [ "Whoops, your Bag is crammed full!\n", "I’ll give this to you later." ] }, { - "id": "pl_msg_00000171_00006", + "id": "SunyshoreCityHouse1_Text_YoureGood", "en_US": [ "You’re good!\n", "You’d make an awesome Bug Maniac!" diff --git a/res/text/unused_sunyshore_city_house_2.json b/res/text/unused_sunyshore_city_house_2.json new file mode 100644 index 0000000000..c893ea9e26 --- /dev/null +++ b/res/text/unused_sunyshore_city_house_2.json @@ -0,0 +1,37 @@ +{ + "key": 21562, + "messages": [ + { + "id": "SunyshoreCityHouse2_Text_Dummy0", + "garbage": 51 + }, + { + "id": "SunyshoreCityHouse2_Text_Dummy1", + "garbage": 71 + }, + { + "id": "SunyshoreCityHouse2_Text_Dummy2", + "garbage": 34 + }, + { + "id": "SunyshoreCityHouse2_Text_Dummy3", + "garbage": 65 + }, + { + "id": "SunyshoreCityHouse2_Text_Dummy4", + "garbage": 59 + }, + { + "id": "SunyshoreCityHouse2_Text_Dummy5", + "garbage": 38 + }, + { + "id": "SunyshoreCityHouse2_Text_Dummy6", + "garbage": 33 + }, + { + "id": "SunyshoreCityHouse2_Text_Dummy7", + "garbage": 67 + } + ] +} diff --git a/res/text/verity_lakefront_unknown_house.json b/res/text/unused_verity_lakefront_house.json similarity index 59% rename from res/text/verity_lakefront_unknown_house.json rename to res/text/unused_verity_lakefront_house.json index 1ee50550ba..5fb01fac7c 100644 --- a/res/text/verity_lakefront_unknown_house.json +++ b/res/text/unused_verity_lakefront_house.json @@ -2,7 +2,7 @@ "key": 9216, "messages": [ { - "id": "pl_msg_00000400_00000", + "id": "VerityLakefrontHouse1_Text_Dummy0", "garbage": 32 } ] diff --git a/src/tv_segment.c b/src/tv_segment.c index d43749bc2b..003529fc57 100644 --- a/src/tv_segment.c +++ b/src/tv_segment.c @@ -2191,7 +2191,7 @@ static int TVSegment_LoadMessage_YourTownsBestThree(FieldSystem *fieldSystem, St return TVProgramSinnohNow_Text_YourTownsBestThree_CelesticTown; } - if (mapID == MAP_HEADER_JUBILIFE_CITY || (mapID >= MAP_HEADER_POKETCH_CO_1F && mapID <= MAP_HEADER_JUBILIFE_CITY_UNKNOWN_HOUSE_4)) { + if (mapID == MAP_HEADER_JUBILIFE_CITY || (mapID >= MAP_HEADER_POKETCH_CO_1F && mapID <= MAP_HEADER_UNUSED_JUBILIFE_CITY_HOUSE_4)) { return TVProgramSinnohNow_Text_YourTownsBestThree_JubilifeCity; } @@ -2203,7 +2203,7 @@ static int TVSegment_LoadMessage_YourTownsBestThree(FieldSystem *fieldSystem, St return TVProgramSinnohNow_Text_YourTownsBestThree_OreburghCity; } - if (mapID == MAP_HEADER_ETERNA_CITY || (mapID >= MAP_HEADER_CYCLE_SHOP && mapID <= MAP_HEADER_ETERNA_CITY_UNKNOWN_HOUSE)) { + if (mapID == MAP_HEADER_ETERNA_CITY || (mapID >= MAP_HEADER_CYCLE_SHOP && mapID <= MAP_HEADER_UNUSED_ETERNA_CITY_HOUSE)) { return TVProgramSinnohNow_Text_YourTownsBestThree_EternaCity; }