Merge branch 'master' into graphql

Author: Naramsim

data/v2/csv/encounter_method_prose.csv

@@ -40,3 +40,6 @@ encounter_method_id,local_language_id,name
 22,9,Headbutting a low encounter rate tree
 23,9,Headbutting a normal encounter rate tree
 24,9,Headbutting a high encounter rate tree
+25,9,Using the Squirt Bottle on a Sudowoodo
+26,9,Using the Wailmer Pail on a Sudowoodo
+27,9,Surfing on seaweed

data/v2/csv/encounter_methods.csv

@@ -23,3 +23,6 @@ id,identifier,order
 22,headbutt-low,22
 23,headbutt-normal,23
 24,headbutt-high,24
+25,squirt-bottle,25
+26,wailmer-pail,26
+27,seaweed,27

data/v2/csv/encounter_slots.csv

@@ -631,3 +631,17 @@ id,version_group_id,encounter_method_id,slot,rarity
 630,4,24,4,10
 631,4,24,5,5
 632,4,24,6,5
+633,3,25,,100
+634,4,25,,100
+635,10,25,,100
+636,6,26,,100
+637,5,27,1,60
+638,5,27,2,30
+639,5,27,3,5
+640,5,27,4,4
+641,5,27,5,1
+642,6,27,1,60
+643,6,27,2,30
+644,6,27,3,5
+645,6,27,4,4
+646,6,27,5,1

data/v2/csv/encounters.csv

@@ -24118,11 +24118,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 27828,7,416,167,278,15,25
 27829,7,416,168,279,25,30
 27830,7,416,169,279,25,30
-27831,7,417,165,366,20,30
-27832,7,417,166,170,20,30
-27833,7,417,167,366,30,35
-27834,7,417,168,369,30,35
-27835,7,417,169,369,30,35
+27831,7,417,637,366,20,30
+27832,7,417,638,170,20,30
+27833,7,417,639,366,30,35
+27834,7,417,640,369,30,35
+27835,7,417,641,369,30,35
 27836,7,418,155,129,10,30
 27837,7,418,156,72,10,30
 27838,7,418,157,320,10,30
@@ -24153,11 +24153,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 27863,7,419,167,278,15,25
 27864,7,419,168,279,25,30
 27865,7,419,169,279,25,30
-27866,7,420,165,366,20,30
-27867,7,420,166,170,20,30
-27868,7,420,167,366,30,35
-27869,7,420,168,369,30,35
-27870,7,420,169,369,30,35
+27866,7,420,637,366,20,30
+27867,7,420,638,170,20,30
+27868,7,420,639,366,30,35
+27869,7,420,640,369,30,35
+27870,7,420,641,369,30,35
 27871,7,421,155,129,10,30
 27872,7,421,156,72,10,30
 27873,7,421,157,320,10,30
@@ -25569,11 +25569,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 29279,8,416,167,278,15,25
 29280,8,416,168,279,25,30
 29281,8,416,169,279,25,30
-29282,8,417,165,366,20,30
-29283,8,417,166,170,20,30
-29284,8,417,167,366,30,35
-29285,8,417,168,369,30,35
-29286,8,417,169,369,30,35
+29282,8,417,637,366,20,30
+29283,8,417,638,170,20,30
+29284,8,417,639,366,30,35
+29285,8,417,640,369,30,35
+29286,8,417,641,369,30,35
 29287,8,418,155,129,10,30
 29288,8,418,156,72,10,30
 29289,8,418,157,320,10,30
@@ -25604,11 +25604,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 29314,8,419,167,278,15,25
 29315,8,419,168,279,25,30
 29316,8,419,169,279,25,30
-29317,8,420,165,366,20,30
-29318,8,420,166,170,20,30
-29319,8,420,167,366,30,35
-29320,8,420,168,369,30,35
-29321,8,420,169,369,30,35
+29317,8,420,637,366,20,30
+29318,8,420,638,170,20,30
+29319,8,420,639,366,30,35
+29320,8,420,640,369,30,35
+29321,8,420,641,369,30,35
 29322,8,421,155,129,10,30
 29323,8,421,156,72,10,30
 29324,8,421,157,320,10,30
@@ -26158,11 +26158,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 29868,9,416,211,278,15,25
 29869,9,416,212,279,25,30
 29870,9,416,213,279,25,30
