Merge pull request #539 from PokeAPI/staging

config/docker-compose.py

@@ -17,7 +17,9 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://cache:6379/1",
-        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
+        },
     }
 }
 

config/docker.py

@@ -17,7 +17,9 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://127.0.0.1:6379/1",
-        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
+        },
     }
 }
 

config/local.py

@@ -7,7 +7,11 @@ DATABASES = {
     }
 }
 
-CACHES = {"default": {"BACKEND": "django.core.cache.backends.dummy.DummyCache",}}
+CACHES = {
+    "default": {
+        "BACKEND": "django.core.cache.backends.dummy.DummyCache",
+    }
+}
 
 DEBUG = True
 TASTYPIE_FULL_DEBUG = True

config/settings.py

@@ -72,7 +72,9 @@ CACHES = {
     "default": {
         "BACKEND": "django_redis.cache.RedisCache",
         "LOCATION": "redis://127.0.0.1:6379/1",
-        "OPTIONS": {"CLIENT_CLASS": "django_redis.client.DefaultClient",},
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
+        },
     }
 }
 

data/v2/csv/abilities.csv

@@ -232,6 +232,12 @@ id,identifier,generation_id,is_main_series
 231,shadow-shield,7,1
 232,prism-armor,7,1
 233,neuroforce,7,1
+262,transistor,8,1
+263,dragon's-maw,8,1
+264,chilling-neigh,8,1
+265,grim-neigh,8,1
+266,as-one,8,1
+267,as-one,8,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

data/v2/csv/ability_flavor_text.csv

@@ -17469,3 +17469,9 @@ les attaques super efficaces."
 威力が　さらに　上がる。"
 233,18,12,"效果绝佳的攻击，
 威力会变得更强。"
+262,20,9,"Powers up Electric-type moves."
+263,20,9,"Powers up Dragon-type moves."
+264,20,9,"When the Pokémon knocks out a target, it utters a chilling neigh, which boosts its Attack stat."
+265,20,9,"When the Pokémon knocks out a target, it utters a terrifying neigh, which boosts its Sp. Atk stat."
+266,20,9,"This Ability combines the effects of both Calyrex's Unnerve Ability and Glastrier's Chilling Neigh Ability."
+267,20,9,"This Ability combines the effects of both Calyrex's Unnerve Ability and Spectrier's Grim Neigh Ability."

data/v2/csv/ability_names.csv

@@ -2329,6 +2329,12 @@ ability_id,local_language_id,name
 233,9,Neuroforce
 233,11,ブレインフォース
 233,12,脑核之力
+262,9,Transistor
+263,9,Dragon's Maw
+264,9,Chilling Neigh
+265,9,Grim Neigh
+266,9,As One
+267,9,As One
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

data/v2/csv/ability_prose.csv

@@ -1244,4 +1244,4 @@ This ability cannot be nullified."
 232,9,Reduces super-effective damage to 0.75×.,"Super-effective damage this Pokémon takes is reduced to 0.75×.
 
 This Ability is not bypassed by []{ability:mold-breaker}, []{ability:teravolt}, or []{ability:turboblaze}."
-233,9,XXX new effect for neuroforce,XXX new effect for neuroforce
+233,9,Increases super-effective damage dealt to 1.25×.,Increases super-effective damage dealt to 1.25×.

data/v2/csv/evolution_chains.csv

@@ -418,3 +418,51 @@ id,baby_trigger_item_id
 425,
 426,
 427,
+428,
+429,
+430,
+431,
+432,
+433,
+434,
+435,
+436,
+437,
+438,
+439,
+440,
+441,
+442,
+443,
+444,
+445,
+446,
+447,
+448,
+449,
+450,
+451,
+452,
+453,
+454,
+455,
+456,
+457,
+458,
+459,
+460,
+461,
+462,
+463,
+464,
+465,
+466,
+467,
+468,
+469,
+470,
+471,
+472,
+473,
+474,
+475,

data/v2/csv/evolution_trigger_prose.csv

@@ -11,3 +11,4 @@ evolution_trigger_id,local_language_id,name
 4,5,Place dans l'équipe et une Poké Ball
 4,6,Platz im Team und ein Pokéball
 4,9,Shed
+5,9,Other

data/v2/csv/evolution_triggers.csv

@@ -3,3 +3,4 @@ id,identifier
 2,trade
 3,use-item
 4,shed
+5,other

data/v2/csv/move_effect_prose.csv

@@ -1110,11 +1110,11 @@ Any [regular damage]{mechanic:regular-damage} dealt to an affected Pokémon is r
 413,9,Damages the target for 75% of its remaining HP.,Inflicts direct damage equal to ¾ of the target's remaining HP.
 414,9,Raises all of the user's stats by two stages.,"Raises the user's [Attack]{mechanic:attack}, [Defense]{mechanic:defense}, [Special Attack]{mechanic:special-attack}, [Special Defense]{mechanic:special-defense}, and [Speed]{mechanic:speed} by two [stages]{mechanic:stage} each."
 415,9,Changes the terrain to Psychic Terrain after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) changes the terrain to []{move:psychic-terrain}."
-416,9,XXX new effect for light-that-burns-the-sky,XXX new effect for light-that-burns-the-sky
-417,9,XXX new effect for lets-snuggle-forever,XXX new effect for lets-snuggle-forever
-418,9,XXX new effect for splintered-stormshards,XXX new effect for splintered-stormshards
-419,9,XXX new effect for clangorous-soulblaze,XXX new effect for clangorous-soulblaze
-420,9,XXX new effect for mind-blown,XXX new effect for mind-blown
+416,9,"Inflicts damage using either Attack or Special Attack stat, whichever is higher.","Inflicts damage using either [Attack]{mechanic:attack} or [Special Attack]{mechanic:special-attack} stat, whichever is higher. Determining which stat is used takes into account [stat changes]{mechanic:stage} but not held items or abilities."
+417,9,"After inflicting damage, causes all Normal-type moves to become Electric-type for the remainder of the turn.","After inflicting damage, all Normal-type moves become Electric-type for the remainder of the turn, including status moves. This effect is applied after move type-changing abilities, such as [Pixilate]{ability:pixilate} and [Normalize]{ability:normalize}."
+418,9,Inflicts damage and removes any terrain present on the battlefield.,Inflicts damage and removes any terrain present on the battlefield.
+419,9,"Inflicts damage to all opposing Pokémon and increases the user's Attack, Defense, Special Attack, Special Defense, and Speed by one stage each.","Inflicts sound-based damage to all opposing Pokémon and increases the user's [Attack]{mechanic:attack}, [Defense]{mechanic:defense}, [Special Attack]{mechanic:special-attack}, [Special Defense]{mechanic:special-defense}, and [Speed]{mechanic:speed} by one [stage]{mechanic:stage} each. The user's stats are not raised if the move fails to damage any opposing Pokémon."
+420,9,"Inflicts damage, and the user takes damage equal to half of its max HP, rounded up.","Inflicts damage, and the user takes damage equal to half of its max [HP]{mechanic:hp}, rounded up. The user still takes damage if the move is blocked by [Protect]{move:protect} or [Substitute]{move:substitute}, misses, or if the target has [Flash Fire]{ability:flash-fire}."
 421,9,Sets [Light Screen]{move:light-screen} on the user's side of the field after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) sets []{move:light-screen} on the user's side of the [field]{mechanic:field}."
 422,9,Sets [Reflect]{move:reflect} on the user's side of the field after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) sets []{move:reflect} on the user's side of the [field]{mechanic:field}."
 423,9,Seeds the target after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) sets []{move:leech-seed} on the target."

data/v2/csv/moves.csv

@@ -719,12 +719,12 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 718,multi-attack,7,1,90,10,100,0,10,2,269,,,,
 719,10-000-000-volt-thunderbolt,7,13,195,1,,0,10,3,1,,,,
 720,mind-blown,7,10,150,5,100,0,9,3,420,,,,
-721,plasma-fists,7,13,100,15,100,0,10,2,1,,,,
-722,photon-geyser,7,14,100,5,100,0,10,3,1,,,,
+721,plasma-fists,7,13,100,15,100,0,10,2,417,,,,
+722,photon-geyser,7,14,100,5,100,0,10,3,416,,,,
 723,light-that-burns-the-sky,7,14,200,1,,0,10,3,416,,,,
 724,searing-sunraze-smash,7,9,200,1,,0,10,2,411,,,,
 725,menacing-moonraze-maelstrom,7,8,200,1,,0,10,3,411,,,,
-726,lets-snuggle-forever,7,18,190,1,,0,10,2,417,,,,
+726,lets-snuggle-forever,7,18,190,1,,0,10,2,1,,,,
 727,splintered-stormshards,7,6,190,1,,0,10,2,418,,,,
 728,clangorous-soulblaze,7,16,185,1,,0,11,3,419,100,,,
 729,zippy-zap,7,13,50,15,100,2,10,2,289,,,,

data/v2/csv/pokemon.csv

@@ -847,7 +847,7 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 846,arrokuda,846,5,10,56,,1
 847,barraskewda,847,13,300,172,,1
 848,toxel,848,4,110,48,,1
-849,toxtricity,849,16,400,176,,1
+849,toxtricity-amped,849,16,400,176,,1
 850,sizzlipede,850,7,10,61,,1
 851,centiskorch,851,30,1200,184,,1
 852,clobbopus,852,6,40,62,,1
@@ -863,8 +863,8 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 862,obstagoon,862,16,460,260,,1
 863,perrserker,863,8,280,154,,1
 864,cursola,864,10,4,179,,1
-865,sirfetch,865,8,1170,177,,1
-866,mr,866,15,582,182,,1
+865,sirfetchd,865,8,1170,177,,1
+866,mr-rime,866,15,582,182,,1
 867,runerigus,867,16,666,169,,1
 868,milcery,868,2,3,54,,1
 869,alcremie,869,3,5,173,,1
@@ -873,8 +873,8 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 872,snom,872,3,38,37,,1
 873,frosmoth,873,13,420,168,,1
 874,stonjourner,874,25,5200,165,,1
-875,eiscue,875,14,890,165,,1
-876,indeedee,876,9,280,166,,1
+875,eiscue-ice,875,14,890,165,,1
+876,indeedee-male,876,9,280,166,,1
 877,morpeko,877,3,30,153,,1
 878,cufant,878,12,1000,66,,1
 879,copperajah,879,30,6500,175,,1
@@ -886,12 +886,17 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 885,dreepy,885,5,20,54,,1
 886,drakloak,886,14,110,144,,1
 887,dragapult,887,30,500,300,,1
