Merge branch 'master' into master

Makefile

@@ -121,6 +121,7 @@ k8s-delete:  # (k8s) Delete pokeapi namespace
 
 update-graphql-prod:
 	git pull origin master
+	git submodule update --init
 	docker stop pokeapi_graphql-engine_1
 	sync; echo 3 > /proc/sys/vm/drop_caches
 	docker-compose -f docker-compose.yml -f docker-compose.override.yml -f Resources/compose/docker-compose-prod-graphql.yml up -d app

data/v2/build.py

@@ -30,7 +30,9 @@ DB_CURSOR = connection.cursor()
 DB_VENDOR = connection.vendor
 
 
-MEDIA_DIR = "/media/sprites/{0}"
+MEDIA_DIR = "{prefix}{{file_name}}".format(
+    prefix=os.environ.get("POKEAPI_SPRITES_PREFIX", "/media/sprites/")
+)
 IMAGE_DIR = os.getcwd() + "/data/v2/sprites/sprites/"
 RESOURCE_IMAGES = []
 
@@ -42,7 +44,9 @@ for root, dirs, files in os.walk(IMAGE_DIR):
 
 
 def file_path_or_none(file_name):
-    return MEDIA_DIR.format(file_name) if file_name in RESOURCE_IMAGES else None
+    return (
+        MEDIA_DIR.format(file_name=file_name) if file_name in RESOURCE_IMAGES else None
+    )
 
 
 def with_iter(context, iterable=None):

data/v2/csv/encounter_condition_value_map.csv

@@ -16973,3 +16973,838 @@ encounter_id,encounter_condition_value_id
 58140,27
 59280,39
 59281,39
+59318,3
+59319,3
+59320,3
+59321,3
+59322,3
+59323,3
+59324,3
+59325,3
+59326,3
+59327,3
+59328,4
+59329,4
+59330,4
+59331,4
+59332,4
+59333,4
+59334,4
+59335,4
+59336,4
+59337,4
+59338,5
+59339,5
+59340,5
+59341,5
+59342,5
+59343,5
+59344,5
+59345,5
+59346,5
+59347,5
+59348,3
+59349,3
+59350,3
+59351,3
+59352,3
+59353,3
+59354,3
+59355,3
+59356,3
+59357,3
+59358,4
+59359,4
+59360,4
+59361,4
+59362,4
+59363,4
+59364,4
+59365,4
+59366,4
+59367,4
+59368,5
+59369,5
+59370,5
+59371,5
+59372,5
+59373,5
+59374,5
+59375,5
+59376,5
+59377,5
+59378,3
+59379,3
+59380,3
+59381,3
+59382,3
+59383,3
+59384,3
+59385,3
+59386,3
+59387,3
+59388,4
+59389,4
+59390,4
+59391,4
+59392,4
+59393,4
+59394,4
+59395,4
+59396,4
+59397,4
+59398,5
+59399,5
+59400,5
+59401,5
+59402,5
+59403,5
+59404,5
+59405,5
+59406,5
+59407,5
+59408,3
+59409,3
+59410,3
+59411,3
+59412,3
+59413,3
+59414,3
+59415,3
+59416,3
+59417,3
+59418,4
+59419,4
+59420,4
+59421,4
+59422,4
+59423,4
+59424,4
+59425,4
+59426,4
+59427,4
+59428,5
+59429,5
+59430,5
+59431,5
+59432,5
+59433,5
+59434,5
+59435,5
+59436,5
+59437,5
+59438,3
+59439,3
+59440,3
+59441,3
+59442,3
+59443,3
+59444,3
+59445,3
+59446,3
+59447,3
+59448,4
+59449,4
+59450,4
+59451,4
+59452,4
+59453,4
+59454,4
+59455,4
+59456,4
+59457,4
+59458,5
+59459,5
+59460,5
+59461,5
+59462,5
+59463,5
+59464,5
+59465,5
+59466,5
+59467,5
+59468,3
+59469,3
+59470,3
+59471,3
+59472,3
+59473,3
+59474,3
+59475,3
+59476,3
+59477,3
+59478,4
+59479,4
+59480,4
+59481,4
+59482,4
+59483,4
+59484,4
+59485,4
+59486,4
+59487,4
+59488,5
+59489,5
+59490,5
+59491,5
+59492,5
+59493,5
+59494,5
+59495,5
+59496,5
+59497,5
+59498,3
+59499,3
+59500,3
+59501,3
+59502,3
+59503,3
+59504,3
+59505,3
+59506,3
+59507,3
+59508,4
+59509,4
+59510,4
+59511,4
+59512,4
+59513,4
+59514,4
+59515,4
+59516,4
+59517,4
+59518,5
+59519,5
+59520,5
+59521,5
+59522,5
+59523,5
+59524,5
+59525,5
+59526,5
+59527,5
+59528,3
+59529,3
+59530,3
+59531,3
+59532,3
+59533,3
+59534,3
+59535,3
+59536,3
+59537,3
+59538,4
+59539,4
+59540,4
+59541,4
+59542,4
+59543,4
+59544,4
+59545,4
+59546,4
+59547,4
+59548,5
+59549,5
+59550,5
+59551,5
+59552,5
+59553,5
+59554,5
+59555,5
+59556,5
+59557,5
+59558,3
+59559,3
+59560,3
+59561,3
+59562,3
+59563,3
+59564,3
+59565,3
+59566,3
+59567,3
+59568,4
+59569,4
+59570,4
+59571,4
+59572,4
+59573,4
+59574,4
+59575,4
+59576,4
+59577,4
+59578,5
+59579,5
+59580,5
+59581,5
+59582,5
+59583,5
+59584,5
+59585,5
+59586,5
+59587,5
+59588,3
+59589,3
+59590,3
+59591,3
+59592,3
+59593,3
+59594,3
+59595,3
+59596,3
+59597,3
+59598,4
+59599,4
+59600,4
+59601,4
+59602,4
+59603,4
+59604,4
+59605,4
+59606,4
+59607,4
+59608,5
+59609,5
+59610,5
+59611,5
+59612,5
+59613,5
+59614,5
+59615,5
+59616,5
+59617,5
+59618,3
+59619,3
+59620,3
+59621,3
+59622,3
+59623,3
+59624,3
+59625,3
+59626,3
+59627,3
+59628,4
+59629,4
+59630,4
+59631,4
+59632,4
+59633,4
+59634,4
+59635,4
+59636,4
+59637,4
+59638,5
+59639,5
+59640,5
+59641,5
+59642,5
+59643,5
+59644,5
+59645,5
+59646,5
+59647,5
+59648,3
+59649,3
+59650,3
+59651,3
+59652,3
+59653,3
+59654,3
+59655,3
+59656,3
+59657,3
+59658,4
+59659,4
+59660,4
+59661,4
+59662,4
+59663,4
+59664,4
+59665,4
+59666,4
+59667,4
+59668,5
+59669,5
+59670,5
+59671,5
+59672,5
+59673,5
+59674,5
+59675,5
+59676,5
+59677,5
+59878,3
+59879,3
+59880,3
+59881,3
+59882,3
+59883,3
+59884,3
+59885,3
+59886,3
+59887,3
+59888,4
+59889,4
+59890,4
+59891,4
+59892,4
+59893,4
+59894,4
+59895,4
+59896,4
+59897,4
+59898,5
+59899,5
+59900,5
+59901,5
+59902,5
+59903,5
+59904,5
+59905,5
+59906,5
+59907,5
+59908,3
+59909,3
+59910,3
+59911,3
+59912,3
+59913,3
+59914,3
+59915,3
+59916,3
+59917,3
+59918,4
+59919,4
+59920,4
+59921,4
+59922,4
+59923,4
+59924,4
+59925,4
+59926,4
+59927,4
+59928,5
+59929,5
+59930,5
+59931,5
+59932,5
+59933,5
+59934,5
+59935,5
+59936,5
+59937,5
+59938,3
+59939,3
+59940,3
+59941,3
+59942,3
+59943,3
+59944,3
+59945,3
+59946,3
+59947,3
+59948,4
+59949,4
+59950,4
+59951,4
+59952,4
+59953,4
+59954,4
+59955,4
+59956,4
+59957,4
+59958,5
+59959,5
+59960,5
+59961,5
+59962,5
+59963,5
+59964,5
+59965,5
+59966,5
+59967,5
+59968,3
+59969,3
+59970,3
+59971,3
+59972,3
+59973,3
+59974,3
+59975,3
+59976,3
+59977,3
+59978,4
+59979,4
+59980,4
+59981,4
+59982,4
+59983,4
+59984,4
+59985,4
+59986,4
+59987,4
+59988,5
+59989,5
+59990,5
+59991,5
+59992,5
+59993,5
+59994,5
+59995,5
+59996,5
+59997,5
+59998,3
+59999,3
+60000,3
+60001,3
+60002,3
+60003,3
+60004,3
+60005,3
+60006,3
+60007,3
+60008,4
+60009,4
+60010,4
+60011,4
+60012,4
+60013,4
+60014,4
+60015,4
+60016,4
+60017,4
+60018,5
+60019,5
+60020,5
+60021,5
+60022,5
+60023,5
+60024,5
+60025,5
+60026,5
+60027,5
+60028,3
+60029,3
+60030,3
+60031,3
+60032,3
+60033,3
+60034,3
+60035,3
+60036,3
+60037,3
+60038,4
+60039,4
+60040,4
+60041,4
+60042,4
+60043,4
+60044,4
+60045,4
+60046,4
+60047,4
+60048,5
+60049,5
+60050,5
+60051,5
+60052,5
+60053,5
+60054,5
+60055,5
+60056,5
+60057,5
+60058,3
+60059,3
+60060,3
+60061,3
+60062,3
+60063,3
+60064,3
+60065,3
+60066,3
+60067,3
+60068,4
+60069,4
+60070,4
+60071,4
+60072,4
+60073,4
+60074,4
+60075,4
+60076,4
+60077,4
+60078,5
+60079,5
+60080,5
+60081,5
+60082,5
+60083,5
+60084,5
+60085,5
+60086,5
+60087,5
+60088,3
+60089,3
+60090,3
+60091,3
+60092,3
+60093,3
+60094,3
+60095,3
+60096,3
+60097,3
+60098,4
+60099,4
+60100,4
+60101,4
+60102,4
+60103,4
+60104,4
+60105,4
+60106,4
+60107,4
+60108,5
+60109,5
+60110,5
+60111,5
+60112,5
+60113,5
+60114,5
+60115,5
+60116,5
+60117,5
+60118,3
+60119,3
+60120,3
+60121,3
+60122,3
+60123,3
+60124,3
+60125,3
+60126,3
+60127,3
+60128,4
+60129,4
+60130,4
+60131,4
+60132,4
+60133,4
+60134,4
+60135,4
+60136,4
+60137,4
+60138,5
+60139,5
+60140,5
+60141,5
+60142,5
+60143,5
+60144,5
+60145,5
+60146,5
+60147,5
+60148,3
+60149,3
+60150,3
+60151,3
+60152,3
+60153,3
+60154,3
+60155,3
+60156,3
+60157,3
+60158,4
+60159,4
+60160,4
+60161,4
+60162,4
+60163,4
+60164,4
+60165,4
+60166,4
+60167,4
+60168,5
+60169,5
+60170,5
+60171,5
+60172,5
+60173,5
+60174,5
+60175,5
+60176,5
+60177,5
+60178,3
+60179,3
+60180,3
+60181,3
+60182,3
+60183,3
+60184,3
+60185,3
+60186,3
+60187,3
+60188,4
+60189,4
+60190,4
+60191,4
+60192,4
+60193,4
+60194,4
+60195,4
+60196,4
+60197,4
+60198,5
+60199,5
+60200,5
+60201,5
+60202,5
+60203,5
+60204,5
+60205,5
+60206,5
+60207,5
+60208,3
+60209,3
+60210,3
+60211,3
+60212,3
+60213,3
+60214,3
+60215,3
+60216,3
+60217,3
+60218,4
+60219,4
+60220,4
+60221,4
+60222,4
+60223,4
+60224,4
+60225,4
+60226,4
+60227,4
+60228,5
+60229,5
+60230,5
+60231,5
+60232,5
+60233,5
+60234,5
+60235,5
+60236,5
+60237,5
+62198,40
+62215,31
+62216,31
+62217,31
+62218,31
+62219,31
+62220,31
+62221,30
+62222,30
+62223,41
+62224,41
+62225,30
+62226,30
+62227,41
+62228,41
+62229,30
+62230,30
+62231,41
+62232,41
+62249,44
+62249,42
+62249,35
+62250,45
+62250,42
+62250,35
+62254,46
+62255,47
+62256,48
+62257,46
+62258,47
+62259,48
+62260,46
+62261,47
+62262,48
+62263,49
+62264,50
+62265,49
+62266,50
+62267,49
+62268,50
+62271,46
+62272,47
+62273,48
+62274,46
+62275,47
+62276,48
+50380,37
+50381,37
+50523,51
+50526,52
+50527,52
+50528,52
+50529,54
+50530,54
+50531,53
+50532,53
+50533,53
+50534,53
+50535,53
+50536,53
+50400,55
+50401,55
+50402,55
+50403,55
+50404,55
+50405,55
+62277,55
+62278,55
+62279,55
+62280,55
+62281,55
+62282,55
+62277,56
+62278,56
+62279,56
+62280,56
+62281,56
+62282,56
+62283,57
+62284,57
+62293,58
+62294,58
+62295,58
+62326,64
+62327,64
+62328,64
+50519,66
+50520,66
+62433,64
+62434,64
+62433,67
+62434,67
+62435,67
+62436,68
+62437,68
+62438,68
+62436,69
+62437,69
+62438,69
+62439,37
+62440,37
+62439,5
+62440,5
+62441,5
+62488,64
+62489,64
+58115,70
+58116,70
+62489,71
+62490,71
+62491,71
+62492,71
+62493,71
+62494,71
+62495,71

