Add names revealed 2011-02-10. #451

Actually from pokemonblackwhite.com this time!  Woo!

diff --git a/pokedex/data/csv/abilities.csv b/pokedex/data/csv/abilities.csv
index 057b361..0088754 100644 (file)
--- a/pokedex/data/csv/abilities.csv
+++ b/pokedex/data/csv/abilities.csv
@@ -439,7 +439,7 @@ Unlike [Forecast]{ability}, [Multitype]{ability}, and [daruma mode]{ability}, th
 This Pokémon cannot steal upon being knocked out.  It can steal if the attacker has a [Substitute]{move}, but cannot steal when its own Substitute is hit.",Steals attacking Pokémon's held item on contact.
 125,Sheer Force,5,"This Pokémon's moves with extra effects have 1.3× their power, but their effect chances are reduced to 0.","Strengthens moves with extra effects to 1.3× their power, but prevents their extra effects."
 126,antagonist,5,Stat modifiers are inverted for this Pokémon.,Inverts stat modifiers.
 This Pokémon cannot steal upon being knocked out.  It can steal if the attacker has a [Substitute]{move}, but cannot steal when its own Substitute is hit.",Steals attacking Pokémon's held item on contact.
 125,Sheer Force,5,"This Pokémon's moves with extra effects have 1.3× their power, but their effect chances are reduced to 0.","Strengthens moves with extra effects to 1.3× their power, but prevents their extra effects."
 126,antagonist,5,Stat modifiers are inverted for this Pokémon.,Inverts stat modifiers.

-127,tension,5,Opposing Pokémon cannot eat held Berries while this Pokémon is in battle.,Prevents opposing Pokémon from eating held Berries.
+127,Unnerve,5,Opposing Pokémon cannot eat held Berries while this Pokémon is in battle.,Prevents opposing Pokémon from eating held Berries.

 128,competitive spirit,5,"When any of this Pokémon's stats are [lowered]{mechanic:stat modifier}, its [Attack]{mechanic} rises by two stages.",Raises [Attack]{mechanic} two [stages]{mechanic:stat modifier} upon having any stat lowered.
 129,faint-hearted,5,This Pokémon's [Attack]{mechanic} and [Special Attack]{mechanic} are halved when it has less than half its [HP]{mechanic}.,Halves [Attack]{mechanic} and [Special Attack]{mechanic} below 50% [HP]{mechanic}.
 130,cursed body,5,Moves that hit this Pokémon have a 30% chance of being [Disabled]{move:Disable} afterward.,Has a 30% chance of [Disabling]{move:Disable} any move that hits the Pokémon.
 128,competitive spirit,5,"When any of this Pokémon's stats are [lowered]{mechanic:stat modifier}, its [Attack]{mechanic} rises by two stages.",Raises [Attack]{mechanic} two [stages]{mechanic:stat modifier} upon having any stat lowered.
 129,faint-hearted,5,This Pokémon's [Attack]{mechanic} and [Special Attack]{mechanic} are halved when it has less than half its [HP]{mechanic}.,Halves [Attack]{mechanic} and [Special Attack]{mechanic} below 50% [HP]{mechanic}.
 130,cursed body,5,Moves that hit this Pokémon have a 30% chance of being [Disabled]{move:Disable} afterward.,Has a 30% chance of [Disabling]{move:Disable} any move that hits the Pokémon.


@@ -458,7 +458,7 @@ This ability triggers on every hit of a multiple-hit move.",Raises [Speed]{mecha
 141,sudden impulse,5,"After each turn, one of this Pokémon's stats at random rises two [stages]{mechanic:stat modifier}, and another falls one stage.",Raises a random stat two [stages]{mechanic:stat modifier} and lowers another one stage after each turn.
 142,Overcoat,5,This Pokémon does not take damage from [weather]{mechanic}.,Protects against damage from [weather]{mechanic}.
 143,poisoned drink,5,This Pokémon's contact moves have a 20% chance of [poisoning]{mechanic:poison} the target with each hit.,Has a 20% chance of [poisoning]{mechanic:poison} Pokémon upon contact when attacking.
 141,sudden impulse,5,"After each turn, one of this Pokémon's stats at random rises two [stages]{mechanic:stat modifier}, and another falls one stage.",Raises a random stat two [stages]{mechanic:stat modifier} and lowers another one stage after each turn.
 142,Overcoat,5,This Pokémon does not take damage from [weather]{mechanic}.,Protects against damage from [weather]{mechanic}.
 143,poisoned drink,5,This Pokémon's contact moves have a 20% chance of [poisoning]{mechanic:poison} the target with each hit.,Has a 20% chance of [poisoning]{mechanic:poison} Pokémon upon contact when attacking.

