Merge branch 'master' into sv-dlc

data/v2/csv/ability_flavor_text.csv

@@ -27866,7 +27866,7 @@ Unnerve Ability and Spectrier’s Grim Neigh Ability."
 二つの　特性を　あわせ持つ。"
 267,20,12,"兼备蕾冠王的紧张感和
 灵幽马的漆黑嘶鸣这两种特性。"
-299,26,9,The Pokémon ignores changes to opponents' evasiveness, its accuracy can't be lowered, and it can hit Ghost types with Normal-type and Fighting-type moves
+299,26,9,"The Pokémon ignores changes to opponents' evasiveness, its accuracy can't be lowered, and it can hit Ghost types with Normal-type and Fighting-type moves"
 300,26,9,Lowers the evasion of opposing Pok<6F>mon by 1 stage when first sent into battle
 301,26,9,"When the Pok<6F>mon enters a battle, it showers its ally with hospitality, restoring a small amount of the ally's HP"
 302,26,9,The power of the Pok<6F>mon's toxic chain may badly poison any target the Pok<6F>mon hits with a move

data/v2/csv/encounter_condition_value_prose.csv

@@ -96,7 +96,7 @@ encounter_condition_value_id,local_language_id,name
 38,9,None
 38,5,Aucune
 39,9,Beat the Pokémon league after knocking out Snorlax at Route 11
-39,5,Après avoir mis Ronflex KO sur la route 11, puis avoir battu la Ligue
+39,5,"Après avoir mis Ronflex KO sur la route 11, puis avoir battu la Ligue"
 40,9,Playing on the Virtual Console Release
 40,5,En jouant sur la version Virtual Console
 41,9,Cure the nightmares of Eldritch’s Son

data/v2/csv/item_names.csv

@@ -17642,3 +17642,183 @@ item_id,local_language_id,name
 2099,4,黄色盘子
 2099,9,Yellow Dish
 2099,11,イエロープレート