data/v2/csv/encounter_condition_value_prose.csv

@@ -58,3 +58,35 @@ encounter_condition_value_id,local_language_id,name
 37,9,Acquired National Pokédex
 38,9,None
 39,9,Beat the Pokémon league after knocking out Snorlax at Route 11
+40,9,Playing on the Virtual Console Release
+41,9,Cure the nightmares of Eldritch’s Son
+42,9,Talk to Cynthia’s grandmother
+43,9,No item requirement
+44,9,Have Adamant Orb in bag
+45,9,Have Lustrous Orb in bag
+46,9,Have Helix Fossil in bag
+47,9,Have Dome Fossil in bag
+48,9,Have Old Amber in bag
+49,9,Have Root Fossil in bag
+50,9,Have Claw Fossil in bag
+51,9,Defeat Jupiter
+52,9,Defeat Team Galactic at Iron Island
+53,9,Input correct password
+54,9,Obtained Zephyr badge
+55,9,Defeat Red
+56,9,Received a Kanto Starter
+57,9,Received TM59 From Claire
+58,9,"Have Regirock, Regice and Registeel in the party"
+59,9,Sunday
+60,9,Monday
+61,9,Tuesday
+62,9,Wednesday
+63,9,Thursday
+64,9,Friday
+65,9,Saturday
+66,9,The first Pokémon in the player’s party has a high friendship stat
+67,9,Beat Mars for the first time
+68,9,Have Odd Keystone in bag
+69,9,Has talked to at least 32 people in the underground
+70,9,Returned Machine Part to Power Plant
+10,9,Have an Event Arceus in the party

data/v2/csv/encounter_condition_values.csv

@@ -38,3 +38,35 @@ id,encounter_condition_id,identifier,is_default
 37,9,story-progress-national-dex,0
 38,10,other-none,1
 39,10,other-snorlax-11-beat-league,0
+40,10,other-virtual-console,0
+41,9,story-progress-cure-eldritch-nightmares,0
+42,10,other-talk-to-cynthias-grandmother,0
+43,11,item-none,1
+44,11,item-adamant-orb,0
+45,11,item-lustrous-orb,0
+46,11,item-helix-fossil,0
+47,11,item-dome-fossil,0
+48,11,item-old-amber,0
+49,11,item-root-fossil,0
+50,11,item-claw-fossil,0
+51,9,story-progress-defeat-jupiter,0
+52,9,story-progress-beat-team-galactic-iron-island,0
+53,10,other-correct-password,0
+54,9,story-progress-zephyr-badge,0
+55,9,story-progress-beat-red,0
+56,10,other-received-kanto-starter,0
+57,9,story-progress-receive-tm-from-claire,0
+58,10,other-regirock-regice-registeel-in-party,0
+59,12,weekday-sunday,0
+60,12,weekday-monday,0
+61,12,weekday-tuesday,0
+62,12,weekday-wednesday,0
+63,12,weekday-thursday,0
+64,12,weekday-friday,0
+65,12,weekday-saturday,0
+66,13,first-party-pokemon-high-friendship,0
+67,9,story-progress-defeat-mars,0
+68,11,item-odd-keystone,0
+69,10,other-talked-to-32-people-underground,0
+70,9,story-progress-returned-machine-part,0
+71,10,other-event-arceus-in-party,0

data/v2/csv/encounter_conditions.csv

@@ -9,3 +9,6 @@ id,identifier
 8,tv-option
 9,story-progress
 10,other
+11,item
+12,weekday
+13,first-party-pokemon

data/v2/csv/encounter_method_prose.csv

@@ -42,4 +42,8 @@ encounter_method_id,local_language_id,name
 24,9,Headbutting a high encounter rate tree
 25,9,Using the Squirt Bottle on a Sudowoodo
 26,9,Using the Wailmer Pail on a Sudowoodo
-27,9,Surfing on seaweed
+27,9,Diving on seaweed
+28,9,On any overworld patch of grass
+29,9,On any overworld water tile
+30,9,Using Devon Scope
+31,9,Fishing in a Feebas Tile

data/v2/csv/encounter_methods.csv

@@ -26,3 +26,7 @@ id,identifier,order
 25,squirt-bottle,25
 26,wailmer-pail,26
 27,seaweed,27
+28,roaming-grass,28
+29,roaming-water,29
+30,devon-scope,30
+31,feebas-tile-fishing,31

data/v2/csv/encounter_slots.csv

@@ -645,3 +645,69 @@ id,version_group_id,encounter_method_id,slot,rarity
 644,6,27,3,5
 645,6,27,4,4
 646,6,27,5,1
+647,10,1,1,10
+648,10,1,2,10
+649,10,1,3,10
+650,10,1,4,10
+651,10,1,5,10
+652,10,1,6,10
+653,10,1,7,10
+654,10,1,8,10
+655,10,1,9,10
+656,10,1,10,10
+657,10,2,1,10
+658,10,2,2,10
+659,10,2,3,10
+660,10,2,4,10
+661,10,2,5,10
+662,10,2,6,10
+663,10,2,7,10
+664,10,2,8,10
+665,10,2,9,10
+666,10,2,10,10
+667,10,3,1,10
+668,10,3,2,10
+669,10,3,3,10
+670,10,3,4,10
+671,10,3,5,10
+672,10,3,6,10
+673,10,3,7,10
+674,10,3,8,10
+675,10,3,9,10
+676,10,3,10,10
+677,10,4,1,10
+678,10,4,2,10
+679,10,4,3,10
+680,10,4,4,10
+681,10,4,5,10
+682,10,4,6,10
+683,10,4,7,10
+684,10,4,8,10
+685,10,4,9,10
+686,10,4,10,10
+687,10,5,1,10
+688,10,5,2,10
+689,10,5,3,10
+690,10,5,4,10
+691,10,5,5,10
+692,10,5,6,10
+693,10,5,7,10
+694,10,5,8,10
+695,10,5,9,10
+696,10,5,10,10
+697,3,28,1,10
+698,4,28,1,10
+699,5,28,1,25
+700,5,29,1,25
+701,6,28,1,25
+702,6,29,1,25
+703,7,28,1,25
+704,8,28,1,25
+705,8,29,1,25
+706,9,28,1,25
+707,9,29,1,25
+708,10,28,1,25
+709,5,30,1,100
+710,6,30,1,100
+711,5,31,1,50
+712,6,31,1,50

data/v2/csv/generation_names.csv

@@ -48,4 +48,9 @@ generation_id,local_language_id,name
 7,7,Generación VII
 7,9,Generation VII
 7,11,第七世代
