Merge branch 'master' into Add-previous-abilities

data/v2/csv/abilities.csv

@@ -301,6 +301,7 @@ id,identifier,generation_id,is_main_series
 300,supersweet-syrup,9,1
 301,hospitality,9,1
 302,toxic-chain,9,1
+303,embody-aspect,9,1
 10001,mountaineer,5,0
 10002,wave-rider,5,0
 10003,skater,5,0

data/v2/csv/ability_names.csv

@@ -2886,6 +2886,58 @@ ability_id,local_language_id,name
 298,8,Micoforza
 298,9,Mycelium Might
 298,11,きんしのちから
+299,1,しんがん
+299,3,심안
+299,4,心眼
+299,5,Œil Révélateur 
+299,7,Ojo Mental 
+299,8,Occhio Interiore 
+299,9,Minds Eye
+299,11,しんがん
+299,12,心眼
+300,1,かんろなミツ
+300,3,감미로운꿀
+300,4,甘露之蜜
+300,5,Nectar Mielleux
+300,1,かんろなミツ
+300,3,감미로운꿀
+300,4,甘露之蜜
+300,5,Nectar Mielleux
+300,6,Süßer Nektar
+300,7,Néctar Dulce
+300,8,Sciroppo Sublime
+300,9,Supersweet Syrup
+300,12,甘露之蜜
+301,1,おもてなし
+301,3,대접
+301,4,款待
+301,5,Aux Petits Soins
+301,6,Gastlichkeit
+301,7,Hospitalidad
+301,8,Ospitalità
+301,9,Hospitality
+301,11,おもてなし
+301,12,款待
+302,1,どくのくさり
+302,3,독사슬
+302,4,毒鎖鏈
+302,5,Chaîne Toxique
+302,6,Giftkette
+302,7,Cadena Tóxica
+302,8,Catena Tossica
+302,9,Toxic Chain
+302,11,どくのくさり
+302,12,毒锁链
+303,1,おもかげやどし
+303,3,초상투영
+303,4,面影輝映
+303,5,Force Mémorielle
+303,6,Erinnerungskraft
+303,7,Evocarrecuerdos
+303,8,Albergamemorie
+303,9,Embody Aspect
+303,11,おもかげやどし
+303,12,面影辉映
 10001,9,Mountaineer
 10002,9,Wave Rider
 10003,9,Skater

data/v2/csv/moves.csv

@@ -801,7 +801,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 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,,,,
-803,grassy-glide,8,12,70,20,100,0,10,2,1,,,,
+803,grassy-glide,8,12,55,20,100,0,10,2,1,,,,
 804,rising-voltage,8,13,70,20,100,0,10,3,1,,,,
 805,terrain-pulse,8,1,50,10,100,0,10,3,1,,,,
 806,skitter-smack,8,7,70,10,90,0,10,2,1,100,,,

data/v2/csv/pokemon_abilities.csv

@@ -2420,7 +2420,7 @@ pokemon_id,ability_id,is_hidden,slot
 1013,301,0,1
 1013,85,1,3
 1014,302,0,1
-1014,278,1,3
+1014,275,1,3
 1015,302,0,1
 1015,119,1,3
 1016,302,0,1

data/v2/csv/pokemon_form_names.csv

@@ -507,6 +507,16 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 1008,1,コンプリートモード,
 1008,9,Ultimate Mode,
 1008,11,コンプリートモード,
+1017,1,みどりのめん,
+1017,3,벽록의가면,
+1017,4,碧草面具,
+1017,5,Masque Turquoise,
+1017,6,Türkisgrüne Maske,
+1017,7,Máscara Turquesa,
+1017,8,Maschera Turchese,
+1017,9,Teal Mask,
+1017,11,みどりのめん,
+1017,12,碧草面具,
 10001,1,Ｂ,
 10001,3,B,
 10001,5,B,Zarbi B
@@ -3528,3 +3538,43 @@ pokemon_form_id,local_language_id,form_name,pokemon_name
 10440,1,グライドモード,
 10440,9,Glide Mode,
 10440,11,グライドモード,
+10441,1,アカツキ,
+10441,3,붉은 달,
+10441,4,赫月,
+10441,5,Lune Vermeille,
+10441,6,Blutmond,
+10441,7,Luna Carmesí,
+10441,8,Luna Cremisi,
+10441,9,Bloodmoon,
+10441,11,アカツキ,
+10441,12,赫月,
+10442,1,いどのめん,
+10442,3,우물의가면,
+10442,4,水井面具,
+10442,5,Masque du Puits,
+10442,6,Brunnenmaske,
+10442,7,Máscara Fuente,
+10442,8,Maschera Pozzo,
+10442,9,Wellspring Mask,
+10442,11,いどのめん,
+10442,12,水井面具,
+10443,1,かまどのめん,
+10443,3,화덕의가면,
+10443,4,火灶面具,
+10443,5,Masque du Fourneau,
+10443,6,Ofenmaske,
+10443,7,Máscara Horno,
+10443,8,Maschera Focolare,
+10443,9,Hearthflame Mask,
+10443,11,かまどのめん,
+10443,12,火灶面具,
+10444,1,いしずえのめん,
+10444,3,주춧돌의가면,
+10444,4,礎石面具,
+10444,5,Masque de la Pierre,
+10444,6,Fundamentmaske,
+10444,7,Máscara Cimiento,
+10444,8,Maschera Fondamenta,
+10444,9,Cornerstone Mask,
+10444,11,いしずえのめん,
+10444,12,礎石面具,

data/v2/csv/pokemon_forms.csv

@@ -1007,8 +1007,15 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 1006,iron-valiant,,1006,25,1,0,0,1,1352
 1007,koraidon-apex-build,apex-build,1007,25,1,0,0,1,1357
 1008,miraidon-ultimate-mode,ultimate-mode,1008,25,1,0,0,1,1358
-1009,walking-wake,,1009,25,1,0,0,1,1370
-1010,iron-leaves,,1010,25,1,0,0,1,1371
+1009,walking-wake,,1009,25,1,0,0,1,1381
+1010,iron-leaves,,1010,25,1,0,0,1,1382
+1011,dipplin,,1011,26,1,0,0,1,1371
+1012,poltchageist,,1012,26,1,0,0,1,1372
+1013,sinistcha,,1013,26,1,0,0,1,1373
+1014,okidogi,,1014,26,1,0,0,1,1374
+1015,munkidori,,1015,26,1,0,0,1,1375
+1016,fezandipiti,,1016,26,1,0,0,1,1376
+1017,ogerpon,,1017,26,1,0,0,1,1377
 10001,unown-b,b,201,3,0,0,0,2,299
 10002,unown-c,c,201,3,0,0,0,3,300
 10003,unown-d,d,201,3,0,0,0,4,301
@@ -1449,3 +1456,7 @@ id,identifier,form_identifier,pokemon_id,introduced_in_version_group_id,is_defau
 10438,miraidon-drive-mode,drive-mode,10269,25,0,0,0,3,1324
 10439,miraidon-aquatic-mode,aquatic-mode,10270,25,0,0,0,4,1325
 10440,miraidon-glide-mode,glide-mode,10271,25,0,0,0,5,1326
+10441,ursaluna-bloodmoon,bloodmoon,10272,26,0,0,0,2,1370
+10442,ogerpon-wellspring-mask,wellspring-mask,10273,26,0,0,0,2,1378
+10443,ogerpon-hearthflame-mask,hearthflame-mask,10274,26,0,0,0,3,1379
+10444,ogerpon-cornerstone-mask,cornerstone-mask,10275,26,0,0,0,4,1380