+2100,1,ロトりぼう
+2100,9,Roto Stick
+2100,11,ロトりぼう
+2101,1,おしゃれカードみどり
+2101,9,Teal Style Card
+2101,11,おしゃれカードみどり
+2102,1,みどりのめん
+2102,9,Teal Mask
+2102,11,みどりのめん
+2103,1,きらめくおまもり
+2103,9,Glimmering Charm
+2103,11,きらめくおまもり
+2104,1,けっしょうのかけら
+2104,9,Crystal Cluster
+2104,11,けっしょうのかけら
+2105,1,ようせいのハネ
+2105,9,Fairy Feather
+2105,11,ようせいのハネ
+2106,1,いどのめん
+2106,9,Wellspring Mask
+2106,11,いどのめん
+2107,1,かまどのめん
+2107,9,Hearthflame Mask
+2107,11,かまどのめん
+2108,1,いしずえのめん
+2108,9,Cornerstone Mask
+2108,11,いしずえのめん
+2109,1,みついりりんご
+2109,9,Syrupy Apple
+2109,11,みついりりんご
+2110,1,ボンサクのちゃわん
+2110,9,Unremarlable Teacup
+2110,11,ボンサクのちゃわん
+2111,1,ケッサクのちゃわん
+2111,9,Masterpiece Teacup
+2111,11,ボンサクのちゃわん
+2112,1,たいりょくのもち
+2112,9,Health Mochi
+2112,11,たいりょくのもち
+2113,1,きんりょくのもち
+2113,9,Muscle Mochi
+2113,11,きんりょくのもち
+2114,1,ていこうのもち
+2114,9,Resist Mochi
+2114,11,ていこうのもち
+2115,1,ちりょくのもち
+2115,9,Genius Mochi
+2115,11,ちりょくのもち
+2116,1,せいしんのもち
+2116,9,Clever Mochi
+2116,11,せいしんのもち
+2117,1,しゅんぱつのもち
+2117,9,Swift Mochi
+2117,11,しゅんぱつのもち
+2118,1,まっさらもち
+2118,9,Fresh Start Mochi
+2118,11,まっさらもち
+2119,1,アーボのきば
+2119,9,Ekans Fang
+2119,11,アーボのきば
+2120,1,サンドのツメ
+2120,9,Sandshrew Claw
+2120,11,サンドのツメ
+2121,1,ピィのけ
+2121,9,Cleffa Fur
+2121,11,ピィのけ
+2122,1,ロコンのけ
+2122,9,Vulpix Fur
+2122,11,ロコンのけ
+2123,1,ニョロモのめんえき
+2123,9,Poliwag Slime
+2123,11,ニョロモのめんえき
+2124,1,マダツボミのツル
+2124,9,Bellsprout Vine
+2124,11,マダツボミのツル
+2125,1,イシツブテのかけら
+2125,9,Geodude Fragment
+2125,11,イシツブテのかけら
+2126,1,ドガースのガス
+2126,9,Koffing Gas
+2126,11,ドガースのガス
+2127,1,ゴンベのキバ
+2127,9,Munchlax Fang
+2127,11,ゴンベのキバ
+2128,1,オタチのけ
+2128,9,Sentret Fur
+2128,11,オタチのけ
+2129,1,ホーホーのはね
+2129,9,Hoothoot Feather
+2129,11,ホーホーのはね
+2130,1,イトマルのいと
+2130,9,Spinarak Thread
+2130,11,イトマルのいと
+2131,1,エイパムのけ
+2131,9,Aipom Hair
+2131,11,エイパムのけ
+2132,1,ヤンヤンマのトゲ
+2132,9,Yanma Spike
+2132,11,ヤンヤンマのトゲ
+2133,1,グライガーのキバ
+2133,9,Gligar Fang
+2133,11,グライガーのキバ
+2134,1,マグマッグのようがん
+2134,9,Slugma Lava
+2134,11,マグマッグのようがん
+2135,1,ウリムーのけ
+2135,9,Swinub Hair
+2135,11,ウリムーのけ
+2136,1,ポチエナのキバ
+2136,9,Poochyena Fang
+2136,11,ポチエナのキバ
+2137,1,ハスボーのはっぱ
+2137,9,Lotad Leaf
+2137,11,ハスボーのはっぱ
+2138,1,タネボーのえだ
+2138,9,Seedot Stem
+2138,11,タネボーのえだ
+2139,1,ノズパスのかけら
+2139,9,Nosepass Fragment
+2139,11,ノズパスのかけら
+2140,1,バルビートのしる
+2140,9,Volbeat Fluid
+2140,11,バルビートのしる
+2141,1,イルミーゼのしる
+2141,9,Illumise Fluid
+2141,11,イルミーゼのしる
+2142,1,ヘイガニのから
+2142,9,Corphish Shell
+2142,11,ヘイガニのから
+2143,1,ヒンバスのうろこ
+2143,9,Feebas Scales
+2143,11,ヒンバスのうろこ
+2144,1,ヨマワルのかけら
+2144,9,Duskull Fragment
+2144,11,ヨマワルのかけら
+2145,1,リーシャンのかけら
+2145,9,Chingling Fragment
+2145,11,リーシャンのかけら
+2146,1,ドッコラーのあせ
+2146,9,Timburr Sweat
+2146,11,ドッコラーのあせ
+2147,1,クルミルのはっぱ
+2147,9,Sewaddle Leaf
+2147,11,クルミルのはっぱ
+2148,1,コアルヒーのはね
+2148,9,Ducklett Feather
+2148,11,コアルヒーのはね
+2149,1,ヒトモシのすす
+2149,9,Litwick Soot
+2149,11,ヒトモシのすす
+2150,1,コジョフーのツメ
+2150,9,Mienfoo Claw
+2150,11,コジョフーのツメ
+2151,1,バルチャイのはね
+2151,9,Vullaby Feather
+2151,11,バルチャイのはね
+2152,1,メレシーのほうせき
+2152,9,Carbink Jewel
+2152,11,メレシーのほうせき
+2153,1,ボクレーのえだ
+2153,9,Phantump Twig
+2153,11,ボクレーのえだ
+2154,1,アゴジムシのいと
+2154,9,Grubbin Thread
+2154,11,アゴジムシのいと
+2155,1,アブリーのこな
+2155,9,Cutiefly Powder
+2155,11,アブリーのこな
+2156,1,ジャラコのウロコ
+2156,9,Jangmo-o Scales
+2156,11,ジャラコのウロコ
+2157,1,ウッウのうもう
+2157,9,Cramorant Down
+2157,11,ウッウのうもう
+2158,1,モルペコのたね
+2158,9,Morpeko Snack
+2158,11,モルペコのたね
+2159,1,チャデスのこな
+2159,9,Poltchageist Powder
+2159,11,チャデスのこな

data/v2/csv/items.csv

@@ -2047,5 +2047,65 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
 2097,red-dish,55,0,,
 2098,white-dish,55,0,,
 2099,yellow-dish,55,0,,
