diff --git a/pokedex/data/csv/location_game_indices.csv b/pokedex/data/csv/location_game_indices.csv
index 799cc5e..e9474b7 100644
--- a/pokedex/data/csv/location_game_indices.csv
+++ b/pokedex/data/csv/location_game_indices.csv
@@ -64,48 +64,74 @@ location_id,generation_id,game_index
 65,4,136
 66,4,206
 67,4,144
+67,7,34
 68,4,141
+68,7,31
 69,4,127
 70,4,130
 71,4,146
+71,7,36
 72,4,220
 73,4,197
+73,7,43
 74,4,222
 75,4,133
 76,4,145
+76,7,35
 77,4,217
 78,4,214
 79,4,135
 80,4,198
+80,7,40
 81,4,216
 82,4,137
 83,4,207
 84,4,126
 85,4,132
 86,4,138
+86,7,28
 87,4,200
+87,7,41
 88,4,149
+88,7,3
 89,4,158
+89,7,12
 90,4,159
+90,7,13
 91,4,160
+91,7,14
 92,4,161
+92,7,15
 93,4,162
+93,7,16
 94,4,163
+94,7,17
 95,4,164
+95,7,18
 96,4,165
+96,7,19
 97,4,166
+97,7,20
 98,4,167
+98,7,21
 99,4,150
+99,7,4
 100,4,168
+100,7,22
 101,4,169
+101,7,23
 102,4,170
+102,7,24
 103,4,172
+103,7,26
 104,4,173
+104,7,27
 105,4,174
 106,4,175
 107,4,176
 108,4,177
 109,4,151
+109,7,5
 110,4,178
 111,4,179
 112,4,180
@@ -117,6 +143,7 @@ location_id,generation_id,game_index
 118,4,186
 119,4,187
 120,4,152
+120,7,6
 121,4,188
 122,4,189
 123,4,190
@@ -127,27 +154,42 @@ location_id,generation_id,game_index
 128,4,195
 129,4,196
 130,4,153
+130,7,7
 131,4,154
+131,7,8
 132,4,155
+132,7,9
 133,4,156
+133,7,10
 134,4,157
+134,7,11
 135,4,209
 136,4,203
+136,7,44
 137,4,211
 138,4,204
 139,4,205
 140,4,223
 141,4,210
 147,4,199
+147,7,46
 151,4,143
+151,7,33
 152,4,221
+152,7,45
 153,4,128
 154,4,139
+154,7,29
 155,4,224
+155,7,39
 156,4,218
 157,4,171
+157,7,25
 158,4,201
+158,7,42
+160,7,47
 161,4,106
+161,7,51
 162,4,202
 163,4,2
 164,4,3
@@ -215,9 +257,13 @@ location_id,generation_id,game_index
 229,4,131
 230,4,134
 231,4,140
+231,7,30
 232,4,142
+232,7,32
 233,4,147
+233,7,37
 234,4,148
+234,7,38
 236,4,212
 237,4,213
 238,4,215
@@ -246,11 +292,13 @@ location_id,generation_id,game_index
 263,4,2011
 264,4,2012
 264,6,2
+264,7,1
 264,7,2
 265,4,3000
 266,4,3001
 267,4,3002
 267,6,4
+267,7,2
 267,7,4
 268,4,3003
 269,4,3004
@@ -499,6 +547,7 @@ location_id,generation_id,game_index
 483,6,324
 484,6,174
 485,6,182
+498,7,48
 531,5,117
 532,5,118
 533,5,119
@@ -784,3 +833,7 @@ location_id,generation_id,game_index
 814,7,228
 815,7,230
 816,7,232
+817,7,49
+818,7,50
+819,7,52
+820,7,53
diff --git a/pokedex/data/csv/location_names.csv b/pokedex/data/csv/location_names.csv
index f872a3f..3a0d40f 100644
--- a/pokedex/data/csv/location_names.csv
+++ b/pokedex/data/csv/location_names.csv
@@ -129,34 +129,82 @@ location_id,local_language_id,name,subtitle
 65,9,Blackthorn City,
 66,5,Tour Cendrée,
 66,9,Burned Tower,
+67,1,タマムシシティ,
+67,3,무지개시티,
+67,4,玉虹市,
 67,5,Céladopole,
