Skip to content

Commit 8fedb42

Browse files
authored
Merge branch 'master' into sv-dlc
2 parents 75ea241 + 655fc4f commit 8fedb42

File tree

7 files changed

+253
-5
lines changed

7 files changed

+253
-5
lines changed

data/v2/csv/ability_flavor_text.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27866,7 +27866,7 @@ Unnerve Ability and Spectrier’s Grim Neigh Ability."
2786627866
二つの 特性を あわせ持つ。"
2786727867
267,20,12,"兼备蕾冠王的紧张感和
2786827868
灵幽马的漆黑嘶鸣这两种特性。"
27869-
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
27869+
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"
2787027870
300,26,9,Lowers the evasion of opposing Pok�mon by 1 stage when first sent into battle
2787127871
301,26,9,"When the Pok�mon enters a battle, it showers its ally with hospitality, restoring a small amount of the ally's HP"
2787227872
302,26,9,The power of the Pok�mon's toxic chain may badly poison any target the Pok�mon hits with a move

data/v2/csv/encounter_condition_value_prose.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ encounter_condition_value_id,local_language_id,name
9696
38,9,None
9797
38,5,Aucune
9898
39,9,Beat the Pokémon league after knocking out Snorlax at Route 11
99-
39,5,Après avoir mis Ronflex KO sur la route 11, puis avoir battu la Ligue
99+
39,5,"Après avoir mis Ronflex KO sur la route 11, puis avoir battu la Ligue"
100100
40,9,Playing on the Virtual Console Release
101101
40,5,En jouant sur la version Virtual Console
102102
41,9,Cure the nightmares of Eldritch’s Son

data/v2/csv/item_names.csv

