Merge branch 'master' into graphql

data/v2/csv/encounter_condition_prose.csv

@@ -17,3 +17,7 @@ encounter_condition_id,local_language_id,name
 6,5,Saison
 6,6,Jahreszeit
 6,9,Season
+7,9,Chosen Starter
+8,9,Chosen dialogue at the news report
+9,9,Story Progress
+10,9,Miscellaneous

data/v2/csv/encounter_condition_value_map.csv

@@ -16939,3 +16939,37 @@ encounter_id,encounter_condition_value_id
 57870,5
 57871,5
 57872,5
+58117,29
+58118,29
+58119,29
+58120,29
+58121,29
+58122,29
+58123,29
+58124,29
+58125,34
+58126,34
+58127,34
+58128,34
+58129,34
+58130,34
+58131,29
+58132,29
+58133,29
+58134,29
+58135,32
+58136,32
+58125,22
+58126,22
+58127,21
+58128,21
+58129,23
+58130,23
+58137,35
+58138,35
+58139,35
+58140,35
+58138,28
+58140,27
+59280,39
+59281,39

data/v2/csv/encounter_condition_value_prose.csv

@@ -39,3 +39,22 @@ encounter_condition_value_id,local_language_id,name
 19,9,During Autumn
 20,6,Im Winter
 20,9,During Winter
+21,9,Bulbasaur as starter
+22,9,Squirtle as starter
+23,9,Charmander as starter
+24,9,Chespin as starter
+25,9,Fennekin as starter
+26,9,Froakie as starter
+27,9,Chose ‘Blue’ on the TV news report
+28,9,Chose ‘Red’ on the TV news report
+29,9,Awakened the legendary beasts at Burned Tower
+30,9,Visited Lake Verity after defeating Team Galactic at Mt. Coronet
+31,9,Talked to Professor Oak at Eterna City
+32,9,Visited the Pokémon Fan Club with Copycat’s doll
+33,9,Met Tornadus or Thundurus in a cutscene
+34,9,Beat the Elite 4 for the second time
+35,9,Enter the Hall of Fame
+36,9,None
+37,9,Acquired National Pokédex
+38,9,None
+39,9,Beat the Pokémon league after knocking out Snorlax at Route 11

data/v2/csv/encounter_condition_values.csv

@@ -19,3 +19,22 @@ id,encounter_condition_id,identifier,is_default
 18,6,season-summer,0
 19,6,season-autumn,0
 20,6,season-winter,0
+21,7,starter-bulbasaur,0
+22,7,starter-squirtle,0
+23,7,starter-charmander,0
+24,7,starter-chespin,0
+25,7,starter-fennekin,0
+26,7,starter-froakie,0
+27,8,tv-option-blue,1
+28,8,tv-option-red,0
+29,9,story-progress-awakened-beasts,0
+30,9,story-progress-beat-galactic-coronet,0
+31,9,story-progress-oak-eterna-city,0
+32,9,story-progress-vermilion-copycat,0
+33,9,story-progress-met-tornadus-thundurus,0
+34,9,story-progress-beat-elite-four-round-two,0
+35,9,story-progress-hall-of-fame,0
+36,9,story-progress-none,1
+37,9,story-progress-national-dex,0
+38,10,other-none,1
+39,10,other-snorlax-11-beat-league,0

data/v2/csv/encounter_conditions.csv

@@ -5,3 +5,7 @@ id,identifier
 4,slot2
 5,radio
 6,season
+7,starter
+8,tv-option
+9,story-progress
+10,other

data/v2/csv/encounter_method_prose.csv

@@ -35,3 +35,8 @@ encounter_method_id,local_language_id,name
 17,9,Walking on rough terrain
 18,9,Receive as a gift
 19,9,Receive egg as a gift
+20,9,"Static encounter, only one chance"
+21,9,Playing Pokéflute
+22,9,Headbutting a low encounter rate tree
+23,9,Headbutting a normal encounter rate tree
+24,9,Headbutting a high encounter rate tree

data/v2/csv/encounter_methods.csv

@@ -18,3 +18,8 @@ id,identifier,order
 17,rough-terrain,9
 18,gift,18
 19,gift-egg,19