-144,regeneration,5,This Pokémon regains 1/3 of its maximum [HP]{mechanic} upon leaving battle.,Heals for 1/3 max [HP]{mechanic} upon leaving battle.
+144,Regenerator,5,This Pokémon regains 1/3 of its maximum [HP]{mechanic} upon leaving battle.,Heals for 1/3 max [HP]{mechanic} upon leaving battle.

 145,Big Pecks,5,This Pokémon's [Defense]{mechanic} cannot be [lowered]{mechanic:stat modifiers}.,Protects against [Defense]{mechanic} drops.
 146,Sand Rush,5,This Pokémon's [Speed]{mechanic} is doubled during a [sandstorm]{mechanic}.,Doubles [Speed]{mechanic} during a [sandstorm]{mechanic}.
 147,miracle skin,5,"Non-damaging moves that inflict [major status ailments]{mechanic:major status ailment}, such as [Thunder Wave]{move}, have a 50% chance of failing against this Pokémon.",Has a 50% chance of protecting against non-damaging moves that inflict [major status ailments]{mechanic:major status ailment}.
 145,Big Pecks,5,This Pokémon's [Defense]{mechanic} cannot be [lowered]{mechanic:stat modifiers}.,Protects against [Defense]{mechanic} drops.
 146,Sand Rush,5,This Pokémon's [Speed]{mechanic} is doubled during a [sandstorm]{mechanic}.,Doubles [Speed]{mechanic} during a [sandstorm]{mechanic}.
 147,miracle skin,5,"Non-damaging moves that inflict [major status ailments]{mechanic:major status ailment}, such as [Thunder Wave]{move}, have a 50% chance of failing against this Pokémon.",Has a 50% chance of protecting against non-damaging moves that inflict [major status ailments]{mechanic:major status ailment}.

diff --git a/pokedex/data/csv/ability_names.csv b/pokedex/data/csv/ability_names.csv
index a04796e..cc4a65e 100644 (file)
--- a/pokedex/data/csv/ability_names.csv
+++ b/pokedex/data/csv/ability_names.csv
@@ -622,6 +622,10 @@ ability_id,language_id,name
 125,8,Forzabruta
 126,1,あまのじゃく
 127,1,きんちょうかん
 125,8,Forzabruta
 126,1,あまのじゃく
 127,1,きんちょうかん

+127,5,Tension
+127,6,Anspannung
+127,7,Nerviosismo
+127,8,Agitazione

 128,1,まけんき
 129,1,よわき
 130,1,のろわれボディ
 128,1,まけんき
 129,1,よわき
 130,1,のろわれボディ


@@ -647,6 +651,10 @@ ability_id,language_id,name
 142,8,Copricapo
 143,1,どくしゅ
 144,1,さいせいりょく
 142,8,Copricapo
 143,1,どくしゅ
 144,1,さいせいりょく

+144,5,Régé-Force
+144,6,Belebekraft
+144,7,Regeneración
+144,8,Rigenergia

 145,1,はとむね
 145,5,Coeur de Coq
 145,6,Brustbieter
 145,1,はとむね
 145,5,Coeur de Coq
 145,6,Brustbieter

diff --git a/pokedex/data/csv/move_names.csv b/pokedex/data/csv/move_names.csv
index 755c51b..7e6199a 100644 (file)
--- a/pokedex/data/csv/move_names.csv
+++ b/pokedex/data/csv/move_names.csv
@@ -2356,11 +2356,19 @@ move_id,language_id,name
 479,1,うちおとす
 480,1,やまあらし
 481,1,はじけるほのお
 479,1,うちおとす
 480,1,やまあらし
 481,1,はじけるほのお

+481,5,Rebondifeu
+481,6,Funkenflug
+481,7,Pirotecnia
+481,8,Pirolancio

 482,1,ヘドロウェーブ
 483,1,ちょうのまい
 484,1,ヘビーボンバー
 485,1,シンクロノイズ
 486,1,エレキボール
 482,1,ヘドロウェーブ
 483,1,ちょうのまい
 484,1,ヘビーボンバー
 485,1,シンクロノイズ
 486,1,エレキボール

+486,5,Boule Elec
+486,6,Elektroball
+486,7,Bola Voltio
+486,8,Energisfera

 487,1,みずびたし
 488,1,ニトロチャージ
 489,1,とぐろをまく
 487,1,みずびたし
 488,1,ニトロチャージ
 489,1,とぐろをまく


@@ -2379,6 +2387,10 @@ move_id,language_id,name
 495,7,Cede Paso
 495,8,Cortesia
 496,1,りんしょう
 495,7,Cede Paso
 495,8,Cortesia
 496,1,りんしょう

+496,5,Chant Canon
+496,6,Kanon
+496,7,Canon
+496,8,Coro

 497,1,エコーボイス
 498,1,なしくずし
 499,1,クリアスモッグ
 497,1,エコーボイス
 498,1,なしくずし
 499,1,クリアスモッグ


@@ -2386,9 +2398,21 @@ move_id,language_id,name
 501,1,ファストガード
 502,1,サイドチェンジ
 503,1,ねっとう
 501,1,ファストガード
 502,1,サイドチェンジ
 503,1,ねっとう

+503,5,Ebullition
+503,6,Siedewasser
+503,7,Escaldar
+503,8,Idrovampata

 504,1,からをやぶる
 505,1,いやしのはどう
 504,1,からをやぶる
 505,1,いやしのはどう

