Skip to content

Commit 62f8eda

Browse files
committed
merge: Merge branch 'master' of github.com:pokeapi/pokeapi into feat/add_hoenn_location_area_encounters
2 parents 4c3c95e + 5ce8b1e commit 62f8eda

3 files changed

Lines changed: 39 additions & 9 deletions

File tree

data/v2/csv/pokemon.csv

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

data/v2/csv/pokemon_form_names.csv

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,6 +161,26 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
161161
586,7,Forma Primavera,
162162
586,8,Forma Primavera,
163163
586,9,Spring Form,Spring Sawsbuck
164+
592,1,オスのすがた,
165+
592,3,수컷의 모습,
166+
592,4,雄性的樣子,
167+
592,5,Mâle,
168+
592,6,Männlich,
169+
592,7,Macho,
170+
592,8,Maschio,
171+
592,9,Male,Male Frillish
172+
592,11,オスのすがた,
173+
592,12,雄性的样子,
174+
593,1,オスのすがた,
175+
593,3,수컷의 모습,
176+
593,4,雄性的樣子,
177+
593,5,Mâle,
178+
593,6,Männlich,
179+
593,7,Macho,
180+
593,8,Maschio,
181+
593,9,Male,Male Jellicent
182+
593,11,オスのすがた,
183+
593,12,雄性的样子,
164184
641,1,けしんフォルム,
165185
641,3,화신폼,
166186
641,4,化身形態,
@@ -228,6 +248,16 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
228248
666,7,Motivo Floral,
229249
666,8,Motivo Giardinfiore,
230250
666,9,Meadow Pattern,Meadow Vivillon
251+
668,1,オスのすがた,
252+
668,3,수컷의 모습,
253+
668,4,雄性的樣子,
254+
668,5,Mâle,
255+
668,6,Männlich,
256+
668,7,Macho,
257+
668,8,Maschio,
258+
668,9,Male,Male Pyroar
259+
668,11,オスのすがた,
260+
668,12,雄性的样子,
231261
669,1,あかいはな,
232262
669,3,빨간 꽃,
233263
669,5,Fleur Rouge,Flabébé Rouge

data/v2/csv/pokemon_forms.csv

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -590,8 +590,8 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
590590
589,escavalier,,589,11,1,0,0,1,791
591591
590,foongus,,590,11,1,0,0,1,792
592592
591,amoonguss,,591,11,1,0,0,1,793
593-
592,frillish,,592,11,1,0,0,1,794
594-
593,jellicent,,593,11,1,0,0,1,795
593+
592,frillish-male,male,592,11,1,0,0,1,794
594+
593,jellicent-male,male,593,11,1,0,0,1,795
595595
594,alomomola,,594,11,1,0,0,1,796
596596
595,joltik,,595,11,1,0,0,1,797
597597
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
666666
665,spewpa-icy-snow,icy-snow,665,15,1,0,0,1,906
667667
666,vivillon-meadow,meadow,666,15,1,0,0,7,932
668668
667,litleo,,667,15,1,0,0,1,946
669-
668,pyroar,,668,15,1,0,0,1,947
669+
668,pyroar-male,male,668,15,1,0,0,1,947
670670
669,flabebe-red,red,669,15,1,0,0,1,949
671671
670,floette-red,red,670,15,1,0,0,1,954
672672
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
15751575
10549,tatsugiri-stretchy-mega,mega,10324,31,1,1,1,6,1361
15761576
10550,baxcalibur-mega,mega,10325,31,1,1,1,2,1356
15771577
10551,pyroar-female,female,668,15,0,0,0,2,949
1578-
10552,frillish-female,female,592,11,1,0,0,2,794
1579-
10553,jellicent-female,female,593,11,1,0,0,2,795
1578+
10552,frillish-female,female,592,11,0,0,0,2,794
1579+
10553,jellicent-female,female,593,11,0,0,0,2,795

0 commit comments

Comments
 (0)