Merge branch 'master' into horde-encounter-info

Author: ItsMeJoji

data/v2/csv/pokemon_form_generations.csv

@@ -4975,3 +4975,13 @@ pokemon_form_id,generation_id,game_index
 10416,8,0
 10417,8,0
 10418,8,0
+10551,6,0
+10551,7,0
+10552,5,0
+10552,6,0
+10552,7,0
+10552,8,0
+10553,5,0
+10553,6,0
+10553,7,0
+10553,8,0

data/v2/csv/pokemon_form_names.csv

@@ -3884,3 +3884,33 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10549,9,Mega Stretchy Tatsugiri,Mega Stretchy Tatsugiri
 10550,5,Méga-Glaivodo,Méga-Glaivodo
 10550,9,Mega Baxcalibur,Mega Baxcalibur
+10551,1,メスのすがた,
+10551,3,암컷의 모습,
+10551,4,雌性的樣子,
+10551,5,Femelle,
+10551,6,Weiblich,
+10551,7,Hembra,
+10551,8,Femmina,
+10551,9,Female,Female Pyroar
+10551,11,メスのすがた,
+10551,12,雌性的样子,
+10552,1,メスのすがた,
+10552,3,암컷의 모습,
+10552,4,雌性的樣子,
+10552,5,Femelle,
+10552,6,Weiblich,
+10552,7,Hembra,
+10552,8,Femmina,
+10552,9,Female,Female Frillish
+10552,11,メスのすがた,
+10552,12,雌性的样子,
+10553,1,メスのすがた,
+10553,3,암컷의 모습,
+10553,4,雌性的樣子,
+10553,5,Femelle,
+10553,6,Weiblich,
+10553,7,Hembra,
+10553,8,Femmina,
+10553,9,Female,Female Jellicent
+10553,11,メスのすがた,
+10553,12,雌性的样子,

data/v2/csv/pokemon_forms.csv

@@ -1543,7 +1543,7 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10517,chesnaught-mega,mega,10292,31,1,1,1,2,870
 10518,delphox-mega,mega,10293,31,1,1,1,2,874
 10519,greninja-mega,mega,10294,31,1,1,1,4,880
-10520,pyroar-mega,mega,10295,31,1,1,1,2,948
+10520,pyroar-mega,mega,10295,31,1,1,1,3,948
 10521,floette-mega,mega,10296,31,1,1,1,7,960
 10522,malamar-mega,mega,10297,31,1,1,1,2,994
 10523,barbaracle-mega,mega,10298,31,1,1,1,2,997
@@ -1574,3 +1574,6 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10548,tatsugiri-droopy-mega,mega,10323,31,1,1,1,5,1359
 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