+67,6,Prismania City,
+67,7,Ciudad Azulona,
+67,8,Azzurropoli,
 67,9,Celadon City,
+67,11,タマムシシティ,
+67,12,玉虹市,
+68,1,ハナダシティ,
+68,3,블루시티,
+68,4,華藍市,
 68,5,Azuria,
+68,6,Azuria City,
+68,7,Ciudad Celeste,
+68,8,Celestopoli,
 68,9,Cerulean City,
+68,11,ハナダシティ,
+68,12,华蓝市,
 69,5,Ville Griotte,
 69,9,Cherrygrove City,
 70,5,Irisia,
 70,9,Cianwood City,
-71,5,Cramois'Ile,
+71,1,グレンタウン,
+71,3,홍련마을,
+71,4,紅蓮鎮,
+71,5,Cramois’Île,
+71,6,Zinnoberinsel,
+71,7,Isla Canela,
+71,8,Isola Cannella,
 71,9,Cinnabar Island,
+71,11,グレンタウン,
+71,12,红莲镇,
 72,5,Antre Noir,
 72,9,Dark Cave,
-73,5,Cave TAUPIQUEUR,
-73,9,Diglett's Cave,
+73,1,ディグダのあな,
+73,3,디그다의 굴,
+73,4,地鼠洞穴,
+73,5,Grotte Taupiqueur,
+73,6,Digda-Höhle,
+73,7,Cueva Diglett,
+73,8,Grotta Diglett,
+73,9,Diglett’s Cave,
+73,11,ディグダの穴,
+73,12,地鼠洞穴,
 74,5,Antre du Dragon,
 74,9,Dragon's Den,
 75,5,Rosalia,
 75,9,Ecruteak City,
+76,1,セキチクシティ,
+76,3,연분홍시티,
+76,4,淺紅市,
 76,5,Parmanie,
+76,6,Fuchsania City,
+76,7,Ciudad Fucsia,
+76,8,Fucsiapoli,
 76,9,Fuchsia City,
+76,11,セキチクシティ,
+76,12,浅红市,
 77,5,Route de Glace,
 77,9,Ice Path,
 78,5,Bois aux Chênes,
 78,9,Ilex Forest,
 79,5,Lac Colère,
 79,9,Lake of Rage,
+80,1,オツキミやま,
+80,3,달맞이산,
+80,4,月見山,
 80,5,Mont Sélénite,
+80,6,Mondberg,
+80,7,Monte Moon,
+80,8,Monte Luna,
 80,9,Mt. Moon,
+80,11,お月見山,
+80,12,月见山,
 81,5,Mont Creuset,
 81,9,Mt. Mortar,
 82,5,Mont Argenté,
@@ -167,44 +215,196 @@ location_id,local_language_id,name,subtitle
 84,9,New Bark Town,
 85,5,Oliville,
 85,9,Olivine City,
+86,1,マサラタウン,
+86,3,태초마을,
+86,4,真新鎮,
 86,5,Bourg Palette,
+86,6,Alabastia,
+86,7,Pueblo Paleta,
+86,8,Biancavilla,
 86,9,Pallet Town,
-87,5,Grotte,
+86,11,マサラタウン,
+86,12,真新镇,
+87,1,イワヤマトンネル,
+87,3,돌산터널,
+87,4,岩山隧道,
+87,5,Grotte Sombre,
+87,6,Felstunnel,
+87,7,Túnel Roca,
+87,8,Tunnel Roccioso,
 87,9,Rock Tunnel,
+87,11,イワヤマトンネル,
+87,12,岩山隧道,
+88,1,１ばんどうろ,
+88,3,1번도로,
+88,4,１號道路,
 88,5,Route 1,
+88,6,Route 1,
+88,7,Ruta 1,
+88,8,Percorso 1,
 88,9,Route 1,
+88,11,１番道路,
+88,12,１号道路,
+89,1,１０ばんどうろ,
+89,3,10번도로,
+89,4,10號道路,
 89,5,Route 10,
+89,6,Route 10,
+89,7,Ruta 10,
+89,8,Percorso 10,
 89,9,Route 10,