-888,zacian,888,28,1100,335,,1
-889,zamazenta,889,29,2100,335,,1
+888,zacian-hero,888,28,1100,335,,1
+889,zamazenta-hero,889,29,2100,335,,1
 890,eternatus,890,200,9500,345,,1
 891,kubfu,891,6,120,,,1
-892,urshifu,892,19,1050,,,1
+892,urshifu-single-strike,892,19,1050,,,1
 893,zarude,893,18,700,,,1
+894,regieleki,894,12,1450,,,1
+895,regidrago,895,21,2000,,,1
+896,glastrier,896,22,8000,,,1
+897,spectrier,897,20,445,,,1
+898,calyrex,898,11,77,,,1
 10001,deoxys-attack,386,17,608,270,497,0
 10002,deoxys-defense,386,17,608,270,498,0
 10003,deoxys-speed,386,17,608,270,499,0
@@ -1049,3 +1054,65 @@ id,identifier,species_id,height,weight,base_experience,order,is_default
 10155,necrozma-dusk,800,38,4600,306,954,0
 10156,necrozma-dawn,800,42,3500,306,955,0
 10157,necrozma-ultra,800,75,2300,339,956,0
+10158,meowth-galar,52,4,75,58,87,0
+10159,ponyta-galar,77,8,240,82,118,0
+10160,rapidash-galar,78,17,800,175,119,0
+10161,slowpoke-galar,79,12,360,63,120,0
+10162,slowbro-galar,80,16,705,172,121,0
+10163,farfetchd-galar,83,8,420,132,127,0
+10164,weezing-galar,110,30,160,172,165,0
+10165,mr-mime-galar,122,14,568,161,184,0
+10166,articuno-galar,144,17,509,261,224,0
+10167,zapdos-galar,145,16,582,261,225,0
+10168,moltres-galar,146,20,660,261,226,0
+10169,slowking-galar,199,18,795,172,123,0
+10170,corsola-galar,222,6,5,144,306,0
+10171,zigzagoon-galar,263,4,175,56,345,0
+10172,linoone-galar,264,5,325,147,346,0
+10173,darumaka-galar,554,7,400,63,653,0
+10174,darmanitan-standard-galar,555,17,1200,168,654,0
+10175,darmanitan-zen-galar,555,17,1200,168,655,0
+10176,yamask-galar,562,5,15,61,662,0
+10177,stunfisk-galar,618,7,205,165,718,0
+10178,toxtricity-low-key,849,16,400,176,,0
+10179,eiscue-noice,875,14,890,165,,0
+10180,indeedee-female,876,9,28,166,,0
+10181,zacian-crowned,888,28,3550,335,,0
+10182,zamazenta-crowned,889,29,7850,335,,0
+10183,urshifu-rapid-strike,892,19,1050,,,0
+10184,calyrex-ice-rider,898,24,8091,,,0
+10185,calyrex-shadow-rider,898,24,536,,,0
+10186,venusaur-gmax,3,240,10000,236,,0
+10187,charizard-gmax,6,280,10000,240,,0
+10188,blastoise-gmax,9,250,10000,239,,0
+10189,butterfree-gmax,12,170,10000,178,,0
+10190,pikachu-gmax,25,210,10000,112,,0
+10191,meowth-gmax,52,330,10000,58,,0
+10192,machamp-gmax,68,250,10000,227,,0
+10193,gengar-gmax,94,200,10000,225,,0
+10194,kingler-gmax,99,190,10000,166,,0
+10195,lapras-gmax,131,240,10000,187,,0
+10196,eevee-gmax,133,180,10000,65,,0
+10197,snorlax-gmax,143,350,10000,189,,0
+10198,garbodor-gmax,569,210,10000,166,,0
+10199,melmetal-gmax,809,250,10000,270,,0
+10200,rillaboom-gmax,812,280,10000,265,,0
+10201,cinderace-gmax,815,270,10000,265,,0
+10202,inteleon-gmax,818,400,10000,265,,0
+10203,corviknight-gmax,823,140,10000,248,,0
+10204,orbeetle-gmax,826,140,10000,253,,0
+10205,drednaw-gmax,834,240,10000,170,,0
+10206,coalossal-gmax,839,420,10000,255,,0
+10207,flapple-gmax,841,240,10000,170,,0
+10208,appletun-gmax,842,240,10000,170,,0
+10209,sandaconda-gmax,844,220,10000,179,,0
+10210,toxtricity-gmax,849,240,10000,176,,0
+10211,centiskorch-gmax,851,750,10000,184,,0
+10212,hatterene-gmax,858,260,10000,255,,0
+10213,grimmsnarl-gmax,861,320,10000,255,,0
+10214,alcremie-gmax,869,300,10000,173,,0
+10215,copperajah-gmax,879,230,10000,175,,0
+10216,duraludon-gmax,884,430,10000,187,,0
+10217,eternatus-eternamax,890,1000,10000,345,,0
+10218,urshifu-single-strike-gmax,892,290,10000,,,0
+10219,urshifu-rapid-strike-gmax,892,260,10000,,,0

data/v2/csv/pokemon_dex_numbers.csv

@@ -5134,3 +5134,94 @@ species_id,pokedex_id,pokedex_number
 806,21,393
 807,1,807
 807,21,403
+808,1,808
+809,1,809
+810,1,810
+811,1,811
+812,1,812
+813,1,813
+814,1,814
+815,1,815
+816,1,816
+817,1,817
+818,1,818
+819,1,819
+820,1,820
+821,1,821
+822,1,822
+823,1,823
+824,1,824
+825,1,825
+826,1,826
+827,1,827
+828,1,828
+829,1,829
+830,1,830
+831,1,831
+832,1,832
+833,1,833
+834,1,834
+835,1,835
+836,1,836
+837,1,837
+838,1,838
+839,1,839
+840,1,840
+841,1,841
+842,1,842
+843,1,843
+844,1,844
+845,1,845
+846,1,846
+847,1,847
+848,1,848
+849,1,849
+850,1,850
+851,1,851
+852,1,852
+853,1,853
+854,1,854
+855,1,855
+856,1,856
+857,1,857
+858,1,858
+859,1,859
+860,1,860
+861,1,861
+862,1,862
+863,1,863
+864,1,864
+865,1,865
+866,1,866
+867,1,867
+868,1,868
+869,1,869
+870,1,870
+871,1,871
+872,1,872
+873,1,873
+874,1,874
+875,1,875
+876,1,876
+877,1,877
+878,1,878
+879,1,879
+880,1,880
+881,1,881
+882,1,882
+883,1,883
+884,1,884
+885,1,885
+886,1,886
+887,1,887
+888,1,888
+889,1,889
+890,1,890
+891,1,891
+892,1,892
+893,1,893
+894,1,894
+895,1,895
+896,1,896
+897,1,897
+898,1,898

data/v2/csv/pokemon_evolution.csv

@@ -403,3 +403,45 @@ id,evolved_species_id,evolution_trigger_id,trigger_item_id,minimum_level,gender_
 403,791,1,,53,,,,,,,,,,,,,,0,0
 404,792,1,,53,,,,,,,,,,,,,,0,0
 405,804,1,,,,,,,406,,,,,,,,,0,0
+406,811,1,,16,,,,,,,,,,,,,,0,0
+407,812,1,,35,,,,,,,,,,,,,,0,0
+408,814,1,,16,,,,,,,,,,,,,,0,0
+409,815,1,,35,,,,,,,,,,,,,,0,0
+410,817,1,,16,,,,,,,,,,,,,,0,0
+411,818,1,,35,,,,,,,,,,,,,,0,0
+412,820,1,,24,,,,,,,,,,,,,,0,0
+413,822,1,,18,,,,,,,,,,,,,,0,0
+414,823,1,,38,,,,,,,,,,,,,,0,0
+415,825,1,,10,,,,,,,,,,,,,,0,0
+416,826,1,,30,,,,,,,,,,,,,,0,0
+417,828,1,,18,,,,,,,,,,,,,,0,0
+418,830,1,,20,,,,,,,,,,,,,,0,0
+419,832,1,,24,,,,,,,,,,,,,,0,0
+420,834,1,,22,,,,,,,,,,,,,,0,0
+421,836,1,,25,,,,,,,,,,,,,,0,0
+422,838,1,,18,,,,,,,,,,,,,,0,0
+423,839,1,,34,,,,,,,,,,,,,,0,0
+424,841,3,,,,,,,,,,,,,,,,0,0
+425,842,3,,,,,,,,,,,,,,,,0,0
+426,844,1,,36,,,,,,,,,,,,,,0,0
+427,847,1,,26,,,,,,,,,,,,,,0,0
+428,849,1,,30,,,,,,,,,,,,,,0,0
+429,851,1,,28,,,,,,,,,,,,,,0,0
+430,853,1,,,,,,,,,,,,,,,,0,0
+431,855,3,,,,,,,,,,,,,,,,0,0
+432,857,1,,32,,,,,,,,,,,,,,0,0
+433,858,1,,42,,,,,,,,,,,,,,0,0
+434,860,1,,32,,,,,,,,,,,,,,0,0
+435,861,1,,42,,,,,,,,,,,,,,0,0
+436,862,1,,35,,,,,,,,,,,,,,0,0
+437,863,1,,28,,,,,,,,,,,,,,0,0
+438,864,1,,38,,,,,,,,,,,,,,0,0
+439,865,5,,,,,,,,,,,,,,,,0,0
+440,866,1,,42,,,,,,,,,,,,,,0,0
+441,867,5,,,,,,,,,,,,,,,,0,0
+442,869,5,,,,,,,,,,,,,,,,0,0
+443,873,1,,,,,,night,,,220,,,,,,,0,0
+444,879,1,,34,,,,,,,,,,,,,,0,0
+445,886,1,,50,,,,,,,,,,,,,,0,0
+446,887,1,,60,,,,,,,,,,,,,,0,0
+447,892,5,,,,,,,,,,,,,,,,0,0

data/v2/csv/pokemon_form_names.csv

@@ -1,4 +1,4 @@
-pokemon_form_id,local_language_id,form_name,pokemon_name
+pokemon_form_id,local_language_id,form_name,pokemon_name
 3,1,,
 3,3,,
 3,4,,
@@ -1136,6 +1136,55 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 801,9,,
 801,11,,
 801,12,,
