Merge branch 'master' into bot/task-93-issue-1432

Author: Naramsim

data/v2/csv/encounter_slots.csv

@@ -1346,3 +1346,15 @@ id,version_group_id,encounter_method_id,slot,rarity
 1345,5,46,,100
 1346,6,46,,100
 1347,7,46,,100
+1348,16,1,1,30
+1349,16,1,2,30
+1350,16,1,3,30
+1351,16,1,4,10
+1352,16,1,1,60
+1353,16,1,2,40
+1354,16,1,1,90
+1355,16,1,2,10
+1356,16,6,1,85
+1357,16,6,2,15
+1358,5,1,1,100
+1359,6,1,2,100

data/v2/csv/encounters.csv

@@ -65257,3 +65257,62 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 70816,9,1205,196,363,32,32
 70817,9,1205,197,42,32,32
 70818,9,1205,198,363,32,32
+70819,25,1215,1348,114,36,38
+70820,25,1215,1349,178,36,38
+70821,25,1215,1350,523,36,38
+70822,25,1215,1351,49,36,38
+70823,26,1215,1348,114,36,38
+70824,26,1215,1349,178,36,38
+70825,26,1215,1350,523,36,38
+70826,26,1215,1351,49,36,38
+70827,25,1216,1348,49,36,38
+70828,25,1216,1349,178,36,38
+70829,25,1216,1350,523,36,38
+70830,25,1216,1351,555,36,38
+70831,26,1216,1348,49,36,38
+70832,26,1216,1349,178,36,38
+70833,26,1216,1350,523,36,38
+70834,26,1216,1351,555,36,38
+70835,25,1217,1352,555,36,38
+70836,25,1217,1353,636,36,38
+70837,26,1217,1352,555,36,38
+70838,26,1217,1353,636,36,38
+70839,25,1218,1348,49,36,38
+70840,25,1218,1349,178,36,38
+70841,25,1218,1350,523,36,38
+70842,25,1218,1351,53,36,38
+70843,26,1218,1348,49,36,38
+70844,26,1218,1349,178,36,38
+70845,26,1218,1350,523,36,38
+70846,26,1218,1351,53,36,38
+70847,25,1219,1352,517,36,38
+70848,25,1219,1353,132,36,38
+70849,26,1219,1352,517,36,38
+70850,26,1219,1353,132,36,38
+70851,25,1220,1348,49,36,38
+70852,25,1220,1349,178,36,38
+70853,25,1220,1350,523,36,38
+70854,25,1220,1351,556,36,38
+70855,26,1220,1348,49,36,38
+70856,26,1220,1349,178,36,38
+70857,26,1220,1350,523,36,38
+70858,26,1220,1351,556,36,38
+70859,25,1220,1356,75,38,38
+70860,25,1220,1357,688,37,37
+70861,26,1220,1356,75,38,38
+70862,26,1220,1357,688,37,37
+70863,25,1221,1354,531,36,38
+70864,25,1221,1355,178,36,38
+70865,26,1221,1354,531,36,38
+70866,26,1221,1355,178,36,38
+70867,25,1221,1356,75,38,38
+70868,25,1221,1357,688,37,37
+70869,26,1221,1356,75,38,38
+70870,26,1221,1357,688,37,37
+70871,25,1222,1352,432,36,38
+70872,25,1222,1353,137,36,38
+70873,26,1222,1352,432,36,38
+70874,26,1222,1353,137,36,38
+70875,7,1223,1358,360,5,50
+70876,8,1223,1358,360,5,50
+70877,9,1223,1359,360,5,50

data/v2/csv/location_area_prose.csv

@@ -2268,4 +2268,13 @@ location_area_id,local_language_id,name
 1198,5,Ultra-Dimension Zéro Monde Grotte
 1199,9,Mount Lanakila Crater
 1199,6,Mount Lanakila Krater
-1199,5,Mont Lanakila Cratère
+1199,5,Mont Lanakila Cratère
+1215,9,Mirage Island (West Of Dewford Town)
+1216,9,Mirage Island (West Of Route 104)
+1217,9,Mirage Island (Route 114)
+1218,9,Mirage Island (Route 124)
+1219,9,Mirage Island (Route 132)
+1220,9,Mirage Island (South of Route 134)
+1221,9,Mirage Island (South of Pacofidlog)
+1222,9,Mirage Island (East of Shoal Cave)
+1223,9,Mirage Island

data/v2/csv/location_areas.csv

@@ -1103,3 +1103,12 @@ id,location_id,game_index,identifier
 1212,1091,0,
 1213,1092,0,
 1214,1093,0,
+1215,577,0,west-of-dewford-town
+1216,577,0,west-of-route-104
+1217,577,0,route-114
+1218,577,0,route-124
+1219,577,0,route-132
+1220,577,0,south-of-route-134
+1221,577,0,south-of-pacifidlog
+1222,577,0,east-of-shoal-cave
+1223,1094,0,

data/v2/csv/locations.csv

@@ -558,7 +558,7 @@ id,region_id,identifier
 574,3,fortree-city
 575,3,underwater
 576,3,mt-chimney
-577,3,mirage-island
+577,3,mirage-spot-island
 578,3,southern-island
 579,3,sealed-chamber
 580,3,scorched-slab
@@ -678,9 +678,9 @@ id,region_id,identifier
 694,3,team-magma-hideout
 695,3,battle-resort
 696,3,ss-tidal
-697,3,mirage-forest
-698,3,mirage-cave
-699,3,mirage-mountain
+697,3,mirage-spot-forest
+698,3,mirage-spot-cave
+699,3,mirage-spot-mountain
 700,3,trackless-forest
 701,3,pathless-plain
 702,3,nameless-cavern
@@ -1075,3 +1075,4 @@ id,region_id,identifier
 1091,1,kanto-pokecenter
 1092,4,sinnoh-pokemart
 1093,2,johto-pokemart
+1094,3,mirage-island

data/v2/csv/pokedex_prose.csv

@@ -110,4 +110,6 @@ pokedex_id,local_language_id,name,description
 33,7,Arándano,Pokédex regional de la Academia Arándano de Escarlata/Púrpura
 33,9,Blueberry,Blueberry Academy dex
 34,7,Ciudad Luminalia,Pokédex regional de Ciudad Luminalia de Pokemon Leyendas Z-A
+34,9,Lumiose,Lumiose City dex
 35,7,Luminalia Dimensional,Pokédex regional de Luminalia Dimensional de Pokemon Leyendas Z-A
+35,9,Hyperspace,Hyperspace dex

data/v2/csv/version_names.csv

@@ -399,7 +399,22 @@ version_id,local_language_id,name
 46,7,Azul
 46,8,Blu
 46,9,Blue
+47,1,レジェンズ Z-A
+47,2,Legends Z-A
+47,3,LEGENDS Z-A
+47,4,傳說 Z-A
 47,5,Légendes : Z-A
-47,9,Legends: ZA
+47,6,Legenden: Z-A
+47,7,Leyendas: Z-A
+47,8,Leggende: Z-A
+47,9,Legends: Z-A
+47,11,レジェンズ Z-A
+47,12,传说 Z-A
+48,3,메가 차원 러시
+48,4,超次元爆湧
 48,5,Méga-Dimension
+48,6,Mega-Dimension
+48,7,Megadimensión
+48,8,Megadimensione
 48,9,Mega Dimension
+48,12,超次元爆涌