+8,3,8세대
+8,5,Génération VIII
+8,6,Generation VIII
+8,7,Generación VIII
 8,9,Generation VIII
+8,11,第八世代

data/v2/csv/location_area_prose.csv

@@ -669,3 +669,33 @@ location_area_id,local_language_id,name
 810,9,Desert Ruins
 811,9,Island Cave
 812,9,Ancient Tomb
+813,9,Johto Safari Zone Peak
+814,9,Johto Safari Zone Desert
+815,9,Johto Safari Zone Plains
+816,9,Johto Safari Zone Meadow
+817,9,Johto Safari Zone Forest
+818,9,Johto Safari Zone Swamp
+819,9,Johto Safari Zone Marshland
+820,9,Johto Safari Zone Mountain
+821,9,Johto Safari Zone Rocky Beach
+822,9,Johto Safari Zone Wasteland
+823,9,Johto Safari Zone Savannah
+824,9,Johto Safari Zone Wetland
+825,9,Mt. Ember Summit
+826,9,Kyogre’s Room
+827,9,Groudon’s Room
+828,9,Rayquaza’s Room
+829,9,Acuity Cavern
+830,9,Valor Cavern
+831,9,Spear Pillar
+832,9,Pokémon Center
+833,9,Cinnabar Lab
+834,9,
+835,9,Silph Co.
+836,9,Pokémon Center
+837,9,Heatran Chamber
+838,9,
+839,9,
+840,9,
+841,9,
+842,9,

data/v2/csv/location_areas.csv

@@ -701,3 +701,33 @@ id,location_id,game_index,identifier
 810,582,0,area
 811,581,0,area
 812,583,0,area
+813,814,0,zone-peak
+814,814,0,zone-desert
+815,814,0,zone-plains
+816,814,0,zone-meadow
+817,814,0,zone-forest
+818,814,0,zone-swamp
+819,814,0,zone-marshland
+820,814,0,zone-mountain
+821,814,0,zone-rocky-beach
+822,814,0,zone-wasteland
+823,814,0,zone-savannah
+824,814,0,zone-wetland
+825,500,0,summit
+826,248,0,kyogre-room
+827,248,0,groundon-room
+828,248,0,rayquaza-room
+829,28,0,cavern
+830,27,0,cavern
+831,172,0,area
+832,109,0,pokemon-center
+833,71,0,cinnabar-lab
+834,573,0,
+835,234,0,silph-co
+836,70,0,pokemon-center
+837,16,0,heatran-chamber
+838,183,0,
+839,179,0,
+840,188,0,
+841,237,0,
+842,247,0,

data/v2/csv/location_names.csv

@@ -3591,3 +3591,4 @@ location_id,local_language_id,name,subtitle
 811,9,Navel Rock,
 812,9,Faraway Island,
 813,9,Hoenn Battle Frontier,
+814,9,Johto Safari Zone,

data/v2/csv/locations.csv

@@ -795,3 +795,4 @@ id,region_id,identifier
 811,1,navel-rock
 812,3,faraway-island
 813,3,hoenn-battle-frontier
+814,2,johto-safari-zone

data/v2/csv/move_effect_prose.csv

@@ -1120,6 +1120,7 @@ Any [regular damage]{mechanic:regular-damage} dealt to an affected Pokémon is r
 423,9,Seeds the target after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) sets []{move:leech-seed} on the target."
 424,9,Cures the entire party of major status effects after inflicting damage.,"Inflicts [regular damage]{mechanic:regular-damage}, then (if successful) removes [major status effects]{mechanic:major-status-effects} from every Pokémon in the user's party."
 425,9,Hits twice in one turn, with a $effect_chance% chance to make the target flinch.,"Inflicts [regular damage]{mechanic:regular-damage}.  Hits twice in one turn, with a $effect_chance% chance to make the target [flinch]{mechanic:flinch}."
+443,9,Boosts the user's Speed and lowers their Defense by one stage after inflicting damage two to five times in a row.,"Inflicts [regular damage]{mechanic:regular-damage} two to five times in a row, raising the user's [Speed]{mechanic:speed} and lowering the user's [Defense]{mechanic:defense} by one [stage]{mechanic:stage} each upon last hit."
 10001,9,Has an increased chance for a critical hit in Hyper Mode.,Inflicts [regular damage]{mechanic:regular-damage}.  User's [critical hit]{mechanic:critical-hit} rate is one level higher when using this move while in [hyper mode]{mechanic:hyper-mode}.
 10002,9,User receives 1/2 its HP in recoil.,Inflicts [regular damage]{mechanic:regular-damage}.  User takes 1/2 of its current [HP]{mechanic:hp} in recoil.
 10003,9,Halves HP of all Pokémon on the field.  Must recharge,"Halves [HP]{mechanic:hp} of all Pokémon on the field.  User loses its next turn to ""recharge"", and cannot attack or [switch]{mechanic:switch} out during that turn."

data/v2/csv/move_effects.csv

@@ -422,6 +422,7 @@ id
 440
 441
 442
+443
 10001
 10002
 10003

data/v2/csv/moves.csv

@@ -797,7 +797,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 796,steel-beam,8,9,140,5,95,0,10,3,420,,,,
 797,expanding-force,8,14,80,10,100,0,10,3,1,,,,
 798,steel-roller,8,9,130,5,100,0,10,2,1,,,,
-799,scale-shot,8,16,25,20,90,0,10,2,1,,,,
+799,scale-shot,8,16,25,20,90,0,10,2,443,,,,
 800,meteor-beam,8,6,120,10,90,0,10,3,1,100,,,
 801,shell-side-arm,8,4,90,10,100,0,10,3,1,20,,,
 802,misty-explosion,8,18,100,5,100,0,9,3,1,,,,

data/v2/csv/pokedex_prose.csv

@@ -57,3 +57,4 @@ pokedex_id,local_language_id,name,description
 27,9,Galar,Sword/Shield Galar dex
 28,9,Isle of Armor,Isle of Armor dex
 29,9,Crown Tundra,Crown Tundra dex
+30,9,Hisui,Hisui dex

data/v2/csv/pokedexes.csv

@@ -27,3 +27,4 @@ id,region_id,identifier,is_main_series
 27,8,galar,1
 28,8,isle-of-armor,1
 29,8,crown-tundra,1
+30,9,hisui,1

data/v2/csv/pokemon_abilities.csv

@@ -2148,6 +2148,9 @@ pokemon_id,ability_id,is_hidden,slot
 900,68,0,1
 900,125,0,2
 900,80,1,3
+901,62,0,1
+901,171,0,2
+901,127,1,3
 902,155,0,1
 902,91,0,2
 902,104,1,3

data/v2/csv/pokemon_form_names.csv

@@ -468,8 +468,12 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 892,9,Single Strike Style,Single Strike Urshifu
 892,11,いちげきのかた,
 892,12,一击流,
+902,1,オスのすがた,
 902,9,Male, Male Basculegion
+902,11,オスのすがた,
+905,1,けしんフォルム,
 905,9,Incarnate Forme, Incarnate Enamorus
+905,11,けしんフォルム,
 10001,1,Ｂ,
 10001,3,B,
 10001,5,B,Zarbi B
@@ -2025,7 +2029,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10193,1,アローラのすがた,
 10193,3,알로라의 모습,
 10193,4,阿羅拉的樣子,
-10193,5,Forme d’Alola,
+10193,5,Forme d’Alola,Rattata d'Alola
 10193,6,Alola-Form,
 10193,7,Forma de Alola,
 10193,8,Forma di Alola,
@@ -2035,7 +2039,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10194,1,アローラのすがた,
 10194,3,알로라의 모습,
 10194,4,阿羅拉的樣子,
-10194,5,Forme d’Alola,
+10194,5,Forme d’Alola,Rattatac d'Alola
 10194,6,Alola-Form,
 10194,7,Forma de Alola,
 10194,8,Forma di Alola,
@@ -2043,10 +2047,11 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10194,11,アローラのすがた,
 10194,12,阿罗拉的样子,
 10195,9,,Totem Alolan Raticate
+10195,5,,Rattatac d'Alola Dominant
 10196,1,オリジナルキャップ,
 10196,3,오리지널캡,
 10196,4,初始帽子,
-10196,5,Casquette Originale,
+10196,5,Casquette Originale,Pikachu Casquette Originale
 10196,6,Original-Kappe,
 10196,7,Gorra Original,
 10196,8,Berretto Originale,
@@ -2056,7 +2061,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10197,1,ホウエンキャップ,
 10197,3,호연캡,
 10197,4,豐緣帽子,
-10197,5,Casquette de Hoenn,
+10197,5,Casquette de Hoenn,Pikachu Casquette de Hoenn
 10197,6,Hoenn-Kappe,
 10197,7,Gorra Hoenn,
 10197,8,Berretto Hoenn,
@@ -2066,7 +2071,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10198,1,シンオウキャップ,
 10198,3,신오캡,
 10198,4,神奧帽子,
-10198,5,Casquette de Sinnoh,
+10198,5,Casquette de Sinnoh,Pikachu Casquette de Sinnoh
 10198,6,Sinnoh-Kappe,
 10198,7,Gorra Sinnoh,
 10198,8,Berretto Sinnoh,
@@ -2076,7 +2081,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10199,1,イッシュキャップ,
 10199,3,하나캡,
 10199,4,合眾帽子,
-10199,5,Casquette d’Unys,
+10199,5,Casquette d’Unys,Pikachu Casquette d’Unys
 10199,6,Einall-Kappe,
 10199,7,Gorra Teselia,
 10199,8,Berretto Unima,
@@ -2086,7 +2091,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10200,1,カロスキャップ,
 10200,3,칼로스캡,
 10200,4,卡洛斯帽子,
-10200,5,Casquette de Kalos,
+10200,5,Casquette de Kalos, Pikachu Casquette de Kalos
 10200,6,Kalos-Kappe,
 10200,7,Gorra Kalos,
 10200,8,Berretto Kalos,
@@ -2096,7 +2101,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10201,1,アローラキャップ,
 10201,3,알로라캡,
 10201,4,阿羅拉帽子,
-10201,5,Casquette d’Alola,
+10201,5,Casquette d’Alola, Pikachu Casquette d’Alola
 10201,6,Alola-Kappe,
 10201,7,Gorra Alola,
 10201,8,Berretto Alola,