+505,5,Vibra Soin
+505,6,Heilwoge
+505,7,Pulsa Cura
+505,8,Ondasana

 506,1,たたりめ
 506,1,たたりめ

+506,5,Châtiment
+506,6,Bürde
+506,7,Infortunio
+506,8,Sciagura

 507,1,フリーフォール
 507,5,Chute Libre
 507,6,Freier Fall
 507,1,フリーフォール
 507,5,Chute Libre
 507,6,Freier Fall


@@ -2405,6 +2429,10 @@ move_id,language_id,name
 512,8,Acrobazia
 513,1,ミラータイプ
 514,1,かたきうち
 512,8,Acrobazia
 513,1,ミラータイプ
 514,1,かたきうち

+514,5,Vengeance
+514,6,Heimzahlung
+514,7,Represalia
+514,8,Nemesi

 515,1,いのちがけ
 516,1,ギフトパス
 517,1,れんごく
 515,1,いのちがけ
 516,1,ギフトパス
 517,1,れんごく


@@ -2420,7 +2448,15 @@ move_id,language_id,name
 523,1,じならし
 524,1,こおりのいぶき
 525,1,ドラゴンテール
 523,1,じならし
 524,1,こおりのいぶき
 525,1,ドラゴンテール

+525,5,Draco-Queue
+525,6,Drachenrute
+525,7,Cola Dragón
+525,8,Codadrago

 526,1,ふるいたてる
 526,1,ふるいたてる

+526,5,Rengorgement
+526,6,Kraftschub
+526,7,Avivar
+526,8,Cuordileone

 527,1,エレキネット
 528,1,ワイルドボルト
 528,5,Eclair Fou
 527,1,エレキネット
 528,1,ワイルドボルト
 528,5,Eclair Fou


@@ -2443,6 +2479,10 @@ move_id,language_id,name
 531,7,Arrumaco
 531,8,Cuorestampo
 532,1,ウッドホーン
 531,7,Arrumaco
 531,8,Cuorestampo
 532,1,ウッドホーン

+532,5,Encornebois
+532,6,Holzgeweih
+532,7,Astadrenaje
+532,8,Legnicorno

 533,1,せいなるつるぎ
 534,1,シェルブレード
 535,1,ヒートスタンプ
 533,1,せいなるつるぎ
 534,1,シェルブレード
 535,1,ヒートスタンプ

diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv
index c1f1ef6..dfc4d6d 100644 (file)
--- a/pokedex/data/csv/moves.csv
+++ b/pokedex/data/csv/moves.csv
@@ -479,12 +479,12 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 478,magic room,5,14,0,10,,-7,12,1,287,,,,
 479,knock down,5,6,50,15,100,0,10,2,288,100,,,
 480,mountain storm,5,2,40,10,100,0,10,2,289,,,,
 478,magic room,5,14,0,10,,-7,12,1,287,,,,
 479,knock down,5,6,50,15,100,0,10,2,288,100,,,
 480,mountain storm,5,2,40,10,100,0,10,2,289,,,,

-481,flame burst,5,10,70,15,100,0,10,3,290,,,,
+481,Flame Burst,5,10,70,15,100,0,10,3,290,,,,

 482,sludge wave,5,4,95,10,100,0,9,3,3,10,,,
 483,butterfly dance,5,7,0,20,,0,7,1,291,,,,
 484,heavy bomber,5,9,1,10,100,0,10,2,292,,,,
 485,synchro noise,5,14,70,15,100,0,9,3,293,,,,
 482,sludge wave,5,4,95,10,100,0,9,3,3,10,,,
 483,butterfly dance,5,7,0,20,,0,7,1,291,,,,
 484,heavy bomber,5,9,1,10,100,0,10,2,292,,,,
 485,synchro noise,5,14,70,15,100,0,9,3,293,,,,

-486,electric ball,5,13,1,10,100,0,10,3,294,,,,
+486,Electro Ball,5,13,1,10,100,0,10,3,294,,,,

 487,submersion,5,11,0,20,100,0,10,1,295,,,,
 488,nitro charge,5,10,50,20,100,0,10,2,296,100,,,
 489,snake coil,5,4,0,20,,0,7,1,323,,,,
 487,submersion,5,11,0,20,100,0,10,1,295,,,,
 488,nitro charge,5,10,50,20,100,0,10,2,296,100,,,
 489,snake coil,5,4,0,20,,0,7,1,323,,,,


@@ -494,17 +494,17 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 493,simple beam,5,1,0,15,100,0,10,1,299,,,,
 494,befriend,5,1,0,15,100,0,10,1,300,,,,
 495,After You,5,1,0,15,,0,10,1,301,,,,
 493,simple beam,5,1,0,15,100,0,10,1,299,,,,
 494,befriend,5,1,0,15,100,0,10,1,300,,,,
 495,After You,5,1,0,15,,0,10,1,301,,,,