+89,11,１０番道路,
+89,12,10号道路,
+90,1,１１ばんどうろ,
+90,3,11번도로,
+90,4,11號道路,
 90,5,Route 11,
+90,6,Route 11,
+90,7,Ruta 11,
+90,8,Percorso 11,
 90,9,Route 11,
+90,11,１１番道路,
+90,12,11号道路,
+91,1,１２ばんどうろ,
+91,3,12번도로,
+91,4,12號道路,
 91,5,Route 12,
+91,6,Route 12,
+91,7,Ruta 12,
+91,8,Percorso 12,
 91,9,Route 12,
+91,11,１２番道路,
+91,12,12号道路,
+92,1,１３ばんどうろ,
+92,3,13번도로,
+92,4,13號道路,
 92,5,Route 13,
+92,6,Route 13,
+92,7,Ruta 13,
+92,8,Percorso 13,
 92,9,Route 13,
+92,11,１３番道路,
+92,12,13号道路,
+93,1,１４ばんどうろ,
+93,3,14번도로,
+93,4,14號道路,
 93,5,Route 14,
+93,6,Route 14,
+93,7,Ruta 14,
+93,8,Percorso 14,
 93,9,Route 14,
+93,11,１４番道路,
+93,12,14号道路,
+94,1,１５ばんどうろ,
+94,3,15번도로,
+94,4,15號道路,
 94,5,Route 15,
+94,6,Route 15,
+94,7,Ruta 15,
+94,8,Percorso 15,
 94,9,Route 15,
+94,11,１５番道路,
+94,12,15号道路,
+95,1,１６ばんどうろ,
+95,3,16번도로,
+95,4,16號道路,
 95,5,Route 16,
+95,6,Route 16,
+95,7,Ruta 16,
+95,8,Percorso 16,
 95,9,Route 16,
+95,11,１６番道路,
+95,12,16号道路,
+96,1,１７ばんどうろ,
+96,3,17번도로,
+96,4,17號道路,
 96,5,Route 17,
+96,6,Route 17,
+96,7,Ruta 17,
+96,8,Percorso 17,
 96,9,Route 17,
+96,11,１７番道路,
+96,12,17号道路,
+97,1,１８ばんどうろ,
+97,3,18번도로,
+97,4,18號道路,
 97,5,Route 18,
+97,6,Route 18,
+97,7,Ruta 18,
+97,8,Percorso 18,
 97,9,Route 18,
+97,11,１８番道路,
+97,12,18号道路,
+98,1,１９ばんすいどう,
+98,3,19번수로,
+98,4,19號水路,
 98,5,Chenal 19,
-98,9,Sea Route 19,
+98,6,Route 19 (Wasserweg),
+98,7,Ruta 19,
+98,8,Percorso 19,
+98,9,Route 19,
+98,11,１９番水道,
+98,12,19号水路,
+99,1,２ばんどうろ,
+99,3,2번도로,
+99,4,２號道路,
 99,5,Route 2,
+99,6,Route 2,
+99,7,Ruta 2,
+99,8,Percorso 2,
 99,9,Route 2,
+99,11,２番道路,
+99,12,２号道路,
+100,1,２０ばんすいどう,
+100,3,20번수로,
+100,4,20號水路,
 100,5,Chenal 20,
-100,9,Sea Route 20,
+100,6,Route 20 (Wasserweg),
+100,7,Ruta 20,
+100,8,Percorso 20,
+100,9,Route 20,
+100,11,２０番水道,
+100,12,20号水路,
+101,1,２１ばんすいどう,
+101,3,21번수로,
+101,4,21號水路,
 101,5,Chenal 21,
-101,9,Sea Route 21,
+101,6,Route 21 (Wasserweg),
+101,7,Ruta 21,
+101,8,Percorso 21,
+101,9,Route 21,
+101,11,２１番水道,
+101,12,21号水路,
+102,1,２２ばんどうろ,
+102,3,22번도로,
+102,4,22號道路,
 102,5,Route 22,
+102,6,Route 22,
+102,7,Ruta 22,
+102,8,Percorso 22,
 102,9,Route 22,
+102,11,２２番道路,
+102,12,22号道路,
+103,1,２４ばんどうろ,
+103,3,24번도로,
+103,4,24號道路,
 103,5,Route 24,