@@ -2106,7 +2111,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10202,1,アローラのすがた,
 10202,3,알로라의 모습,
 10202,4,阿羅拉的樣子,
-10202,5,Forme d’Alola,
+10202,5,Forme d’Alola,Raichu d'Alola
 10202,6,Alola-Form,
 10202,7,Forma de Alola,
 10202,8,Forma di Alola,
@@ -2116,7 +2121,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10203,1,アローラのすがた,
 10203,3,알로라의 모습,
 10203,4,阿羅拉的樣子,
-10203,5,Forme d’Alola,
+10203,5,Forme d’Alola,Sabelette d'Alola
 10203,6,Alola-Form,
 10203,7,Forma de Alola,
 10203,8,Forma di Alola,
@@ -2126,7 +2131,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10204,1,アローラのすがた,
 10204,3,알로라의 모습,
 10204,4,阿羅拉的樣子,
-10204,5,Forme d’Alola,
+10204,5,Forme d’Alola,Sablaireau d'Alola
 10204,6,Alola-Form,
 10204,7,Forma de Alola,
 10204,8,Forma di Alola,
@@ -2136,7 +2141,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10205,1,アローラのすがた,
 10205,3,알로라의 모습,
 10205,4,阿羅拉的樣子,
-10205,5,Forme d’Alola,
+10205,5,Forme d’Alola,Goupix d'Alola
 10205,6,Alola-Form,
 10205,7,Forma de Alola,
 10205,8,Forma di Alola,
@@ -2146,7 +2151,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10206,1,アローラのすがた,
 10206,3,알로라의 모습,
 10206,4,阿羅拉的樣子,
-10206,5,Forme d’Alola,
+10206,5,Forme d’Alola,Feunard d'Alola
 10206,6,Alola-Form,
 10206,7,Forma de Alola,
 10206,8,Forma di Alola,
@@ -2156,7 +2161,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10207,1,アローラのすがた,
 10207,3,알로라의 모습,
 10207,4,阿羅拉的樣子,
-10207,5,Forme d’Alola,
+10207,5,Forme d’Alola,Taupiqueur d'Alola
 10207,6,Alola-Form,
 10207,7,Forma de Alola,
 10207,8,Forma di Alola,
@@ -2166,7 +2171,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10208,1,アローラのすがた,
 10208,3,알로라의 모습,
 10208,4,阿羅拉的樣子,
-10208,5,Forme d’Alola,
+10208,5,Forme d’Alola,Triopikeur d'Alola
 10208,6,Alola-Form,
 10208,7,Forma de Alola,
 10208,8,Forma di Alola,
@@ -2176,7 +2181,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10209,1,アローラのすがた,
 10209,3,알로라의 모습,
 10209,4,阿羅拉的樣子,
-10209,5,Forme d’Alola,
+10209,5,Forme d’Alola,Miaouss d'Alola
 10209,6,Alola-Form,
 10209,7,Forma de Alola,
 10209,8,Forma di Alola,
@@ -2186,7 +2191,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10210,1,アローラのすがた,
 10210,3,알로라의 모습,
 10210,4,阿羅拉的樣子,
-10210,5,Forme d’Alola,
+10210,5,Forme d’Alola,Persian d'Alola
 10210,6,Alola-Form,
 10210,7,Forma de Alola,
 10210,8,Forma di Alola,
@@ -2196,7 +2201,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10211,1,アローラのすがた,
 10211,3,알로라의 모습,
 10211,4,阿羅拉的樣子,
-10211,5,Forme d’Alola,
+10211,5,Forme d’Alola,Racaillou d'Alola
 10211,6,Alola-Form,
 10211,7,Forma de Alola,
 10211,8,Forma di Alola,
@@ -2206,7 +2211,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10212,1,アローラのすがた,
 10212,3,알로라의 모습,
 10212,4,阿羅拉的樣子,
-10212,5,Forme d’Alola,
+10212,5,Forme d’Alola,Gravalanch d'Alola
 10212,6,Alola-Form,
 10212,7,Forma de Alola,
 10212,8,Forma di Alola,
@@ -2216,7 +2221,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10213,1,アローラのすがた,
 10213,3,알로라의 모습,
 10213,4,阿羅拉的樣子,
-10213,5,Forme d’Alola,
+10213,5,Forme d’Alola,Grolem d'Alola
 10213,6,Alola-Form,
 10213,7,Forma de Alola,
 10213,8,Forma di Alola,
@@ -2226,7 +2231,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10214,1,アローラのすがた,
 10214,3,알로라의 모습,
 10214,4,阿羅拉的樣子,
-10214,5,Forme d’Alola,
+10214,5,Forme d’Alola,Tadmorv d'Alola
 10214,6,Alola-Form,
 10214,7,Forma de Alola,
 10214,8,Forma di Alola,
@@ -2236,7 +2241,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10215,1,アローラのすがた,
 10215,3,알로라의 모습,
 10215,4,阿羅拉的樣子,
-10215,5,Forme d’Alola,
+10215,5,Forme d’Alola,Grotadmorv d'Alola
 10215,6,Alola-Form,
 10215,7,Forma de Alola,
 10215,8,Forma di Alola,
@@ -2246,7 +2251,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10216,1,アローラのすがた,
 10216,3,알로라의 모습,
 10216,4,阿羅拉的樣子,
-10216,5,Forme d’Alola,
+10216,5,Forme d’Alola,Noadkoko d'Alola
 10216,6,Alola-Form,
 10216,7,Forma de Alola,
 10216,8,Forma di Alola,
@@ -2256,18 +2261,19 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10217,1,アローラのすがた,
 10217,3,알로라의 모습,
 10217,4,阿羅拉的樣子,
-10217,5,Forme d’Alola,
+10217,5,Forme d’Alola,Ossatueur d'Alola
 10217,6,Alola-Form,
 10217,7,Forma de Alola,
 10217,8,Forma di Alola,
 10217,9,Alolan Form,Alolan Marowak
 10217,11,アローラのすがた,
 10217,12,阿罗拉的样子,
+10218,5,,Amphinobi Synergie
 10218,9,,Battle Bond Greninja
 10219,1,サトシゲッコウガ,
 10219,3,지우개굴닌자,
 10219,4,小智版甲賀忍蛙,
-10219,5,Forme Sacha,
+10219,5,Forme Sacha,Amphinobi Forme Sacha
 10219,6,Ash-Form,
 10219,7,Forma Ash,
 10219,8,Forma Ash,
@@ -2277,7 +2283,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10220,1,１０％フォルム,
 10220,3,10%폼,
 10220,4,１０％形態,
-10220,5,Forme 10 %,
+10220,5,Forme 10 %,Zygarde Forme 10 %
 10220,6,10%-Form,
 10220,7,Forma 10%,
 10220,8,Forma 10%,
@@ -2287,7 +2293,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10221,1,５０％フォルム,
 10221,3,50%폼,
 10221,4,５０％形態,
-10221,5,Forme 50 %,
+10221,5,Forme 50 %,Zygarde Forme 50 %
 10221,6,50%-Form,
 10221,7,Forma 50%,
 10221,8,Forma 50%,
@@ -2297,19 +2303,21 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10222,1,パーフェクトフォルム,
 10222,3,퍼펙트폼,
 10222,4,完全體形態,
-10222,5,Forme Parfaite,
+10222,5,Forme Parfaite,Zygarde Forme Parfaite
 10222,6,Optimumform,
 10222,7,Forma Completa,
 10222,8,Forma Perfetta,
 10222,9,Complete Forme,Complete Zygarde
 10222,11,パーフェクトフォルム,
 10222,12,完全体形态,
+10223,5,,Argouste Dominant
 10223,9,,Totem Gumshoos
+10224,5,,Lucanon Dominant
 10224,9,,Totem Vikavolt
 10225,1,ぱちぱちスタイル,
 10225,3,파칙파칙스타일,
 10225,4,啪滋啪滋風格,
-10225,5,Style Pom-Pom,
+10225,5,Style Pom-Pom,Plumeline Style Pom-Pom
 10225,6,Cheerleading-Stil,
 10225,7,Estilo Animado,
 10225,8,Stile Cheerdance,
@@ -2319,7 +2327,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10226,1,ふらふらスタイル,
 10226,3,훌라훌라스타일,
 10226,4,呼拉呼拉風格,
-10226,5,Style Hula,
+10226,5,Style Hula,Plumeline Style Hula
 10226,6,Hula-Stil,
 10226,7,Estilo Plácido,
 10226,8,Stile Hula,
@@ -2329,7 +2337,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10227,1,まいまいスタイル,
 10227,3,하늘하늘스타일,
 10227,4,輕盈輕盈風格,
-10227,5,Style Buyō,
+10227,5,Style Buyō,Plumeline Style Buyō
 10227,6,Buyo-Stil,
 10227,7,Estilo Refinado,
 10227,8,Stile Buyō,
@@ -2339,7 +2347,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10228,1,まよなかのすがた,
 10228,3,한밤중의 모습,
 10228,4,黑夜的樣子,
-10228,5,Forme Nocturne,
+10228,5,Forme Nocturne,Lougaroc Forme Nocturne
 10228,6,Nachtform,
 10228,7,Forma Nocturna,
 10228,8,Forma Notte,
@@ -2349,14 +2357,16 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10229,1,むれたすがた,
 10229,3,군집의 모습,
 10229,4,魚群的樣子,
-10229,5,Forme Banc,
+10229,5,Forme Banc,Froussardine Forme Banc
 10229,6,Schwarmform,
 10229,7,Forma Banco,
 10229,8,Forma Banco,
 10229,9,School Form,School Wishiwashi
 10229,11,むれたすがた,
 10229,12,鱼群的样子,
+10230,5,,Floramantis Dominant
 10230,9,,Totem Lurantis
+10231,5,,Malamandre Dominant
 10231,9,,Totem Salazzle
 10232,1,タイプ：ファイト,
 10232,3,타입:파이팅,
@@ -2531,7 +2541,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10249,1,りゅうせいのすがた,
 10249,3,유성의 모습,
 10249,4,流星的樣子,
-10249,5,Forme Météore,
+10249,5,Forme Météore,Météno Forme Météore Noyeau Orange
 10249,6,Meteorform,
 10249,7,Forma Meteorito,
 10249,8,Forma Meteora,