Lines changed: 180 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17642,3 +17642,183 @@ item_id,local_language_id,name
1764217642
2099,4,黄色盘子
1764317643
2099,9,Yellow Dish
1764417644
2099,11,イエロープレート
17645+
2100,1,ロトりぼう
17646+
2100,9,Roto Stick
17647+
2100,11,ロトりぼう
17648+
2101,1,おしゃれカードみどり
17649+
2101,9,Teal Style Card
17650+
2101,11,おしゃれカードみどり
17651+
2102,1,みどりのめん
17652+
2102,9,Teal Mask
17653+
2102,11,みどりのめん
17654+
2103,1,きらめくおまもり
17655+
2103,9,Glimmering Charm
17656+
2103,11,きらめくおまもり
17657+
2104,1,けっしょうのかけら
17658+
2104,9,Crystal Cluster
17659+
2104,11,けっしょうのかけら
17660+
2105,1,ようせいのハネ
17661+
2105,9,Fairy Feather
17662+
2105,11,ようせいのハネ
17663+
2106,1,いどのめん
17664+
2106,9,Wellspring Mask
17665+
2106,11,いどのめん
17666+
2107,1,かまどのめん
17667+
2107,9,Hearthflame Mask
17668+
2107,11,かまどのめん
17669+
2108,1,いしずえのめん
17670+
2108,9,Cornerstone Mask
17671+
2108,11,いしずえのめん
17672+
2109,1,みついりりんご
17673+
2109,9,Syrupy Apple
17674+
2109,11,みついりりんご
17675+
2110,1,ボンサクのちゃわん
17676+
2110,9,Unremarlable Teacup
17677+
2110,11,ボンサクのちゃわん
17678+
2111,1,ケッサクのちゃわん
17679+
2111,9,Masterpiece Teacup
17680+
2111,11,ボンサクのちゃわん
17681+
2112,1,たいりょくのもち
17682+
2112,9,Health Mochi
17683+
2112,11,たいりょくのもち
17684+
2113,1,きんりょくのもち
17685+
2113,9,Muscle Mochi
17686+
2113,11,きんりょくのもち
17687+
2114,1,ていこうのもち
17688+
2114,9,Resist Mochi
17689+
2114,11,ていこうのもち
17690+
2115,1,ちりょくのもち
17691+
2115,9,Genius Mochi
17692+
2115,11,ちりょくのもち
17693+
2116,1,せいしんのもち
17694+
2116,9,Clever Mochi
17695+
2116,11,せいしんのもち
17696+
2117,1,しゅんぱつのもち
17697+
2117,9,Swift Mochi
17698+
2117,11,しゅんぱつのもち
17699+
2118,1,まっさらもち
17700+
2118,9,Fresh Start Mochi
17701+
2118,11,まっさらもち
17702+
2119,1,アーボのきば
17703+
2119,9,Ekans Fang
17704+
2119,11,アーボのきば
17705+
2120,1,サンドのツメ
17706+
2120,9,Sandshrew Claw
17707+
2120,11,サンドのツメ
17708+
2121,1,ピィのけ
17709+
2121,9,Cleffa Fur
17710+
2121,11,ピィのけ
17711+
2122,1,ロコンのけ
17712+
2122,9,Vulpix Fur
17713+
2122,11,ロコンのけ
17714+
2123,1,ニョロモのめんえき
17715+
2123,9,Poliwag Slime
17716+
2123,11,ニョロモのめんえき
17717+
2124,1,マダツボミのツル
17718+
2124,9,Bellsprout Vine
17719+
2124,11,マダツボミのツル
17720+
2125,1,イシツブテのかけら
17721+
2125,9,Geodude Fragment
17722+
2125,11,イシツブテのかけら
17723+
2126,1,ドガースのガス
17724+
2126,9,Koffing Gas
17725+
2126,11,ドガースのガス
17726+
2127,1,ゴンベのキバ
17727+
2127,9,Munchlax Fang
17728+
2127,11,ゴンベのキバ
17729+
2128,1,オタチのけ
17730+
2128,9,Sentret Fur
17731+
2128,11,オタチのけ
17732+
2129,1,ホーホーのはね
17733+
2129,9,Hoothoot Feather
17734+
2129,11,ホーホーのはね
17735+
2130,1,イトマルのいと
17736+
2130,9,Spinarak Thread
17737+
2130,11,イトマルのいと
17738+
2131,1,エイパムのけ
17739+
2131,9,Aipom Hair
17740+
2131,11,エイパムのけ
17741+
2132,1,ヤンヤンマのトゲ
17742+
2132,9,Yanma Spike
17743+
2132,11,ヤンヤンマのトゲ
17744+
2133,1,グライガーのキバ
17745+
2133,9,Gligar Fang
17746+
2133,11,グライガーのキバ
17747+
2134,1,マグマッグのようがん
17748+
2134,9,Slugma Lava
17749+
2134,11,マグマッグのようがん
17750+
2135,1,ウリムーのけ
17751+
2135,9,Swinub Hair
17752+
2135,11,ウリムーのけ
17753+
2136,1,ポチエナのキバ
17754+
2136,9,Poochyena Fang
17755+
2136,11,ポチエナのキバ
17756+
2137,1,ハスボーのはっぱ
17757+
2137,9,Lotad Leaf
17758+
2137,11,ハスボーのはっぱ
17759+
2138,1,タネボーのえだ
17760+
2138,9,Seedot Stem
17761+
2138,11,タネボーのえだ
17762+
2139,1,ノズパスのかけら
17763+
2139,9,Nosepass Fragment
17764+
2139,11,ノズパスのかけら
17765+
2140,1,バルビートのしる
17766+
2140,9,Volbeat Fluid
17767+
2140,11,バルビートのしる
17768+
2141,1,イルミーゼのしる
17769+
2141,9,Illumise Fluid
17770+
2141,11,イルミーゼのしる
17771+
2142,1,ヘイガニのから
17772+
2142,9,Corphish Shell
17773+
2142,11,ヘイガニのから
17774+
2143,1,ヒンバスのうろこ
17775+
2143,9,Feebas Scales
17776+
2143,11,ヒンバスのうろこ
17777+
2144,1,ヨマワルのかけら
17778+
2144,9,Duskull Fragment
17779+
2144,11,ヨマワルのかけら
17780+
2145,1,リーシャンのかけら
17781+
2145,9,Chingling Fragment
17782+
2145,11,リーシャンのかけら
17783+
2146,1,ドッコラーのあせ
17784+
2146,9,Timburr Sweat
17785+
2146,11,ドッコラーのあせ
17786+
2147,1,クルミルのはっぱ
17787+
2147,9,Sewaddle Leaf
17788+
2147,11,クルミルのはっぱ
17789+
2148,1,コアルヒーのはね
17790+
2148,9,Ducklett Feather
17791+
2148,11,コアルヒーのはね
17792+
2149,1,ヒトモシのすす
17793+
2149,9,Litwick Soot
17794+
2149,11,ヒトモシのすす
17795+
2150,1,コジョフーのツメ
17796+
2150,9,Mienfoo Claw
17797+
2150,11,コジョフーのツメ
17798+
2151,1,バルチャイのはね
17799+
2151,9,Vullaby Feather
17800+
2151,11,バルチャイのはね
17801+
2152,1,メレシーのほうせき
17802+
2152,9,Carbink Jewel
17803+
2152,11,メレシーのほうせき
17804+
2153,1,ボクレーのえだ
17805+
2153,9,Phantump Twig
17806+
2153,11,ボクレーのえだ
17807+
2154,1,アゴジムシのいと
17808+
2154,9,Grubbin Thread
17809+
2154,11,アゴジムシのいと
17810+
2155,1,アブリーのこな
17811+
2155,9,Cutiefly Powder
17812+
2155,11,アブリーのこな
17813+
2156,1,ジャラコのウロコ
17814+
2156,9,Jangmo-o Scales
17815+
2156,11,ジャラコのウロコ
17816+
2157,1,ウッウのうもう
17817+
2157,9,Cramorant Down
17818+
2157,11,ウッウのうもう
17819+
2158,1,モルペコのたね
17820+
2158,9,Morpeko Snack
17821+
2158,11,モルペコのたね
17822+
2159,1,チャデスのこな
17823+
2159,9,Poltchageist Powder
17824+
2159,11,チャデスのこな