-496,a capella,5,1,60,15,100,0,10,3,302,,,,
+496,Round,5,1,60,15,100,0,10,3,302,,,,

 497,echo voice,5,1,40,15,100,0,10,3,303,,,,
 498,repayment,5,1,70,20,100,0,10,2,304,,,,
 499,clear smog,5,4,50,15,,0,10,3,305,,,,
 500,assist power,5,14,20,10,100,0,10,3,306,,,,
 501,fast guard,5,2,0,15,,3,4,1,307,,,,
 502,side change,5,14,0,15,,1,7,1,308,,,,
 497,echo voice,5,1,40,15,100,0,10,3,303,,,,
 498,repayment,5,1,70,20,100,0,10,2,304,,,,
 499,clear smog,5,4,50,15,,0,10,3,305,,,,
 500,assist power,5,14,20,10,100,0,10,3,306,,,,
 501,fast guard,5,2,0,15,,3,4,1,307,,,,
 502,side change,5,14,0,15,,1,7,1,308,,,,

-503,boil over,5,11,80,15,100,0,10,3,5,30,,,
+503,Scald,5,11,80,15,100,0,10,3,5,30,,,

 504,shell smash,5,1,0,15,,0,7,1,309,,,,
 504,shell smash,5,1,0,15,,0,7,1,309,,,,

-505,healing wave,5,14,0,10,,0,10,1,310,,,,
-506,evil eye,5,8,50,10,100,0,10,3,311,,,,
+505,Heal Pulse,5,14,0,10,,0,10,1,310,,,,
+506,Hex,5,8,50,10,100,0,10,3,311,,,,

 507,Sky Drop,5,3,60,10,100,0,10,2,312,,,,
 508,gear change,5,9,0,10,,0,7,1,313,,,,
 509,overhead throw,5,2,60,10,90,-6,10,2,314,,,,
 507,Sky Drop,5,3,60,10,100,0,10,2,312,,,,
 508,gear change,5,9,0,10,,0,7,1,313,,,,
 509,overhead throw,5,2,60,10,90,-6,10,2,314,,,,


@@ -512,7 +512,7 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 511,postpone,5,17,0,15,100,0,10,1,316,,,,
 512,Acrobatics,5,3,55,15,100,0,10,2,318,,,,
 513,mirror type,5,1,0,15,,0,10,1,319,,,,
 511,postpone,5,17,0,15,100,0,10,1,316,,,,
 512,Acrobatics,5,3,55,15,100,0,10,2,318,,,,
 513,mirror type,5,1,0,15,,0,10,1,319,,,,

-514,retribution,5,1,70,5,100,0,10,2,320,,,,
+514,Retaliate,5,1,70,5,100,0,10,2,320,,,,

 515,death gambit,5,2,1,5,100,0,10,3,321,,,,
 516,gift pass,5,1,0,15,,0,10,1,324,,,,
 517,purgatory,5,10,100,5,50,0,10,3,5,100,,,
 515,death gambit,5,2,1,5,100,0,10,3,321,,,,
 516,gift pass,5,1,0,15,,0,10,1,324,,,,
 517,purgatory,5,10,100,5,50,0,10,3,5,100,,,


@@ -523,14 +523,14 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 522,Struggle Bug,5,7,30,20,100,0,11,3,72,100,,,
 523,level field,5,5,60,20,100,0,9,2,71,100,,,
 524,ice breath,5,15,40,10,90,0,10,3,289,100,,,
 522,Struggle Bug,5,7,30,20,100,0,11,3,72,100,,,
 523,level field,5,5,60,20,100,0,9,2,71,100,,,
 524,ice breath,5,15,40,10,90,0,10,3,289,100,,,

-525,dragon tail,5,16,60,10,90,-6,10,2,314,,,,
+525,Dragon Tail,5,16,60,10,90,-6,10,2,314,,,,

 526,Work Up,5,1,0,30,,0,7,1,328,,,,
 527,electric net,5,13,55,15,95,0,11,3,21,100,,,
 528,Wild Charge,5,13,90,15,100,0,10,2,49,,,,
 529,Drill Run,5,5,80,10,95,0,10,2,44,,,,
 530,Dual Chop,5,16,40,15,90,0,10,2,45,,,,
 531,Heart Stamp,5,14,60,25,100,0,10,2,32,30,,,
 526,Work Up,5,1,0,30,,0,7,1,328,,,,
 527,electric net,5,13,55,15,95,0,11,3,21,100,,,
 528,Wild Charge,5,13,90,15,100,0,10,2,49,,,,
 529,Drill Run,5,5,80,10,95,0,10,2,44,,,,
 530,Dual Chop,5,16,40,15,90,0,10,2,45,,,,
 531,Heart Stamp,5,14,60,25,100,0,10,2,32,30,,,