+845,1,,
+845,3,,
+845,4,,
+845,5,,
+845,6,,
+845,7,,
+845,8,,
+845,9,,
+845,11,,
+845,12,,
+849,9,Amped Form,Amped Toxtricity
+854,9,Phony Form,Phony Sinistea
+855,9,Phony Form,Phony Polteageist
+875,9,Ice Face,Ice Face Eiscue
+876,9,Male,Male Indeedee
+877,9,Full Belly Mode,Full Belly Morpeko
+888,9,Hero of Many Battles,Hero Zacian
+889,9,Hero of Many Battles,Hero Zamazenta
+890,1,,
+890,3,,
+890,4,,
+890,5,,
+890,6,,
+890,7,,
+890,8,,
+890,9,,
+890,11,,
+890,12,,
+892,9,Single Strike Style,Single Strike Urshifu
+893,1,,
+893,3,,
+893,4,,
+893,5,,
+893,6,,
+893,7,,
+893,8,,
+893,9,,
+893,11,,
+893,12,,
+898,1,,
+898,3,,
+898,4,,
+898,5,,
+898,6,,
+898,7,,
+898,8,,
+898,9,,
+898,11,,
+898,12,,
 10001,1,Ｂ,
 10001,3,B,
 10001,5,B,Zarbi B
@@ -3346,3 +3395,71 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10316,9,Ultra Necrozma,Ultra Necrozma
 10316,11,ウルトラネクロズマ,
 10316,12,究极奈克洛兹玛,
+10317,9,Galarian Form,Galarian Meowth
+10318,9,Galarian Form,Galarian Ponyta
+10319,9,Galarian Form,Galarian Rapidash
+10320,9,Galarian Form,Galarian Slowpoke
+10321,9,Galarian Form,Galarian Slowbro
+10322,9,Galarian Form,Galarian Farfetch'd
+10323,9,Galarian Form,Galarian Weezing
+10324,9,Galarian Form,Galarian Mr. Mime
+10325,9,Galarian Form,Galarian Articuno
+10326,9,Galarian Form,Galarian Zapdos
+10327,9,Galarian Form,Galarian Moltres
+10328,9,Galarian Form,Galarian Slowking
+10329,9,Galarian Form,Galarian Corsola
+10330,9,Galarian Form,Galarian Zigzagoon
+10331,9,Galarian Form,Galarian Linoone
+10332,9,Galarian Form,Galarian Darumaka
+10333,9,Galarian Form,Galarian Darmanitan
+10334,9,Galarian Form,Galarian Zen Darmanitan
+10335,9,Galarian Form,Galarian Yamask
+10336,9,Galarian Form,Galarian Stunfisk
+10337,9,Gulping Form,
+10338,9,Gorging Form,
+10339,9,Low Key Form,Low Key Toxtricity
+10340,9,Antique Form,Antique Sinistea
+10341,9,Antique Form,Antique Polteageist
+10404,9,Noice Face,Noice Face Eiscue
+10405,9,Female,Female Indeedee
+10406,9,Hangry Mode,Hangry Morpeko
+10407,9,Crowned Sword,Crowned Zacian
+10408,9,Crowned Shield,Crowned Zamazenta
+10409,9,Rapid Strike Style,Rapid Strike Urshifu
+10410,9,Dada Form,Dada Zarude
+10411,9,Ice Rider Form,Ice Rider Calyrex
+10412,9,Shadow Rider Form,Shadow Rider Calyrex
+10413,9,Gigantamax Form,Gigantamax Venusaur
+10414,9,Gigantamax Form,Gigantamax Charizard
+10415,9,Gigantamax Form,Gigantamax Blastoise
+10416,9,Gigantamax Form,Gigantamax Butterfree
+10417,9,Gigantamax Form,Gigantamax Pikachu
+10418,9,Gigantamax Form,Gigantamax Meowth
+10419,9,Gigantamax Form,Gigantamax Machamp
+10420,9,Gigantamax Form,Gigantamax Gengar
+10421,9,Gigantamax Form,Gigantamax Kingler
+10422,9,Gigantamax Form,Gigantamax Lapras
+10423,9,Gigantamax Form,Gigantamax Eevee
+10424,9,Gigantamax Form,Gigantamax Snorlax
+10425,9,Gigantamax Form,Gigantamax Garbodor
+10426,9,Gigantamax Form,Gigantamax Melmetal
+10427,9,Gigantamax Form,Gigantamax Rillaboom
+10428,9,Gigantamax Form,Gigantamax Cinderace
+10429,9,Gigantamax Form,Gigantamax Inteleon
+10430,9,Gigantamax Form,Gigantamax Corviknight
+10431,9,Gigantamax Form,Gigantamax Orbeetle
+10432,9,Gigantamax Form,Gigantamax Drednaw
+10433,9,Gigantamax Form,Gigantamax Coalossal
+10434,9,Gigantamax Form,Gigantamax Flapple
+10435,9,Gigantamax Form,Gigantamax Appletun
+10436,9,Gigantamax Form,Gigantamax Sandaconda
+10437,9,Gigantamax Form,Gigantamax Toxtricity
+10438,9,Gigantamax Form,Gigantamax Centiskorch
+10439,9,Gigantamax Form,Gigantamax Hatterene
+10440,9,Gigantamax Form,Gigantamax Grimmsnarl
+10441,9,Gigantamax Form,Gigantamax Alcremie
+10442,9,Gigantamax Form,Gigantamax Copperajah
+10443,9,Gigantamax Form,Gigantamax Duraludon
+10444,9,Eternamax Form,Eternamax Eternatus
+10445,9,Gigantamax Form,Gigantamax Single Strike Urshifu
+10446,9,Gigantamax Form,Gigantamax Rapid Strike Urshifu

data/v2/csv/pokemon_forms.csv

@@ -806,6 +806,97 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 805,stakataka,,805,18,1,0,0,1,1121
 806,blacephalon,,806,18,1,0,0,1,1122
 807,zeraora,,807,18,1,0,0,1,1123
+808,meltan,,808,19,1,0,0,1,1124
+809,melmetal,,809,19,1,0,0,1,1125
+810,grookey,,810,20,1,0,0,1,1126
+811,thwackey,,811,20,1,0,0,1,1127
+812,rillaboom,,812,20,1,0,0,1,1128
+813,scorbunny,,813,20,1,0,0,1,1129
+814,raboot,,814,20,1,0,0,1,1130
+815,cinderace,,815,20,1,0,0,1,1131
+816,sobble,,816,20,1,0,0,1,1132
+817,drizzile,,817,20,1,0,0,1,1133
+818,inteleon,,818,20,1,0,0,1,1134
+819,skwovet,,819,20,1,0,0,1,1135
+820,greedent,,820,20,1,0,0,1,1136
+821,rookidee,,821,20,1,0,0,1,1137
+822,corvisquire,,822,20,1,0,0,1,1138
+823,corviknight,,823,20,1,0,0,1,1139
+824,blipbug,,824,20,1,0,0,1,1140
+825,dottler,,825,20,1,0,0,1,1141
+826,orbeetle,,826,20,1,0,0,1,1142
+827,nickit,,827,20,1,0,0,1,1143
+828,thievul,,828,20,1,0,0,1,1144
+829,gossifleur,,829,20,1,0,0,1,1145
+830,eldegoss,,830,20,1,0,0,1,1146
+831,wooloo,,831,20,1,0,0,1,1147
+832,dubwool,,832,20,1,0,0,1,1148
+833,chewtle,,833,20,1,0,0,1,1149
+834,drednaw,,834,20,1,0,0,1,1150
+835,yamper,,835,20,1,0,0,1,1151
+836,boltund,,836,20,1,0,0,1,1152
+837,rolycoly,,837,20,1,0,0,1,1153
+838,carkol,,838,20,1,0,0,1,1154
+839,coalossal,,839,20,1,0,0,1,1155
+840,applin,,840,20,1,0,0,1,1156
+841,flapple,,841,20,1,0,0,1,1157
+842,appletun,,842,20,1,0,0,1,1158
+843,silicobra,,843,20,1,0,0,1,1159
+844,sandaconda,,844,20,1,0,0,1,1160
+845,cramorant,,845,20,1,0,0,1,1161
+846,arrokuda,,846,20,1,0,0,1,1162
+847,barraskewda,,847,20,1,0,0,1,1163
+848,toxel,,848,20,1,0,0,1,1164
+849,toxtricity-amped,amped,849,20,1,0,0,1,1165
+850,sizzlipede,,850,20,1,0,0,1,1166
+851,centiskorch,,851,20,1,0,0,1,1167
+852,clobbopus,,852,20,1,0,0,1,1168
+853,grapploct,,853,20,1,0,0,1,1169
+854,sinistea-phony,phony,854,20,1,0,0,1,1170
+855,polteageist-phony,phony,855,20,1,0,0,1,1171
+856,hatenna,,856,20,1,0,0,1,1172
+857,hattrem,,857,20,1,0,0,1,1173
+858,hatterene,,858,20,1,0,0,1,1174
+859,impidimp,,859,20,1,0,0,1,1175
+860,morgrem,,860,20,1,0,0,1,1176
+861,grimmsnarl,,861,20,1,0,0,1,1177
+862,obstagoon,,862,20,1,0,0,1,1178
+863,perrserker,,863,20,1,0,0,1,1179
+864,cursola,,864,20,1,0,0,1,1180
+865,sirfetchd,,865,20,1,0,0,1,1181
+866,mr-rime,,866,20,1,0,0,1,1182
+867,runerigus,,867,20,1,0,0,1,1183
+868,milcery,,868,20,1,0,0,1,1184
+869,alcremie,,869,20,1,0,0,1,1185
+870,falinks,,870,20,1,0,0,1,1186
+871,pincurchin,,871,20,1,0,0,1,1187
+872,snom,,872,20,1,0,0,1,1188
+873,frosmoth,,873,20,1,0,0,1,1189
+874,stonjourner,,874,20,1,0,0,1,1190
+875,eiscue-ice,ice,875,20,1,0,0,1,1191
+876,indeedee-male,male,876,20,1,0,0,1,1192
+877,morpeko-full-belly,full-belly,877,20,1,0,0,1,1193
+878,cufant,,878,20,1,0,0,1,1194
+879,copperajah,,879,20,1,0,0,1,1195
+880,dracozolt,,880,20,1,0,0,1,1196
+881,arctozolt,,881,20,1,0,0,1,1197
+882,dracovish,,882,20,1,0,0,1,1198
+883,arctovish,,883,20,1,0,0,1,1199
+884,duraludon,,884,20,1,0,0,1,1200
+885,dreepy,,885,20,1,0,0,1,1201
+886,drakloak,,886,20,1,0,0,1,1202
+887,dragapult,,887,20,1,0,0,1,1203
+888,zacian-hero,hero,888,20,1,0,0,1,1204
+889,zamazenta-hero,hero,889,20,1,0,0,1,1205
+890,eternatus,,890,20,1,0,0,1,1206
+891,kubfu,,891,20,1,0,0,1,1207
+892,urshifu-single-strike,single-strike,892,20,1,0,0,1,1208
+893,zarude,,893,20,1,0,0,1,1209
+894,regieleki,,894,20,1,0,0,1,1210
+895,regidrago,,895,20,1,0,0,1,1211
+896,glastrier,,896,20,1,0,0,1,1212
+897,spectrier,,897,20,1,0,0,1,1213
+898,calyrex,,898,20,1,0,0,1,1214
 10001,unown-b,b,201,3,0,0,0,2,284
 10002,unown-c,c,201,3,0,0,0,3,285
 10003,unown-d,d,201,3,0,0,0,4,286