+103,6,Route 24,
+103,7,Ruta 24,
+103,8,Percorso 24,
 103,9,Route 24,
+103,11,２４番道路,
+103,12,24号道路,
+104,1,２５ばんどうろ,
+104,3,25번도로,
+104,4,25號道路,
 104,5,Route 25,
+104,6,Route 25,
+104,7,Ruta 25,
+104,8,Percorso 25,
 104,9,Route 25,
+104,11,２５番道路,
+104,12,25号道路,
 105,5,Route 26,
 105,9,Route 26,
 106,5,Route 27,
@@ -213,8 +413,16 @@ location_id,local_language_id,name,subtitle
 107,9,Route 28,
 108,5,Route 29,
 108,9,Route 29,
+109,1,３ばんどうろ,
+109,3,3번도로,
+109,4,３號道路,
 109,5,Route 3,
+109,6,Route 3,
+109,7,Ruta 3,
+109,8,Percorso 3,
 109,9,Route 3,
+109,11,３番道路,
+109,12,３号道路,
 110,5,Route 30,
 110,9,Route 30,
 111,5,Route 31,
@@ -235,8 +443,16 @@ location_id,local_language_id,name,subtitle
 118,9,Route 38,
 119,5,Route 39,
 119,9,Route 39,
+120,1,４ばんどうろ,
+120,3,4번도로,
+120,4,４號道路,
 120,5,Route 4,
+120,6,Route 4,
+120,7,Ruta 4,
+120,8,Percorso 4,
 120,9,Route 4,
+120,11,４番道路,
+120,12,４号道路,
 121,5,Chenal 40,
 121,9,Sea Route 40,
 122,5,Chenal 41,
@@ -255,20 +471,68 @@ location_id,local_language_id,name,subtitle
 128,9,Route 47,
 129,5,Route 48,
 129,9,Route 48,
+130,1,５ばんどうろ,
+130,3,5번도로,
+130,4,５號道路,
 130,5,Route 5,
+130,6,Route 5,
+130,7,Ruta 5,
+130,8,Percorso 5,
 130,9,Route 5,
+130,11,５番道路,
+130,12,５号道路,
+131,1,６ばんどうろ,
+131,3,6번도로,
+131,4,６號道路,
 131,5,Route 6,
+131,6,Route 6,
+131,7,Ruta 6,
+131,8,Percorso 6,
 131,9,Route 6,
+131,11,６番道路,
+131,12,６号道路,
+132,1,７ばんどうろ,
+132,3,7번도로,
+132,4,７號道路,
 132,5,Route 7,
+132,6,Route 7,
+132,7,Ruta 7,
+132,8,Percorso 7,
 132,9,Route 7,
+132,11,７番道路,
+132,12,７号道路,
+133,1,８ばんどうろ,
+133,3,8번도로,
+133,4,８號道路,
 133,5,Route 8,
+133,6,Route 8,
+133,7,Ruta 8,
+133,8,Percorso 8,
 133,9,Route 8,
+133,11,８番道路,
+133,12,８号道路,
+134,1,９ばんどうろ,
+134,3,9번도로,
+134,4,９號道路,
 134,5,Route 9,
+134,6,Route 9,
+134,7,Ruta 9,
+134,8,Percorso 9,
 134,9,Route 9,
+134,11,９番道路,
+134,12,９号道路,
 135,5,Ruines d'Alpha,
 135,9,Ruins of Alph,
-136,5,Iles Ecume,
+136,1,ふたごじま,
+136,3,쌍둥이섬,
+136,4,雙子島,
+136,5,Îles Écume,
+136,6,Seeschauminseln,
+136,7,Islas Espuma,
+136,8,Isole Spumarine,
 136,9,Seafoam Islands,
+136,11,双子島,
+136,12,双子岛,
 137,5,Puits RAMOLOSS,
 137,9,Slowpoke Well,
 138,5,Tour CHETIFLOR,
@@ -279,36 +543,108 @@ location_id,local_language_id,name,subtitle
 140,9,Tohjo Falls,
 141,5,Caves Jumelles,
 141,9,Union Cave,
+147,1,ハナダのどうくつ,
+147,3,블루시티동굴,
+147,4,華藍洞窟,
 147,5,Caverne Azurée,
