Merge branch 'master' into patch-1

data/v2/csv/encounter_slots.csv

@@ -659,159 +659,55 @@ id,version_group_id,encounter_method_id,slot,rarity
 658,10,2,2,10
 659,10,2,3,10
 660,10,2,4,10
-661,10,2,5,5
+661,10,2,5,10
 662,10,2,6,10
-663,10,2,7,5
+663,10,2,7,10
 664,10,2,8,10
-665,10,2,9,15
-666,10,2,10,15
-667,10,2,11,0
-668,10,2,12,0
-669,10,3,1,10
-670,10,3,2,10
-671,10,3,3,10
-672,10,3,4,10
-673,10,3,5,5
-674,10,3,6,10
-675,10,3,7,5
-676,10,3,8,10
-677,10,3,9,15
-678,10,3,10,15
-679,10,3,11,0
-680,10,3,12,0
-681,10,4,1,10
-682,10,4,2,10
-683,10,4,3,10
-684,10,4,4,10
-685,10,4,5,5
-686,10,4,6,10
-687,10,4,7,5
-688,10,4,8,10
-689,10,4,9,15
-690,10,4,10,15
-691,10,4,11,0
-692,10,4,12,0
-693,10,5,1,10
-694,10,5,2,10
-695,10,5,3,10
-696,10,5,4,10
-697,10,5,5,5
-698,10,5,6,10
-699,10,5,7,5
-700,10,5,8,10
-701,10,5,9,15
-702,10,5,10,15
-703,10,5,11,0
-704,10,5,12,0
-705,3,28,1,10
-706,4,28,1,10
-707,5,28,1,25
-708,5,29,1,25
-709,6,28,1,25
-710,6,29,1,25
-711,7,28,1,25
-712,8,28,1,25
-713,8,29,1,25
-714,9,28,1,25
-715,9,29,1,25
-716,10,28,1,25
-717,10,2,1,10
-718,10,2,2,10
-719,10,2,3,5
-720,10,2,4,10
-721,10,2,5,5
-722,10,2,6,10
-723,10,2,7,15
-724,10,2,8,15
-725,10,2,9,0
-726,10,2,10,0
-727,10,2,11,10
-728,10,2,12,10
-729,10,3,1,10
-730,10,3,2,10
-731,10,3,3,5
-732,10,3,4,10
-733,10,3,5,5
-734,10,3,6,10
-735,10,3,7,15
-736,10,3,8,15
-737,10,3,9,0
-738,10,3,10,0
-739,10,3,11,10
-740,10,3,12,10
-741,10,4,1,10
-742,10,4,2,10
-743,10,4,3,5
-744,10,4,4,10
-745,10,4,5,5
-746,10,4,6,10
-747,10,4,7,15
-748,10,4,8,15
-749,10,4,9,0
-750,10,4,10,0
-751,10,4,11,10
-752,10,4,12,10
-753,10,5,1,10
-754,10,5,2,10
-755,10,5,3,5
-756,10,5,4,10
-757,10,5,5,5
-758,10,5,6,10
-759,10,5,7,15
-760,10,5,8,15
-761,10,5,9,0
-762,10,5,10,0
-763,10,5,11,10
-764,10,5,12,10
-765,10,2,1,5
-766,10,2,2,10
-767,10,2,3,5
-768,10,2,4,10
-769,10,2,5,15
-770,10,2,6,15
-771,10,2,7,0
-772,10,2,8,0
-773,10,2,9,10
-774,10,2,10,10
-775,10,2,11,10
-776,10,2,12,10
-777,10,3,1,5
-778,10,3,2,10
-779,10,3,3,5
-780,10,3,4,10
-781,10,3,5,15
-782,10,3,6,15
-783,10,3,7,0
-784,10,3,8,0
-785,10,3,9,10
-786,10,3,10,10
-787,10,3,11,10
-788,10,3,12,10
-789,10,4,1,5
-790,10,4,2,10
-791,10,4,3,5
-792,10,4,4,10
-793,10,4,5,15
-794,10,4,6,15
-795,10,4,7,0
-796,10,4,8,0
-797,10,4,9,10
-798,10,4,10,10
-799,10,4,11,10
-800,10,4,12,10
-801,10,5,1,5
-802,10,5,2,10
-803,10,5,3,5
-804,10,5,4,10
-805,10,5,5,15
-806,10,5,6,15
-807,10,5,7,0
-808,10,5,8,0
-809,10,5,9,10
-810,10,5,10,10
-811,10,5,11,10
-812,10,5,12,10
-813,5,30,1,100
-814,6,30,1,100
-815,5,31,1,50
-816,6,31,1,50
+665,10,2,9,10
+666,10,2,10,10
+667,10,3,1,10
+668,10,3,2,10
+669,10,3,3,10
+670,10,3,4,10
+671,10,3,5,10
+672,10,3,6,10
+673,10,3,7,10
+674,10,3,8,10
+675,10,3,9,10
+676,10,3,10,10
+677,10,4,1,10
+678,10,4,2,10
+679,10,4,3,10
+680,10,4,4,10
+681,10,4,5,10
+682,10,4,6,10
+683,10,4,7,10
+684,10,4,8,10
+685,10,4,9,10
+686,10,4,10,10
+687,10,5,1,10
+688,10,5,2,10
+689,10,5,3,10
+690,10,5,4,10
+691,10,5,5,10
+692,10,5,6,10
+693,10,5,7,10
+694,10,5,8,10
+695,10,5,9,10
+696,10,5,10,10
+697,3,28,1,10
+698,4,28,1,10
+699,5,28,1,25
+700,5,29,1,25
+701,6,28,1,25
+702,6,29,1,25
+703,7,28,1,25
+704,8,28,1,25
+705,8,29,1,25
+706,9,28,1,25
+707,9,29,1,25
+708,10,28,1,25
+709,5,30,1,100
+710,6,30,1,100
+711,5,31,1,50
+712,6,31,1,50

data/v2/csv/location_areas.csv

@@ -701,18 +701,18 @@ id,location_id,game_index,identifier
 810,582,0,area
 811,581,0,area
 812,583,0,area
-813,814,0,johto-safari-zone-peak
-814,814,0,johto-safari-zone-desert
-815,814,0,johto-safari-zone-plains
-816,814,0,johto-safari-zone-meadow
-817,814,0,johto-safari-zone-forest
-818,814,0,johto-safari-zone-swamp
-819,814,0,johto-safari-zone-marshland
-820,814,0,johto-safari-zone-mountain
-821,814,0,johto-safari-zone-rocky-beach
-822,814,0,johto-safari-zone-wasteland
-823,814,0,johto-safari-zone-savannah
-824,814,0,johto-safari-zone-wetland
+813,814,0,zone-peak
+814,814,0,zone-desert
+815,814,0,zone-plains
+816,814,0,zone-meadow
+817,814,0,zone-forest
+818,814,0,zone-swamp
+819,814,0,zone-marshland
+820,814,0,zone-mountain
+821,814,0,zone-rocky-beach
+822,814,0,zone-wasteland
+823,814,0,zone-savannah
+824,814,0,zone-wetland
 825,500,0,summit
 826,248,0,kyogre-room
 827,248,0,groundon-room

data/v2/csv/pokemon_abilities.csv

@@ -2148,6 +2148,9 @@ pokemon_id,ability_id,is_hidden,slot
 900,68,0,1
 900,125,0,2
 900,80,1,3
+901,62,0,1
+901,171,0,2
+901,127,1,3
 902,155,0,1
 902,91,0,2
 902,104,1,3