+20,only-one,20
+21,pokeflute,21
+22,headbutt-low,22
+23,headbutt-normal,23
+24,headbutt-high,24

data/v2/csv/encounter_slots.csv

@@ -559,3 +559,75 @@ id,version_group_id,encounter_method_id,slot,rarity
 558,4,5,3,10
 559,4,6,1,90
 560,4,6,2,10
+561,1,20,,100
+562,2,20,,100
+563,3,20,,100
+564,4,20,,100
+565,5,20,,100
+566,6,20,,100
+567,7,20,,100
+568,8,20,,100
+569,9,20,,100
+570,10,20,,100
+571,11,20,,100
+572,14,20,,100
+573,15,20,,100
+574,16,20,,100
+575,17,20,,100
+576,18,20,,100
+577,19,20,,100
+578,20,20,,100
+579,1,21,,100
+580,2,21,,100
+581,3,21,,100
+582,4,21,,100
+583,7,21,,100
+584,10,21,,100
+585,15,21,,100
+586,19,21,,100
+587,3,22,1,50
+588,3,22,2,15
+589,3,22,3,15
+590,3,22,4,10
+591,3,22,5,5
+592,3,22,6,5
+593,3,23,1,50
+594,3,23,2,15
+595,3,23,3,15
+596,3,23,4,10
+597,3,23,5,5
+598,3,23,6,5
+599,3,22,1,50
+600,3,22,2,30
+601,3,22,3,10
+602,3,22,4,5
+603,3,22,5,5
+604,3,23,1,50
+605,3,23,2,30
+606,3,23,3,10
+607,3,23,4,5
+608,3,23,5,5
+609,3,24,1,50
+610,3,24,2,15
+611,3,24,3,15
+612,3,24,4,10
+613,3,24,5,5
+614,3,24,6,5
+615,4,22,1,50
+616,4,22,2,15
+617,4,22,3,15
+618,4,22,4,10
+619,4,22,5,5
+620,4,22,6,5
+621,4,23,1,50
+622,4,23,2,15
+623,4,23,3,15
+624,4,23,4,10
+625,4,23,5,5
+626,4,23,6,5
+627,4,24,1,50
+628,4,24,2,15
+629,4,24,3,15
+630,4,24,4,10
+631,4,24,5,5
+632,4,24,6,5

data/v2/csv/location_area_prose.csv

@@ -650,3 +650,15 @@ location_area_id,local_language_id,name
 790,9,Poke Mart
 791,9,Pokemon Center
 792,9,West Gate
+793,9,Bell Tower Roof
+794,9,Roaming Kanto
+795,9,Roaming Johto
+796,9,Roaming Hoenn
+797,9,Roaming Sinnoh
+798,9,Azalea Town
+800,9,Mahogany City
+801,9,Cave of Origin B4F
+802,9,Terra Cave
+803,9,Marine Cave
+804,9,Sky Pillar Apex
+805,9,Bell Tower 1F

data/v2/csv/location_areas.csv

@@ -682,3 +682,15 @@ id,location_id,game_index,identifier
 790,153,0,poke-mart
 791,153,0,pokemon-center
 792,349,0,west-gate
+793,139,0,roof
+794,799,0,area
+795,800,0,area
+796,801,0,area
+797,802,0,area
+798,228,0,area
+800,230,0,area
+801,443,0,b4f
+802,803,0,area
+803,804,0,area
+804,448,0,apex
+805,139,0,1f

data/v2/csv/location_names.csv

@@ -3576,3 +3576,9 @@ location_id,local_language_id,name,subtitle
 798,9,Malie City,Outer Cape
 798,11,マリエシティ,はずれの岬
 798,12,马利埃静市,市郊海角
+799,9,Roaming Kanto,
+800,9,Roaming Johto,
+801,9,Roaming Hoenn,
+802,9,Roaming Sinnoh,
+803,9,Terra Cave,
+804,9,Marine Cave,

data/v2/csv/locations.csv

@@ -780,3 +780,9 @@ id,region_id,identifier
 796,7,aether-paradise
 797,7,ultra-space
 798,7,malie-city--outer-cape
+799,1,roaming-kanto
+800,2,roaming-johto
+801,3,roaming-hoenn
+802,4,roaming-sinnoh
+803,3,terra-cave
+804,3,marine-cave