+147,6,Azuria-Höhle,
+147,7,Cueva Celeste,
+147,8,Grotta Celeste,
 147,9,Cerulean Cave,
+147,11,ハナダの洞窟,
+147,12,华蓝洞窟,
 148,5,Inconnu; que des Ptitard,
 148,9,Unknown; all Poliwag,
 149,5,Inconnu; que des Rattata,
 149,9,Unknown; all Rattata,
 150,5,Inconnu; que des insectes,
 150,9,Unknown; all bugs,
+151,1,クチバシティ,
+151,3,갈색시티,
+151,4,枯葉市,
 151,5,Carmin sur Mer,
+151,6,Orania City,
+151,7,Ciudad Carmín,
+151,8,Aranciopoli,
 151,9,Vermilion City,
+151,11,クチバシティ,
+151,12,枯叶市,
+152,1,チャンピオンロード,
+152,3,챔피언로드,
+152,4,冠軍之路,
 152,5,Route Victoire,
+152,6,Siegesstraße,
+152,7,Calle Victoria,
+152,8,Via Vittoria,
 152,9,Victory Road,
+152,11,チャンピオンロード,
+152,12,冠军之路,
 153,5,Mauville,
 153,9,Violet City,
+154,1,トキワシティ,
+154,3,상록시티,
+154,4,常青市,
 154,5,Jadielle,
+154,6,Vertania City,
+154,7,Ciudad Verde,
+154,8,Smeraldopoli,
 154,9,Viridian City,
+154,11,トキワシティ,
+154,12,常青市,
+155,1,トキワのもり,
+155,3,상록숲,
+155,4,常青森林,
 155,5,Forêt de Jade,
+155,6,Vertania-Wald,
+155,7,Bosque Verde,
+155,8,Bosco Smeraldo,
 155,9,Viridian Forest,
+155,11,トキワの森,
+155,12,常青森林,
 156,5,Tourb'Iles,
 156,9,Whirl Islands,
+157,1,２３ばんどうろ,
+157,3,23번도로,
+157,4,23號道路,
 157,5,Route 23,
+157,6,Route 23,
+157,7,Ruta 23,
+157,8,Percorso 23,
 157,9,Route 23,
-158,5,Centrale,
+157,11,２３番道路,
+157,12,23号道路,
+158,1,むじんはつでんしょ,
+158,3,무인발전소,
+158,4,無人發電廠,
+158,5,Centrale abandonnée,
+158,6,Kraftwerk,
+158,7,Central de Energía,
+158,8,Centrale Elettrica,
 158,9,Power Plant,
+158,11,無人発電所,
+158,12,无人发电厂,
 159,5,Route Victoire,
 159,9,Victory Road,
+160,1,ポケモンタワー,
+160,3,포켓몬타워,
+160,4,寶可夢塔,
 160,5,Tour Pokémon,
+160,6,Pokémon-Turm,
+160,7,Torre Pokémon,
+160,8,Torre Pokémon,
 160,9,Pokémon Tower,
+160,11,ポケモンタワー,
+160,12,宝可梦塔,
+161,1,ポケモンやしき,
+161,3,포켓몬저택,
+161,4,寶可夢屋,
 161,5,Manoir Pokémon,
+161,6,Pokémon-Villa,
+161,7,Mansión Pokémon,
+161,8,Villa Pokémon,
 161,9,Pokémon Mansion,
+161,11,ポケモン屋敷,
+161,12,宝可梦屋,
 162,5,Parc Safari,
 162,9,Safari Zone,
 163,5,Littorella,
@@ -443,14 +779,46 @@ location_id,local_language_id,name,subtitle
 229,9,Goldenrod City,
 230,5,Acajou,
 230,9,Mahogany Town,
+231,1,ニビシティ,
+231,3,회색시티,
+231,4,深灰市,
 231,5,Argenta,
+231,6,Marmoria City,
+231,7,Ciudad Plateada,
+231,8,Plumbeopoli,
 231,9,Pewter City,
+231,11,ニビシティ,
+231,12,深灰市,
+232,1,シオンタウン,
+232,3,보라타운,
+232,4,紫苑鎮,
 232,5,Lavanville,