@@ -1122,3 +1213,71 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10314,necrozma-dusk,dusk,10155,18,1,0,0,2,1113
 10315,necrozma-dawn,dawn,10156,18,1,0,0,3,1114
 10316,necrozma-ultra,ultra,10157,18,1,0,0,4,1115
+10317,meowth-galar,galar,10158,20,1,0,0,1,1215
+10318,ponyta-galar,galar,10159,20,1,0,0,1,1216
+10319,rapidash-galar,galar,10160,20,1,0,0,1,1217
+10320,slowpoke-galar,galar,10161,20,1,0,0,1,1218
+10321,slowbro-galar,galar,10162,20,1,0,0,1,1219
+10322,farfetchd-galar,galar,10163,20,1,0,0,1,1220
+10323,weezing-galar,galar,10164,20,1,0,0,1,1221
+10324,mr-mime-galar,galar,10165,20,1,0,0,1,1222
+10325,articuno-galar,galar,10166,20,1,0,0,1,1223
+10326,zapdos-galar,galar,10167,20,1,0,0,1,1224
+10327,moltres-galar,galar,10168,20,1,0,0,1,1225
+10328,slowking-galar,galar,10169,20,1,0,0,1,1226
+10329,corsola-galar,galar,10170,20,1,0,0,1,1227
+10330,zigzagoon-galar,galar,10171,20,1,0,0,1,1228
+10331,linoone-galar,galar,10172,20,1,0,0,1,1229
+10332,darumaka-galar,galar,10173,20,1,0,0,1,1230
+10333,darmanitan-standard-galar,galar,10174,20,1,0,0,1,1231
+10334,darmanitan-zen-galar,galar,10175,20,1,0,0,1,1232
+10335,yamask-galar,galar,10176,20,1,0,0,1,1233
+10336,stunfisk-galar,galar,10177,20,1,0,0,1,1234
+10337,cramorant-gulping,gulping,845,20,0,1,0,1,1235
+10338,cramorant-gorging,gorging,845,20,0,1,0,1,1236
+10339,toxtricity-low-key,low-key,10178,20,1,0,0,1,1237
+10340,sinistea-antique,antique,854,20,0,0,0,1,1238
+10341,polteageist-antique,antique,855,20,0,0,0,1,1239
+10404,eiscue-noice,noice,10179,20,1,1,0,1,1240
+10405,indeedee-female,female,10180,20,1,0,0,1,1241
+10406,morpeko-hangry,hangry,877,20,0,1,0,1,1242
+10407,zacian-crowned,crowned,10181,20,1,1,0,1,1243
+10408,zamazenta-crowned,crowned,10182,20,1,1,0,1,1244
+10409,urshifu-rapid-strike,rapid-strike,10183,20,1,0,0,1,1245
+10410,zarude-dada,dada,893,20,0,0,0,1,1246
+10411,calyrex-ice-rider,ice-rider,10184,20,1,0,0,1,1247
+10412,calyrex-shadow-rider,shadow-rider,10185,20,1,0,0,1,1248
+10413,venusaur-gmax,gmax,10186,20,1,1,0,1,1249
+10414,charizard-gmax,gmax,10187,20,1,1,0,1,1250
+10415,blastoise-gmax,gmax,10188,20,1,1,0,1,1251
+10416,butterfree-gmax,gmax,10189,20,1,1,0,1,1252
+10417,pikachu-gmax,gmax,10190,20,1,1,0,1,1253
+10418,meowth-gmax,gmax,10191,20,1,1,0,1,1254
+10419,machamp-gmax,gmax,10192,20,1,1,0,1,1255
+10420,gengar-gmax,gmax,10193,20,1,1,0,1,1256
+10421,kingler-gmax,gmax,10194,20,1,1,0,1,1257
+10422,lapras-gmax,gmax,10195,20,1,1,0,1,1258
+10423,eevee-gmax,gmax,10196,20,1,1,0,1,1259
+10424,snorlax-gmax,gmax,10197,20,1,1,0,1,1260
+10425,garbodor-gmax,gmax,10198,20,1,1,0,1,1261
+10426,melmetal-gmax,gmax,10199,20,1,1,0,1,1262
+10427,rillaboom-gmax,gmax,10200,20,1,1,0,1,1263
+10428,cinderace-gmax,gmax,10201,20,1,1,0,1,1264
+10429,inteleon-gmax,gmax,10202,20,1,1,0,1,1265
+10430,corviknight-gmax,gmax,10203,20,1,1,0,1,1266
+10431,orbeetle-gmax,gmax,10204,20,1,1,0,1,1267
+10432,drednaw-gmax,gmax,10205,20,1,1,0,1,1268
+10433,coalossal-gmax,gmax,10206,20,1,1,0,1,1269
+10434,flapple-gmax,gmax,10207,20,1,1,0,1,1270
+10435,appletun-gmax,gmax,10208,20,1,1,0,1,1271
+10436,sandaconda-gmax,gmax,10209,20,1,1,0,1,1272
+10437,toxtricity-gmax,gmax,10210,20,1,1,0,1,1273
+10438,centiskorch-gmax,gmax,10211,20,1,1,0,1,1274
+10439,hatterene-gmax,gmax,10212,20,1,1,0,1,1275
+10440,grimmsnarl-gmax,gmax,10213,20,1,1,0,1,1276
+10441,alcremie-gmax,gmax,10214,20,1,1,0,1,1277
+10442,copperajah-gmax,gmax,10215,20,1,1,0,1,1278
+10443,duraludon-gmax,gmax,10216,20,1,1,0,1,1279
+10444,eternatus-eternamax,eternamax,10217,20,1,1,0,1,1280
+10445,urshifu-single-strike-gmax,gmax,10218,20,1,1,0,1,1281
+10446,urshifu-rapid-strike-gmax,gmax,10219,20,1,1,0,1,1282

data/v2/csv/pokemon_species.csv

@@ -806,89 +806,94 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 805,stakataka,7,,425,4,8,,-1,30,0,0,120,0,1,0,0,0,805,
 806,blacephalon,7,,426,9,12,,-1,30,0,0,120,0,1,0,0,0,806,
 807,zeraora,7,,427,10,12,,-1,3,0,0,120,0,1,0,0,1,807,