-532,wood horn,5,12,75,10,100,0,10,2,4,,,,
+532,Horn Leech,5,12,75,10,100,0,10,2,4,,,,

 533,holy sword,5,2,90,20,100,0,10,2,304,,,,
 534,shell blade,5,11,75,10,95,0,10,2,70,50,,,
 535,heat stamp,5,10,1,10,100,0,10,2,292,,,,
 533,holy sword,5,2,90,20,100,0,10,2,304,,,,
 534,shell blade,5,11,75,10,95,0,10,2,70,50,,,
 535,heat stamp,5,10,1,10,100,0,10,2,292,,,,

diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 5e3ec0c..b97bdc3 100644 (file)
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -504,16 +504,16 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 503,daikenki,5,258,15,946,かんろく,2,,,1,45,238,70,0,20,0,518
 504,Patrat,5,259,5,116,Scout,3,,,4,255,51,70,0,15,0,519
 505,Watchog,5,259,11,270,Lookout,3,,,4,255,147,70,0,20,0,520
 503,daikenki,5,258,15,946,かんろく,2,,,1,45,238,70,0,20,0,518
 504,Patrat,5,259,5,116,Scout,3,,,4,255,51,70,0,15,0,519
 505,Watchog,5,259,11,270,Lookout,3,,,4,255,147,70,0,20,0,520

-506,Lillipup,5,260,4,41,こいぬ,3,,,4,255,55,70,0,15,0,521
-507,haaderia,5,260,9,147,ちゅうけん,4,,,4,120,130,70,0,15,0,522
+506,Lillipup,5,260,4,41,Puppy,3,,,4,255,55,70,0,15,0,521
+507,Herdier,5,260,9,147,Loyal Dog,4,,,4,120,130,70,0,15,0,522

 508,muurando,5,260,12,610,かんだい,4,,,4,45,221,70,0,15,0,523
 508,muurando,5,260,12,610,かんだい,4,,,4,45,221,70,0,15,0,523

-509,choroneko,5,261,4,101,しょうわる,7,,,4,255,56,70,0,20,0,524
-510,reparudasu,5,261,11,375,れいこく,7,,,4,90,156,70,0,20,0,525
+509,Purrloin,5,261,4,101,Devious,7,,,4,255,56,70,0,20,0,524
+510,Liepard,5,261,11,375,Cruel,7,,,4,90,156,70,0,20,0,525

 511,Pansage,5,262,6,105,Grass Monkey,5,,,1,190,63,70,0,20,0,526
 512,yanakkii,5,262,11,305,とげざる,5,,,1,75,174,70,0,20,0,527
 511,Pansage,5,262,6,105,Grass Monkey,5,,,1,190,63,70,0,20,0,526
 512,yanakkii,5,262,11,305,とげざる,5,,,1,75,174,70,0,20,0,527

-513,Pansear,5,263,6,110,こうおん,8,,,1,190,63,70,0,20,0,528
+513,Pansear,5,263,6,110,High Temp,8,,,1,190,63,70,0,20,0,528

 514,baokkii,5,263,10,280,ひのこ,8,,,1,75,174,70,0,20,0,529
 514,baokkii,5,263,10,280,ひのこ,8,,,1,75,174,70,0,20,0,529

-515,Panpour,5,264,6,135,みずかけ,2,,,1,190,63,70,0,20,0,530
+515,Panpour,5,264,6,135,Spray,2,,,1,190,63,70,0,20,0,530

 516,hiyakkii,5,264,10,290,ほうすい,2,,,1,75,174,70,0,20,0,531
 517,Munna,5,265,6,233,Dream Eater,6,,,4,190,58,70,0,10,0,532
 518,Musharna,5,265,11,605,Drowsing,6,,,4,75,170,70,0,10,0,533
 516,hiyakkii,5,264,10,290,ほうすい,2,,,1,75,174,70,0,20,0,531
 517,Munna,5,265,6,233,Dream Eater,6,,,4,190,58,70,0,10,0,532
 518,Musharna,5,265,11,605,Drowsing,6,,,4,75,170,70,0,10,0,533


@@ -529,7 +529,7 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 528,kokoromori,5,269,9,105,きゅうあい,2,,,4,45,149,70,0,15,0,543
 529,Drilbur,5,270,3,85,Mole,4,,,4,120,66,70,0,20,0,544
 530,Excadrill,5,270,7,404,Subterrene,4,,,4,60,178,70,0,20,0,545
 528,kokoromori,5,269,9,105,きゅうあい,2,,,4,45,149,70,0,15,0,543
 529,Drilbur,5,270,3,85,Mole,4,,,4,120,66,70,0,20,0,544
 530,Excadrill,5,270,7,404,Subterrene,4,,,4,60,178,70,0,20,0,545

-531,tabunne,5,271,11,310,ヒヤリング,6,,,4,255,390,70,0,20,0,546
+531,Audino,5,271,11,310,Hearing,6,,,4,255,390,70,0,20,0,546

 532,Timburr,5,272,6,125,きんこつ,4,,,2,180,61,70,0,20,0,547
 533,dotekkotsu,5,272,12,400,きんこつ,4,,,2,90,142,70,0,20,0,548
 534,roobushin,5,272,14,870,きんこつ,3,,,2,45,227,70,0,20,0,549
 532,Timburr,5,272,6,125,きんこつ,4,,,2,180,61,70,0,20,0,547
 533,dotekkotsu,5,272,12,400,きんこつ,4,,,2,90,142,70,0,20,0,548
 534,roobushin,5,272,14,870,きんこつ,3,,,2,45,227,70,0,20,0,549


