Skip to content

Commit 488470b

Browse files
authored
Merge branch 'master' into bot/task-93-issue-1432
2 parents 961635a + fd3bdea commit 488470b

7 files changed

Lines changed: 113 additions & 6 deletions

File tree

data/v2/csv/encounter_slots.csv

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1346,3 +1346,15 @@ id,version_group_id,encounter_method_id,slot,rarity
13461346
1345,5,46,,100
13471347
1346,6,46,,100
13481348
1347,7,46,,100
1349+
1348,16,1,1,30
1350+
1349,16,1,2,30
1351+
1350,16,1,3,30
1352+
1351,16,1,4,10
1353+
1352,16,1,1,60
1354+
1353,16,1,2,40
1355+
1354,16,1,1,90
1356+
1355,16,1,2,10
1357+
1356,16,6,1,85
1358+
1357,16,6,2,15
1359+
1358,5,1,1,100
1360+
1359,6,1,2,100

data/v2/csv/encounters.csv

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65257,3 +65257,62 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
6525765257
70816,9,1205,196,363,32,32
6525865258
70817,9,1205,197,42,32,32
6525965259
70818,9,1205,198,363,32,32
65260+
70819,25,1215,1348,114,36,38
65261+
70820,25,1215,1349,178,36,38
65262+
70821,25,1215,1350,523,36,38
65263+
70822,25,1215,1351,49,36,38
65264+
70823,26,1215,1348,114,36,38
65265+
70824,26,1215,1349,178,36,38
65266+
70825,26,1215,1350,523,36,38
65267+
70826,26,1215,1351,49,36,38
65268+
70827,25,1216,1348,49,36,38
65269+
70828,25,1216,1349,178,36,38
65270+
70829,25,1216,1350,523,36,38
65271+
70830,25,1216,1351,555,36,38
65272+
70831,26,1216,1348,49,36,38
65273+
70832,26,1216,1349,178,36,38
65274+
70833,26,1216,1350,523,36,38
65275+
70834,26,1216,1351,555,36,38
65276+
70835,25,1217,1352,555,36,38
65277+
70836,25,1217,1353,636,36,38
65278+
70837,26,1217,1352,555,36,38
65279+
70838,26,1217,1353,636,36,38
65280+
70839,25,1218,1348,49,36,38
65281+
70840,25,1218,1349,178,36,38
65282+
70841,25,1218,1350,523,36,38
65283+
70842,25,1218,1351,53,36,38
65284+
70843,26,1218,1348,49,36,38
65285+
70844,26,1218,1349,178,36,38
65286+
70845,26,1218,1350,523,36,38
65287+
70846,26,1218,1351,53,36,38
65288+
70847,25,1219,1352,517,36,38
65289+
70848,25,1219,1353,132,36,38
65290+
70849,26,1219,1352,517,36,38
65291+
70850,26,1219,1353,132,36,38
65292+
70851,25,1220,1348,49,36,38
65293+
70852,25,1220,1349,178,36,38
65294+
70853,25,1220,1350,523,36,38
65295+
70854,25,1220,1351,556,36,38
65296+
70855,26,1220,1348,49,36,38
65297+
70856,26,1220,1349,178,36,38
65298+
70857,26,1220,1350,523,36,38
65299+
70858,26,1220,1351,556,36,38
65300+
70859,25,1220,1356,75,38,38
65301+
70860,25,1220,1357,688,37,37
65302+
70861,26,1220,1356,75,38,38
65303+
70862,26,1220,1357,688,37,37
65304+
70863,25,1221,1354,531,36,38
65305+
70864,25,1221,1355,178,36,38
65306+
70865,26,1221,1354,531,36,38
65307+
70866,26,1221,1355,178,36,38
65308+
70867,25,1221,1356,75,38,38
65309+
70868,25,1221,1357,688,37,37
65310+
70869,26,1221,1356,75,38,38
65311+
70870,26,1221,1357,688,37,37
65312+
70871,25,1222,1352,432,36,38
65313+
70872,25,1222,1353,137,36,38
65314+
70873,26,1222,1352,432,36,38
65315+
70874,26,1222,1353,137,36,38
65316+
70875,7,1223,1358,360,5,50
65317+
70876,8,1223,1358,360,5,50
65318+
70877,9,1223,1359,360,5,50