@@ -2541,7 +2551,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10250,1,りゅうせいのすがた,
 10250,3,유성의 모습,
 10250,4,流星的樣子,
-10250,5,Forme Météore,
+10250,5,Forme Météore,Météno Forme Météore Noyeau Jaune
 10250,6,Meteorform,
 10250,7,Forma Meteorito,
 10250,8,Forma Meteora,
@@ -2551,7 +2561,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10251,1,りゅうせいのすがた,
 10251,3,유성의 모습,
 10251,4,流星的樣子,
-10251,5,Forme Météore,
+10251,5,Forme Météore,Météno Forme Météore Noyeau Vert
 10251,6,Meteorform,
 10251,7,Forma Meteorito,
 10251,8,Forma Meteora,
@@ -2561,7 +2571,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10252,1,りゅうせいのすがた,
 10252,3,유성의 모습,
 10252,4,流星的樣子,
-10252,5,Forme Météore,
+10252,5,Forme Météore,Météno Forme Météore Noyeau Bleu
 10252,6,Meteorform,
 10252,7,Forma Meteorito,
 10252,8,Forma Meteora,
@@ -2571,7 +2581,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10253,1,りゅうせいのすがた,
 10253,3,유성의 모습,
 10253,4,流星的樣子,
-10253,5,Forme Météore,
+10253,5,Forme Météore,Météno Forme Météore Noyeau Indigo
 10253,6,Meteorform,
 10253,7,Forma Meteorito,
 10253,8,Forma Meteora,
@@ -2581,7 +2591,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10254,1,りゅうせいのすがた,
 10254,3,유성의 모습,
 10254,4,流星的樣子,
-10254,5,Forme Météore,
+10254,5,Forme Météore,Météno NoyeaForme Météore u Violet
 10254,6,Meteorform,
 10254,7,Forma Meteorito,
 10254,8,Forma Meteora,
@@ -2591,7 +2601,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10255,1,あかいろのコア,
 10255,3,빨간색 코어,
 10255,4,紅色核心,
-10255,5,Noyau Rouge,
+10255,5,Noyau Rouge,Météno Noyeau Rouge
 10255,6,Roter Kern,
 10255,7,Núcleo Rojo,
 10255,8,Nucleo Rosso,
@@ -2601,7 +2611,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10256,1,だいだいいろのコア,
 10256,3,주황색 코어,
 10256,4,橙色核心,
-10256,5,Noyau Orange,
+10256,5,Noyau Orange,Météno Noyeau Orange
 10256,6,Oranger Kern,
 10256,7,Núcleo Naranja,
 10256,8,Nucleo Arancione,
@@ -2611,7 +2621,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10257,1,きいろのコア,
 10257,3,노란색 코어,
 10257,4,黃色核心,
-10257,5,Noyau Jaune,
+10257,5,Noyau Jaune,Météno Noyeau Jaune
 10257,6,Gelber Kern,
 10257,7,Núcleo Amarillo,
 10257,8,Nucleo Giallo,
@@ -2621,7 +2631,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10258,1,みどりいろのコア,
 10258,3,초록색 코어,
 10258,4,綠色核心,
-10258,5,Noyau Vert,
+10258,5,Noyau Vert,Météno Noyeau Vert
 10258,6,Grüner Kern,
 10258,7,Núcleo Verde,
 10258,8,Nucleo Verde,
@@ -2631,7 +2641,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10259,1,みずいろのコア,
 10259,3,옥색 코어,
 10259,4,淺藍色核心,
-10259,5,Noyau Bleu,
+10259,5,Noyau Bleu,Météno Noyeau Bleu
 10259,6,Hellblauer Kern,
 10259,7,Núcleo Azul,
 10259,8,Nucleo Azzurro,
@@ -2641,7 +2651,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10260,1,あおいろのコア,
 10260,3,파란색 코어,
 10260,4,藍色核心,
-10260,5,Noyau Indigo,
+10260,5,Noyau Indigo,Météno Noyeau Indigo
 10260,6,Blauer Kern,
 10260,7,Núcleo Añil,
 10260,8,Nucleo Indaco,
@@ -2651,7 +2661,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10261,1,むらさきいろのコア,
 10261,3,보라색 코어,
 10261,4,紫色核心,
-10261,5,Noyau Violet,
+10261,5,Noyau Violet,Météno Noyeau Violet
 10261,6,Violetter Kern,
 10261,7,Núcleo Violeta,
 10261,8,Nucleo Violetto,
@@ -2661,20 +2671,23 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10262,1,ばれたすがた,
 10262,3,들킨 모습,
 10262,4,現形的樣子,
-10262,5,Forme Démasquée,
+10262,5,Forme Démasquée,Mimiqui Forme Démasquée
 10262,6,Entlarvte Form,
 10262,7,Forma Descubierta,
 10262,8,Forma Smascherata,
 10262,9,Busted Form,Busted Mimikyu
 10262,11,ばれたすがた,
 10262,12,现形的样子,
+10263,5,,Mimiqui Dominant
 10263,9,,Totem Disguised Mimikyu
+10264,5,,Mimiqui Dominant Forme Démasquée
 10264,9,,Totem Busted Mimikyu
+10265,5,,Ékaïser Dominant
 10265,9,,Totem Kommo-o
 10266,1,５００ねんまえのいろ,
 10266,3,500년 전의 색,
 10266,4,５００年前的顏色,
-10266,5,Couleur du Passé,
+10266,5,Couleur du Passé,Magearna Couleur du Passé
 10266,6,Originalfarbe,
 10266,7,Color Vetusto,
 10266,8,Colore Antico,
@@ -2684,7 +2697,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10267,1,キミにきめたキャップ,
 10267,3,너로정했다캡,
 10267,4,就決定是你了之帽子,
-10267,5,Casquette Partenaire,
+10267,5,Casquette Partenaire,Pikachu Casquette Partenaire
 10267,6,Partner-Kappe,
 10267,7,Gorra Compañero,
 10267,8,Berretto Compagni,
@@ -2692,25 +2705,30 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10267,11,キミにきめたキャップ,
 10267,12,就决定是你了之帽子,
 10268,3,알로라의 모습,
+10268,5,,Ossatueur d'Alola Dominant
 10268,9,,Totem Alolan Marowak
+10309,5,,Rubombelle Dominant
 10309,9,,Totem Ribombee
+10310,5,,Rocabot Tempo Perso
 10310,9,,Own Tempo Rockruff
 10311,1,たそがれのすがた,
 10311,3,황혼의 모습,
 10311,4,黃昏的樣子,
-10311,5,Forme Crépusculaire,
+10311,5,Forme Crépusculaire,Lougaroc Forme Crépusculaire
 10311,6,Zwielichtform,
 10311,7,Forma Crepuscular,
 10311,8,Forma Crepuscolo,
 10311,9,Dusk Form,Dusk Lycanroc
 10311,11,たそがれのすがた,
 10311,12,黄昏的样子,
+10312,5,,Tarenbulle Dominant
 10312,9,,Totem Araquanid
+10313,5,,Togedemaru Dominant
 10313,9,,Totem Togedemaru
 10314,1,たそがれのたてがみ,
 10314,3,황혼의 갈기,
 10314,4,黃昏之鬃,
-10314,5,Crinière du Couchant,
+10314,5,Crinière du Couchant,Necrozma Crinière du Couchant
 10314,6,Abendmähne,
 10314,7,Melena Crepuscular,
 10314,8,Criniera del Vespro,
@@ -2720,7 +2738,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10315,1,あかつきのつばさ,
 10315,3,새벽의 날개,
 10315,4,拂曉之翼,
-10315,5,Ailes de l’Aurore,
+10315,5,Ailes de l’Aurore,Necrozma Ailes de l’Aurore
 10315,6,Morgenschwingen,
 10315,7,Alas del Alba,
 10315,8,Ali dell’Aurora,
@@ -2730,7 +2748,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10316,1,ウルトラネクロズマ,
 10316,3,울트라네크로즈마,
 10316,4,究極奈克洛茲瑪,
-10316,5,Ultra-Necrozma,
+10316,5,Ultra-Necrozma,Ultra-Necrozma
 10316,6,Ultra-Necrozma,
 10316,7,Ultra-Necrozma,
 10316,8,UltraNecrozma,
@@ -2738,11 +2756,13 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10316,11,ウルトラネクロズマ,
 10316,12,究极奈克洛兹玛,
 10317,9,,Partner Pikachu
+10317,5,,Pikachu Partenaire
 10318,9,,Partner Eevee
+10318,5,,Évoli Partenaire
 10319,1,ワールドキャップ,
 10319,3,월드캡,
 10319,4,世界帽子,
-10319,5,Casquette Monde,
+10319,5,Casquette Monde,Pikachu Casquette Monde
 10319,6,Weltreise-Kappe,
 10319,7,Gorra Trotamundos,
 10319,8,Berretto Giramondo,
@@ -2752,7 +2772,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10320,1,ガラルのすがた,
 10320,3,가라르의 모습,
 10320,4,伽勒爾的樣子,
-10320,5,Forme de Galar,
+10320,5,Forme de Galar,Miaouss de Galar
 10320,6,Galar-Form,
 10320,7,Forma de Galar,
 10320,8,Forma di Galar,
@@ -2762,7 +2782,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10321,1,ガラルのすがた,
 10321,3,가라르의 모습,
 10321,4,伽勒爾的樣子,
-10321,5,Forme de Galar,
+10321,5,Forme de Galar,Ponyta de Galar
 10321,6,Galar-Form,
 10321,7,Forma de Galar,
 10321,8,Forma di Galar,
@@ -2772,7 +2792,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10322,1,ガラルのすがた,
 10322,3,가라르의 모습,
 10322,4,伽勒爾的樣子,
-10322,5,Forme de Galar,
+10322,5,Forme de Galar,Galopa de Galar
 10322,6,Galar-Form,
 10322,7,Forma de Galar,
 10322,8,Forma di Galar,
@@ -2782,7 +2802,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10323,1,ガラルのすがた,
 10323,3,가라르의 모습,
 10323,4,伽勒爾的樣子,
-10323,5,Forme de Galar,
+10323,5,Forme de Galar,Ramoloss de Galar
 10323,6,Galar-Form,
 10323,7,Forma de Galar,
 10323,8,Forma di Galar,
