From bbb00fa4ed1897b55f74e1b2a78defb12afd753b Mon Sep 17 00:00:00 2001 From: Dalton Date: Sat, 20 Jan 2024 14:17:19 -0600 Subject: [PATCH 1/3] Renamed Gen 7 locations to align with newly added Gen 7 location areas --- data/v2/csv/location_areas.csv | 90 ++++++++++++++++++++++++++++++++++ data/v2/csv/locations.csv | 16 ++---- 2 files changed, 94 insertions(+), 12 deletions(-) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 29fcb79ef..43cf5158b 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -923,3 +923,93 @@ id,location_id,game_index,identifier 1032,1038,0,windbreak-stand 1033,1039,0,windswept-run 1034,1040,0,worn-bridge +1035,711,0,main +1036,711,0,hauoli-outskirts +1037,712,0, +1038,713,0, +1039,714,0, +1040,715,0, +1041,716,0,beachfront +1042,716,0,shopping-district +1043,716,0,marina +1044,719,0, +1045,720,0,main +1046,720,0,plank-bridge +1047,722,0, +1048,723,0,main +1049,723,0,farthest-hollow +1050,725,0, +1051,726,0, +1052,727,0, +1053,728,0, +1054,729,0,trial-site +1055,729,0,totems-den +1056,731,0, +1057,732,0, +1058,733,0, +1059,734,0, +1060,735,0, +1061,736,0, +1062,737,0, +1063,738,0, +1064,739,0, +1065,740,0, +1066,741,0, +1067,742,0, +1068,743,0, +1069,744,0, +1070,745,0, +1071,746,0,main +1072,746,0,totems-den +1073,748,0,main +1074,748,0,totems-den +1075,750,0, +1076,751,0, +1077,752,0, +1078,753,0, +1079,754,0, +1080,755,0, +1081,756,0, +1082,757,0, +1083,758,0, +1084,759,0, +1085,760,0, +1086,761,0, +1087,762,0, +1088,763,0, +1089,764,0, +1090,765,0, +1091,766,0, +1092,767,0, +1093,768,0, +1094,769,0, +1095,770,0, +1096,771,0, +1097,772,0, +1098,773,0, +1099,774,0, +1100,775,0, +1101,776,0, +1102,777,0,abandoned-site +1103,778,0, +1104,779,0, +1105,780,0, +1106,781,0, +1107,782,0, +1108,783,0, +1109,784,0, +1110,785,0, +1111,786,0, +1112,787,0, +1113,788,0, +1114,789,0, +1115,790,0, +1116,791,0, +1117,792,0, +1118,793,0, +1119,794,0, +1120,795,0, +1121,796,0, +1122,797,0, +1123,798,0,main +1124,798,0,outer-cape diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index 9b1fcb9d5..c283e89ab 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -691,27 +691,21 @@ id,region_id,identifier 707,3,soaring-in-the-sky 708,3,secret-shore 709,3,secret-meadow -710,7,alola-route-1--hauoli-outskirts 711,7,alola-route-1 712,7,alola-route-3 713,7,alola-route-2 714,7,kalae-bay 715,7,melemele-sea -716,7,hauoli-city--beachfront -717,7,hauoli-city--shopping-district -718,7,hauoli-city--marina +716,7,hauoli-city 719,7,iki-town 720,7,mahalo-trail -721,7,mahalo-trail--plank-bridge 722,7,ruins-of-conflict 723,7,ten-carat-hill -724,7,ten-carat-hill--farthest-hollow 725,7,hauoli-cemetery 726,7,melemele-meadow 727,7,seaward-cave 728,7,berry-fields -729,7,verdant-cavern--trial-site -730,7,verdant-cavern--totems-den +729,7,verdant-cavern 731,7,alola-route-4 732,7,alola-route-5 733,7,alola-route-6 @@ -728,9 +722,7 @@ id,region_id,identifier 744,7,memorial-hill 745,7,paniola-ranch 746,7,wela-volcano-park -747,7,wela-volcano-park--totems-den 748,7,brooklet-hill -749,7,brooklet-hill--totems-den 750,7,lush-jungle 751,7,ruins-of-life 752,7,akala-outskirts @@ -758,7 +750,7 @@ id,region_id,identifier 774,7,lake-of-the-moone 775,7,mount-lanakila 776,7,shady-house -777,7,thrifty-megamart--abandoned-site +777,7,thrifty-megamart 778,7,hokulani-observatory 779,7,alola-pokemon-league 780,7,poni-meadow @@ -779,7 +771,7 @@ id,region_id,identifier 795,7,battle-tree 796,7,aether-paradise 797,7,ultra-space -798,7,malie-city--outer-cape +798,7,malie-city 799,1,roaming-kanto 800,2,roaming-johto 801,3,roaming-hoenn From f0098460c30c31bd55050f206d72be0d87b5f858 Mon Sep 17 00:00:00 2001 From: Dalton Date: Sat, 20 Jan 2024 14:46:12 -0600 Subject: [PATCH 2/3] Restored locations associated with translated location sub-area names --- data/v2/csv/locations.csv | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index c283e89ab..9b1fcb9d5 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -691,21 +691,27 @@ id,region_id,identifier 707,3,soaring-in-the-sky 708,3,secret-shore 709,3,secret-meadow +710,7,alola-route-1--hauoli-outskirts 711,7,alola-route-1 712,7,alola-route-3 713,7,alola-route-2 714,7,kalae-bay 715,7,melemele-sea -716,7,hauoli-city +716,7,hauoli-city--beachfront +717,7,hauoli-city--shopping-district +718,7,hauoli-city--marina 719,7,iki-town 720,7,mahalo-trail +721,7,mahalo-trail--plank-bridge 722,7,ruins-of-conflict 723,7,ten-carat-hill +724,7,ten-carat-hill--farthest-hollow 725,7,hauoli-cemetery 726,7,melemele-meadow 727,7,seaward-cave 728,7,berry-fields -729,7,verdant-cavern +729,7,verdant-cavern--trial-site +730,7,verdant-cavern--totems-den 731,7,alola-route-4 732,7,alola-route-5 733,7,alola-route-6 @@ -722,7 +728,9 @@ id,region_id,identifier 744,7,memorial-hill 745,7,paniola-ranch 746,7,wela-volcano-park +747,7,wela-volcano-park--totems-den 748,7,brooklet-hill +749,7,brooklet-hill--totems-den 750,7,lush-jungle 751,7,ruins-of-life 752,7,akala-outskirts @@ -750,7 +758,7 @@ id,region_id,identifier 774,7,lake-of-the-moone 775,7,mount-lanakila 776,7,shady-house -777,7,thrifty-megamart +777,7,thrifty-megamart--abandoned-site 778,7,hokulani-observatory 779,7,alola-pokemon-league 780,7,poni-meadow @@ -771,7 +779,7 @@ id,region_id,identifier 795,7,battle-tree 796,7,aether-paradise 797,7,ultra-space -798,7,malie-city +798,7,malie-city--outer-cape 799,1,roaming-kanto 800,2,roaming-johto 801,3,roaming-hoenn From ef8f2e026a252a8ac00d06a1bf76559f649b1d25 Mon Sep 17 00:00:00 2001 From: Dalton Date: Sat, 20 Jan 2024 15:23:04 -0600 Subject: [PATCH 3/3] Adding needed locations, and adjusting location_areas accordingly --- data/v2/csv/location_areas.csv | 209 +++++++++++++++++++-------------- data/v2/csv/locations.csv | 10 ++ 2 files changed, 131 insertions(+), 88 deletions(-) diff --git a/data/v2/csv/location_areas.csv b/data/v2/csv/location_areas.csv index 43cf5158b..1b6d6d75b 100644 --- a/data/v2/csv/location_areas.csv +++ b/data/v2/csv/location_areas.csv @@ -923,93 +923,126 @@ id,location_id,game_index,identifier 1032,1038,0,windbreak-stand 1033,1039,0,windswept-run 1034,1040,0,worn-bridge -1035,711,0,main +1035,711,0,east 1036,711,0,hauoli-outskirts -1037,712,0, -1038,713,0, -1039,714,0, -1040,715,0, -1041,716,0,beachfront -1042,716,0,shopping-district -1043,716,0,marina -1044,719,0, -1045,720,0,main -1046,720,0,plank-bridge -1047,722,0, -1048,723,0,main -1049,723,0,farthest-hollow -1050,725,0, -1051,726,0, -1052,727,0, -1053,728,0, -1054,729,0,trial-site -1055,729,0,totems-den -1056,731,0, -1057,732,0, -1058,733,0, -1059,734,0, -1060,735,0, -1061,736,0, -1062,737,0, -1063,738,0, -1064,739,0, -1065,740,0, -1066,741,0, -1067,742,0, -1068,743,0, -1069,744,0, -1070,745,0, -1071,746,0,main -1072,746,0,totems-den -1073,748,0,main -1074,748,0,totems-den -1075,750,0, -1076,751,0, -1077,752,0, +1037,711,0,south +1038,711,0,trainers-school +1039,711,0,west +1040,713,0,main +1041,713,0,north +1042,713,0,south +1043,712,0,main +1044,712,0,north +1045,712,0,south +1046,731,0, +1047,732,0, +1048,733,0,north +1049,733,0,south +1050,734,0, +1051,735,0,main +1052,735,0,fossil-restoration-center +1053,736,0,main +1054,736,0,police-station +1055,755,0, +1056,756,0, +1057,763,0, +1058,758,0, +1059,765,0, +1060,760,0,main +1061,760,0,aether-house +1062,761,0,main +1063,761,0,east +1064,761,0,west +1065,762,0,northeast +1066,762,0,west +1067,796,0,2f +1068,752,0, +1069,791,0, +1070,790,0, +1071,782,0, +1072,728,0, +1073,771,0, +1074,748,0,main +1075,748,0,north +1076,748,0,south +1077,748,0,totems-den 1078,753,0, -1079,754,0, -1080,755,0, -1081,756,0, -1082,757,0, -1083,758,0, -1084,759,0, -1085,760,0, -1086,761,0, -1087,762,0, -1088,763,0, -1089,764,0, -1090,765,0, -1091,766,0, -1092,767,0, -1093,768,0, -1094,769,0, -1095,770,0, -1096,771,0, -1097,772,0, -1098,773,0, -1099,774,0, -1100,775,0, -1101,776,0, -1102,777,0,abandoned-site -1103,778,0, -1104,779,0, -1105,780,0, -1106,781,0, -1107,782,0, -1108,783,0, -1109,784,0, -1110,785,0, -1111,786,0, -1112,787,0, -1113,788,0, -1114,789,0, -1115,790,0, -1116,791,0, -1117,792,0, -1118,793,0, -1119,794,0, -1120,795,0, -1121,796,0, -1122,797,0, -1123,798,0,main -1124,798,0,outer-cape +1079,1046,0, +1080,794,0, +1081,764,0, +1082,738,0, +1083,725,0, +1084,1042,0,main +1085,1042,0,shopping-district +1086,1042,0,beachfront +1087,1047,0, +1088,741,0,surf-association +1089,719,0, +1090,714,0, +1091,742,0, +1092,774,0, +1093,773,0, +1094,750,0,east-cave +1095,750,0,north +1096,750,0,south +1097,750,0,west +1098,720,0, +1099,1045,0,main +1100,1045,0,outer-cape +1101,769,0, +1102,726,0, +1103,715,0, +1104,744,0, +1105,770,0,main +1106,770,0,east +1107,770,0,west +1108,775,0,base +1109,775,0,cave +1110,775,0,outside +1111,745,0, +1112,740,0, +1113,783,0, +1114,786,0, +1115,787,0, +1116,784,0, +1117,780,0, +1118,785,0,center +1119,785,0,east +1120,785,0,north +1121,785,0,west +1122,781,0, +1123,793,0, +1124,743,0, +1125,772,0, +1126,722,0, +1127,792,0, +1128,751,0, +1129,1048,0, +1130,788,0,main +1131,788,0,huntail-boat +1132,727,0, +1133,757,0, +1134,759,0, +1135,723,0,farthest-hollow +1136,723,0,inside +1137,1044,0,abandoned-site +1138,1049,0, +1139,766,0, +1140,797,0,ultra-crater +1141,797,0,ultra-deep-sea +1142,797,0,ultra-desert +1143,797,0,ultra-forest +1144,797,0,ultra-jungle +1145,797,0,ultra-plant +1146,797,0,ultra-ruin +1147,1051,0,cave +1148,1051,0,cliff +1149,1051,0,crag +1150,1051,0,waterfall +1151,789,0,inside +1152,789,0,northwest +1153,789,0,outside +1154,1043,0,trial-site +1155,1043,0,totems-den +1156,746,0,main +1157,746,0,totems-den diff --git a/data/v2/csv/locations.csv b/data/v2/csv/locations.csv index 9b1fcb9d5..843ef1678 100644 --- a/data/v2/csv/locations.csv +++ b/data/v2/csv/locations.csv @@ -1023,3 +1023,13 @@ id,region_id,identifier 1039,9,windswept-run 1040,9,worn-bridge 1041,8,giants-cap +1042,7,hauoli-city +1043,7,verdant-cavern +1044,7,thrifty-megamart +1045,7,malie-city +1046,7,dividing-peak-tunnel +1047,7,heahea-beach +1048,7,sandy-cave +1049,7,ulaula-beach +1050,7,ultra-megalopolis +1051,7,ultra-space-wilds