From 8b2501ee4da18a678e977be3ef4aa0443695d7a6 Mon Sep 17 00:00:00 2001
From: "Lynn \"Zhorken\" Vaughan" <zhorken@gmail.com>
Date: Mon, 27 Dec 2010 13:14:48 -0500
Subject: [PATCH] Add a bunch of newly-revealed English names. #451

---
 pokedex/data/csv/abilities.csv |  6 +++---
 pokedex/data/csv/moves.csv     |  6 +++---
 pokedex/data/csv/pokemon.csv   | 18 +++++++++---------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pokedex/data/csv/abilities.csv b/pokedex/data/csv/abilities.csv
index 8bab7a6..4a8c372 100644
--- a/pokedex/data/csv/abilities.csv
+++ b/pokedex/data/csv/abilities.csv
@@ -437,7 +437,7 @@ Unlike [Forecast]{ability}, [Multitype]{ability}, and [daruma mode]{ability}, th
 124,wicked trick,5,"Whenever a move makes contact with this Pokémon, it steals the attacker's held item if it does not already have an item.
 
 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,brute 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."
+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.
 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.
@@ -459,7 +459,7 @@ This ability triggers on every hit of a multiple-hit move.",Raises [Speed]{mecha
 142,dustproof,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.
-145,pigeon chest,5,This Pokémon's [Defense]{mechanic} cannot be [lowered]{mechanic:stat modifiers}.,Protects against [Defense]{mechanic} drops.
+145,Big Pecks,5,This Pokémon's [Defense]{mechanic} cannot be [lowered]{mechanic:stat modifiers}.,Protects against [Defense]{mechanic} drops.
 146,sand fence,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}.
 148,analyze,5,This Pokémon inflicts more damage when it moves last in a turn.,Strengthens moves when moving last.
@@ -471,7 +471,7 @@ If the party order becomes temporarily shuffled around as Pokémon are switched
 150,eccentric,5,This Pokémon uses [Transform]{move} upon entering battle.,[Transforms]{move:Transform} upon entering battle.
 151,slip through,5,"This Pokémon's moves ignore [Light Screen]{move}, [Reflect]{move}, and [Safeguard]{move}.","Ignores [Light Screen]{move}, [Reflect]{move}, and [Safeguard]{move}."
 152,mummify,5,"Whenever a contact move hits this Pokémon, the attacking Pokémon's ability changes to mummify.",Changes attacking Pokémon's abilities to mummify on contact.
-153,brazen,5,"This Pokémon's [Attack]{mechanic} rises one stage upon knocking out another Pokémon, even a friendly Pokémon.
+153,Moxie,5,"This Pokémon's [Attack]{mechanic} rises one stage upon knocking out another Pokémon, even a friendly Pokémon.
 
 This ability does not take effect when the Pokémon indirectly causes another Pokémon to faint, e.g. through [poison]{mechanic} or [Spikes]{move}.",Raises [Attack]{mechanic} one stage upon KOing a Pokémon.
 154,righteous heart,5,"Whenever a [Dark]{type}-type move hits this Pokémon, its [Attack]{mechanic} rises one [stage]{mechanic:stat modifier}.
diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv
index 9512fb4..6136cb8 100644
--- a/pokedex/data/csv/moves.csv
+++ b/pokedex/data/csv/moves.csv
@@ -475,7 +475,7 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 474,venom shock,5,4,65,10,100,0,10,3,284,,,,
 475,body purge,5,9,0,15,,0,7,1,285,,,,
 476,anger powder,5,7,0,20,,3,7,1,173,,,,
-477,telekinesis,5,14,0,15,,0,10,1,286,,,,
+477,Telekinesis,5,14,0,15,,0,10,1,286,,,,
 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,,,,
@@ -526,7 +526,7 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 525,dragon tail,5,16,60,10,90,-6,10,2,314,,,,
 526,cheer up,5,1,0,30,,0,7,1,328,,,,
 527,electric net,5,13,55,15,95,0,11,3,21,100,,,
-528,wild bolt,5,13,90,15,100,0,10,2,49,,,,
+528,Wild Charge,5,13,90,15,100,0,10,2,49,,,,
 529,drill liner,5,5,80,10,95,0,10,2,44,,,,
 530,double chop,5,16,40,15,90,0,10,2,45,,,,
 531,heart stamp,5,14,60,25,100,0,10,2,32,30,,,
@@ -539,7 +539,7 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 538,cotton guard,5,12,0,10,,0,7,1,329,,,,
 539,night burst,5,17,85,10,95,0,10,3,74,40,,,
 540,psycho break,5,14,100,10,100,0,10,3,283,,,,
-541,sweep slap,5,1,25,10,85,0,10,2,30,,,,
+541,Tail Slap,5,1,25,10,85,0,10,2,30,,,,
 542,hurricane,5,3,120,10,70,0,10,3,338,30,,,
 543,afro break,5,1,120,15,100,0,10,2,49,,,,
 544,gear saucer,5,9,50,15,85,0,10,2,45,,,,
diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index 4cfabf8..a8e1983 100644
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -515,16 +515,16 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 514,baokkii,5,263,10,280,ひのこ,8,,,1,75,174,70,0,20,0,0,529
 515,hiyappu,5,264,6,135,みずかけ,2,,,1,190,63,70,0,20,0,0,530
 516,hiyakkii,5,264,10,290,ほうすい,2,,,1,75,174,70,0,20,0,0,531