@@ -2792,7 +2812,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10324,1,ガラルのすがた,
 10324,3,가라르의 모습,
 10324,4,伽勒爾的樣子,
-10324,5,Forme de Galar,
+10324,5,Forme de Galar,Flagadoss de Galar
 10324,6,Galar-Form,
 10324,7,Forma de Galar,
 10324,8,Forma di Galar,
@@ -2802,7 +2822,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10325,1,ガラルのすがた,
 10325,3,가라르의 모습,
 10325,4,伽勒爾的樣子,
-10325,5,Forme de Galar,
+10325,5,Forme de Galar,Canarticho de Galar
 10325,6,Galar-Form,
 10325,7,Forma de Galar,
 10325,8,Forma di Galar,
@@ -2812,7 +2832,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10326,1,ガラルのすがた,
 10326,3,가라르의 모습,
 10326,4,伽勒爾的樣子,
-10326,5,Forme de Galar,
+10326,5,Forme de Galar,Smogogo de Galar
 10326,6,Galar-Form,
 10326,7,Forma de Galar,
 10326,8,Forma di Galar,
@@ -2822,7 +2842,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10327,1,ガラルのすがた,
 10327,3,가라르의 모습,
 10327,4,伽勒爾的樣子,
-10327,5,Forme de Galar,
+10327,5,Forme de Galar,M. Mime de Galar
 10327,6,Galar-Form,
 10327,7,Forma de Galar,
 10327,8,Forma di Galar,
@@ -2832,7 +2852,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10328,1,ガラルのすがた,
 10328,3,가라르의 모습,
 10328,4,伽勒爾的樣子,
-10328,5,Forme de Galar,
+10328,5,Forme de Galar,Artikodin de Galar
 10328,6,Galar-Form,
 10328,7,Forma de Galar,
 10328,8,Forma di Galar,
@@ -2842,7 +2862,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10329,1,ガラルのすがた,
 10329,3,가라르의 모습,
 10329,4,伽勒爾的樣子,
-10329,5,Forme de Galar,
+10329,5,Forme de Galar,Électhor de Galar
 10329,6,Galar-Form,
 10329,7,Forma de Galar,
 10329,8,Forma di Galar,
@@ -2852,7 +2872,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10330,1,ガラルのすがた,
 10330,3,가라르의 모습,
 10330,4,伽勒爾的樣子,
-10330,5,Forme de Galar,
+10330,5,Forme de Galar,Sulfura de Galar
 10330,6,Galar-Form,
 10330,7,Forma de Galar,
 10330,8,Forma di Galar,
@@ -2862,7 +2882,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10331,1,ガラルのすがた,
 10331,3,가라르의 모습,
 10331,4,伽勒爾的樣子,
-10331,5,Forme de Galar,
+10331,5,Forme de Galar,Roigada de Galar
 10331,6,Galar-Form,
 10331,7,Forma de Galar,
 10331,8,Forma di Galar,
@@ -2872,7 +2892,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10332,1,ガラルのすがた,
 10332,3,가라르의 모습,
 10332,4,伽勒爾的樣子,
-10332,5,Forme de Galar,
+10332,5,Forme de Galar,Corayon de Galar
 10332,6,Galar-Form,
 10332,7,Forma de Galar,
 10332,8,Forma di Galar,
@@ -2882,7 +2902,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10333,1,ガラルのすがた,
 10333,3,가라르의 모습,
 10333,4,伽勒爾的樣子,
-10333,5,Forme de Galar,
+10333,5,Forme de Galar,	Zigzaton de Galar
 10333,6,Galar-Form,
 10333,7,Forma de Galar,
 10333,8,Forma di Galar,
@@ -2892,7 +2912,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10334,1,ガラルのすがた,
 10334,3,가라르의 모습,
 10334,4,伽勒爾的樣子,
-10334,5,Forme de Galar,
+10334,5,Forme de Galar,Linéon de Galar
 10334,6,Galar-Form,
 10334,7,Forma de Galar,
 10334,8,Forma di Galar,
@@ -2902,7 +2922,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10335,1,ガラルのすがた,
 10335,3,가라르의 모습,
 10335,4,伽勒爾的樣子,
-10335,5,Forme de Galar,
+10335,5,Forme de Galar,Darumarond de Galar
 10335,6,Galar-Form,
 10335,7,Forma de Galar,
 10335,8,Forma di Galar,
@@ -2912,7 +2932,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10336,1,ガラルのすがた,
 10336,3,가라르의 모습,
 10336,4,伽勒爾的樣子,
-10336,5,Forme de Galar,
+10336,5,Forme de Galar,Darumacho de Galar Normal
 10336,6,Galar-Form,
 10336,7,Forma de Galar,
 10336,8,Forma di Galar,
@@ -2922,7 +2942,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10337,1,ダルマモード,
 10337,3,달마모드,
 10337,4,達摩模式,
-10337,5,Mode Transe,
+10337,5,Mode Transe,Darumacho de Galar Transe
 10337,6,Trance-Modus,
 10337,7,Modo Daruma,
 10337,8,Stato Zen,
@@ -2932,7 +2952,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10338,1,ガラルのすがた,
 10338,3,가라르의 모습,
 10338,4,伽勒爾的樣子,
-10338,5,Forme de Galar,
+10338,5,Forme de Galar,Tutafeh de Galar
 10338,6,Galar-Form,
 10338,7,Forma de Galar,
 10338,8,Forma di Galar,
@@ -2942,7 +2962,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10339,1,ガラルのすがた,
 10339,3,가라르의 모습,
 10339,4,伽勒爾的樣子,
-10339,5,Forme de Galar,
+10339,5,Forme de Galar,Limonde de Galar
 10339,6,Galar-Form,
 10339,7,Forma de Galar,
 10339,8,Forma di Galar,
@@ -2952,7 +2972,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10340,1,１０％フォルム,
 10340,3,10%폼,
 10340,4,１０％形態,
-10340,5,Forme 10 %,
+10340,5,Forme 10 %,Zygarde Forme 10 %
 10340,6,10%-Form,
 10340,7,Forma 10%,
 10340,8,Forma 10%,
@@ -2962,7 +2982,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10341,1,うのみのすがた,
 10341,3,그대로 삼킨 모습,
 10341,4,一口吞的樣子,
-10341,5,Forme Gobe-Tout,
+10341,5,Forme Gobe-Tout,Nigosier Forme Gobe-Tout
 10341,6,Schlingform,
 10341,7,Forma Tragatodo,
 10341,8,Forma Inghiottitutto,
@@ -2972,7 +2992,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10342,1,まるのみのすがた,
 10342,3,통째로 삼킨 모습,
 10342,4,大口吞的樣子,
-10342,5,Forme Gobe-Chu,
+10342,5,Forme Gobe-Chu,Nigosier Forme Gobe-Chu
 10342,6,Stopfform,
 10342,7,Forma Engulletodo,
 10342,8,Forma Inghiottintero,
@@ -2982,7 +3002,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10343,1,ローなすがた,
 10343,3,로우한 모습,
 10343,4,低調的樣子,
-10343,5,Forme Grave,
+10343,5,Forme Grave,Salarsen Forme Grave
 10343,6,Tief-Form,
 10343,7,Forma Grave,
 10343,8,Forma Basso,
@@ -3074,7 +3094,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10354,1,ナイスフェイス,
 10354,3,나이스페이스,
 10354,4,解凍頭,
-10354,5,Tête Dégel,
+10354,5,Tête Dégel,Bekaglaçon Tête Dégel
 10354,6,Wohlfühlkopf,
 10354,7,Cara Deshielo,
 10354,8,Liquefaccia,
@@ -3084,7 +3104,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10355,1,メスのすがた,
 10355,3,암컷의 모습,
 10355,4,雌性的樣子,
-10355,5,Femelle,
+10355,5,Femelle,Wimessir Femelle
 10355,6,Weiblich,
 10355,7,Hembra,
 10355,8,Femmina,
@@ -3094,7 +3114,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10356,1,はらぺこもよう,
 10356,3,배고픈 모양,
 10356,4,空腹花紋,
-10356,5,Mode Affamé,
+10356,5,Mode Affamé,Morpeko Mode Affamé
 10356,6,Kohldampfmuster,
 10356,7,Forma Voraz,
 10356,8,Motivo Panciavuota,
@@ -3104,7 +3124,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10357,1,けんのおう,
 10357,3,검왕,
 10357,4,劍之王,
-10357,5,Épée Suprême,
+10357,5,Épée Suprême,Zacian Épée Suprême
 10357,6,König des Schwertes,
 10357,7,Espada Suprema,
 10357,8,Re delle Spade,
@@ -3114,7 +3134,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10358,1,たてのおう,
 10358,3,방패왕,
 10358,4,盾之王,
-10358,5,Bouclier Suprême,
+10358,5,Bouclier Suprême,Zamazenta Bouclier Suprême
 10358,6,König des Schildes,
 10358,7,Escudo Supremo,
 10358,8,Re degli Scudi,
@@ -3124,7 +3144,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10359,1,ムゲンダイマックス,
 10359,3,무한다이맥스,
 10359,4,無極巨化,
-10359,5,Infinimax,
+10359,5,Infinimax,Éthernatos Infinimax
 10359,6,Unendynamax,
 10359,7,Dinamax Infinito,
 10359,8,Dynamax Infinito,
@@ -3134,7 +3154,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10360,1,れんげきのかた,
 10360,3,연격의 태세,
 10360,4,連擊流,
-10360,5,Style Mille Poings,
+10360,5,Style Mille Poings,Shifours Style Mille Poings
 10360,6,Fließender Stil,
 10360,7,Estilo Fluido,
 10360,8,Stile Pluricolpo,
@@ -3144,7 +3164,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10361,1,とうちゃん,
 10361,3,아빠,
 10361,4,阿爸,
-10361,5,Papa,
+10361,5,Papa,Zarude Papa
 10361,6,Papa,
 10361,7,Papá,
 10361,8,Papà,
@@ -3154,7 +3174,7 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10362,1,はくばじょうのすがた,
 10362,3,백마 탄 모습,
 10362,4,騎白馬的樣子,
-10362,5,Cavalier du Froid,
+10362,5,Cavalier du Froid,Calyrex Cavalier du Froid
 10362,6,Schimmelreiter,
 10362,7,Jinete Glacial,
 10362,8,Cavaliere Glaciale,