+2100,roto-stick,21,0,,
+2101,teal-style-card,21,0,,
+2102,teak-mask,20,0,,
+2103,glimmering-charm,21,0,,
+2104,cyrstal-cluster,20,0,,
+2105,fairy-feather,12,750,,
+2106,wellspring-mask,12,0,,
+2107,hearthflame-mask,12,0,,
+2108,cornerstone-mask,12,0,,
+2109,syrupy-apple,10,500,,
+2110,unremarkable-teacup,10,400,,
+2111,masterpiece-teacup,10,9500,,
+2112,health-mochi,26,125,,
+2113,muscle-mochi,26,125,,
+2114,resist-mochi,26,125,,
+2115,genius-mochi,26,125,,
+2116,clever-mochi,26,125,,
+2117,swift-mochi,26,125,,
+2118,fresh-start-mochi,26,75,,
+2119,ekans-fang,54,15,,
+2120,sandshrew-claw,54,10,,
+2121,cleffa-fur,54,25,,
+2122,vulpix-fur,54,35,,
+2123,poliwag-slime,54,35,,
+2124,bellsprout-vine,54,25,,
+2125,geodude-fragment,54,30,,
+2126,koffing-gas,54,25,,
+2127,munchlax-fang,54,40,,
+2128,sentret-fur,54,10,,
+2129,hoothoot-feather,54,15,,
+2130,spinarak-thread,54,10,,
+2131,aipom-hair,54,30,,
+2132,yanma-spike,54,35,,
+2133,gligar-fang,54,40,,
+2134,slugma-lava,54,20,,
+2135,swinub-hair,54,35,,
+2136,poochyena-fang,54,15,,
+2137,lotad-leaf,54,20,,
+2138,seedot-stem,54,20,,
+2139,nosepass-fragment,54,40,,
+2140,volbeat-fluid,54,10,,
+2141,illumise-fluid,54,10,,
+2142,corphish-shell,54,10,,
+2143,feebas-scales,54,35,,
+2144,duskull-fragment,54,40,,
+2145,chingling-fragment,54,20,,
+2146,timburr-sweat,54,30,,
+2147,sewaddle-leaf,54,20,,
+2148,ducklett-feather,54,15,,
+2149,litwick-soot,54,30,,
+2150,mienfoo-claw,54,40,,
+2151,vullaby-feather,54,35,,
+2152,carbink-jewel,54,50,,
+2153,phantump-twig,54,20,,
+2154,grubbin-thread,54,25,,
+2155,cutiefly-powder,54,25,,
+2156,jangmo-o-scales,54,50,,
+2157,cramorant-down,54,30,,
+2158,morpeko-snack,54,15,,
+2159,poltchageist-powder,54,30,,
 10001,black-augurite,10,0,,
 10002,peat-block,10,0,,

data/v2/csv/move_names.csv

@@ -8623,10 +8623,18 @@ move_id,local_language_id,name
 900,8,Turboincanto
 900,9,Magical Torque
 900,11,マジカルアクセル
+901,1,ブラッドムーン
 901,9,Blood Moon
+901,11,ブラッドムーン
+902,1,シャカシャカほう
 902,9,Matcha Gotcha
+902,11,シャカシャカほう
+903,1,みずあめボム
 903,9,Syrup Bomb
+903,11,みずあめボム
+904,1,ツタこんぼう
 904,9,Ivy Cudgel
+904,11,ツタこんぼう
 10001,1,ダークラッシュ
 10001,5,Charge Noire
 10001,6,Cryptoschlag

data/v2/csv/moves.csv

@@ -902,7 +902,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
 901,blood-moon,9,1,140,5,100,0,10,3,,,,,
 902,matcha-gotcha,9,12,80,15,90,0,10,3,,,,,
 903,syrup-bomb,9,12,60,10,85,0,10,3,,,,,
-904,ivy-cudgel,9,12,100,10,1100,0,10,2,,,,,
+904,ivy-cudgel,9,12,100,10,100,0,10,2,,,,,
 10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
 10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
 10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

data/v2/csv/pokemon_abilities.csv

@@ -977,9 +977,9 @@ pokemon_id,ability_id,is_hidden,slot
 392,66,0,1
 392,89,1,3
 393,67,0,1
-393,128,1,3
+393,172,1,3
 394,67,0,1
-394,128,1,3
+394,172,1,3
 395,67,0,1
 395,172,1,3
 396,51,0,1