merge: Merge branch 'master' of github.com:pokeapi/pokeapi into feat/add_hoenn_location_area_encounters

Author: jemarq04

data/v2/csv/pokemon.csv

@@ -590,8 +590,8 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 589,escavalier,589,10,330,173,711,1
 590,foongus,590,2,10,59,712,1
 591,amoonguss,591,6,105,162,713,1
-592,frillish,592,12,330,67,714,1
-593,jellicent,593,22,1350,168,715,1
+592,frillish-male,592,12,330,67,714,1
+593,jellicent-male,593,22,1350,168,715,1
 594,alomomola,594,12,316,165,716,1
 595,joltik,595,1,6,64,717,1
 596,galvantula,596,8,143,165,718,1
@@ -666,7 +666,7 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 665,spewpa,665,3,84,75,797,1
 666,vivillon,666,12,170,185,798,1
 667,litleo,667,6,135,74,799,1
-668,pyroar,668,15,815,177,800,1
+668,pyroar-male,668,15,815,177,800,1
 669,flabebe,669,1,1,61,801,1
 670,floette,670,2,9,130,802,1
 671,florges,671,11,100,248,804,1
@@ -1304,7 +1304,7 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 10278,clefable-mega,36,17,423,,,0
 10279,victreebel-mega,71,45,1255,,,0
 10280,starmie-mega,121,23,800,,,0
-10281,dragonite-mega,149,55,2900,,,0
+10281,dragonite-mega,149,22,2900,,,0
 10282,meganium-mega,154,24,2010,,,0
 10283,feraligatr-mega,160,23,1088,,,0
 10284,skarmory-mega,227,17,404,,,0

data/v2/csv/pokemon_form_names.csv

@@ -161,6 +161,26 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 586,7,Forma Primavera,
 586,8,Forma Primavera,
 586,9,Spring Form,Spring Sawsbuck
+592,1,オスのすがた,
+592,3,수컷의 모습,
+592,4,雄性的樣子,
+592,5,Mâle,
+592,6,Männlich,
+592,7,Macho,
+592,8,Maschio,
+592,9,Male,Male Frillish
+592,11,オスのすがた,
+592,12,雄性的样子,
+593,1,オスのすがた,
+593,3,수컷의 모습,
+593,4,雄性的樣子,
+593,5,Mâle,
+593,6,Männlich,
+593,7,Macho,
+593,8,Maschio,
+593,9,Male,Male Jellicent
+593,11,オスのすがた,
+593,12,雄性的样子,
 641,1,けしんフォルム,
 641,3,화신폼,
 641,4,化身形態,
@@ -228,6 +248,16 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 666,7,Motivo Floral,
 666,8,Motivo Giardinfiore,
 666,9,Meadow Pattern,Meadow Vivillon
+668,1,オスのすがた,
+668,3,수컷의 모습,
+668,4,雄性的樣子,
+668,5,Mâle,
+668,6,Männlich,
+668,7,Macho,
+668,8,Maschio,
+668,9,Male,Male Pyroar
+668,11,オスのすがた,
+668,12,雄性的样子,
 669,1,あかいはな,
 669,3,빨간 꽃,
 669,5,Fleur Rouge,Flabébé Rouge

data/v2/csv/pokemon_forms.csv

@@ -590,8 +590,8 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 589,escavalier,,589,11,1,0,0,1,791
 590,foongus,,590,11,1,0,0,1,792
 591,amoonguss,,591,11,1,0,0,1,793
-592,frillish,,592,11,1,0,0,1,794
-593,jellicent,,593,11,1,0,0,1,795
+592,frillish-male,male,592,11,1,0,0,1,794
+593,jellicent-male,male,593,11,1,0,0,1,795
 594,alomomola,,594,11,1,0,0,1,796
 595,joltik,,595,11,1,0,0,1,797
 596,galvantula,,596,11,1,0,0,1,798
@@ -666,7 +666,7 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 665,spewpa-icy-snow,icy-snow,665,15,1,0,0,1,906
 666,vivillon-meadow,meadow,666,15,1,0,0,7,932
 667,litleo,,667,15,1,0,0,1,946
-668,pyroar,,668,15,1,0,0,1,947
+668,pyroar-male,male,668,15,1,0,0,1,947
 669,flabebe-red,red,669,15,1,0,0,1,949
 670,floette-red,red,670,15,1,0,0,1,954
 671,florges-red,red,671,15,1,0,0,1,961
@@ -1575,5 +1575,5 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10549,tatsugiri-stretchy-mega,mega,10324,31,1,1,1,6,1361
 10550,baxcalibur-mega,mega,10325,31,1,1,1,2,1356
 10551,pyroar-female,female,668,15,0,0,0,2,949
-10552,frillish-female,female,592,11,1,0,0,2,794
-10553,jellicent-female,female,593,11,1,0,0,2,795
+10552,frillish-female,female,592,11,0,0,0,2,794
+10553,jellicent-female,female,593,11,0,0,0,2,795