@@ -3164,65 +3184,162 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10363,1,こくばじょうのすがた,
 10363,3,흑마 탄 모습,
 10363,4,騎黑馬的樣子,
-10363,5,Cavalier d’Effroi,
+10363,5,Cavalier d’Effroi,Calyrex Cavalier d’Effroi
 10363,6,Rappenreiter,
 10363,7,Jinete Espectral,
 10363,8,Cavaliere Spettrale,
 10363,9,Shadow Rider,Shadow Calyrex
 10363,11,こくばじょうのすがた,
 10363,12,骑黑马的样子,
+10364,5,Forme Gigamax,Florizarre Gigamax
 10364,9,Gigantamax Form,Gigantamax Venusaur
+10365,5,Forme Gigamax,Dracaufeu Gigamax
 10365,9,Gigantamax Form,Gigantamax Charizard
+10366,5,Forme Gigamax,Tortank Gigamax
 10366,9,Gigantamax Form,Gigantamax Blastoise
+10367,5,Forme Gigamax,Papilusion Gigamax
 10367,9,Gigantamax Form,Gigantamax Butterfree
+10368,5,Forme Gigamax,Pikachu Gigamax
 10368,9,Gigantamax Form,Gigantamax Pikachu
+10369,5,Forme Gigamax,Miaouss Gigamax
 10369,9,Gigantamax Form,Gigantamax Meowth
+10370,5,Forme Gigamax,Mackogneur Gigamax
 10370,9,Gigantamax Form,Gigantamax Machamp
+10371,5,Forme Gigamax,Ectoplasma Gigamax
 10371,9,Gigantamax Form,Gigantamax Gengar
+10372,5,Forme Gigamax,Leviator Gigamax
 10372,9,Gigantamax Form,Gigantamax Kingler
+10373,5,Forme Gigamax,Lokhlass Gigamax
 10373,9,Gigantamax Form,Gigantamax Lapras
+10374,5,Forme Gigamax,Évoli Gigamax
 10374,9,Gigantamax Form,Gigantamax Eevee
+10375,5,Forme Gigamax,Ronflex Gigamax
 10375,9,Gigantamax Form,Gigantamax Snorlax
+10376,5,Forme Gigamax,Miasmax Gigamax
 10376,9,Gigantamax Form,Gigantamax Garbodor
+10377,5,Forme Gigamax,Melmetal Gigamax
 10377,9,Gigantamax Form,Gigantamax Melmetal
+10378,5,Forme Gigamax,Gorythmic Gigamax
 10378,9,Gigantamax Form,Gigantamax Rillaboom
+10379,5,Forme Gigamax,Pyrobut Gigamax
 10379,9,Gigantamax Form,Gigantamax Cinderace
+10380,5,Forme Gigamax,Lézargus Gigamax
 10380,9,Gigantamax Form,Gigantamax Inteleon
+10381,5,Forme Gigamax,Corvaillus Gigamax
 10381,9,Gigantamax Form,Gigantamax Corviknight
+10382,5,Forme Gigamax,Astronelle Gigamax
 10382,9,Gigantamax Form,Gigantamax Orbeetle
+10383,5,Forme Gigamax,Torgamord Gigamax
 10383,9,Gigantamax Form,Gigantamax Drednaw
+10384,5,Forme Gigamax,Monthracite Gigamax
 10384,9,Gigantamax Form,Gigantamax Coalossal
+10385,5,Forme Gigamax,Pomdrapi Gigamax
 10385,9,Gigantamax Form,Gigantamax Flapple
+10386,5,Forme Gigamax,Dratatin Gigamax
 10386,9,Gigantamax Form,Gigantamax Appletun
+10387,5,Forme Gigamax,Dunaconda 
 10387,9,Gigantamax Form,Gigantamax Sandaconda
+10388,5,Forme Gigamax,Salarsen Forme Aigüe Gigamax
 10388,9,Gigantamax Form,Gigantamax Amped Toxtricity
+10389,5,Forme Gigamax,Scolocendre Gigamax
 10389,9,Gigantamax Form,Gigantamax Centiskorch
+10390,5,Forme Gigamax,Sorcilence Gigamax
 10390,9,Gigantamax Form,Gigantamax Hatterene
+10391,5,Forme Gigamax,Angoliath Gigamax
 10391,9,Gigantamax Form,Gigantamax Grimmsnarl
+10392,5,Forme Gigamax,Charmilly Gigamax
 10392,9,Gigantamax Form,Gigantamax Alcremie
+10393,5,Forme Gigamax,Pachyradjah Gigamax
 10393,9,Gigantamax Form,Gigantamax Copperajah
+10394,5,Forme Gigamax,Duralugon Gigamax
 10394,9,Gigantamax Form,Gigantamax Duraludon
+10395,5,Forme Gigamax,Shifours Style Poing Final Gigamax
 10395,9,Gigantamax Form,Gigantamax Single Strike Urshifu
+10396,5,Forme Gigamax,Shifours Style Mille Poings Gigamax
 10396,9,Gigantamax Form,Gigantamax Rapid Strike Urshifu
+10397,5,Gigantamax Form,Salarsen Forme Grave Gigamax
 10397,9,Gigantamax Form,Gigantamax Low Key Toxtricity
+10398,1,ヒスイのすがた,
+10398,5,Forme de Hisui,Caninos de Hisui
 10398,9,Hisuian Form,Hisuian Growlithe
+10398,11,ヒスイのすがた,
+10399,1,ヒスイのすがた,
+10399,5,Forme de Hisui,Arcanin de Hisui
 10399,9,Hisuian Form,Hisuian Arcanine
+10399,11,ヒスイのすがた,
+10400,1,ヒスイのすがた,
+10400,5,Forme de Hisui,Voltorbe de Hisui
 10400,9,Hisuian Form,Hisuian Voltorb
+10400,11,ヒスイのすがた,
+10401,1,ヒスイのすがた,
+10401,5,Forme de Hisui,Électrode de Hisui
 10401,9,Hisuian Form,Hisuian Electrode
+10401,11,ヒスイのすがた,
+10402,1,ヒスイのすがた,
+10402,5,Forme de Hisui,Typhlosion de Hisui
 10402,9,Hisuian Form,Hisuian Typhlosion
+10402,11,ヒスイのすがた,
+10403,1,ヒスイのすがた,
+10403,5,Forme de Hisui,Qwilfish de Hisui
 10403,9,Hisuian Form,Hisuian Qwilfish
+10403,11,ヒスイのすがた,
+10404,1,ヒスイのすがた,
+10404,5,Forme de Hisui,Farfuret de Hisui
 10404,9,Hisuian Form,Hisuian Sneasel
+10404,11,ヒスイのすがた,
+10405,1,ヒスイのすがた,
+10405,5,Forme de Hisui,Clamiral de Hisui
 10405,9,Hisuian Form,Hisuian Samurott
+10405,11,ヒスイのすがた,
+10406,1,ヒスイのすがた,
+10406,5,Forme de Hisui,Fragilady de Hisui
 10406,9,Hisuian Form,Hisuian Lilligant
+10406,11,ヒスイのすがた,
+10407,1,ヒスイのすがた,
+10407,5,Forme de Hisui,Zorua de Hisui
 10407,9,Hisuian Form,Hisuian Zorua
+10407,11,ヒスイのすがた,
+10408,1,ヒスイのすがた,
+10408,5,Forme de Hisui,Zoroark de Hisui
 10408,9,Hisuian Form,Hisuian Zoroark
+10408,11,ヒスイのすがた,
+10409,1,ヒスイのすがた,
+10409,5,Forme de Hisui,Gueriaigle de Hisui
 10409,9,Hisuian Form,Hisuian Braviary
+10409,11,ヒスイのすがた,
+10410,1,ヒスイのすがた,
+10410,5,Forme de Hisui,Colimucus de Hisui
 10410,9,Hisuian Form,Hisuian Sliggoo
+10410,11,ヒスイのすがた,
+10411,1,ヒスイのすがた,
+10411,5,Forme de Hisui,Muplodocus de Hisui
 10411,9,Hisuian Form,Hisuian Goodra
+10411,11,ヒスイのすがた,
+10412,1,ヒスイのすがた,
+10412,5,Forme de Hisui,Séracrawl de Hisui
 10412,9,Hisuian Form,Hisuian Avalugg
+10412,11,ヒスイのすがた,
+10413,1,ヒスイのすがた,
+10413,5,Forme de Hisui,Archéduc de Hisui
 10413,9,Hisuian Form,Hisuian Decidueye
+10413,11,ヒスイのすがた,
+10414,1,オリジンフォルム,
+10414,5,Forme Originelle,Diagla Originel
 10414,9,Origin Forme,Origin Dialga
+10414,11,オリジンフォルム,
+10415,1,オリジンフォルム,
+10415,5,Forme Originelle,Palkia Originel
 10415,9,Origin Forme,Origin Palkia
+10415,11,オリジンフォルム,
+10416,1,しろすじのすがた,
+10416,5,Motif Blanch,Basculin Blanc
 10416,9,White-Striped Form,White-Striped Basculin
+10416,11,しろすじのすがた,
+10417,1,メスのすがた,
+10417,5,Femelle,Paragruel Femelle
 10417,9,Female,Female Basculegion
+10417,11,メスのすがた,
+10418,1,れいじゅうフォルム,
+10418,5,Forme Avatar,Amovénus Avatar
 10418,9,Therian Forme,Therian Enamorus
+10418,11,れいじゅうフォルム,

data/v2/csv/pokemon_forms.csv

@@ -1320,5 +1320,5 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10414,dialga-origin,origin,10245,24,1,1,0,1,1300
 10415,palkia-origin,origin,10246,24,1,1,0,1,1301
 10416,basculin-white-striped,white-striped,10247,24,1,1,0,1,1302
-10417,basculegion-female,female,902,24,1,1,0,1,1303
-10418,enamorus-therian,therian,905,24,1,1,0,1,1304
+10417,basculegion-female,female,10248,24,1,1,0,1,1303
+10418,enamorus-therian,therian,10249,24,1,1,0,1,1304

data/v2/csv/pokemon_species.csv