-29871,9,417,209,366,20,30
-29872,9,417,210,170,20,30
-29873,9,417,211,366,30,35
-29874,9,417,212,369,30,35
-29875,9,417,213,369,30,35
+29871,9,417,642,366,20,30
+29872,9,417,643,170,20,30
+29873,9,417,644,366,30,35
+29874,9,417,645,369,30,35
+29875,9,417,646,369,30,35
 29876,9,365,187,261,5,5
 29877,9,365,188,265,5,5
 29878,9,365,189,285,5,5
@@ -26519,11 +26519,11 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 30229,9,436,196,241,37,37
 30230,9,436,197,228,39,39
 30231,9,436,198,241,40,40
-30232,9,420,209,366,20,30
-30233,9,420,210,170,20,30
-30234,9,420,211,366,30,35
-30235,9,420,212,369,30,35
-30236,9,420,213,369,30,35
+30232,9,420,642,366,20,30
+30233,9,420,643,170,20,30
+30234,9,420,644,366,30,35
+30235,9,420,645,369,30,35
+30236,9,420,646,369,30,35
 30237,9,419,199,129,10,30
 30238,9,419,200,72,10,30
 30239,9,419,201,320,10,30
@@ -55576,3 +55576,32 @@ id,version_id,location_area_id,encounter_slot_id,pokemon_id,min_level,max_level
 59286,7,804,565,384,70,70
 59287,8,804,565,384,70,70
 59288,9,804,566,384,70,70
+59289,4,209,633,185,20,20
+59290,5,209,633,185,20,20
+59291,6,209,634,185,20,20
+59292,15,209,635,185,20,20
+59293,16,209,635,185,20,20
+59294,9,809,636,185,40,40
+59295,9,807,566,249,70,70
+59296,9,807,566,250,70,70
+59297,10,807,567,249,70,70
+59298,10,807,567,250,70,70
+59299,11,807,567,249,70,70
+59300,11,807,567,250,70,70
+59301,10,806,567,386,30,30
+59302,11,806,567,386,30,30
+59303,9,806,566,386,30,30
+59304,9,808,566,151,30,30
+59305,7,810,565,377,40,40
+59306,7,811,565,378,40,40
+59307,7,812,565,379,40,40
+59308,8,810,565,377,40,40
+59309,8,811,565,378,40,40
+59310,8,812,565,379,40,40
+59311,9,810,566,377,40,40
+59312,9,811,566,378,40,40
+59313,9,812,566,379,40,40
+59314,7,785,565,380,50,50
+59315,8,785,565,381,50,50
+59316,9,785,566,380,50,50
+59317,9,785,566,381,50,50

data/v2/csv/location_area_prose.csv

@@ -662,3 +662,10 @@ location_area_id,local_language_id,name
 803,9,Marine Cave
 804,9,Sky Pillar Apex
 805,9,Bell Tower 1F
+806,9,Birth Island
+807,9,Navel Rock
+808,9,Faraway Island
+809,9,Hoenn Battle Frontier
+810,9,Desert Ruins
+811,9,Island Cave
+812,9,Ancient Tomb

data/v2/csv/location_areas.csv

@@ -694,3 +694,10 @@ id,location_id,game_index,identifier
 803,804,0,area
 804,448,0,apex
 805,139,0,1f
+806,810,0,area
+807,811,0,area
+808,812,0,area
+809,813,0,area
+810,582,0,area
+811,581,0,area
+812,583,0,area

data/v2/csv/location_names.csv

@@ -3582,3 +3582,12 @@ location_id,local_language_id,name,subtitle
 802,9,Roaming Sinnoh,
 803,9,Terra Cave,
 804,9,Marine Cave,
+805,9,Two Island,
+806,9,Three Island,
+80,9,Three Isle Path,
+808,9,Six Island,
+809,9,Seven Island,
+810,9,Birth Island,
+811,9,Navel Rock,
+812,9,Faraway Island,
+813,9,Hoenn Battle Frontier,

data/v2/csv/locations.csv

@@ -786,3 +786,12 @@ id,region_id,identifier
 802,4,roaming-sinnoh
 803,3,terra-cave
 804,3,marine-cave
+805,1,two-island
+806,1,three-island
+807,1,three-isle-path
+808,1,six-island
+809,1,seven-island
+810,1,birth-island
+811,1,navel-rock
+812,3,faraway-island
+813,3,hoenn-battle-frontier