-517,munna,5,265,6,233,ゆめくい,6,,,4,190,58,70,0,10,0,0,532
+517,Munna,5,265,6,233,Dream Eater,6,,,4,190,58,70,0,10,0,0,532
 518,mushaana,5,265,11,605,ゆめうつつ,6,,,4,75,170,70,0,10,0,0,533
-519,mamepato,5,266,3,21,こばと,4,,,4,255,53,70,0,15,0,0,534
+519,Pidove,5,266,3,21,Tiny Pigeon,4,,,4,255,53,70,0,15,0,0,534
 520,hatooboo,5,266,6,150,のばと,4,,,4,120,125,70,0,15,0,0,535
 521,kenhorou,5,266,12,290,プライド,4,,,4,45,215,70,0,15,1,1,536
-522,shimama,5,267,8,298,たいでん,1,,,4,190,59,70,0,20,0,0,537
+522,Blitzle,5,267,8,298,Electrified,1,,,4,190,59,70,0,20,0,0,537
 523,zeburaika,5,267,16,795,らいでん,1,,,4,75,174,70,0,20,0,0,538
 524,dangoro,5,268,4,180,マントル,2,,,4,255,56,70,0,15,0,0,539
 525,gantoru,5,268,9,1020,こうせき,2,,,4,120,137,70,0,15,0,0,540
-526,gigaiasu,5,268,17,2600,こうあつ,2,,,4,45,227,70,0,15,0,0,541
+526,Gigalith,5,268,17,2600,Compressed,2,,,4,45,227,70,0,15,0,0,541
 527,koromori,5,269,4,21,こうもり,2,,,4,190,63,70,0,15,0,0,542
 528,kokoromori,5,269,9,105,きゅうあい,2,,,4,45,149,70,0,15,0,0,543
 529,moguryuu,5,270,3,85,もぐら,4,,,4,120,66,70,0,20,0,0,544
@@ -549,11 +549,11 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 548,churine,5,279,5,66,ねっこ,5,,,8,190,56,70,0,20,0,0,563
 549,doredia,5,279,11,163,はなかざり,5,,,8,75,168,70,0,20,0,0,564
 550,basurao,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,0,565
-551,meguroko,5,281,7,152,さばくワニ,3,,,4,180,58,70,0,20,0,0,567
+551,Sandile,5,281,7,152,Desert Croc,3,,,4,180,58,70,0,20,0,0,567
 552,warubiru,5,281,10,334,さばくワニ,3,,,4,90,123,70,0,20,0,0,568
 553,warubiaru,5,281,15,963,いかく,8,,,4,45,229,70,0,20,0,0,569
 554,darumakka,5,282,6,375,だるま,8,,,4,120,63,70,0,20,0,0,570
-555,hihidaruma,5,282,13,929,えんじょう,8,,,4,60,168,70,0,20,0,0,571
+555,Darmanitan,5,282,13,929,Blazing,8,,,4,60,168,70,0,20,0,0,571
 556,marakacchi,5,283,10,280,サボテン,5,,,4,255,161,70,0,20,0,0,573
 557,ishizumai,5,284,3,145,いしやど,8,,,4,190,65,70,0,20,0,0,574
 558,iwaparesu,5,284,14,2000,いわやど,8,,,4,75,166,70,0,20,0,0,575
@@ -570,7 +570,7 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 569,dasutodasu,5,290,19,1073,ゴミすてば,5,,,4,60,166,70,0,20,0,0,586
 570,Zorua,5,291,7,125,Tricky Fox,4,,,1,75,66,70,0,25,0,0,587
 571,Zoroark,5,291,16,811,Illusion Fox,4,,,1,45,179,70,0,20,0,0,588
-572,chiraamy,5,292,4,58,チンチラ,4,,,6,255,60,70,0,15,0,0,589
+572,Minccino,5,292,4,58,Chinchilla,4,,,6,255,60,70,0,15,0,0,589
 573,chirachiino,5,292,5,75,スカーフ,4,,,6,60,165,70,0,15,0,0,590
 574,gochimu,5,293,4,58,ぎょうし,7,,,6,200,58,70,0,20,0,0,591
 575,gochimiru,5,293,7,180,あやつり,7,,,6,100,137,70,0,20,0,0,592
@@ -597,7 +597,7 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 596,denchura,5,303,8,143,でんきグモ,10,,,4,75,165,70,0,20,0,0,613
 597,tesshiido,5,304,6,188,とげのみ,4,,,4,255,61,70,0,20,0,0,614
 598,nattorei,5,304,10,1100,とげだま,4,,,4,90,171,70,0,20,0,0,615
-599,giaru,5,305,3,210,はぐるま,4,,,-1,130,60,70,0,20,0,0,616
+599,Klink,5,305,3,210,Gear,4,,,-1,130,60,70,0,20,0,0,616
 600,gigiaru,5,305,6,510,はぐるま,4,,,-1,60,154,70,0,20,0,0,617
 601,gigigiaru,5,305,6,810,はぐるま,4,,,-1,30,234,70,0,20,0,0,618
 602,shibishirasu,5,306,2,3,でんきうお,9,,,4,190,55,70,0,20,0,0,619
@@ -664,5 +664,5 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 10014,Castform,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,0,380
 10015,Castform,3,179,3,8,てんき,9,1,3,4,45,147,70,0,25,0,0,381
 10016,basurao,5,280,10,180,らんぼう,5,,,4,25,161,70,0,40,0,0,566
-10017,hihidaruma,5,282,13,929,えんじょう,8,,,4,60,189,70,0,20,0,0,572
+10017,Darmanitan,5,282,13,929,Blazing,8,,,4,60,189,70,0,20,0,0,572
 10018,meroetta,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,0,666
-- 
2.7.4