@@ -676,7 +676,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 675,pangoro,6,674,346,9,12,,4,65,50,0,25,0,2,0,0,0,676,
 676,furfrou,6,,347,9,8,,4,160,70,0,20,0,2,1,0,0,677,
 677,espurr,6,,348,4,6,,4,190,50,0,20,0,2,0,0,0,678,
-678,meowstic,6,677,348,2,6,,0,75,50,0,20,1,2,0,0,0,679,
+678,meowstic,6,677,348,2,6,,4,75,50,0,20,1,2,0,0,0,679,
 679,honedge,6,,349,3,5,,4,180,50,0,20,0,2,0,0,0,680,
 680,doublade,6,679,349,3,11,,4,90,50,0,20,0,2,0,0,0,681,
 681,aegislash,6,680,349,3,5,,4,45,50,0,20,0,2,1,0,0,682,
@@ -874,7 +874,7 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 873,frosmoth,8,872,455,9,13,,4,75,50,0,20,0,2,0,0,0,873,
 874,stonjourner,8,,456,4,7,,4,60,50,0,25,0,1,0,0,0,874,
 875,eiscue,8,,457,2,6,,4,60,50,0,25,0,1,0,0,0,875,
-876,indeedee,8,,458,7,6,,0,30,140,0,40,0,3,0,0,0,876,
+876,indeedee,8,,458,7,6,,4,30,140,0,40,0,3,0,0,0,876,
 877,morpeko,8,,459,10,12,,4,180,50,0,10,0,2,0,0,0,877,
 878,cufant,8,,460,10,8,,4,190,50,0,25,0,2,0,0,0,878,
 879,copperajah,8,878,460,5,8,,4,90,50,0,25,0,2,0,0,0,879,
@@ -897,10 +897,10 @@ id,identifier,generation_id,evolves_from_species_id,evolution_chain_id,color_id,
 896,glastrier,8,,474,9,8,,-1,3,35,0,120,0,1,0,1,0,896,
 897,spectrier,8,,475,1,8,,-1,3,35,0,120,0,1,0,1,0,897,
 898,calyrex,8,,476,5,12,,-1,3,100,0,120,0,1,0,1,0,898,
-899,wyrdeer,8,234,,4,8,,4,,,0,,0,1,0,0,0,899,
-900,kleavor,8,123,,3,13,,4,75,,0,,0,2,0,0,0,900,
-901,ursaluna,8,217,,3,8,,4,,,0,,0,2,0,0,0,901,
-902,basculegion,8,550,,5,3,,4,,,0,,1,2,1,0,0,902,
+899,wyrdeer,8,234,,4,8,,4,135,,0,,0,1,0,0,0,899,
+900,kleavor,8,123,,3,13,,4,115,,0,,0,2,0,0,0,900,
+901,ursaluna,8,217,,3,8,,4,75,,0,,0,2,0,0,0,901,
+902,basculegion,8,550,,5,3,,4,135,,0,,1,2,1,0,0,902,
 903,sneasler,8,215,,4,6,,4,135,,0,,0,4,0,0,0,903,
 904,overqwil,8,211,,1,3,,4,135,,0,,0,2,0,0,0,904,
-905,enamorus,8,,,6,4,,8,,,0,,0,1,1,1,0,905,
+905,enamorus,8,,,6,4,,8,3,,0,,0,1,1,1,0,905,

data/v2/csv/pokemon_species_names.csv

@@ -9883,6 +9883,7 @@ pokemon_species_id,local_language_id,name,genus
 899,4,詭角鹿,
 899,5,Cerbyllin,Pokémon Maxi Corne
 899,6,Damythir,Vielender-Pokémon
+899,8,Wyrdeer,Pokémon Grancorno
 899,9,Wyrdeer,Big Horn Pokémon
 899,11,アヤシシ,おおツノポケモン
 899,12,诡角鹿,
@@ -9892,6 +9893,7 @@ pokemon_species_id,local_language_id,name,genus
 900,4,劈斧螳螂,
 900,5,Hachécateur,Pokémon Hache
 900,6,Axantor,Axt-Pokémon
+900,8,Kleavor,Pokémon Scure
 900,9,Kleavor,Axe Pokémon
 900,11,バサギリ,まさかりポケモン
 900,12,劈斧螳螂,
@@ -9901,6 +9903,7 @@ pokemon_species_id,local_language_id,name,genus
 901,4,月月熊,
 901,5,Ursaking,Pokémon Tourbe
 901,6,Ursaluna,Torf-Pokémon
+901,8,Ursaluna,Pokémon Torba
 901,9,Ursaluna,Peat Pokémon
 901,11,ガチグマ,でいたんポケモン
 901,12,月月熊,
@@ -9910,6 +9913,7 @@ pokemon_species_id,local_language_id,name,genus
 902,4,幽尾玄魚,
 902,5,Paragruel,Pokémon Poissigrand
 902,6,Salmagnis,Großfisch-Pokémon
+902,8,Basculegion,Pokémon Pescegrosso
 902,9,Basculegion,Big Fish Pokémon
 902,11,イダイトウ,おおうおポケモン
 902,12,幽尾玄鱼,
@@ -9919,6 +9923,7 @@ pokemon_species_id,local_language_id,name,genus
 903,4,大狃拉,
 903,5,Farfurex,Pokémon Grimpeur
 903,6,Snieboss,Kletterei-Pokémon
+903,8,Sneasler,Pokémon Scalata
 903,9,Sneasler,Free Climb Pokémon
 903,11,オオニューラ,クライミングポケモン
 903,12,大狃拉,
@@ -9928,6 +9933,7 @@ pokemon_species_id,local_language_id,name,genus
 904,4,萬針魚,
 904,5,Qwilpik,Pokémon Épineux
 904,6,Myriador,Tausenddorn-Pokémon
+904,8,Overqwil,Pokémon Spinoso
 904,9,Overqwil,Pin Cluster Pokémon
 904,11,ハリーマン,けんざんポケモン
 904,12,万针鱼,
@@ -9937,6 +9943,7 @@ pokemon_species_id,local_language_id,name,genus
 905,4,眷戀雲,
 905,5,Amovénus,Pokémon Hainamour
 905,6,Cupidos,Hassliebe-Pokémon
+905,8,Enamorus,Pokémon Amoreodio
 905,9,Enamorus,Love-Hate Pokémon
 905,11,ラブトロス,あいぞうポケモン
 905,12,眷恋云,

data/v2/csv/region_names.csv

@@ -37,4 +37,5 @@ region_id,local_language_id,name
 6,9,Kalos
 7,9,Alola
 8,9,Galar
+9,8,Hisui
 9,9,Hisui

data/v2/csv/version_names.csv

@@ -265,24 +265,24 @@ version_id,local_language_id,name
 30,8,Ultraluna
 30,9,Ultra Moon
 30,12,究极之月
-31,1,"Let's Go! ピカチュウ"
-31,3,"레츠고! 피카츄"
-31,4,"Let's Go！皮卡丘"
+31,1,Let's Go! ピカチュウ
+31,3,레츠고! 피카츄
+31,4,Let's Go！皮卡丘
 31,5,"Let's Go, Pikachu"
 31,6,"Let's Go, Pikachu!"
 31,7,"Let's Go, Pikachu!"
 31,8,"Let's Go, Pikachu!"
-31,9,"Let’s Go, Pikachu!"
-31,12,"Let's Go！皮卡丘"
-32,1,"Let's Go! イーブイ"
-32,3,"레츠고! 이브이"
-32,4,"Let's Go！伊布"
+31,9,"Let's Go, Pikachu!"
+31,12,Let's Go！皮卡丘
+32,1,Let's Go! イーブイ
+32,3,레츠고! 이브이
+32,4,Let's Go！伊布
 32,5,"Let's Go, Évoli"
 32,6,"Let's Go, Evoli!"
 32,8,"Let's Go, Eevee!"
 32,7,"Let's Go, Eevee!"
-32,9,"Let’s Go, Eevee!"
-32,12,Let's Go！伊布"
+32,9,"Let's Go, Eevee!"
+32,12,Let's Go！伊布
 33,1, ソード
 33,3,소드
 33,4,劍
@@ -304,11 +304,11 @@ version_id,local_language_id,name
 35,1,鎧の孤島
 35,3,갑옷의 외딴섬
 35,4,鎧之孤島
-35,5,"L'île solitaire de l'Armure"
-35,6,"Die Insel der Rüstung"
-35,7,"La isla de la armadura"
-35,8,"L'isola solitaria dell'armatura"
-35,9,"The Isle of Armor"
+35,5,L'île solitaire de l'Armure
+35,6,Die Insel der Rüstung
+35,7,La isla de la armadura
+35,8,L'isola solitaria dell'armatura
+35,9,The Isle of Armor
 35,12,铠之孤岛
 36,1,冠の雪原
 36,3,왕관의 설원
@@ -317,7 +317,7 @@ version_id,local_language_id,name
 36,6,Die Schneelande der Krone
 36,7,Las nieves de la corona
 36,8,Le terre innevate della corona
-36,9,"The Crown Tundra"
+36,9,The Crown Tundra
 36,12,冠之雪原
 37,1,ブリリアントダイヤモンド
 37,3,브릴리언트 다이아몬드

pokemon_v2/migrations/0012_auto_20220626_1402.py

@@ -0,0 +1,23 @@
+# Generated by Django 2.1.15 on 2022-06-26 13:02
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("pokemon_v2", "0011_typeefficacypast"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="itemsprites",
+            name="sprites",
+            field=models.CharField(max_length=1000),
+        ),
+        migrations.AlterField(
+            model_name="pokemonformsprites",
+            name="sprites",
+            field=models.CharField(max_length=1000),
+        ),
+    ]

pokemon_v2/models.py

@@ -941,7 +941,7 @@ class ItemGameIndex(HasItem, HasGeneration, HasGameIndex):
 
 class ItemSprites(HasItem):
 
-    sprites = models.CharField(max_length=500)
+    sprites = models.CharField(max_length=1000)
 
 
 ####################
@@ -1809,7 +1809,7 @@ class PokemonFormName(HasPokemonForm, IsName):
 
 class PokemonFormSprites(HasPokemonForm):
 
-    sprites = models.CharField(max_length=500)
+    sprites = models.CharField(max_length=1000)
 
 
 class PokemonGameIndex(HasPokemon, HasGameIndex, HasVersion):