@@ -560,7 +560,7 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 559,zuruggu,5,285,6,118,だっぴ,10,,,4,180,70,35,0,15,0,576
 560,zuruzukin,5,285,11,300,あくとう,8,,,4,90,171,70,0,15,0,577
 561,shinboraa,5,286,14,140,とりもどき,1,,,4,45,172,70,0,20,0,578
 559,zuruggu,5,285,6,118,だっぴ,10,,,4,180,70,35,0,15,0,576
 560,zuruzukin,5,285,11,300,あくとう,8,,,4,90,171,70,0,15,0,577
 561,shinboraa,5,286,14,140,とりもどき,1,,,4,45,172,70,0,20,0,578

-562,desumasu,5,287,5,15,たましい,1,,,4,190,61,70,0,25,0,579
+562,Yamask,5,287,5,15,Spirit,1,,,4,190,61,70,0,25,0,579

 563,Cofagrigus,5,287,17,765,Coffin,10,,,4,90,169,70,0,25,0,580
 564,purotooga,5,288,7,165,こだいがめ,2,,,1,45,71,70,0,30,0,581
 565,abagoora,5,288,12,810,こだいがめ,2,,,1,45,173,70,0,30,0,582
 563,Cofagrigus,5,287,17,765,Coffin,10,,,4,90,169,70,0,25,0,580
 564,purotooga,5,288,7,165,こだいがめ,2,,,1,45,71,70,0,30,0,581
 565,abagoora,5,288,12,810,こだいがめ,2,,,1,45,173,70,0,30,0,582


@@ -584,8 +584,8 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 583,baniricchi,5,296,11,410,ひょうせつ,9,,,4,120,138,70,0,20,0,600
 584,baibanira,5,296,13,575,ブリザード,9,,,4,45,241,70,0,20,0,601
 585,Deerling,5,297,6,195,Season,10,,,4,190,67,70,0,20,0,602
 583,baniricchi,5,296,11,410,ひょうせつ,9,,,4,120,138,70,0,20,0,600
 584,baibanira,5,296,13,575,ブリザード,9,,,4,45,241,70,0,20,0,601
 585,Deerling,5,297,6,195,Season,10,,,4,190,67,70,0,20,0,602

-586,mebukijika,5,297,19,925,きせつ,3,,,4,75,166,70,0,20,0,603
-587,emonga,5,298,4,50,モモンガ,9,,,4,200,150,70,0,20,0,604
+586,Sawsbuck,5,297,19,925,Season,3,,,4,75,166,70,0,20,0,603
+587,Emolga,5,298,4,50,Sky Squirrel,9,,,4,200,150,70,0,20,0,604

 588,kaburumo,5,299,5,59,かぶりつき,2,,,4,200,63,70,0,15,0,605
 589,shubarugo,5,299,10,330,きへい,4,,,4,75,173,70,0,15,0,606
 590,tamagetake,5,300,2,10,きのこ,9,,,4,190,59,70,0,20,0,607
 588,kaburumo,5,299,5,59,かぶりつき,2,,,4,200,63,70,0,15,0,605
 589,shubarugo,5,299,10,330,きへい,4,,,4,75,173,70,0,15,0,606
 590,tamagetake,5,300,2,10,きのこ,9,,,4,190,59,70,0,20,0,607


@@ -594,7 +594,7 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 593,burungeru,5,301,22,1350,ふゆう,9,,,4,60,168,70,0,20,1,610
 594,Alomomola,5,302,12,316,Caring,6,,,4,75,165,70,0,40,0,611
 595,bachuru,5,303,1,6,くっつき,10,,,4,190,64,70,0,20,0,612
 593,burungeru,5,301,22,1350,ふゆう,9,,,4,60,168,70,0,20,1,610
 594,Alomomola,5,302,12,316,Caring,6,,,4,75,165,70,0,40,0,611
 595,bachuru,5,303,1,6,くっつき,10,,,4,190,64,70,0,20,0,612

-596,denchura,5,303,8,143,でんきグモ,10,,,4,75,165,70,0,20,0,613
+596,Galvantula,5,303,8,143,EleSpider,10,,,4,75,165,70,0,20,0,613

 597,tesshiido,5,304,6,188,とげのみ,4,,,4,255,61,70,0,20,0,614
 598,nattorei,5,304,10,1100,とげだま,4,,,4,90,171,70,0,20,0,615
 599,Klink,5,305,3,210,Gear,4,,,-1,130,60,70,0,20,0,616
 597,tesshiido,5,304,6,188,とげのみ,4,,,4,255,61,70,0,20,0,614
 598,nattorei,5,304,10,1100,とげだま,4,,,4,90,171,70,0,20,0,615
 599,Klink,5,305,3,210,Gear,4,,,-1,130,60,70,0,20,0,616