-808,meltan,7,,,,1,,,3,0,0,120,,,0,0,1,,
-809,melmetal,7,,,,12,,,3,,0,120,,,0,0,1,,
-810,grookey,8,,,5,6,,,45,50,0,20,,,0,0,0,,
-811,thwackey,8,,,5,6,,,45,50,0,20,,,0,0,0,,
-812,rillaboom,8,,,5,12,,,45,50,0,20,,,0,0,0,,
-813,scorbunny,8,,,9,6,,,45,50,0,20,,,0,0,0,,
-814,raboot,8,,,4,6,,,45,50,0,20,,,0,0,0,,
-815,cinderace,8,,,9,6,,,45,50,0,20,,,0,0,0,,
-816,sobble,8,,,2,8,,,45,50,0,20,,,0,0,0,,
-817,drizzile,8,,,2,6,,,45,50,0,20,,,0,0,0,,
-818,inteleon,8,,,2,6,,,45,50,0,20,,,0,0,0,,
-819,skwovet,8,,,3,6,,,255,50,0,20,,,0,0,0,,
-820,greedent,8,,,3,6,,,90,50,0,20,,,0,0,0,,
-821,rookidee,8,,,2,9,,,255,50,0,15,,,0,0,0,,
-822,corvisquire,8,,,2,9,,,120,50,0,15,,,0,0,0,,
-823,corviknight,8,,,7,9,,,45,50,0,15,,,0,0,0,,
-824,blipbug,8,,,2,14,,,255,50,0,15,,,0,0,0,,
-825,dottler,8,,,10,14,,,120,50,0,15,,,0,0,0,,
-826,orbeetle,8,,,8,9,,,45,50,0,15,,,0,0,0,,
-827,nickit,8,,,3,8,,,255,50,0,15,,,0,0,0,,
-828,thievul,8,,,3,8,,,127,50,0,15,,,0,0,0,,
-829,gossifleur,8,,,5,5,,,190,50,0,20,,,0,0,0,,
-830,eldegoss,8,,,5,5,,,75,50,0,20,,,0,0,0,,
-831,wooloo,8,,,9,8,,,255,50,0,15,,,0,0,0,,
-832,dubwool,8,,,9,8,,,127,50,0,15,,,0,0,0,,
-833,chewtle,8,,,5,8,,,255,50,0,20,,,0,0,0,,
-834,drednaw,8,,,5,8,,,75,50,0,20,,,0,0,0,,
-835,yamper,8,,,10,8,,,255,50,0,20,,,0,0,0,,
-836,boltund,8,,,10,8,,,45,50,0,20,,,0,0,0,,
-837,rolycoly,8,,,1,1,,,255,50,0,15,,,0,0,0,,
-838,carkol,8,,,1,7,,,120,50,0,15,,,0,0,0,,
-839,coalossal,8,,,1,12,,,45,50,0,15,,,0,0,0,,
-840,applin,8,,,5,2,,,255,50,0,20,,,0,0,0,,
-841,flapple,8,,,5,9,,,45,50,0,20,,,0,0,0,,
-842,appletun,8,,,5,8,,,45,50,0,20,,,0,0,0,,
-843,silicobra,8,,,5,2,,,255,50,0,20,,,0,0,0,,
-844,sandaconda,8,,,5,2,,,120,50,0,20,,,0,0,0,,
-845,cramorant,8,,,2,9,,,45,50,0,20,,,0,0,0,,
-846,arrokuda,8,,,3,3,,,255,50,0,20,,,0,0,0,,
-847,barraskewda,8,,,3,3,,,60,50,0,20,,,0,0,0,,
-848,toxel,8,,,7,6,,,75,50,0,25,,,0,0,0,,
-849,toxtricity,8,,,7,6,,,45,50,0,25,,,0,0,0,,
-850,sizzlipede,8,,,8,10,,,190,50,0,20,,,0,0,0,,
-851,centiskorch,8,,,8,10,,,75,50,0,20,,,0,0,0,,
-852,clobbopus,8,,,3,10,,,180,50,0,25,,,0,0,0,,
-853,grapploct,8,,,2,10,,,45,50,0,25,,,0,0,0,,
-854,sinistea,8,,,7,1,,,120,50,0,20,,,0,0,0,,
-855,polteageist,8,,,7,1,,,60,50,0,20,,,0,0,0,,
-856,hatenna,8,,,6,7,,,235,50,0,20,,,0,0,0,,
-857,hattrem,8,,,6,12,,,120,50,0,20,,,0,0,0,,
-858,hatterene,8,,,6,5,,,45,50,0,20,,,0,0,0,,
-859,impidimp,8,,,6,12,,,255,50,0,20,,,0,0,0,,
-860,morgrem,8,,,6,12,,,120,50,0,20,,,0,0,0,,
-861,grimmsnarl,8,,,7,12,,,45,50,0,20,,,0,0,0,,
-862,obstagoon,8,,,4,6,,,45,50,0,15,,,0,0,0,,
-863,perrserker,8,,,3,6,,,90,50,0,20,,,0,0,0,,
-864,cursola,8,,,9,4,,,30,50,0,20,,,0,0,0,,
-865,sirfetch,8,,,9,9,,,45,50,0,20,,,0,0,0,,
-866,mr,8,,,7,12,,,45,50,0,25,,,0,0,0,,
-867,runerigus,8,,,4,5,,,90,50,0,25,,,0,0,0,,
-868,milcery,8,,,9,1,,,200,50,0,20,,,0,0,0,,
-869,alcremie,8,,,9,5,,,100,50,0,20,,,0,0,0,,
-870,falinks,8,,,10,11,,,45,50,0,25,,,0,0,0,,
-871,pincurchin,8,,,7,10,,,75,50,0,20,,,0,0,0,,
-872,snom,8,,,9,2,,,190,50,0,20,,,0,0,0,,
-873,frosmoth,8,,,9,13,,,75,50,0,20,,,0,0,0,,
-874,stonjourner,8,,,4,7,,,60,50,0,25,,,0,0,0,,
-875,eiscue,8,,,2,6,,,60,50,0,25,,,0,0,0,,
-876,indeedee,8,,,7,6,,,30,140,0,40,,,0,0,0,,
-877,morpeko,8,,,10,12,,,180,50,0,10,,,0,0,0,,
-878,cufant,8,,,10,8,,,190,50,0,25,,,0,0,0,,
-879,copperajah,8,,,5,8,,,90,50,0,25,,,0,0,0,,
-880,dracozolt,8,,,5,6,,,45,50,0,35,,,0,0,0,,
-881,arctozolt,8,,,2,6,,,45,50,0,35,,,0,0,0,,
-882,dracovish,8,,,5,7,,,45,50,0,35,,,0,0,0,,
-883,arctovish,8,,,2,3,,,45,50,0,35,,,0,0,0,,
-884,duraludon,8,,,9,6,,,45,50,0,30,,,0,0,0,,
-885,dreepy,8,,,5,2,,,45,50,0,40,,,0,0,0,,
-886,drakloak,8,,,5,4,,,45,50,0,40,,,0,0,0,,
-887,dragapult,8,,,5,6,,,45,50,0,40,,,0,0,0,,
-888,zacian,8,,,2,8,,,10,0,0,120,,,0,1,0,,
-889,zamazenta,8,,,8,8,,,10,0,0,120,,,0,1,0,,
-890,eternatus,8,,,7,9,,,255,0,0,120,,,0,1,0,,
-891,kubfu,8,,,4,,,,3,50,0,120,,,0,1,0,,
-892,urshifu,8,,,4,,,,3,50,0,120,,,0,1,0,,
-893,zarude,8,,,5,,,,3,,0,120,,,0,0,1,,
+808,meltan,7,,428,,1,,-1,3,0,0,120,,,0,0,1,,
+809,melmetal,7,808,428,,12,,-1,3,,0,120,,,0,0,1,,
+810,grookey,8,,429,5,6,,1,45,50,0,20,,,0,0,0,,
+811,thwackey,8,810,429,5,6,,1,45,50,0,20,,,0,0,0,,
+812,rillaboom,8,811,429,5,12,,1,45,50,0,20,,,0,0,0,,
+813,scorbunny,8,,430,9,6,,1,45,50,0,20,,,0,0,0,,
+814,raboot,8,813,430,4,6,,1,45,50,0,20,,,0,0,0,,
+815,cinderace,8,814,430,9,6,,1,45,50,0,20,,,0,0,0,,
+816,sobble,8,,431,2,8,,1,45,50,0,20,,,0,0,0,,
+817,drizzile,8,816,431,2,6,,1,45,50,0,20,,,0,0,0,,
+818,inteleon,8,817,431,2,6,,1,45,50,0,20,,,0,0,0,,
+819,skwovet,8,,432,3,6,,4,255,50,0,20,,,0,0,0,,
+820,greedent,8,819,432,3,6,,4,90,50,0,20,,,0,0,0,,
+821,rookidee,8,,433,2,9,,4,255,50,0,15,,,0,0,0,,
+822,corvisquire,8,821,433,2,9,,4,120,50,0,15,,,0,0,0,,
+823,corviknight,8,822,433,7,9,,4,45,50,0,15,,,0,0,0,,
+824,blipbug,8,,434,2,14,,4,255,50,0,15,,,0,0,0,,
+825,dottler,8,824,434,10,14,,4,120,50,0,15,,,0,0,0,,
+826,orbeetle,8,825,434,8,9,,4,45,50,0,15,,,0,0,0,,
+827,nickit,8,,435,3,8,,4,255,50,0,15,,,0,0,0,,
+828,thievul,8,827,435,3,8,,4,127,50,0,15,,,0,0,0,,
+829,gossifleur,8,,436,5,5,,4,190,50,0,20,,,0,0,0,,
+830,eldegoss,8,829,436,5,5,,4,75,50,0,20,,,0,0,0,,
+831,wooloo,8,,437,9,8,,4,255,50,0,15,,,0,0,0,,
+832,dubwool,8,831,437,9,8,,4,127,50,0,15,,,0,0,0,,
+833,chewtle,8,,438,5,8,,4,255,50,0,20,,,0,0,0,,
+834,drednaw,8,833,438,5,8,,4,75,50,0,20,,,0,0,0,,
+835,yamper,8,,439,10,8,,4,255,50,0,20,,,0,0,0,,
+836,boltund,8,835,439,10,8,,4,45,50,0,20,,,0,0,0,,
+837,rolycoly,8,,440,1,1,,4,255,50,0,15,,,0,0,0,,
+838,carkol,8,837,440,1,7,,4,120,50,0,15,,,0,0,0,,
+839,coalossal,8,838,440,1,12,,4,45,50,0,15,,,0,0,0,,
+840,applin,8,,441,5,2,,4,255,50,0,20,,,0,0,0,,
+841,flapple,8,840,441,5,9,,4,45,50,0,20,,,0,0,0,,
+842,appletun,8,840,441,5,8,,4,45,50,0,20,,,0,0,0,,
+843,silicobra,8,,442,5,2,,4,255,50,0,20,,,0,0,0,,
+844,sandaconda,8,843,442,5,2,,4,120,50,0,20,,,0,0,0,,
+845,cramorant,8,,443,2,9,,4,45,50,0,20,,,0,0,0,,
+846,arrokuda,8,,444,3,3,,4,255,50,0,20,,,0,0,0,,
+847,barraskewda,8,846,444,3,3,,4,60,50,0,20,,,0,0,0,,
+848,toxel,8,,445,7,6,,4,75,50,0,25,,,0,0,0,,
+849,toxtricity,8,848,445,7,6,,4,45,50,0,25,,,0,0,0,,
+850,sizzlipede,8,,446,8,10,,4,190,50,0,20,,,0,0,0,,
+851,centiskorch,8,850,446,8,10,,4,75,50,0,20,,,0,0,0,,
+852,clobbopus,8,,447,3,10,,4,180,50,0,25,,,0,0,0,,
+853,grapploct,8,852,447,2,10,,4,45,50,0,25,,,0,0,0,,
+854,sinistea,8,,448,7,1,,-1,120,50,0,20,,,0,0,0,,
+855,polteageist,8,854,448,7,1,,-1,60,50,0,20,,,0,0,0,,
+856,hatenna,8,,449,6,7,,8,235,50,0,20,,,0,0,0,,
+857,hattrem,8,856,449,6,12,,8,120,50,0,20,,,0,0,0,,
+858,hatterene,8,857,449,6,5,,8,45,50,0,20,,,0,0,0,,
+859,impidimp,8,,450,6,12,,0,255,50,0,20,,,0,0,0,,
+860,morgrem,8,859,450,6,12,,0,120,50,0,20,,,0,0,0,,
+861,grimmsnarl,8,860,450,7,12,,0,45,50,0,20,,,0,0,0,,
+862,obstagoon,8,264,134,4,6,,4,45,50,0,15,,,0,0,0,,
+863,perrserker,8,52,22,3,6,,4,90,50,0,20,,,0,0,0,,
+864,cursola,8,222,113,9,4,,6,30,50,0,20,,,0,0,0,,
+865,sirfetchd,8,83,35,9,9,,4,45,50,0,20,,,0,0,0,,
+866,mr-rime,8,122,57,7,12,,4,45,50,0,25,,,0,0,0,,
+867,runerigus,8,562,287,4,5,,4,90,50,0,25,,,0,0,0,,
+868,milcery,8,,451,9,1,,8,200,50,0,20,,,0,0,0,,
+869,alcremie,8,868,451,9,5,,8,100,50,0,20,,,0,0,0,,
+870,falinks,8,,452,10,11,,-1,45,50,0,25,,,0,0,0,,
+871,pincurchin,8,,453,7,10,,4,75,50,0,20,,,0,0,0,,
+872,snom,8,,454,9,2,,4,190,50,0,20,,,0,0,0,,
+873,frosmoth,8,872,454,9,13,,4,75,50,0,20,,,0,0,0,,
+874,stonjourner,8,,455,4,7,,4,60,50,0,25,,,0,0,0,,
+875,eiscue,8,,456,2,6,,4,60,50,0,25,,,0,0,0,,
+876,indeedee,8,,457,7,6,,4,30,140,0,40,1,,0,0,0,,
+877,morpeko,8,,458,10,12,,4,180,50,0,10,,,0,0,0,,
+878,cufant,8,,459,10,8,,4,190,50,0,25,,,0,0,0,,
+879,copperajah,8,878,459,5,8,,4,90,50,0,25,,,0,0,0,,
+880,dracozolt,8,,460,5,6,,-1,45,50,0,35,,,0,0,0,,
+881,arctozolt,8,,461,2,6,,-1,45,50,0,35,,,0,0,0,,
+882,dracovish,8,,462,5,7,,-1,45,50,0,35,,,0,0,0,,
+883,arctovish,8,,463,2,3,,-1,45,50,0,35,,,0,0,0,,
+884,duraludon,8,,464,9,6,,4,45,50,0,30,,,0,0,0,,
+885,dreepy,8,,465,5,2,,4,45,50,0,40,,,0,0,0,,
+886,drakloak,8,885,465,5,4,,4,45,50,0,40,,,0,0,0,,
+887,dragapult,8,886,465,5,6,,4,45,50,0,40,,,0,0,0,,
+888,zacian,8,,466,2,8,,-1,10,0,0,120,,,0,1,0,,
+889,zamazenta,8,,467,8,8,,-1,10,0,0,120,,,0,1,0,,
+890,eternatus,8,,468,7,9,,-1,255,0,0,120,,,0,1,0,,
+891,kubfu,8,,469,4,,,1,3,50,0,120,,,0,1,0,,
+892,urshifu,8,891,469,4,,,1,3,50,0,120,,,0,1,0,,
+893,zarude,8,,470,5,,,-1,3,,0,120,,,0,0,1,,
+894,regieleki,8,,471,10,,,-1,3,,0,120,,1,0,1,0,,
+895,regidrago,8,,472,5,,,-1,3,,0,120,,1,0,1,0,,
+896,glastrier,8,,473,9,,,-1,3,0,0,120,,1,0,1,0,,
+897,spectrier,8,,474,1,,,-1,3,0,0,120,,1,0,1,0,,
+898,calyrex,8,,475,5,,,-1,3,,0,120,,1,1,1,0,,

