diff --git a/pokedex/data/csv/location_game_indices.csv b/pokedex/data/csv/location_game_indices.csv
index 7732070..5051fc9 100644
--- a/pokedex/data/csv/location_game_indices.csv
+++ b/pokedex/data/csv/location_game_indices.csv
@@ -246,10 +246,12 @@ location_id,generation_id,game_index
 263,4,2011
 264,4,2012
 264,6,2
+264,7,2
 265,4,3000
 266,4,3001
 267,4,3002
 267,6,4
+267,7,4
 268,4,3003
 269,4,3004
 270,4,3005
@@ -674,3 +676,93 @@ location_id,generation_id,game_index
 707,6,348
 708,6,350
 709,6,352
+710,7,6
+711,7,8
+712,7,10
+713,7,12
+714,7,14
+715,7,16
+716,7,18
+717,7,20
+718,7,22
+719,7,24
+720,7,26
+721,7,28
+722,7,30
+723,7,34
+724,7,36
+725,7,38
+726,7,40
+727,7,42
+728,7,44
+729,7,46
+730,7,48
+731,7,50
+732,7,52
+733,7,54
+734,7,56
+735,7,58
+736,7,60
+737,7,62
+737,7,102
+738,7,64
+739,7,66
+740,7,68
+741,7,70
+742,7,72
+743,7,74
+744,7,76
+745,7,78
+746,7,82
+747,7,84
+748,7,86
+749,7,88
+750,7,90
+751,7,92
+752,7,94
+753,7,100
+754,7,104
+755,7,106
+756,7,108
+757,7,110
+758,7,112
+759,7,114
+760,7,116
+761,7,118
+762,7,120
+763,7,122
+764,7,124
+765,7,126
+766,7,128
+767,7,130
+768,7,132
+769,7,134
+770,7,136
+771,7,138
+772,7,140
+773,7,142
+774,7,144
+775,7,146
+776,7,148
+777,7,150
+778,7,152
+779,7,154
+780,7,156
+781,7,158
+782,7,160
+783,7,162
+784,7,164
+785,7,166
+786,7,168
+787,7,170
+788,7,172
+789,7,174
+790,7,176
+791,7,178
+792,7,180
+793,7,182
+794,7,184
+795,7,186
+796,7,188
+797,7,190
+798,7,192
diff --git a/pokedex/data/csv/location_names.csv b/pokedex/data/csv/location_names.csv
index 06baeb0..c1195bf 100644
--- a/pokedex/data/csv/location_names.csv
+++ b/pokedex/data/csv/location_names.csv
@@ -2686,3 +2686,893 @@ location_id,local_language_id,name,subtitle
 709,8,Valle Segreta,
 709,9,Secret Meadow,
 709,11,ひみつの花畑,