@@ -609,8 +609,8 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 608,ranpuraa,5,308,6,130,ランプ,1,,,4,90,130,70,0,20,0,625
 609,shandera,5,308,10,343,いざない,1,,,4,45,234,70,0,20,0,626
 610,Axew,5,309,6,180,Tusk,5,,,4,75,64,35,0,40,0,627
 608,ranpuraa,5,308,6,130,ランプ,1,,,4,90,130,70,0,20,0,625
 609,shandera,5,308,10,343,いざない,1,,,4,45,234,70,0,20,0,626
 610,Axew,5,309,6,180,Tusk,5,,,4,75,64,35,0,40,0,627

-611,onondo,5,309,10,360,あごオノ,5,,,4,60,144,35,0,40,0,628
-612,ononokusu,5,309,18,1055,あごオノ,10,,,4,45,243,35,0,40,0,629
+611,Fraxure,5,309,10,360,Axe Jaw,5,,,4,60,144,35,0,40,0,628
+612,Haxorus,5,309,18,1055,Axe Jaw,10,,,4,45,243,35,0,40,0,629

 613,kumashun,5,310,5,85,ひょうけつ,9,,,4,120,61,70,0,20,0,630
 614,tsunbeaa,5,310,26,2600,とうけつ,9,,,4,60,170,70,0,20,0,631
 615,furiijio,5,311,11,1480,けっしょう,2,,,-1,25,170,70,0,25,0,632
 613,kumashun,5,310,5,85,ひょうけつ,9,,,4,120,61,70,0,20,0,630
 614,tsunbeaa,5,310,26,2600,とうけつ,9,,,4,60,170,70,0,20,0,631
 615,furiijio,5,311,11,1480,けっしょう,2,,,-1,25,170,70,0,25,0,632

diff --git a/pokedex/data/csv/pokemon_form_groups.csv b/pokedex/data/csv/pokemon_form_groups.csv
index 5ab84d5..8ccebea 100644 (file)
--- a/pokedex/data/csv/pokemon_form_groups.csv
+++ b/pokedex/data/csv/pokemon_form_groups.csv
@@ -15,6 +15,6 @@ pokemon_id,term,is_battle_only,description
 550,Form,0,"Forms have one different ability and different wild held items. Blue-Striped Basculin are rarer in Black Version, and Red-Striped Basculin in White Version."
 555,mode,0,"Forms have different stats and types.  Darmanitan changes to daruma mode below 50% HP if it has [daruma mode]{ability}, and back to normal mode above 50% HP."
 585,Form,0,"Form changes to match the season.  To switch forms, Deerling must be in the party when loading the game."
 550,Form,0,"Forms have one different ability and different wild held items. Blue-Striped Basculin are rarer in Black Version, and Red-Striped Basculin in White Version."
 555,mode,0,"Forms have different stats and types.  Darmanitan changes to daruma mode below 50% HP if it has [daruma mode]{ability}, and back to normal mode above 50% HP."
 585,Form,0,"Form changes to match the season.  To switch forms, Deerling must be in the party when loading the game."

-586,form,0,"Form changes to match the season.  To switch forms, mebukijika must be in the party when loading the game."
+586,Form,0,"Form changes to match the season.  To switch forms, Sawsbuck must be in the party when loading the game."

 648,forme,0,"Forms have different stats and types.  meroetta changes form upon using [ancient song]{move} in battle, and reverts to voice forme outside of battle."
 649,buster,0,Form changes to match genosekuto's held cassette.  The only differences are the color of its weapon and [techno buster]{move}'s type.
 648,forme,0,"Forms have different stats and types.  meroetta changes form upon using [ancient song]{move} in battle, and reverts to voice forme outside of battle."
 649,buster,0,Form changes to match genosekuto's held cassette.  The only differences are the color of its weapon and [techno buster]{move}'s type.

diff --git a/pokedex/data/csv/pokemon_forms.csv b/pokedex/data/csv/pokemon_forms.csv
index d01e76e..f6df6c7 100644 (file)
--- a/pokedex/data/csv/pokemon_forms.csv
+++ b/pokedex/data/csv/pokemon_forms.csv
@@ -584,7 +584,7 @@ id,name,form_base_pokemon_id,unique_pokemon_id,introduced_in_version_group_id,is
 583,,583,,11,1,1
 584,,584,,11,1,1
 585,Spring,585,,11,1,1
 583,,583,,11,1,1
 584,,584,,11,1,1
 585,Spring,585,,11,1,1

-586,spring,586,,11,1,1
+586,Spring,586,,11,1,1

 587,,587,,11,1,1
 588,,588,,11,1,1
 589,,589,,11,1,1
 587,,587,,11,1,1
 588,,588,,11,1,1
 589,,589,,11,1,1


@@ -718,9 +718,9 @@ id,name,form_base_pokemon_id,unique_pokemon_id,introduced_in_version_group_id,is
 10068,Summer,585,,11,0,2
 10069,Autumn,585,,11,0,3
 10070,Winter,585,,11,0,4
 10068,Summer,585,,11,0,2
 10069,Autumn,585,,11,0,3
 10070,Winter,585,,11,0,4