data/v2/csv/pokemon_species_flavor_text.csv

@@ -188199,3 +188199,13 @@ Pokémon has raised since the child’s infancy."
 893,34,12,"长在身上的藤蔓断掉之后
 会变成土壤的养分，
 帮助森林中的植物成长。"
+894,33,9,"This Pokémon is a cluster of electrical energy. It's said that removing the rings on Regieleki's body will unleash the Pokémon's latent power."
+894,34,9,"Its entire body is made up of a single organ that generates electrical energy. Regieleki is capable of creating all Galar's electricity."
+895,33,9,"An academic theory proposes that Regidrago's arms were once the head of an ancient dragon Pokémon. The theory remains unproven."
+895,34,9,"Its body is composed of crystallized dragon energy. Regidrago is said to have the powers of every dragon Pokémon."
+896,33,9,"Glastrier emits intense cold from its hooves. It's also a belligerent Pokémon—anything it wants, it takes by force."
+896,34,9,"Glastrier has tremendous physical strength, and the mask of ice covering its face is 100 times harder than diamond."
+897,33,9,"It probes its surroundings with all its senses save one—it doesn't use its sense of sight. Spectrier's kicks are said to separate soul from body."
+897,34,9,"As it dashes through the night, Spectrier absorbs the life-force of sleeping creatures. It craves silence and solitude."
+898,33,9,"Calyrex is a merciful Pokémon, capable of providing healing and blessings. It reigned over the Galar region in times of yore."
+898,34,9,"Calyrex is known in legend as a king that ruled over Galar in ancient times. It has the power to cause hearts to mend and plants to spring forth."

data/v2/csv/pokemon_species_names.csv

@@ -1,4 +1,4 @@
-pokemon_species_id,local_language_id,name,genus
+pokemon_species_id,local_language_id,name,genus
 1,1,フシギダネ,たねポケモン
 1,2,Fushigidane,
 1,3,이상해씨,씨앗포켓몬
@@ -8562,3 +8562,94 @@ pokemon_species_id,local_language_id,name,genus
 807,9,Zeraora,Thunderclap Pokémon
 807,11,ゼラオラ,じんらいポケモン
 807,12,捷拉奥拉,奔雷宝可梦
+808,9,Meltan,Hex Nut Pokémon
+809,9,Melmetal,Hex Nut Pokémon
+810,9,Grookey,Chimp Pokémon
+811,9,Thwackey,Beat Pokémon
+812,9,Rillaboom,Drummer Pokémon
+813,9,Scorbunny,Rabbit Pokémon
+814,9,Raboot,Rabbit Pokémon
+815,9,Cinderace,Striker Pokémon
+816,9,Sobble,Water Lizard Pokémon
+817,9,Drizzile,Water Lizard Pokémon
+818,9,Inteleon,Secret Agent Pokémon
+819,9,Skwovet,Cheeky Pokémon
+820,9,Greedent,Greedy Pokémon
+821,9,Rookidee,Tiny Bird Pokémon
+822,9,Corvisquire,Raven Pokémon
+823,9,Corviknight,Raven Pokémon
+824,9,Blipbug,Larva Pokémon
+825,9,Dottler,Radome Pokémon
+826,9,Orbeetle,Seven Spot Pokémon
+827,9,Nickit,Fox Pokémon
+828,9,Thievul,Fox Pokémon
+829,9,Gossifleur,Flowering Pokémon
+830,9,Eldegoss,Cotton Bloom Pokémon
+831,9,Wooloo,Sheep Pokémon
+832,9,Dubwool,Pokémon
+833,9,Chewtle,Snapping Pokémon
+834,9,Drednaw,Bite Pokémon
+835,9,Yamper,Puppy Pokémon
+836,9,Boltund,Dog Pokémon
+837,9,Rolycoly,Coal Pokémon
+838,9,Carkol,Coal Pokémon
+839,9,Coalossal,Coal Pokémon
+840,9,Applin,Apple Core Pokémon
+841,9,Flapple,Apple Wing Pokémon
+842,9,Appletun,Apple Nectar Pokémon
+843,9,Silicobra,Sand Snake Pokémon
+844,9,Sandaconda,Sand Snake Pokémon
+845,9,Cramorant,Gulp Pokémon
+846,9,Arrokuda,Rush Pokémon
+847,9,Barraskewda,Skewer Pokémon
+848,9,Toxel,Baby Pokémon
+849,9,Toxtricity,Punk Pokémon
+850,9,Sizzlipede,Radiator Pokémon
+851,9,Centiskorch,Radiator Pokémon
+852,9,Clobbopus,Tantrum Pokémon
+853,9,Grapploct,Jujitsu Pokémon
+854,9,Sinistea,Black Tea Pokémon
+855,9,Polteageist,Black Tea Pokémon
+856,9,Hatenna,Calm Pokémon
+857,9,Hattrem,Serene Pokémon
+858,9,Hatterene,Silent Pokémon
+859,9,Impidimp,Wily Pokémon
+860,9,Morgrem,Devious Pokémon
+861,9,Grimmsnarl,Bulk Up Pokémon
+862,9,Obstagoon,Blocking Pokémon
+863,9,Perrserker,Viking Pokémon
+864,9,Cursola,Coral Pokémon
+865,9,Sirfetch'd,Wild Duck Pokémon
+866,9,Mr. Rime,Comedian Pokémon
+867,9,Runerigus,Grudge Pokémon
+868,9,Milcery,Cream Pokémon
+869,9,Alcremie,Cream Pokémon
+870,9,Falinks,Formation Pokémon
+871,9,Pincurchin,Sea Urchin Pokémon
+872,9,Snom,Worm Pokémon
+873,9,Frosmoth,Frost Moth Pokémon
+874,9,Stonjourner,Big Rock Pokémon
+875,9,Eiscue,Penguin Pokémon
+876,9,Indeedee,Emotion Pokémon
+877,9,Morpeko,Two-Sided Pokémon
+878,9,Cufant,Copperderm Pokémon
+879,9,Copperajah,Copperderm Pokémon
+880,9,Dracozolt,Fossil Pokémon
+881,9,Arctozolt,Fossil Pokémon
+882,9,Dracovish,Fossil Pokémon
+883,9,Arctovish,Fossil Pokémon
+884,9,Duraludon,Alloy Pokémon
+885,9,Dreepy,Lingering Pokémon
+886,9,Drakloak,Caretaker Pokémon
+887,9,Dragapult,Stealth Pokémon
+888,9,Zacian,Warrior Pokémon
+889,9,Zamazenta,Warrior Pokémon
+890,9,Eternatus,Gigantic Pokémon
+891,9,Kubfu,Wushu Pokémon
+892,9,Urshifu,Wushu Pokémon
+893,9,Zarude,Rogue Monkey Pokémon
+894,9,Regieleki,Electron Pokémon
+895,9,Regidrago,Dragon Orb Pokémon
+896,9,Glastrier,Wild Horse Pokémon
+897,9,Spectrier,Swift Horse Pokémon
+898,9,Calyrex,King Pokémon

data/v2/csv/pokemon_stats.csv

@@ -5345,6 +5345,36 @@ pokemon_id,stat_id,base_stat,effort
 893,4,70,0
 893,5,95,0
 893,6,105,0
+894,1,80,0
+894,2,100,0
+894,3,50,0
+894,4,100,0
+894,5,50,0
+894,6,200,3
+895,1,200,3
+895,2,100,0
+895,3,50,0
+895,4,100,0
+895,5,50,0
+895,6,80,0
+896,1,100,0
+896,2,145,3
+896,3,130,0
+896,4,65,0
+896,5,110,0
+896,6,30,0
+897,1,100,0
+897,2,65,0
+897,3,60,0
+897,4,145,3
+897,5,80,0
+897,6,130,0
+898,1,100,3
+898,2,80,0
+898,3,80,0
+898,4,80,0
+898,5,80,0
+898,6,80,0
 10001,1,50,0
 10001,2,180,2
 10001,3,20,0
@@ -6287,3 +6317,375 @@ pokemon_id,stat_id,base_stat,effort
 10157,4,167,1
 10157,5,97,0
 10157,6,129,1