data/v2/csv/items.csv

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2047,5 +2047,65 @@ id,identifier,category_id,cost,fling_power,fling_effect_id
20472047
2097,red-dish,55,0,,
20482048
2098,white-dish,55,0,,
20492049
2099,yellow-dish,55,0,,
2050+
2100,roto-stick,21,0,,
2051+
2101,teal-style-card,21,0,,
2052+
2102,teak-mask,20,0,,
2053+
2103,glimmering-charm,21,0,,
2054+
2104,cyrstal-cluster,20,0,,
2055+
2105,fairy-feather,12,750,,
2056+
2106,wellspring-mask,12,0,,
2057+
2107,hearthflame-mask,12,0,,
2058+
2108,cornerstone-mask,12,0,,
2059+
2109,syrupy-apple,10,500,,
2060+
2110,unremarkable-teacup,10,400,,
2061+
2111,masterpiece-teacup,10,9500,,
2062+
2112,health-mochi,26,125,,
2063+
2113,muscle-mochi,26,125,,
2064+
2114,resist-mochi,26,125,,
2065+
2115,genius-mochi,26,125,,
2066+
2116,clever-mochi,26,125,,
2067+
2117,swift-mochi,26,125,,
2068+
2118,fresh-start-mochi,26,75,,
2069+
2119,ekans-fang,54,15,,
2070+
2120,sandshrew-claw,54,10,,
2071+
2121,cleffa-fur,54,25,,
2072+
2122,vulpix-fur,54,35,,
2073+
2123,poliwag-slime,54,35,,
2074+
2124,bellsprout-vine,54,25,,
2075+
2125,geodude-fragment,54,30,,
2076+
2126,koffing-gas,54,25,,
2077+
2127,munchlax-fang,54,40,,
2078+
2128,sentret-fur,54,10,,
2079+
2129,hoothoot-feather,54,15,,
2080+
2130,spinarak-thread,54,10,,
2081+
2131,aipom-hair,54,30,,
2082+
2132,yanma-spike,54,35,,
2083+
2133,gligar-fang,54,40,,
2084+
2134,slugma-lava,54,20,,
2085+
2135,swinub-hair,54,35,,
2086+
2136,poochyena-fang,54,15,,
2087+
2137,lotad-leaf,54,20,,
2088+
2138,seedot-stem,54,20,,
2089+
2139,nosepass-fragment,54,40,,
2090+
2140,volbeat-fluid,54,10,,
2091+
2141,illumise-fluid,54,10,,
2092+
2142,corphish-shell,54,10,,
2093+
2143,feebas-scales,54,35,,
2094+
2144,duskull-fragment,54,40,,
2095+
2145,chingling-fragment,54,20,,
2096+
2146,timburr-sweat,54,30,,
2097+
2147,sewaddle-leaf,54,20,,
2098+
2148,ducklett-feather,54,15,,
2099+
2149,litwick-soot,54,30,,
2100+
2150,mienfoo-claw,54,40,,
2101+
2151,vullaby-feather,54,35,,
2102+
2152,carbink-jewel,54,50,,
2103+
2153,phantump-twig,54,20,,
2104+
2154,grubbin-thread,54,25,,
2105+
2155,cutiefly-powder,54,25,,
2106+
2156,jangmo-o-scales,54,50,,
2107+
2157,cramorant-down,54,30,,
2108+
2158,morpeko-snack,54,15,,
2109+
2159,poltchageist-powder,54,30,,
20502110
10001,black-augurite,10,0,,
20512111
10002,peat-block,10,0,,