-10071,summer,586,,11,0,2
-10072,autumn,586,,11,0,3
-10073,winter,586,,11,0,4
+10071,Summer,586,,11,0,2
+10072,Autumn,586,,11,0,3
+10073,Winter,586,,11,0,4

 10074,step,648,10018,11,0,2
 10075,blue,649,,11,0,2
 10076,yellow,649,,11,0,2
 10074,step,648,10018,11,0,2
 10075,blue,649,,11,0,2
 10076,yellow,649,,11,0,2

diff --git a/pokedex/data/csv/pokemon_names.csv b/pokedex/data/csv/pokemon_names.csv
index acb9ea6..392d684 100644 (file)
--- a/pokedex/data/csv/pokemon_names.csv
+++ b/pokedex/data/csv/pokemon_names.csv
@@ -2985,18 +2985,30 @@ pokemon_id,language_id,name
 505,5,Miradar
 505,6,Kukmarda
 506,1,ヨーテリー
 505,5,Miradar
 505,6,Kukmarda
 506,1,ヨーテリー

+506,5,Ponchiot
+506,6,Yorkleff

 507,1,ハーデリア
 507,1,ハーデリア

+507,5,Ponchien
+507,6,Terribark

 508,1,ムーランド
 509,1,チョロネコ
 508,1,ムーランド
 509,1,チョロネコ

+509,5,Chacripan
+509,6,Felilou

 510,1,レパルダス
 510,1,レパルダス

+510,5,Léopardus
+510,6,Kleoparda

 511,1,ヤナップ
 511,4,花椰猴
 511,5,Feuillajou
 511,6,Vegimak
 512,1,ヤナッキー
 513,1,バオップ
 511,1,ヤナップ
 511,4,花椰猴
 511,5,Feuillajou
 511,6,Vegimak
 512,1,ヤナッキー
 513,1,バオップ

+513,5,Flamajou
+513,6,Grillmak

 514,1,バオッキー
 515,1,ヒヤップ
 514,1,バオッキー
 515,1,ヒヤップ

+515,5,Flotajou
+515,6,Sodamak

 516,1,ヒヤッキー
 517,1,ムンナ
 517,5,Munna
 516,1,ヒヤッキー
 517,1,ムンナ
 517,5,Munna


@@ -3029,6 +3041,8 @@ pokemon_id,language_id,name
 530,5,Minotaupe
 530,6,Stalobor
 531,1,タブンネ
 530,5,Minotaupe
 530,6,Stalobor
 531,1,タブンネ

+531,5,Nanméouïe
+531,6,Ohrdoch

 532,1,ドッコラー
 533,1,ドテッコツ
 534,1,ローブシン
 532,1,ドッコラー
 533,1,ドテッコツ
 534,1,ローブシン


@@ -3068,6 +3082,8 @@ pokemon_id,language_id,name
 560,1,ズルズキン
 561,1,シンボラー
 562,1,デスマス
 560,1,ズルズキン
 561,1,シンボラー
 562,1,デスマス

+562,5,Tutafeh
+562,6,Makabaja

 563,1,デスカーン
 563,5,Tutankafer
 563,6,Echnatoll
 563,1,デスカーン
 563,5,Tutankafer
 563,6,Echnatoll


@@ -3108,7 +3124,11 @@ pokemon_id,language_id,name
 585,5,Vivaldaim
 585,6,Sesokitz
 586,1,メブキジカ
 585,5,Vivaldaim
 585,6,Sesokitz
 586,1,メブキジカ

+586,5,Haydaim
+586,6,Kronjuwild

 587,1,エモンガ
 587,1,エモンガ

+587,5,Emolga
+587,6,Emolga

 588,1,カブルモ
 589,1,シュバルゴ
 590,1,タマゲタケ
 588,1,カブルモ
 589,1,シュバルゴ
 590,1,タマゲタケ


@@ -3120,6 +3140,8 @@ pokemon_id,language_id,name
 594,6,Mamolida
 595,1,バチュル
 596,1,デンチュラ
 594,6,Mamolida
 595,1,バチュル
 596,1,デンチュラ

+596,5,Mygavolt
+596,6,Voltula

 597,1,テッシード
 598,1,ナットレイ
 599,1,ギアル
 597,1,テッシード
 598,1,ナットレイ
 599,1,ギアル


@@ -3140,7 +3162,11 @@ pokemon_id,language_id,name
 610,5,Coupenotte
 610,6,Milza
 611,1,オノンド
 610,5,Coupenotte
 610,6,Milza
 611,1,オノンド

+611,5,Incisache
+611,6,Sharfax

 612,1,オノノクス
 612,1,オノノクス

+612,5,Tranchodon
+612,6,Maxax

 613,1,クマシュン
 614,1,ツンベアー
 615,1,フリージオ
 613,1,クマシュン
 614,1,ツンベアー
 615,1,フリージオ