+10158,1,50,0
+10158,2,65,1
+10158,3,55,0
+10158,4,40,0
+10158,5,40,0
+10158,6,40,0
+10159,1,50,0
+10159,2,85,0
+10159,3,55,0
+10159,4,65,0
+10159,5,65,0
+10159,6,90,1
+10160,1,65,0
+10160,2,100,0
+10160,3,70,0
+10160,4,80,0
+10160,5,80,0
+10160,6,105,2
+10161,1,90,1
+10161,2,65,0
+10161,3,65,0
+10161,4,40,0
+10161,5,40,0
+10161,6,15,0
+10162,1,95,0
+10162,2,100,2
+10162,3,95,0
+10162,4,100,0
+10162,5,70,0
+10162,6,30,0
+10163,1,52,0
+10163,2,95,1
+10163,3,55,0
+10163,4,58,0
+10163,5,62,0
+10163,6,55,0
+10164,1,65,0
+10164,2,90,0
+10164,3,120,2
+10164,4,85,0
+10164,5,70,0
+10164,6,60,0
+10165,1,50,0
+10165,2,65,0
+10165,3,65,0
+10165,4,90,0
+10165,5,90,0
+10165,6,100,2
+10166,1,90,0
+10166,2,85,0
+10166,3,85,0
+10166,4,125,3
+10166,5,100,0
+10166,6,95,0
+10167,1,90,0
+10167,2,125,3
+10167,3,90,0
+10167,4,85,0
+10167,5,90,0
+10167,6,100,0
+10168,1,90,0
+10168,2,85,0
+10168,3,90,0
+10168,4,100,0
+10168,5,125,3
+10168,6,90,0
+10169,1,95,0
+10169,2,655,0
+10169,3,80,0
+10169,4,110,0
+10169,5,110,2
+10169,6,30,0
+10170,1,60,0
+10170,2,55,0
+10170,3,100,0
+10170,4,65,0
+10170,5,100,1
+10170,6,30,0
+10171,1,38,0
+10171,2,30,0
+10171,3,41,0
+10171,4,30,0
+10171,5,41,0
+10171,6,60,1
+10172,1,78,0
+10172,2,70,0
+10172,3,61,0
+10172,4,50,0
+10172,5,61,0
+10172,6,100,2
+10173,1,70,0
+10173,2,90,1
+10173,3,45,0
+10173,4,15,0
+10173,5,45,0
+10173,6,50,0
+10174,1,105,0
+10174,2,140,2
+10174,3,55,0
+10174,4,30,0
+10174,5,55,0
+10174,6,95,0
+10175,1,105,0
+10175,2,160,2
+10175,3,55,0
+10175,4,30,0
+10175,5,55,0
+10175,6,135,0
+10176,1,38,0
+10176,2,55,0
+10176,3,85,1
+10176,4,30,0
+10176,5,65,0
+10176,6,30,0
+10177,1,109,2
+10177,2,81,0
+10177,3,99,0
+10177,4,66,0
+10177,5,84,0
+10177,6,32,0
+10178,1,75,0
+10178,2,98,0
+10178,3,70,0
+10178,4,114,2
+10178,5,70,0
+10178,6,75,0
+10179,1,75,0
+10179,2,80,0
+10179,3,70,2
+10179,4,65,0
+10179,5,50,0
+10179,6,130,0
+10180,1,70,0
+10180,2,55,0
+10180,3,65,0
+10180,4,95,0
+10180,5,105,2
+10180,6,85,0
+10181,1,92,0
+10181,2,170,0
+10181,3,115,0
+10181,4,80,0
+10181,5,115,0
+10181,6,148,3
+10182,1,92,0
+10182,2,130,0
+10182,3,145,0
+10182,4,80,0
+10182,5,145,0
+10182,6,128,3
+10183,1,100,0
+10183,2,130,3
+10183,3,100,0
+10183,4,63,0
+10183,5,60,0
+10183,6,97,0
+10184,1,100,0
+10184,2,165,3
+10184,3,150,0
+10184,4,85,0
+10184,5,130,0
+10184,6,50,0
+10185,1,100,0
+10185,2,85,0
+10185,3,80,0
+10185,4,165,3
+10185,5,100,0
+10185,6,150,0
+10186,1,80,0
+10186,2,82,0
+10186,3,83,0
+10186,4,100,2
+10186,5,100,1
+10186,6,80,0
+10187,1,78,0
+10187,2,84,0
+10187,3,78,0
+10187,4,109,3
+10187,5,85,0
+10187,6,100,0
+10188,1,79,0
+10188,2,83,0
+10188,3,100,0
+10188,4,85,0
+10188,5,105,3
+10188,6,78,0
+10189,1,60,0
+10189,2,45,0
+10189,3,50,0
+10189,4,90,2
+10189,5,80,1
+10189,6,70,0
+10190,1,35,0
+10190,2,55,0
+10190,3,40,0
+10190,4,50,0
+10190,5,50,0
+10190,6,90,2
+10191,1,40,0
+10191,2,45,0
+10191,3,35,0
+10191,4,40,0
+10191,5,40,0
+10191,6,90,1
+10192,1,90,0
+10192,2,130,3
+10192,3,80,0
+10192,4,65,0
+10192,5,85,0
+10192,6,55,0
+10193,1,60,0
+10193,2,65,0
+10193,3,60,0
+10193,4,130,3
+10193,5,75,0
+10193,6,110,0
+10194,1,55,0
+10194,2,130,2
+10194,3,115,0
+10194,4,50,0
+10194,5,50,0
+10194,6,75,0
+10195,1,130,2
+10195,2,85,0
+10195,3,80,0
+10195,4,85,0
+10195,5,95,0
+10195,6,60,0
+10196,1,55,0
+10196,2,55,0
+10196,3,50,0
+10196,4,45,0
+10196,5,65,1
+10196,6,55,0
+10197,1,160,2
+10197,2,110,0
+10197,3,65,0
+10197,4,65,0
+10197,5,110,0
+10197,6,30,0
+10198,1,80,0
+10198,2,95,2
+10198,3,82,0
+10198,4,60,0
+10198,5,82,0
+10198,6,75,0
+10199,1,135,0
+10199,2,143,3
+10199,3,143,0
+10199,4,80,0
+10199,5,65,0
+10199,6,34,0
+10200,1,100,0
+10200,2,125,3
+10200,3,90,0
+10200,4,60,0
+10200,5,70,0
+10200,6,85,0
+10201,1,80,0
+10201,2,116,0
+10201,3,75,0
+10201,4,65,0
+10201,5,75,0
+10201,6,119,3
+10202,1,70,0
+10202,2,85,0
+10202,3,65,0
+10202,4,125,0
+10202,5,65,0
+10202,6,120,3
+10203,1,98,0
+10203,2,87,0
+10203,3,105,3
+10203,4,53,0
+10203,5,85,0
+10203,6,67,0
+10204,1,60,0
+10204,2,45,0
+10204,3,110,0
+10204,4,80,0
+10204,5,120,3
+10204,6,90,0
+10205,1,90,0
+10205,2,115,2
+10205,3,90,0
+10205,4,48,0
+10205,5,68,0
+10205,6,74,0
+10206,1,110,0
+10206,2,80,0
+10206,3,120,3
+10206,4,80,0
+10206,5,90,0
+10206,6,30,0
+10207,1,70,0
+10207,2,110,2
+10207,3,80,0
+10207,4,95,0
+10207,5,60,0
+10207,6,70,0
+10208,1,110,2
+10208,2,85,0
+10208,3,80,0
+10208,4,100,0
+10208,5,80,0
+10208,6,30,0
+10209,1,72,0
+10209,2,107,0
+10209,3,125,2
+10209,4,65,0
+10209,5,70,0
+10209,6,71,0
+10210,1,75,0
+10210,2,98,0
+10210,3,70,0
+10210,4,114,2
+10210,5,70,0
+10210,6,75,0
+10211,1,100,0
+10211,2,115,2
+10211,3,65,0
+10211,4,90,0
+10211,5,90,0
+10211,6,65,0
+10212,1,57,0
+10212,2,90,0
+10212,3,95,0
+10212,4,136,3
+10212,5,103,0
+10212,6,29,0
+10213,1,95,0
+10213,2,120,3
+10213,3,65,0
+10213,4,95,0
+10213,5,75,0
+10213,6,60,0
+10214,1,65,0
+10214,2,60,0
+10214,3,75,0
+10214,4,110,0
+10214,5,121,2
+10214,6,64,0
+10215,1,122,0
+10215,2,130,2
+10215,3,69,0
+10215,4,80,0
+10215,5,69,0
+10215,6,30,0
+10216,1,70,0
+10216,2,95,0
+10216,3,115,0
+10216,4,120,2
+10216,5,50,0
+10216,6,85,0
+10217,1,255,3
+10217,2,115,0
+10217,3,250,0
+10217,4,125,0
+10217,5,250,0
+10217,6,130,0
+10218,1,100,0
+10218,2,130,3
+10218,3,100,0
+10218,4,63,0
+10218,5,60,0
+10218,6,97,0
+10219,1,100,0
+10219,2,130,3
+10219,3,100,0
+10219,4,63,0
+10219,5,60,0
+10219,6,97,0

data/v2/csv/pokemon_types.csv

@@ -1333,6 +1333,12 @@ pokemon_id,type_id,slot
 892,17,2
 893,17,1
 893,12,2
+894,13,1
+895,16,1
+896,15,1
+897,8,1
+898,14,1
+898,12,2
 10001,14,1
 10002,14,1
 10003,14,1
@@ -1605,3 +1611,104 @@ pokemon_id,type_id,slot
 10156,8,2
 10157,14,1
 10157,16,2
+10158,9,1
+10159,14,1
+10160,14,1
+10160,18,2
+10161,14,1
+10162,4,1
+10162,14,2
+10163,2,1
+10164,4,1
+10164,18,2
+10165,15,1
+10165,14,2
+10166,14,1
+10166,3,2
+10167,2,1
+10167,3,2
+10168,17,1
+10168,3,2
+10169,4,1
+10169,14,2
+10170,8,1
+10171,17,1
+10171,1,2
+10172,17,1
+10172,1,2
+10173,15,1
+10174,15,1
+10175,15,1
+10175,10,2
+10176,5,1
+10176,8,2
+10177,5,1
+10177,9,2
+10178,13,1
+10178,4,2
+10179,15,1
+10180,14,1
+10180,1,2
+10181,18,1
+10181,9,2
+10182,2,1
+10182,9,2
+10183,2,1
+10183,11,2
+10184,14,1
+10184,15,2
+10185,14,1
+10185,8,2
+10186,12,1
+10186,4,2
+10187,10,1
+10187,3,2
+10188,11,1
+10189,7,1
+10189,3,2
+10190,13,1
+10191,1,1
+10192,2,1
+10193,8,1
+10193,4,2
+10194,11,1
+10195,11,1
+10195,15,2
+10196,1,1
+10197,1,1
+10198,4,1
+10199,9,1
+10200,12,1
+10201,10,1
+10202,11,1
+10203,3,1
+10203,9,2
+10204,7,1
+10204,14,2
+10205,11,1
+10205,6,2
+10206,6,1
+10206,10,2
+10207,12,1
+10207,16,2
+10208,12,1
+10208,16,2
+10209,5,1
+10210,13,1
+10210,4,2
+10211,10,1
+10211,7,2
+10212,14,1
+10212,18,2
+10213,17,1
+10213,18,2
+10214,18,1
+10215,9,1
+10216,9,1
+10216,16,2
+10217,4,1
+10217,16,2
+10218,2,1
+10218,17,2
+10219,2,1
+10219,11,2