data/v2/csv/move_names.csv

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8623,10 +8623,18 @@ move_id,local_language_id,name
86238623
900,8,Turboincanto
86248624
900,9,Magical Torque
86258625
900,11,マジカルアクセル
8626+
901,1,ブラッドムーン
86268627
901,9,Blood Moon
8628+
901,11,ブラッドムーン
8629+
902,1,シャカシャカほう
86278630
902,9,Matcha Gotcha
8631+
902,11,シャカシャカほう
8632+
903,1,みずあめボム
86288633
903,9,Syrup Bomb
8634+
903,11,みずあめボム
8635+
904,1,ツタこんぼう
86298636
904,9,Ivy Cudgel
8637+
904,11,ツタこんぼう
86308638
10001,1,ダークラッシュ
86318639
10001,5,Charge Noire
86328640
10001,6,Cryptoschlag

data/v2/csv/moves.csv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_
902902
901,blood-moon,9,1,140,5,100,0,10,3,,,,,
903903
902,matcha-gotcha,9,12,80,15,90,0,10,3,,,,,
904904
903,syrup-bomb,9,12,60,10,85,0,10,3,,,,,
905-
904,ivy-cudgel,9,12,100,10,1100,0,10,2,,,,,
905+
904,ivy-cudgel,9,12,100,10,100,0,10,2,,,,,
906906
10001,shadow-rush,3,10002,55,,100,0,10,2,10001,,,,
907907
10002,shadow-blast,3,10002,80,,100,0,10,2,44,,,,
908908
10003,shadow-blitz,3,10002,40,,100,0,10,2,1,,,,

data/v2/csv/pokemon_abilities.csv

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -977,9 +977,9 @@ pokemon_id,ability_id,is_hidden,slot
977977
392,66,0,1
978978
392,89,1,3
979979
393,67,0,1
980-
393,128,1,3
980+
393,172,1,3
981981
394,67,0,1
982-
394,128,1,3
982+
394,172,1,3
983983
395,67,0,1
984984
395,172,1,3
985985
396,51,0,1

0 commit comments

Comments
 (0)