+710,1,１ばんどうろ,ハウオリシティはずれ
+710,3,1번도로,하우올리시티 변두리
+710,4,１號道路,好奧樂市郊
+710,5,Route 1,Abords d’Ekaeka
+710,6,Route 1,Hauholi-Stadtrand
+710,7,Ruta 1,Afueras de Hauoli
+710,8,Percorso 1,Periferia di Hau’oli
+710,9,Route 1,Hau’oli Outskirts
+710,11,１番道路,ハウオリシティはずれ
+710,12,１号道路,好奥乐市郊
+711,1,１ばんどうろ,
+711,3,1번도로,
+711,4,１號道路,
+711,5,Route 1,
+711,6,Route 1,
+711,7,Ruta 1,
+711,8,Percorso 1,
+711,9,Route 1,
+711,11,１番道路,
+711,12,１号道路,
+712,1,３ばんどうろ,
+712,3,3번도로,
+712,4,３號道路,
+712,5,Route 3,
+712,6,Route 3,
+712,7,Ruta 3,
+712,8,Percorso 3,
+712,9,Route 3,
+712,11,３番道路,
+712,12,３号道路,
+713,1,２ばんどうろ,
+713,3,2번도로,
+713,4,２號道路,
+713,5,Route 2,
+713,6,Route 2,
+713,7,Ruta 2,
+713,8,Percorso 2,
+713,9,Route 2,
+713,11,２番道路,
+713,12,２号道路,
+714,1,カーラエわん,
+714,3,칼라에만,
+714,4,卡拉蔚灣,
+714,5,Baie de Kala’e,
+714,6,Kala’e-Bucht,
+714,7,Bahía Kalae,
+714,8,Baia Kala’e,
+714,9,Kala’e Bay,
+714,11,カーラエ湾,
+714,12,卡拉蔚湾,
+715,1,メレメレかい,
+715,3,멜레멜레해,
+715,4,美樂美樂海,
+715,5,Mer de Mele-Mele,
+715,6,Meer von Mele-Mele,
+715,7,Mar de Melemele,
+715,8,Mare di Mele Mele,
+715,9,Melemele Sea,
+715,11,メレメレ海,
+715,12,美乐美乐海,
+716,1,ハウオリシティ,ビーチサイドエリア
+716,3,하우올리시티,비치사이드에리어
+716,4,好奧樂市,海灘區
+716,5,Ekaeka,Plage
+716,6,Hauholi City,Strandpromenade
+716,7,Ciudad Hauoli,Paseo Marítimo
+716,8,Hau’oli,Lungomare
+716,9,Hau’oli City,Beachfront
+716,11,ハウオリシティ,ビーチサイドエリア
+716,12,好奥乐市,海滩区
+717,1,ハウオリシティ,ショッピングエリア
+717,3,하우올리시티,쇼핑에리어
+717,4,好奧樂市,商業區
+717,5,Ekaeka,Zone commerciale
+717,6,Hauholi City,Einkaufsviertel
+717,7,Ciudad Hauoli,Zona Comercial
+717,8,Hau’oli,Zona Commerciale
+717,9,Hau’oli City,Shopping District
+717,11,ハウオリシティ,ショッピングエリア
+717,12,好奥乐市,商业区
+718,1,ハウオリシティ,ポートエリア
+718,3,하우올리시티,포트에리어
+718,4,好奧樂市,港口區
+718,5,Ekaeka,Port
+718,6,Hauholi City,Hafen
+718,7,Ciudad Hauoli,Puerto
+718,8,Hau’oli,Porto
+718,9,Hau’oli City,Marina
+718,11,ハウオリシティ,ポートエリア
+718,12,好奥乐市,港口区
+719,1,リリィタウン,
+719,3,릴리마을,
+719,4,利利小鎮,
+719,5,Lili’i,
+719,6,Lili’i,
+719,7,Pueblo Lilii,
+719,8,Lili,
+719,9,Iki Town,
+719,11,リリィタウン,
+719,12,利利小镇,
+720,1,マハロさんどう,
+720,3,마할로 산길,
+720,4,馬哈羅山路,
+720,5,Sentier de Mahalo,
+720,6,Mahalo-Bergpfad,
+720,7,Senda Mahalo,
+720,8,Sentiero Mahalo,
+720,9,Mahalo Trail,
+720,11,マハロ山道,
+720,12,马哈罗山路,
+721,1,マハロさんどう,つりばし
+721,3,마할로 산길,현수교
+721,4,馬哈羅山路,吊橋
+721,5,Sentier de Mahalo,Pont suspendu
+721,6,Mahalo-Bergpfad,Hängebrücke
+721,7,Senda Mahalo,Puente Colgante
+721,8,Sentiero Mahalo,Ponte Sospeso
+721,9,Mahalo Trail,Plank Bridge
+721,11,マハロ山道,吊り橋
+721,12,马哈罗山路,吊桥
+722,1,いくさのいせき,
+722,3,전쟁의 유적,
+722,4,戰爭遺跡,
+722,5,Ruines du Conflit,
+722,6,Ruinen des Krieges,
+722,7,Ruinas de la Guerra,
+722,8,Tempio del Conflitto,
+722,9,Ruins of Conflict,
+722,11,戦の遺跡,
+722,12,战争遗迹,
+723,1,テンカラットヒル,
+723,3,텐캐럿힐,
+723,4,十克拉山丘,
+723,5,Colline Dicarat,
+723,6,Tenkarat-Hügel,
+723,7,Colina Dequilate,
+723,8,Collina Diecicarati,
+723,9,Ten Carat Hill,
+723,11,テンカラットヒル,
+723,12,十克拉山丘,
+724,1,テンカラットヒル,さいおうくうどう
+724,3,텐캐럿힐,가장 깊은 공동
+724,4,十克拉山丘,最深處的空洞
+724,5,Colline Dicarat,Caldeira Toutofon
+724,6,Tenkarat-Hügel,Zentraler Felskessel
+724,7,Colina Dequilate,Caldera Remota
+724,8,Collina Diecicarati,Caldera Recondita
+724,9,Ten Carat Hill,Farthest Hollow
+724,11,テンカラットヒル,最奥空洞
+724,12,十克拉山丘,最深处的空洞
+725,1,ハウオリれいえん,
+725,3,하우올리 묘원,
+725,4,好奧樂墓園,
+725,5,Cimetière d’Ekaeka,
+725,6,Hauholi-Friedhof,
+725,7,Cementerio de Hauoli,
+725,8,Cimitero di Hau’oli,
+725,9,Hau’oli Cemetery,
+725,11,ハウオリ霊園,
+725,12,好奥乐墓园,
+726,1,メレメレのはなぞの,
+726,3,멜레멜레 화원,
+726,4,美樂美樂花園,
+726,5,Jardin de Mele-Mele,
+726,6,Mele-Mele-Blumenmeer,
+726,7,Jardines de Melemele,
+726,8,Prato Mele Mele,
+726,9,Melemele Meadow,
+726,11,メレメレの花園,
+726,12,美乐美乐花园,
+727,1,うみつなぎのどうけつ,
+727,3,바다연결동굴,
+727,4,通海洞穴,
+727,5,Grotte Verlamer,
+727,6,Meereshöhle,
+727,7,Gruta Unemar,
+727,8,Grotta Pratomare,
+727,9,Seaward Cave,
+727,11,海繋ぎの洞穴,
+727,12,通海洞穴,
+728,1,きのみばたけ,
+728,3,나무열매 밭,
+728,4,樹果園,
+728,5,Champ de Baies,
+728,6,Beerenfelder,
+728,7,Huerto de Bayas,
+728,8,Orto delle Bacche,
+728,9,Berry Fields,
+728,11,きのみ畑,
+728,12,树果园,
+729,1,しげみのどうくつ,しれんのま
+729,3,우거진 동굴,시련의 방
+729,4,蔥鬱洞窟,考驗之地
+729,5,Grotte Verdoyante,Zone de l’Épreuve
+729,6,Vegetationshöhle,Prüfungsbereich
+729,7,Cueva Sotobosque,Sala de la Prueba
+729,8,Grotta Sottobosco,Luogo della Prova
+729,9,Verdant Cavern,Trial Site
+729,11,茂みの洞窟,試練の間
+729,12,葱郁洞窟,考验之地
+730,1,しげみのどうくつ,ぬしのま
+730,3,우거진 동굴,주인의 방
+730,4,蔥鬱洞窟,霸主居處
+730,5,Grotte Verdoyante,Repaire du Dominant
+730,6,Vegetationshöhle,Herrscherbereich
+730,7,Cueva Sotobosque,Sala del Dominante
+730,8,Grotta Sottobosco,Arena del Dominante
+730,9,Verdant Cavern,Totem’s Den
+730,11,茂みの洞窟,ぬしの間
+730,12,葱郁洞窟,霸主居处
+731,1,４ばんどうろ,
+731,3,4번도로,
+731,4,４號道路,
+731,5,Route 4,
+731,6,Route 4,
+731,7,Ruta 4,
+731,8,Percorso 4,
+731,9,Route 4,
+731,11,４番道路,
+731,12,４号道路,
+732,1,５ばんどうろ,
+732,3,5번도로,
+732,4,５號道路,
+732,5,Route 5,
+732,6,Route 5,
+732,7,Ruta 5,
+732,8,Percorso 5,
+732,9,Route 5,
+732,11,５番道路,
+732,12,５号道路,
+733,1,６ばんどうろ,
+733,3,6번도로,
+733,4,６號道路,
+733,5,Route 6,
+733,6,Route 6,
+733,7,Ruta 6,
+733,8,Percorso 6,
+733,9,Route 6,
+733,11,６番道路,
+733,12,６号道路,
+734,1,７ばんどうろ,
+734,3,7번도로,
+734,4,７號道路,
+734,5,Route 7,
+734,6,Route 7,
+734,7,Ruta 7,
+734,8,Percorso 7,
+734,9,Route 7,
+734,11,７番道路,
+734,12,７号道路,
+735,1,８ばんどうろ,
+735,3,8번도로,
+735,4,８號道路,
+735,5,Route 8,
+735,6,Route 8,
+735,7,Ruta 8,
+735,8,Percorso 8,
+735,9,Route 8,
+735,11,８番道路,
+735,12,８号道路,
+736,1,９ばんどうろ,
+736,3,9번도로,
+736,4,９號道路,
+736,5,Route 9,
+736,6,Route 9,
+736,7,Ruta 9,
+736,8,Percorso 9,
+736,9,Route 9,
+736,11,９番道路,
+736,12,９号道路,
+737,1,ハノハノリゾート,
+737,3,하노하노리조트,
+737,4,豪諾豪諾度假地,
+737,5,Club Hano-Hano,
+737,6,Hanohano-Resort,
+737,7,Resort Hanohano,
+737,8,Resort Hanu Hanu,
+737,9,Hano Grand Resort,
+737,11,ハノハノリゾート,
+737,12,豪诺豪诺度假地,
+738,1,ハノハノビーチ,
+738,3,하노하노비치,
+738,4,豪諾豪諾海灘,
+738,5,Plage Hano-Hano,
+738,6,Hanohano-Strand,
+738,7,Playa de Hanohano,
+738,8,Spiaggia Hanu Hanu,
+738,9,Hano Beach,
+738,11,ハノハノビーチ,
+738,12,豪诺豪诺海滩,
+739,1,アーカラのはなぞの,
+739,3,아칼라 화원,
+739,4,阿卡拉花園,
+739,5,Jardin d’Akala,
+739,6,Akala-Blumenmeer,
+739,7,Jardines de Akala,
+739,8,Prato Akala,
+739,9,Akala Meadow,
+739,11,アーカラの花園,
+739,12,阿卡拉花园,
+740,1,オハナタウン,
+740,3,오하나마을,
+740,4,歐哈納鎮,
+740,5,Ohana,
+740,6,Ohana,
+740,7,Pueblo Ohana,
+740,8,Ohana,
+740,9,Paniola Town,
+740,11,オハナタウン,
+740,12,欧哈纳镇,
+741,1,カンタイシティ,
+741,3,환대시티,
+741,4,慷待市,
+741,5,Ho’ohale,
+741,6,Kantai City,
+741,7,Ciudad Kantai,
+741,8,Kantai,
+741,9,Heahea City,
+741,11,カンタイシティ,
+741,12,慷待市,
+742,1,コニコシティ,
+742,3,코니코니시티,
+742,4,可霓可市,
+742,5,Konikoni,
+742,6,Konikoni City,
+742,7,Ciudad Konikoni,
+742,8,Konikoni,
+742,9,Konikoni City,
+742,11,コニコシティ,
+742,12,可霓可市,
+743,1,ロイヤルアベニュー,
+743,3,로열 애버뉴,
+743,4,皇家大道,
+743,5,Rue du Dôme Royal,
+743,6,Avenue Royale,
+743,7,Avenida Royale,
+743,8,Viale Royale,
+743,9,Royal Avenue,
+743,11,ロイヤルアベニュー,
+743,12,皇家大道,
+744,1,メモリアルヒル,
+744,3,메모리얼힐,
+744,4,回憶之丘,
+744,5,Colline Memento,
+744,6,Hügel des Gedenkens,
+744,7,Colina del Recuerdo,
+744,8,Colle della Memoria,
+744,9,Memorial Hill,
+744,11,メモリアルヒル,
+744,12,回忆之丘,
+745,1,オハナぼくじょう,
+745,3,오하나목장,
+745,4,歐哈納牧場,
+745,5,Ranch Ohana,
+745,6,Ohana-Farm,
+745,7,Rancho Ohana,
+745,8,Fattoria Ohana,
+745,9,Paniola Ranch,
+745,11,オハナ牧場,
+745,12,欧哈纳牧场,
+746,1,ヴェラかざんこうえん,
+746,3,벨라화산공원,
+746,4,維拉火山公園,
+746,5,Parc Volcanique,
+746,6,Wela-Vulkanpark,
+746,7,Área Volcánica Wela,
+746,8,Parco Vulcano Wela,
+746,9,Wela Volcano Park,
+746,11,ヴェラ火山公園,
+746,12,维拉火山公园,
+747,1,ヴェラかざんこうえん,ぬしのま
+747,3,벨라화산공원,주인의 방
+747,4,維拉火山公園,霸主居處
+747,5,Parc Volcanique,Repaire du Dominant
+747,6,Wela-Vulkanpark,Herrscherbereich
+747,7,Área Volcánica Wela,Sala del Dominante
+747,8,Parco Vulcano Wela,Arena del Dominante
+747,9,Wela Volcano Park,Totem’s Den
+747,11,ヴェラ火山公園,ぬしの間
+747,12,维拉火山公园,霸主居处
+748,1,せせらぎのおか,
+748,3,잔잔한물가언덕,
+748,4,潺潺之丘,
+748,5,Colline Clapotis,
+748,6,Plätscherhügel,
+748,7,Colina Saltagua,
+748,8,Collina Scrosciante,
+748,9,Brooklet Hill,
+748,11,せせらぎの丘,
+748,12,潺潺之丘,
+749,1,せせらぎのおか,ぬしのま
+749,3,잔잔한물가언덕,주인의 방
+749,4,潺潺之丘,霸主居處
+749,5,Colline Clapotis,Repaire du Dominant
+749,6,Plätscherhügel,Herrscherbereich
+749,7,Colina Saltagua,Sala del Dominante
+749,8,Collina Scrosciante,Arena del Dominante
+749,9,Brooklet Hill,Totem’s Den
+749,11,せせらぎの丘,ぬしの間
+749,12,潺潺之丘,霸主居处
+750,1,シェードジャングル,
+750,3,셰이드정글,
+750,4,樹蔭叢林,
+750,5,Jungle Sombrefeuille,
+750,6,Schattendschungel,
+750,7,Jungla Umbría,
+750,8,Giungla Ombrosa,
+750,9,Lush Jungle,
+750,11,シェードジャングル,
+750,12,树荫丛林,
+751,1,いのちのいせき,
+751,3,생명의 유적,
+751,4,生命遺跡,
+751,5,Ruines de l’Éveil,
+751,6,Ruinen des Lebens,
+751,7,Ruinas de la Vida,
+751,8,Tempio della Vita,
+751,9,Ruins of Life,
+751,11,命の遺跡,
+751,12,生命遗迹,
+752,1,アーカラじまはずれ,
+752,3,아칼라외곽,
+752,4,阿卡拉島郊外,
+752,5,Côte Reculée d’Akala,
+752,6,Akala-Küstenstreifen,
+752,7,Afueras de Akala,
+752,8,Punta Akala,
+752,9,Akala Outskirts,
+752,11,アーカラ島はずれ,
+752,12,阿卡拉岛郊外,
+753,1,ディグダトンネル,
+753,3,디그다터널,
+753,4,地鼠隧道,
+753,5,Tunnel Taupiqueur,
+753,6,Digda-Tunnel,
+753,7,Túnel Diglett,
+753,8,Tunnel Diglett,
+753,9,Diglett’s Tunnel,
+753,11,ディグダトンネル,
+753,12,地鼠隧道,
+754,1,ロイヤルドーム,
+754,3,로열돔,
+754,4,皇家巨蛋,
+754,5,Dôme Royal,
+754,6,Dome Royale,
+754,7,Estadio Royale,
+754,8,Stadio Royale,
+754,9,Battle Royal Dome,
+754,11,ロイヤルドーム,
+754,12,皇家巨蛋,
+755,1,１０ばんどうろ,
+755,3,10번도로,
+755,4,１０號道路,
+755,5,Route 10,
+755,6,Route 10,
+755,7,Ruta 10,
+755,8,Percorso 10,
+755,9,Route 10,
+755,11,１０番道路,
+755,12,１０号道路,
+756,1,１１ばんどうろ,
+756,3,11번도로,
+756,4,１１號道路,
+756,5,Route 11,
+756,6,Route 11,
+756,7,Ruta 11,
+756,8,Percorso 11,
+756,9,Route 11,
+756,11,１１番道路,
+756,12,１１号道路,
+757,1,ウラウラうらかいがん,
+757,3,울라울라 뒤쪽 해안,
+757,4,烏拉烏拉後海岸,
+757,5,Côte Sauvage,
+757,6,Küste von Ula-Ula,
+757,7,Playa Menor,
+757,8,Lido di Ula Ula,
+757,9,Secluded Shore,
+757,11,ウラウラ裏海岸,
+757,12,乌拉乌拉后海岸,
+758,1,１３ばんどうろ,
+758,3,13번도로,
+758,4,１３號道路,
+758,5,Route 13,
+758,6,Route 13,
+758,7,Ruta 13,
+758,8,Percorso 13,
+758,9,Route 13,
+758,11,１３番道路,
+758,12,１３号道路,
+759,1,カプのむら,
+759,3,카푸마을,
+759,4,卡璞村,
+759,5,Village Toko,
+759,6,Dorf der Kapu,
+759,7,Aldea Tapu,
+759,8,Villaggio Tapu,
+759,9,Tapu Village,
+759,11,カプの村,
+759,12,卡璞村,
+760,1,１５ばんすいどう,
+760,3,15번수로,
+760,4,１５號水路,
+760,5,Route 15,
+760,6,Route 15 (Wasserweg),
+760,7,Ruta 15,
+760,8,Percorso 15,
+760,9,Route 15,
+760,11,１５番水道,
+760,12,１５号水路,
+761,1,１６ばんどうろ,
+761,3,16번도로,
+761,4,１６號道路,
+761,5,Route 16,
+761,6,Route 16,
+761,7,Ruta 16,
+761,8,Percorso 16,
+761,9,Route 16,
+761,11,１６番道路,
+761,12,１６号道路,
+762,1,１７ばんどうろ,
+762,3,17번도로,
+762,4,１７號道路,
+762,5,Route 17,
+762,6,Route 17,
+762,7,Ruta 17,
+762,8,Percorso 17,
+762,9,Route 17,
+762,11,１７番道路,
+762,12,１７号道路,
+763,1,１２ばんどうろ,
+763,3,12번도로,
+763,4,１２號道路,
+763,5,Route 12,
+763,6,Route 12,
+763,7,Ruta 12,
+763,8,Percorso 12,
+763,9,Route 12,
+763,11,１２番道路,
+763,12,１２号道路,
+764,1,ハイナさばく,
+764,3,하이나사막,
+764,4,哈伊納沙漠,
+764,5,Désert Haina,
+764,6,Haina-Wüste,
+764,7,Desierto de Haina,
+764,8,Deserto Haina,
+764,9,Haina Desert,
+764,11,ハイナ砂漠,
+764,12,哈伊纳沙漠,
+765,1,１４ばんどうろ,
+765,3,14번도로,
+765,4,１４號道路,
+765,5,Route 14,
+765,6,Route 14,
+765,7,Ruta 14,
+765,8,Percorso 14,
+765,9,Route 14,
+765,11,１４番道路,
+765,12,１４号道路,
+766,1,ウラウラのはなぞの,
+766,3,울라울라 화원,
+766,4,烏拉烏拉花園,
+766,5,Jardin d’Ula-Ula,
+766,6,Ula-Ula-Blumenmeer,
+766,7,Jardines de Ula-Ula,
+766,8,Prato Ula Ula,
+766,9,Ula’ula Meadow,
+766,11,ウラウラの花園,
+766,12,乌拉乌拉花园,
+767,1,ポータウン,
+767,3,포마을,
+767,4,魄鎮,
+767,5,Kokohio,
+767,6,Po’u,
+767,7,Pueblo Po,
+767,8,Poh,
+767,9,Po Town,
+767,11,ポータウン,
+767,12,魄镇,
+768,1,マリエシティ,
+768,3,말리에시티,
+768,4,馬利埃靜市,
+768,5,Malié,
+768,6,Malihe City,
+768,7,Ciudad Malíe,
+768,8,Malie,
+768,9,Malie City,
+768,11,マリエシティ,
+768,12,马利埃静市,
+769,1,マリエていえん,
+769,3,말리에 정원,
+769,4,馬利埃庭園,
+769,5,Parc de Malié,
+769,6,Malihe-Ziergarten,
+769,7,Parque de Malíe,
+769,8,Giardino di Malie,
+769,9,Malie Garden,
+769,11,マリエ庭園,
+769,12,马利埃庭园,
+770,1,ホクラニだけ,
+770,3,호쿠라니큰산,
+770,4,輝克拉尼山,
+770,5,Mont Hokulani,
+770,6,Hokulani-Berg,
+770,7,Pico Hokulani,
+770,8,Picco Hokulani,
+770,9,Mount Hokulani,
+770,11,ホクラニ岳,
+770,12,辉克拉尼山,
+771,1,ホテリやま,
+771,3,화끈산,
+771,4,火特力山,
+771,5,Mont Ardent,
+771,6,Glühberg,
+771,7,Monte Rubor,
+771,8,Monte Tepore,
+771,9,Blush Mountain,
+771,11,ホテリ山,
+771,12,火特力山,
+772,1,みのりのいせき,
+772,3,결실의 유적,
+772,4,豐收遺跡,
+772,5,Ruines de l’Essor,
+772,6,Ruinen des Gedeihens,
+772,7,Ruinas de la Cosecha,
+772,8,Tempio del Raccolto,
+772,9,Ruins of Abundance,
+772,11,実りの遺跡,
+772,12,丰收遗迹,
+773,1,にちりんのみずうみ,
+773,3,일륜의 호수,
+773,4,日輪湖,
+773,5,Lac du Halo Solaire,
+773,6,Sonnenkreis-See,
+773,7,Lago Corosol,
+773,8,Lago Solare,
+773,9,Lake of the Sunne,
+773,11,日輪の湖,
+773,12,日轮湖,
+774,1,がちりんのみずうみ,
+774,3,월륜의 호수,
+774,4,月輪湖,
+774,5,Lac du Halo Lunaire,
+774,6,Mondscheiben-See,
+774,7,Lago Coroluna,
+774,8,Lago Lunare,
+774,9,Lake of the Moone,
+774,11,月輪の湖,
+774,12,月轮湖,
+775,1,ラナキラマウンテン,
+775,3,라나키라마운틴,
+775,4,拉納基拉山,
+775,5,Mont Lanakila,
+775,6,Mount Lanakila,
+775,7,Monte Lanakila,
+775,8,Monte Lanakila,
+775,9,Mount Lanakila,
+775,11,ラナキラマウンテン,
+775,12,拉纳基拉山,
+776,1,いかがわしきやしき,
+776,3,수상한 저택,
+776,4,可疑宅邸,
+776,5,Manoir Chelou,
+776,6,Lottervilla,
+776,7,Mansión Misteriosa,
+776,8,Villa Losca,
+776,9,Shady House,
+776,11,いかがわしき屋敷,
+776,12,可疑宅邸,
+777,1,スーパー・メガやす,あとち
+777,3,슈퍼・메가싸네,철거지
+777,4,超值超市,舊址
+777,5,Bradley Prix,Site désaffecté
+777,6,Schnäppchenparadies,Verlassener Laden
+777,7,Súper Ultraganga,Local Abandonado
+777,8,Supermarket Affaroni,Edificio Abbandonato
+777,9,Thrifty Megamart,Abandoned Site
+777,11,スーパー・メガやす,跡地
+777,12,超值超市,旧址
+778,1,ホクラニてんもんだい,
+778,3,호쿠라니천문대,
+778,4,輝克拉尼天文台,
+778,5,Observatoire,
+778,6,Hokulani-Sternwarte,
+778,7,Observ. de Hokulani,
+778,8,Osservatorio,
+778,9,Hokulani Observatory,
+778,11,ホクラニ天文台,
+778,12,辉克拉尼天文台,
+779,1,ポケモンリーグ,
+779,3,포켓몬리그,
+779,4,寶可夢聯盟,
+779,5,Ligue Pokémon,
+779,6,Pokémon-Liga,
+779,7,Liga Pokémon,
+779,8,Lega Pokémon,
+779,9,Pokémon League,
+779,11,ポケモンリーグ,
+779,12,宝可梦联盟,
+780,1,ポニのはなぞの,
+780,3,포니 화원,
+780,4,波尼花園,
+780,5,Jardin de Poni,
+780,6,Poni-Blumenmeer,
+780,7,Jardines de Poni,
+780,8,Prato Poni,
+780,9,Poni Meadow,
+780,11,ポニの花園,
+780,12,波尼花园,
+781,1,ポニのげんや,
+781,3,포니들판,
+781,4,波尼原野,
+781,5,Prairie de Poni,
+781,6,Wildnis von Poni,
+781,7,Prado de Poni,
+781,8,Piana di Poni,
+781,9,Poni Wilds,
+781,11,ポニの原野,
+781,12,波尼原野,
+782,1,ポニのこどう,
+782,3,포니옛길,
+782,4,波尼古道,
+782,5,Vieille Route,
+782,6,Alter Pfad von Poni,
+782,7,Antiguo Paso de Poni,
+782,8,Via Antica di Poni,
+782,9,Ancient Poni Path,
+782,11,ポニの古道,
+782,12,波尼古道,
+783,1,ポニのあらいそ,
+783,3,포니의 거친 해안,
+783,4,波尼鼓浪岩岸,
+783,5,Récif de Poni,
+783,6,Felsenküste von Poni,
+783,7,Arrecife de Poni,
+783,8,Scogliera di Poni,
+783,9,Poni Breaker Coast,
+783,11,ポニの荒磯,
+783,12,波尼鼓浪岩岸,
+784,1,ポニのじゅりん,
+784,3,포니수림,
+784,4,波尼樹林,
+784,5,Forêt de Poni,
+784,6,Wald von Poni,
+784,7,Bosque de Poni,
+784,8,Foresta di Poni,
+784,9,Poni Grove,
+784,11,ポニの樹林,
+784,12,波尼树林,
+785,1,ポニのこうや,
+785,3,포니광야,
+785,4,波尼曠野,
+785,5,Plaine de Poni,
+785,6,Ebene von Poni,
+785,7,Llanura de Poni,
+785,8,Prateria di Poni,
+785,9,Poni Plains,
+785,11,ポニの広野,
+785,12,波尼旷野,
+786,1,ポニのかいがん,
+786,3,포니해안,
+786,4,波尼海岸,
+786,5,Côte de Poni,
+786,6,Küste von Poni,
+786,7,Costa de Poni,
+786,8,Costa di Poni,
+786,9,Poni Coast,
+786,11,ポニの海岸,
+786,12,波尼海岸,
+787,1,ポニのけんろ,
+787,3,포니험로,
+787,4,波尼險路,
+787,5,Chemin du Défi,
+787,6,Beschwerlicher Pfad,
+787,7,Pendiente de Poni,
+787,8,Erta di Poni,
+787,9,Poni Gauntlet,
+787,11,ポニの険路,
+787,12,波尼险路,
+788,1,うみのたみのむら,
+788,3,바다민족의 마을,
+788,4,海洋居民之村,
+788,5,Village Flottant,
+788,6,Dorf des Seevolkes,
+788,7,Aldea Marina,
+788,8,Villaggio del Mare,
+788,9,Seafolk Village,
+788,11,海の民の村,
+788,12,海洋居民之村,
+789,1,ポニのだいきょうこく,
+789,3,포니대협곡,
+789,4,波尼大峽谷,
+789,5,Grand Canyon de Poni,
+789,6,Canyon von Poni,
+789,7,Cañón de Poni,
+789,8,Canyon di Poni,
+789,9,Vast Poni Canyon,
+789,11,ポニの大峡谷,
+789,12,波尼大峡谷,
+790,1,にちりんのさいだん,
+790,3,일륜의 제단,
+790,4,日輪祭壇,
+790,5,Autel du Soleil,
+790,6,Sonnenkreis-Podium,
+790,7,Altar del Sol,
+790,8,Altare Solare,
+790,9,Altar of the Sunne,
+790,11,日輪の祭壇,
+790,12,日轮祭坛,
+791,1,がちりんのさいだん,
+791,3,월륜의 제단,
+791,4,月輪祭壇,
+791,5,Autel de la Lune,
+791,6,Mondscheiben-Podium,
+791,7,Altar de la Luna,
+791,8,Altare Lunare,
+791,9,Altar of the Moone,
+791,11,月輪の祭壇,
+791,12,月轮祭坛,
+792,1,ひがんのいせき,
+792,3,피안의 유적,
+792,4,彼岸遺跡,
+792,5,Ruines de l’Au-Delà,
+792,6,Ruinen der Heimkehr,
+792,7,Ruinas del Tránsito,
+792,8,Tempio del Passaggio,
+792,9,Ruins of Hope,
+792,11,彼岸の遺跡,
+792,12,彼岸遗迹,
+793,1,エンドケイブ,
+793,3,엔드케이브,
+793,4,終結洞窟,
+793,5,Caverne Coda,
+793,6,Finalhöhle,
+793,7,Gruta Desenlace,
+793,8,Caverna Climax,
+793,9,Resolution Cave,
+793,11,エンドケイブ,
+793,12,终结洞窟,
+794,1,ナッシー・アイランド,
+794,3,나시・아일랜드,
+794,4,椰蛋樹島,
+794,5,Île Noadkoko,
+794,6,Kokowei-Eiland,
+794,7,Isla Exeggutor,
+794,8,Isola Exeggutor,
+794,9,Exeggutor Island,
+794,11,ナッシー・アイランド,
+794,12,椰蛋树岛,
+795,1,バトルツリー,
+795,3,배틀트리,
+795,4,對戰樹,
+795,5,Arbre de Combat,
+795,6,Kampfbaum,
+795,7,Árbol de Combate,
+795,8,Albero della Lotta,
+795,9,Battle Tree,
+795,11,バトルツリー,
+795,12,对战树,
+796,1,エーテルパラダイス,
+796,3,에테르파라다이스,
+796,4,以太樂園,
+796,5,Paradis Æther,
+796,6,Æther-Paradies,
+796,7,Paraíso Æther,
+796,8,Æther Paradise,
+796,9,Aether Paradise,
+796,11,エーテルパラダイス,
+796,12,以太乐园,
+797,1,ウルトラスペース,
+797,3,울트라스페이스,
+797,4,究極空間,
+797,5,Ultra-Dimension,
+797,6,Ultradimension,
+797,7,Ultraespacio,
+797,8,Ultramondo,
+797,9,Ultra Space,
+797,11,ウルトラスペース,
+797,12,究极空间,
+798,1,マリエシティ,はずれのみさき
+798,3,말리에시티,외곽해안가
+798,4,馬利埃靜市,市郊海角
+798,5,Malié,Cap Passiloin
+798,6,Malihe City,Kap am Stadtrand
+798,7,Ciudad Malíe,Cabo de las Afueras
+798,8,Malie,Promontorio di Malie
+798,9,Malie City,Outer Cape
+798,11,マリエシティ,はずれの岬
+798,12,马利埃静市,市郊海角
diff --git a/pokedex/data/csv/locations.csv b/pokedex/data/csv/locations.csv
index c81f967..214877f 100644
--- a/pokedex/data/csv/locations.csv
+++ b/pokedex/data/csv/locations.csv
@@ -691,3 +691,92 @@ 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
+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
+731,7,alola-route-4
+732,7,alola-route-5
+733,7,alola-route-6
+734,7,alola-route-7
+735,7,alola-route-8
+736,7,alola-route-9
+737,7,hano-grand-resort
+738,7,hano-beach
+739,7,akala-meadow
+740,7,paniola-town
+741,7,heahea-city
+742,7,konikoni-city
+743,7,royal-avenue
+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
+753,7,digletts-tunnel
+754,7,battle-royal-dome
+755,7,alola-route-10
+756,7,alola-route-11
+757,7,secluded-shore
+758,7,alola-route-13
+759,7,tapu-village
+760,7,alola-route-15
+761,7,alola-route-16
+762,7,alola-route-17
+763,7,alola-route-12
+764,7,haina-desert
+765,7,alola-route-14
+766,7,ulaula-meadow
+767,7,po-town
+768,7,malie-city
+769,7,malie-garden
+770,7,mount-hokulani
+771,7,blush-mountain
+772,7,ruins-of-abundance
+773,7,lake-of-the-sunne
+774,7,lake-of-the-moone
+775,7,mount-lanakila
+776,7,shady-house
+777,7,thrifty-megamart--abandoned-site
+778,7,hokulani-observatory
+779,7,alola-pokemon-league
+780,7,poni-meadow
+781,7,poni-wilds
+782,7,ancient-poni-path
+783,7,poni-breaker-coast
+784,7,poni-grove
+785,7,poni-plains
+786,7,poni-coast
+787,7,poni-gauntlet
+788,7,seafolk-village
+789,7,vast-poni-canyon
+790,7,altar-of-the-sunne
+791,7,altar-of-the-moone
+792,7,ruins-of-hope
+793,7,resolution-cave
+794,7,exeggutor-island
+795,7,battle-tree
+796,7,aether-paradise
+797,7,ultra-space
+798,7,malie-city--outer-cape
diff --git a/scripts/add-sm-locations.py b/scripts/add-sm-locations.py
new file mode 100644
index 0000000..878e791
--- /dev/null
+++ b/scripts/add-sm-locations.py
@@ -0,0 +1,108 @@
+# encoding: utf-8
+# Adds locations to the database from the text dump.
+#
+# Usage: python add-sm-locations.py | psql pokedex
+
+from __future__ import unicode_literals, print_function
+
+import io
+import os
+import re
+import sys
+
+def make_identifier(name):
+    """Make a string safe to use as an identifier.
+
+    Valid characters are lowercase alphanumerics and "-". This function may
+    raise ValueError if it can't come up with a suitable identifier.
+
+    This function is useful for scripts which add things with names.
+    """
+    if isinstance(name, bytes):
+        identifier = name.decode('utf-8')
+    else:
+        identifier = name
+    identifier = identifier.lower()
+    identifier = identifier.replace(u'+', u' plus ')
+    identifier = re.sub(u'[ _–]+', u'-', identifier)
+    identifier = re.sub(u"['./;’(),:]", u'', identifier)
+    identifier = identifier.replace(u'é', u'e')
+
+    if not identifier.replace(u"-", u"").isalnum():
+        raise ValueError(identifier)
+    return identifier
+
+ROOT = os.path.expanduser("~/hacks/sm-encounters/textrip/text")
+GENERATION_ID = 7
+REGION_ID = 7
+
+lang_idents = {
+    'ja-kana': 'ja-Hrkt',
+    'ja-kanji': 'ja',
+}
+
+foreign = []
+for lang in 'ja-kana', 'ja-kanji', 'en', 'fr', 'it', 'de', 'es', 'ko', 'zh-Hans', 'zh-Hant':
+    with io.open(os.path.join(ROOT, lang, '67'), encoding="utf-8") as f:
+        names = []
+        while True:
+            name = f.readline()
+            subtitle = f.readline()
+            if not name:
+                break
+            names.append((name.strip(), subtitle.strip()))
+    foreign.append((lang_idents.get(lang, lang), names))
+
+print("BEGIN;")
+#print("UPDATE pokemon_evolution SET location_id = NULL WHERE location_id in (SELECT id FROM locations WHERE region_id = 6);")
+print("DELETE FROM location_game_indices WHERE generation_id = %d;" % GENERATION_ID)
+print("DELETE FROM location_names WHERE location_id IN (SELECT id FROM locations WHERE region_id = %d);" % REGION_ID)
+print("DELETE FROM locations WHERE region_id=%d;" % REGION_ID)
+print("SELECT setval('locations_id_seq', max(id)) FROM locations;")
+en = foreign[2][1]
+for i, (name, subtitle) in enumerate(en):
+    game_index = i * 2
+    foreign_names = [(lang, names[i]) for lang, names in foreign]
+    if i == 0:
+        continue
+    if name == '\n':
+        continue
+    try:
+        ident = make_identifier(name.strip())
+    except ValueError:
+        print(("bad location: %s" % name).encode("utf-8"), file=sys.stderr)
+        continue
+
+    if ident.startswith('route-'):
+        ident = 'alola-' + ident
+    elif ident == 'pokemon-league':
+        ident = 'alola-pokemon-league'
+
+    if subtitle:
+        try:
+            subident = make_identifier(subtitle.strip())
+        except ValueError:
+            print(("bad location: %s %s" % (name, subtitle)).encode("utf-8"), file=sys.stderr)
+            continue
+        ident = ident + "--" + subident
+
+    print("\echo '%s'" % ident)
+    if ident in ('mystery-zone', 'faraway-place'):
+        # standard locations
+        pass
+    elif ident == 'hano-grand-resort' and game_index == 102:
+        # I have no idea why where are two "Hano Grand Resort" locations.
+        # I think this one is unused
+        pass
+    else:
+        print("""INSERT INTO locations (identifier, region_id) VALUES ('%s', %s) RETURNING id;""" % (ident, REGION_ID))
+
+        for lang, (name, subtitle) in foreign_names:
+            print(("""INSERT INTO location_names (location_id, local_language_id, name, subtitle) SELECT loc.id, lang.id, '%s', '%s' FROM locations loc, languages lang WHERE loc.identifier = '%s' AND (loc.region_id is NULL OR loc.region_id = %d) AND lang.identifier = '%s';""" % (name, subtitle, ident, REGION_ID, lang)).encode("utf-8"))
+
+    print(("""INSERT INTO location_game_indices (location_id, generation_id, game_index) SELECT id, %s, %s FROM locations WHERE identifier='%s' AND (region_id is NULL OR region_id = %d);""" % (GENERATION_ID, game_index, ident, REGION_ID)).encode("utf-8"))
+
+#for pokemon_id, location_identifier in (462, 'kalos-route-13'), (470, 'kalos-route-20'), (471, 'frost-cavern'), (476, 'kalos-route-13'):
+#    print("UPDATE pokemon_evolution SET location_id = (SELECT id FROM locations WHERE identifier = '%s') WHERE location_id is NULL AND evolved_species_id = %d;" % (location_identifier, pokemon_id))
+
+print("COMMIT;")