pokemon_v2/migrations/0002_itemsprites_pokemonformsprites_pokemonsprites.py

@@ -32,7 +32,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
         ),
         migrations.CreateModel(
             name="PokemonFormSprites",
@@ -58,7 +60,9 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
         ),
         migrations.CreateModel(
             name="PokemonSprites",
@@ -84,6 +88,8 @@ class Migration(migrations.Migration):
                     ),
                 ),
             ],
-            options={"abstract": False,},
+            options={
+                "abstract": False,
+            },
         ),
     ]

pokemon_v2/migrations/0008_auto_20201123_2045.py

@@ -0,0 +1,18 @@
+# Generated by Django 2.1.11 on 2020-11-23 20:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pokemon_v2", "0007_auto_20200815_0610"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="pokemonformname",
+            name="pokemon_name",
+            field=models.CharField(max_length=60),
+        ),
+    ]

pokemon_v2/models.py

@@ -1792,7 +1792,7 @@ class PokemonFormGeneration(HasPokemonForm, HasGeneration, HasGameIndex):
 
 class PokemonFormName(HasPokemonForm, IsName):
 
-    pokemon_name = models.CharField(max_length=30)
+    pokemon_name = models.CharField(max_length=60)
 
 
 class PokemonFormSprites(HasPokemonForm):

pokemon_v2/tests.py

@@ -17,7 +17,9 @@ class APIData:
     @classmethod
     def setup_gender_data(cls, name="gndr"):
 
-        gender = Gender.objects.create(name=name,)
+        gender = Gender.objects.create(
+            name=name,
+        )
         gender.save()
 
         return gender
@@ -27,7 +29,11 @@ class APIData:
     def setup_language_data(cls, name="lang"):
 
         language = Language.objects.create(
-            iso639="ts", iso3166="tt", name=name, official=True, order=1,
+            iso639="ts",
+            iso3166="tt",
+            name=name,
+            official=True,
+            order=1,
         )
         language.save()
 
@@ -115,7 +121,10 @@ class APIData:
     @classmethod
     def setup_version_data(cls, version_group=None, name="ver"):
 
-        version = Version.objects.create(name=name, version_group=version_group,)
+        version = Version.objects.create(
+            name=name,
+            version_group=version_group,
+        )
         version.save()
 
         return version
@@ -218,7 +227,9 @@ class APIData:
     @classmethod
     def setup_item_attribute_data(cls, name="itm attr"):
 
-        item_attribute = ItemAttribute.objects.create(name=name,)
+        item_attribute = ItemAttribute.objects.create(
+            name=name,
+        )
         item_attribute.save()
 
         return item_attribute
@@ -260,7 +271,9 @@ class APIData:
     @classmethod
     def setup_item_fling_effect_data(cls, name="itm flng efct"):
 
-        item_fling_effect = ItemFlingEffect.objects.create(name=name,)
+        item_fling_effect = ItemFlingEffect.objects.create(
+            name=name,
+        )
         item_fling_effect.save()
 
         return item_fling_effect
@@ -282,7 +295,9 @@ class APIData:
     @classmethod
     def setup_item_pocket_data(cls, name="itm pkt"):
 
-        item_pocket = ItemPocket.objects.create(name=name,)
+        item_pocket = ItemPocket.objects.create(
+            name=name,
+        )
         item_pocket.save()
 
         return item_pocket
@@ -417,7 +432,9 @@ class APIData:
     @classmethod
     def setup_contest_type_data(cls, name="cntst tp"):
 
-        contest_type = ContestType.objects.create(name=name,)
+        contest_type = ContestType.objects.create(
+            name=name,
+        )
         contest_type.save()
 
         return contest_type
@@ -473,7 +490,9 @@ class APIData:
     @classmethod
     def setup_super_contest_effect_data(cls, appeal=2):
 
-        super_contest_effect = SuperContestEffect.objects.create(appeal=appeal,)
+        super_contest_effect = SuperContestEffect.objects.create(
+            appeal=appeal,
+        )
         super_contest_effect.save()
 
         return super_contest_effect
@@ -522,7 +541,9 @@ class APIData:
     @classmethod
     def setup_berry_firmness_data(cls, name="bry frmns"):
 
-        berry_firmness = BerryFirmness.objects.create(name=name,)
+        berry_firmness = BerryFirmness.objects.create(
+            name=name,
+        )
         berry_firmness.save()
 
         return berry_firmness
@@ -590,7 +611,9 @@ class APIData:
     @classmethod
     def setup_egg_group_data(cls, name="egg grp"):
 
-        egg_group = EggGroup.objects.create(name=name,)
+        egg_group = EggGroup.objects.create(
+            name=name,
+        )
         egg_group.save()
 
         return egg_group
@@ -1271,7 +1294,9 @@ class APIData:
     ):
 
         nature_pokeathlon_stat = NaturePokeathlonStat.objects.create(
-            nature=nature, pokeathlon_stat=pokeathlon_stat, max_change=max_change,
+            nature=nature,
+            pokeathlon_stat=pokeathlon_stat,
+            max_change=max_change,
         )
         nature_pokeathlon_stat.save()
 
@@ -1302,7 +1327,10 @@ class APIData:
 
         region = region or cls.setup_region_data(name="rgn for " + name)
 
-        pokedex = Pokedex.objects.create(name=name, region=region,)
+        pokedex = Pokedex.objects.create(
+            name=name,
+            region=region,
+        )
         pokedex.save()
 
         return pokedex
@@ -1349,7 +1377,9 @@ class APIData:
     @classmethod
     def setup_pokemon_habitat_data(cls, name="pkm hbtt"):
 
-        pokemon_habitat = PokemonHabitat.objects.create(name=name,)
+        pokemon_habitat = PokemonHabitat.objects.create(
+            name=name,
+        )
         pokemon_habitat.save()
 
         return pokemon_habitat
@@ -1369,7 +1399,9 @@ class APIData:
     @classmethod
     def setup_pokemon_color_data(cls, name="pkm clr"):
 
-        pokemon_color = PokemonColor.objects.create(name=name,)
+        pokemon_color = PokemonColor.objects.create(
+            name=name,
+        )
         pokemon_color.save()
 
         return pokemon_color
@@ -1389,7 +1421,9 @@ class APIData:
     @classmethod
     def setup_pokemon_shape_data(cls, name="pkm shp"):
 
-        pokemon_shape = PokemonShape.objects.create(name=name,)
+        pokemon_shape = PokemonShape.objects.create(
+            name=name,
+        )
         pokemon_shape.save()
 
         return pokemon_shape
@@ -1753,7 +1787,9 @@ class APIData:
     @classmethod
     def setup_evolution_trigger_data(cls, name="evltn trgr"):
 
-        evolution_trigger = EvolutionTrigger.objects.create(name=name,)
+        evolution_trigger = EvolutionTrigger.objects.create(
+            name=name,
+        )
         evolution_trigger.save()
 
         return evolution_trigger
@@ -3312,8 +3348,10 @@ class APITests(APIData, APITestCase):
     def test_super_contest_effect_api(self):
 
         super_contest_effect = self.setup_super_contest_effect_data(appeal=10)
-        super_contest_effect_flavor_text = self.setup_super_contest_effect_flavor_text_data(
-            super_contest_effect, flavor_text="base spr cntst efct flvr txt"
+        super_contest_effect_flavor_text = (
+            self.setup_super_contest_effect_flavor_text_data(
+                super_contest_effect, flavor_text="base spr cntst efct flvr txt"
+            )
         )
         move = self.setup_move_data(
             name="mv for base spr cntst efct", super_contest_effect=super_contest_effect
@@ -4523,8 +4561,10 @@ class APITests(APIData, APITestCase):
         pokemon_species_name = self.setup_pokemon_species_name_data(
             pokemon_species, name="base pkmn shp name"
         )
-        pokemon_species_form_description = self.setup_pokemon_species_form_description_data(
-            pokemon_species, description="frm dscr for pkmn spcs"
+        pokemon_species_form_description = (
+            self.setup_pokemon_species_form_description_data(
+                pokemon_species, description="frm dscr for pkmn spcs"
+            )
         )
         pokemon_species_flavor_text = self.setup_pokemon_species_flavor_text_data(
             pokemon_species, flavor_text="flvr txt for pkmn spcs"
@@ -5217,11 +5257,14 @@ class APITests(APIData, APITestCase):
         evolution_chain = self.setup_evolution_chain_data()
 
         basic = self.setup_pokemon_species_data(
-            name="wurmple", evolution_chain=evolution_chain,
+            name="wurmple",
+            evolution_chain=evolution_chain,
         )
 
         stage_one_first = self.setup_pokemon_species_data(
-            name="silcoon", evolves_from_species=basic, evolution_chain=evolution_chain,
+            name="silcoon",
+            evolves_from_species=basic,
+            evolution_chain=evolution_chain,
         )
         stage_one_first_evolution = self.setup_pokemon_evolution_data(
             evolved_species=stage_one_first, min_level=7
@@ -5237,7 +5280,9 @@ class APITests(APIData, APITestCase):
         )
 
         stage_one_second = self.setup_pokemon_species_data(
-            name="cascoon", evolves_from_species=basic, evolution_chain=evolution_chain,
+            name="cascoon",
+            evolves_from_species=basic,
+            evolution_chain=evolution_chain,
         )
         stage_one_second_evolution = self.setup_pokemon_evolution_data(
             evolved_species=stage_one_second, min_level=7

test-requirements.txt

@@ -2,4 +2,4 @@
 pylint===2.1.1
 pylint-django===2.0.2
 astroid==2.0.4
-black==19.10b0
+black==20.8b1