+232,6,Lavandia,
+232,7,Pueblo Lavanda,
+232,8,Lavandonia,
 232,9,Lavender Town,
+232,11,シオンタウン,
+232,12,紫苑镇,
+233,1,セキエイこうげん,
+233,3,석영고원,
+233,4,石英高原,
 233,5,Plateau Indigo,
+233,6,Indigo-Plateau,
+233,7,Meseta Añil,
+233,8,Altopiano Blu,
 233,9,Indigo Plateau,
+233,11,セキエイ高原,
+233,12,石英高原,
+234,1,ヤマブキシティ,
+234,3,노랑시티,
+234,4,金黃市,
 234,5,Safrania,
+234,6,Saffronia City,
+234,7,Ciudad Azafrán,
+234,8,Zafferanopoli,
 234,9,Saffron City,
+234,11,ヤマブキシティ,
+234,12,金黄市,
 236,5,Phare,
 236,9,Lighthouse,
 237,5,Repaire Rocket d'Acajou,
@@ -524,7 +892,7 @@ location_id,local_language_id,name,subtitle
 267,6,Ferner Ort,
 267,7,Lugar lejano,
 267,8,Luogo remoto,
-267,9,Faraway Place,
+267,9,Faraway place,
 267,11,遠い場所,
 267,12,遥远的地方,
 268,5,Film Pokémon,
@@ -1408,8 +1776,16 @@ location_id,local_language_id,name,subtitle
 496,9,Rixy Chamber,
 497,5,Chambre Poinsept,
 497,9,Viapos Chamber,
-498,5,L'Océane,
+498,1,サント・アンヌごう,
+498,3,상트앙느호,
+498,4,聖特安努號,
+498,5,L’Océane,
+498,6,MS Anne,
+498,7,S. S. Anne,
+498,8,Motonave Anna,
 498,9,S.S. Anne,
+498,11,サント・アンヌ号,
+498,12,圣特安努号,
 500,5,Mont Braise,
 500,9,Mt. Ember,
 501,5,Bois Baies,
@@ -3772,3 +4148,43 @@ location_id,local_language_id,name,subtitle
 816,9,Dividing Peak Tunnel,
 816,11,ワカツダケトンネル,
 816,12,分隔岭隧道,
+817,1,ロケットだんアジト,
+817,3,로켓단아지트,
+817,4,火箭隊基地,
+817,5,Repaire Rocket,
+817,6,Rocket-Versteck,
+817,7,Guarida Rocket,
+817,8,Rifugio Rocket,
+817,9,Team Rocket Hideout,
+817,11,ロケット団アジト,
+817,12,火箭队基地,
+818,1,ＧＯパーク,
+818,3,GO파크,
+818,4,GO Park,
+818,5,GO Park,
+818,6,GO Park,
+818,7,GO Park,
+818,8,GO Park,
+818,9,GO Park complex,
+818,11,ＧＯパーク,
+818,12,GO Park,
+819,1,シルフカンパニー,
+819,3,실프주식회사,
+819,4,西爾佛公司,
+819,5,Sylphe SARL,
+819,6,Silph Company,
+819,7,Silph S. A.,
+819,8,Silph S.p.A.,
+819,9,Silph Co.,
+819,11,シルフカンパニー,
+819,12,西尔佛公司,
+820,1,ポケモンリーグ,
+820,3,포켓몬리그,
+820,4,寶可夢聯盟,
+820,5,Ligue Pokémon,
+820,6,Pokémon-Liga,
+820,7,Liga Pokémon,
+820,8,Lega Pokémon,
+820,9,Pokémon League,
+820,11,ポケモンリーグ,
+820,12,宝可梦联盟,
diff --git a/pokedex/data/csv/locations.csv b/pokedex/data/csv/locations.csv
index 8a8f3af..ab52847 100644
--- a/pokedex/data/csv/locations.csv
+++ b/pokedex/data/csv/locations.csv
@@ -798,3 +798,7 @@ id,region_id,identifier
 814,7,pikachu-valley
 815,7,alola-route-1--trainers-school
 816,7,dividing-peak-tunnel
+817,1,team-rocket-hideout
+818,1,go-park-complex
+819,1,silph-co
+820,1,kanto-pokemon-league