data/v2/csv/location_area_prose.csv

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2268,4 +2268,13 @@ location_area_id,local_language_id,name
22682268
1198,5,Ultra-Dimension Zéro Monde Grotte
22692269
1199,9,Mount Lanakila Crater
22702270
1199,6,Mount Lanakila Krater
2271-
1199,5,Mont Lanakila Cratère
2271+
1199,5,Mont Lanakila Cratère
2272+
1215,9,Mirage Island (West Of Dewford Town)
2273+
1216,9,Mirage Island (West Of Route 104)
2274+
1217,9,Mirage Island (Route 114)
2275+
1218,9,Mirage Island (Route 124)
2276+
1219,9,Mirage Island (Route 132)
2277+
1220,9,Mirage Island (South of Route 134)
2278+
1221,9,Mirage Island (South of Pacofidlog)
2279+
1222,9,Mirage Island (East of Shoal Cave)
2280+
1223,9,Mirage Island

data/v2/csv/location_areas.csv

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,3 +1103,12 @@ id,location_id,game_index,identifier
11031103
1212,1091,0,
11041104
1213,1092,0,
11051105
1214,1093,0,
1106+
1215,577,0,west-of-dewford-town
1107+
1216,577,0,west-of-route-104
1108+
1217,577,0,route-114
1109+
1218,577,0,route-124
1110+
1219,577,0,route-132
1111+
1220,577,0,south-of-route-134
1112+
1221,577,0,south-of-pacifidlog
1113+
1222,577,0,east-of-shoal-cave
1114+
1223,1094,0,

data/v2/csv/locations.csv

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ id,region_id,identifier
558558
574,3,fortree-city
559559
575,3,underwater
560560
576,3,mt-chimney
561-
577,3,mirage-island
561+
577,3,mirage-spot-island
562562
578,3,southern-island
563563
579,3,sealed-chamber
564564
580,3,scorched-slab
@@ -678,9 +678,9 @@ id,region_id,identifier
678678
694,3,team-magma-hideout
679679
695,3,battle-resort
680680
696,3,ss-tidal
681-
697,3,mirage-forest
682-
698,3,mirage-cave
683-
699,3,mirage-mountain
681+
697,3,mirage-spot-forest
682+
698,3,mirage-spot-cave
683+
699,3,mirage-spot-mountain
684684
700,3,trackless-forest
685685
701,3,pathless-plain
686686
702,3,nameless-cavern
@@ -1075,3 +1075,4 @@ id,region_id,identifier
10751075
1091,1,kanto-pokecenter
10761076
1092,4,sinnoh-pokemart
10771077
1093,2,johto-pokemart
1078+
1094,3,mirage-island

data/v2/csv/pokedex_prose.csv

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,4 +110,6 @@ pokedex_id,local_language_id,name,description
110110
33,7,Arándano,Pokédex regional de la Academia Arándano de Escarlata/Púrpura
111111
33,9,Blueberry,Blueberry Academy dex
112112
34,7,Ciudad Luminalia,Pokédex regional de Ciudad Luminalia de Pokemon Leyendas Z-A
113+
34,9,Lumiose,Lumiose City dex
113114
35,7,Luminalia Dimensional,Pokédex regional de Luminalia Dimensional de Pokemon Leyendas Z-A
115+
35,9,Hyperspace,Hyperspace dex

data/v2/csv/version_names.csv

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,22 @@ version_id,local_language_id,name
399399
46,7,Azul
400400
46,8,Blu
401401
46,9,Blue
402+
47,1,レジェンズ Z-A
403+
47,2,Legends Z-A
404+
47,3,LEGENDS Z-A
405+
47,4,傳說 Z-A
402406
47,5,Légendes : Z-A
403-
47,9,Legends: ZA
407+
47,6,Legenden: Z-A
408+
47,7,Leyendas: Z-A
409+
47,8,Leggende: Z-A
410+
47,9,Legends: Z-A
411+
47,11,レジェンズ Z-A
412+
47,12,传说 Z-A
413+
48,3,메가 차원 러시
414+
48,4,超次元爆湧
404415
48,5,Méga-Dimension
416+
48,6,Mega-Dimension
417+
48,7,Megadimensión
418+
48,8,Megadimensione
405419
48,9,Mega Dimension
420+
48,12,超次元爆涌

0 commit comments

Comments
 (0)