From: Lynn "Zhorken" Vaughan <zhorken@gmail.com>
Date: Wed, 2 Mar 2011 21:38:50 +0000 (-0500)
Subject: English names for everything! #451
X-Git-Tag: veekun-promotions/2011030301~6
X-Git-Url: http://git.veekun.com/zzz-pokedex.git/commitdiff_plain/6afdbc1a5326b06ae559275558691439c6efb131?ds=sidebyside

English names for everything! #451
---

diff --git a/pokedex/data/csv/abilities.csv b/pokedex/data/csv/abilities.csv
index dfeb540..30e6e6c 100644
--- a/pokedex/data/csv/abilities.csv
+++ b/pokedex/data/csv/abilities.csv
@@ -434,60 +434,60 @@ If a Pokémon [Transforms]{move:Transform} into an Arceus with this ability, it
 
 Unlike [Forecast]{ability}, [Multitype]{ability}, and [daruma mode]{ability}, this ability is not tied to its Pokémon's form change; [Cherrim]{pokemon} will switch between its forms even if it loses this ability.  As such, this ability also works if obtained by a Pokémon other than Cherrim.",Increases friendly Pokémon's [Attack]{mechanic} and [Special Defense]{mechanic} to 1.5× during [strong sunlight]{mechanic}.
 123,Bad Dreams,4,Opposing Pokémon take 1/8 of their maximum [HP]{mechanic} in damage after each turn while they are [asleep]{mechanic}.,Damages [sleeping]{mechanic:sleep} opponents for 1/8 their max [HP]{mechanic} after each turn.
-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.
+124,Pickpocket,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,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.
+126,Contrary,5,Stat modifiers are inverted for this Pokémon.,Inverts stat modifiers.
 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,Defiant,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,Defeatist,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.
 131,Healer,5,Friendly Pokémon next to this Pokémon in double and triple battles each have a 30% chance of being cured of any [major status ailment]{mechanic} after each turn.,Has a 30% chance of curing each adjacent ally of any [major status ailment]{mechanic} after each turn.
-132,friend guard,5,This Pokémon's moves inflict less damage against friendly Pokémon.,Decreases damage inflicted against friendly Pokémon.
-133,fragile armor,5,"Whenever any move hits this Pokémon, its [Speed]{mechanic} rises one stage and its [Defense]{mechanic} falls one stage.
+132,Friend Guard,5,This Pokémon's moves inflict less damage against friendly Pokémon.,Decreases damage inflicted against friendly Pokémon.
+133,Weak Armor,5,"Whenever any move hits this Pokémon, its [Speed]{mechanic} rises one stage and its [Defense]{mechanic} falls one stage.
 
 This ability triggers on every hit of a multiple-hit move.",Raises [Speed]{mechanic} and lowers [Defense]{mechanic} by one stage each upon being hit by any move.
-134,heavy metal,5,This Pokémon has double the usual weight for its species.,Doubles the Pokémon's weight.
-135,light metal,5,This Pokémon has half the usual weight for its species.,Halves the Pokémon's weight.
-136,multi-scale,5,This Pokémon takes half as much damage when it is hit having full [HP]{mechanic}.,Halves damage taken from full [HP]{mechanic}.
-137,poison rampage,5,This Pokémon has 1.5× its [Attack]{mechanic} when [poisoned]{mechanic:poison}.,Increases [Attack]{mechanic} to 1.5× when [poisoned]{mechanic:poison}.
-138,heat rampage,5,This Pokémon has 1.5× its [Special Attack]{mechanic} when [burned]{mechanic:burn}.,Increases [Special Attack]{mechanic} to 1.5× when [burned]{mechanic:burn}.
-139,harvest,5,"After each turn, if this Pokémon ate a held Berry or used it with [Natural Gift]{move} that turn, the Pokémon regains its Berry.  If the Pokémon then meets the requirements to eat the Berry again, it will do so immediately, and will not be able restore the Berry again.",Restores any held Berry after the turn on which it is used.
-140,telepathy,5,"This Pokémon does not take damage from friendly Pokémon's moves, including single-targed moves aimed at it.",Protects against damaging moves from friendly Pokémon.
-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.
+134,Heavy Metal,5,This Pokémon has double the usual weight for its species.,Doubles the Pokémon's weight.
+135,Light Metal,5,This Pokémon has half the usual weight for its species.,Halves the Pokémon's weight.
+136,Multiscale,5,This Pokémon takes half as much damage when it is hit having full [HP]{mechanic}.,Halves damage taken from full [HP]{mechanic}.
+137,Toxic Boost,5,This Pokémon has 1.5× its [Attack]{mechanic} when [poisoned]{mechanic:poison}.,Increases [Attack]{mechanic} to 1.5× when [poisoned]{mechanic:poison}.
+138,Flare Boost,5,This Pokémon has 1.5× its [Special Attack]{mechanic} when [burned]{mechanic:burn}.,Increases [Special Attack]{mechanic} to 1.5× when [burned]{mechanic:burn}.
+139,Harvest,5,"After each turn, if this Pokémon ate a held Berry or used it with [Natural Gift]{move} that turn, the Pokémon regains its Berry.  If the Pokémon then meets the requirements to eat the Berry again, it will do so immediately, and will not be able restore the Berry again.",Restores any held Berry after the turn on which it is used.
+140,Telepathy,5,"This Pokémon does not take damage from friendly Pokémon's moves, including single-targed moves aimed at it.",Protects against damaging moves from friendly Pokémon.
+141,Moody,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.
+143,Poison Touch,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,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}.
-148,analyze,5,This Pokémon inflicts more damage when it moves last in a turn.,Strengthens moves when moving last.
+147,Wonder 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,Analytic,5,This Pokémon inflicts more damage when it moves last in a turn.,Strengthens moves when moving last.
 149,Illusion,5,"This Pokémon, upon being sent out, appears to have the species, nickname, and Poké Ball of the last Pokémon in the party that is able to battle.  This illusion breaks upon being hit by a damaging move.
 
 Other damage, e.g. from [weather]{mechanic} or [Spikes]{move}, does not break the illusion, nor does damage done to a [Substitute]{move}.
 
 If the party order becomes temporarily shuffled around as Pokémon are switched out in battle, this ability chooses the last Pokémon according to that shuffled order.",Takes the appearance of the last conscious party Pokémon upon being sent out until hit by a damaging move.
-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}."
+150,Imposter,5,This Pokémon uses [Transform]{move} upon entering battle.,[Transforms]{move:Transform} upon entering battle.
+151,Infiltrator,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,Mummy,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,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}.
+154,Justified,5,"Whenever a [Dark]{type}-type move hits this Pokémon, its [Attack]{mechanic} rises one [stage]{mechanic:stat modifier}.
 
 The move is not negated in any way.",Raises Attack when hit by dark-type moves.
-155,skittish,5,"This Pokémon's [Speed]{mechanic} rises one stage with each hit from a damaging [Dark]{type}-, [Ghost]{type}-, or [Bug]{type}-type move.","Raises [Speed]{mechanic} one [stage]{mechanic:stat modifier} upon being hit by a [Dark]{type}, [Ghost]{type}, or [Bug]{type} move."
-156,magic mirror,5,"When this Pokémon is targeted by a non-damaging move flagged as being reflectable, as most non-damaging, non-self-targetted moves are, the move is redirected to its user.
+155,Rattled,5,"This Pokémon's [Speed]{mechanic} rises one stage with each hit from a damaging [Dark]{type}-, [Ghost]{type}-, or [Bug]{type}-type move.","Raises [Speed]{mechanic} one [stage]{mechanic:stat modifier} upon being hit by a [Dark]{type}, [Ghost]{type}, or [Bug]{type} move."
+156,Magic Bounce,5,"When this Pokémon is targeted by a non-damaging move flagged as being reflectable, as most non-damaging, non-self-targetted moves are, the move is redirected to its user.
 
 This ability cannot reflect moves that have already been reflected by another Pokémon with this ability.",Reflects most non-damaging moves back at their user.
 157,Sap Sipper,5,"Whenever a [Grass]{type}-type move hits this Pokémon, its [Attack]{mechanic} rises one [stage]{mechanic:stat modifier}, negating any other effect on it.","Absorbs [Grass]{type} moves, raising [Attack]{mechanic} one [stage]{mechanic:stat modifier}."
-158,mischievous heart,5,This Pokémon's non-damaging moves have their priority increased by one stage.,Raises non-damaging moves' priority by one stage.
+158,Prankster,5,This Pokémon's non-damaging moves have their priority increased by one stage.,Raises non-damaging moves' priority by one stage.
 159,Sand Force,5,"During a [sandstorm]{mechanic}, this Pokémon's [Rock]{type}-, [Ground]{type}-, and [Steel]{type}-type moves have 1.3× their base power.  This Pokémon does not take sandstorm damage, regardless of type.","Strengthens [Rock]{type}, [Ground]{type}, and [Steel]{type} moves to 1.3× their power during a [sandstorm]{mechanic}."
-160,iron thorns,5,"Whenever a move makes contact with this Pokémon, the move's user takes 1/8 of its maximum [HP]{mechanic} in damage.
+160,Iron Barbs,5,"Whenever a move makes contact with this Pokémon, the move's user takes 1/8 of its maximum [HP]{mechanic} in damage.
 
 This ability functions identically to [Rough Skin]{ability}.",Damages attacking Pokémon for 1/8 their max [HP]{mechanic} on contact.
-161,daruma mode,5,"This Pokémon changes to daruma mode when it falls below 50% of its maximum [HP]{mechanic}.
+161,Zen Mode,5,"This Pokémon changes to daruma mode when it falls below 50% of its maximum [HP]{mechanic}.
 
 This ability has no effect if this Pokémon is not a [Darmanitan]{pokemon}.",Changes [Darmanitan]{pokemon} to daruma mode below 50% max [HP]{mechanic}.
 162,Victory Star,5,"All friendly Pokémon's moves, including this Pokémon's own moves, have 1.1× their usual accuracy while this Pokémon is in battle.",Raises moves' accuracy to 1.1× for friendly Pokémon.
diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv
index 523a418..e305f05 100644
--- a/pokedex/data/csv/moves.csv
+++ b/pokedex/data/csv/moves.csv
@@ -467,97 +467,97 @@ id,name,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_
 466,Ominous Wind,4,8,60,5,100,0,10,3,141,10,4,,11
 467,Shadow Force,4,8,120,5,100,0,10,2,273,,4,,22
 468,Hone Claws,5,17,0,15,,0,7,1,278,,,,
-469,wide guard,5,6,0,10,,3,4,1,279,,,,
-470,guard share,5,14,0,10,,0,10,1,280,,,,
-471,power share,5,14,0,10,,0,10,1,281,,,,
-472,wonder room,5,14,0,10,,-7,12,1,282,,,,
-473,psycho shock,5,14,80,10,100,0,10,3,283,,,,
-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,,,,
+469,Wide Guard,5,6,0,10,,3,4,1,279,,,,
+470,Guard Split,5,14,0,10,,0,10,1,280,,,,
+471,Power Split,5,14,0,10,,0,10,1,281,,,,
+472,Wonder Room,5,14,0,10,,-7,12,1,282,,,,
+473,Psyshock,5,14,80,10,100,0,10,3,283,,,,
+474,Venoshock,5,4,65,10,100,0,10,3,284,,,,
+475,Autotomize,5,9,0,15,,0,7,1,285,,,,
+476,Rage Powder,5,7,0,20,,3,7,1,173,,,,
 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,,,,
+478,Magic Room,5,14,0,10,,-7,12,1,287,,,,
+479,Smack Down,5,6,50,15,100,0,10,2,288,100,,,
+480,Storm Throw,5,2,40,10,100,0,10,2,289,,,,
 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,Quiver Dance,5,7,0,20,,0,7,1,291,,,,
+484,Heavy Slam,5,9,1,10,100,0,10,2,292,,,,
+485,Synchronoise,5,14,70,15,100,0,9,3,293,,,,
 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,,,,
-490,low kick 2.0,5,2,60,20,100,0,10,2,21,100,,,
-491,acid bomb,5,4,40,20,100,0,10,3,297,100,,,
+487,Soak,5,11,0,20,100,0,10,1,295,,,,
+488,Flame Charge,5,10,50,20,100,0,10,2,296,100,,,
+489,Coil,5,4,0,20,,0,7,1,323,,,,
+490,Low Sweep,5,2,60,20,100,0,10,2,21,100,,,
+491,Acid Spray,5,4,40,20,100,0,10,3,297,100,,,
 492,Foul Play,5,17,95,15,100,0,10,2,298,,,,
-493,simple beam,5,1,0,15,100,0,10,1,299,,,,
-494,befriend,5,1,0,15,100,0,10,1,300,,,,
+493,Simple Beam,5,1,0,15,100,0,10,1,299,,,,
+494,Entrainment,5,1,0,15,100,0,10,1,300,,,,
 495,After You,5,1,0,15,,0,10,1,301,,,,
 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,Echoed Voice,5,1,40,15,100,0,10,3,303,,,,
+498,Chip Away,5,1,70,20,100,0,10,2,304,,,,
+499,Clear Smog,5,4,50,15,,0,10,3,305,,,,
+500,Stored Power,5,14,20,10,100,0,10,3,306,,,,
+501,Quick Guard,5,2,0,15,,3,4,1,307,,,,
+502,Ally Switch,5,14,0,15,,1,7,1,308,,,,
 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,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,,,,
-510,incinerate,5,10,30,15,100,0,11,3,315,,,,
-511,postpone,5,17,0,15,100,0,10,1,316,,,,
+508,Shift Gear,5,9,0,10,,0,7,1,313,,,,
+509,Circle Throw,5,2,60,10,90,-6,10,2,314,,,,
+510,Incinerate,5,10,30,15,100,0,11,3,315,,,,
+511,Quash,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,,,,
+513,Reflect Type,5,1,0,15,,0,10,1,319,,,,
 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,,,
-518,water realm,5,11,50,10,100,0,10,3,325,,,,
-519,fire realm,5,10,50,10,100,0,10,3,326,,,,
-520,grass realm,5,12,50,10,100,0,10,3,327,,,,
-521,volt change,5,13,70,20,100,0,10,3,229,,,,
+515,Final Gambit,5,2,1,5,100,0,10,3,321,,,,
+516,Bestow,5,1,0,15,,0,10,1,324,,,,
+517,Inferno,5,10,100,5,50,0,10,3,5,100,,,
+518,Water Pledge,5,11,50,10,100,0,10,3,325,,,,
+519,Fire Pledge,5,10,50,10,100,0,10,3,326,,,,
+520,Grass Pledge,5,12,50,10,100,0,10,3,327,,,,
+521,Volt Switch,5,13,70,20,100,0,10,3,229,,,,
 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,,,
+523,Bulldoze,5,5,60,20,100,0,9,2,71,100,,,
+524,Frost Breath,5,15,40,10,90,0,10,3,289,100,,,
 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,,,
+527,Electroweb,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,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,,,,
-536,grass mixer,5,12,65,10,90,0,10,3,74,50,,,
-537,hard roller,5,7,65,20,100,0,10,2,151,30,,,
-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,,,,
+533,Sacred Sword,5,2,90,20,100,0,10,2,304,,,,
+534,Razor Shell,5,11,75,10,95,0,10,2,70,50,,,
+535,Heat Crash,5,10,1,10,100,0,10,2,292,,,,
+536,Leaf Tornado,5,12,65,10,90,0,10,3,74,50,,,
+537,Steamroller,5,7,65,20,100,0,10,2,151,30,,,
+538,Cotton Guard,5,12,0,10,,0,7,1,329,,,,
+539,Night Daze,5,17,85,10,95,0,10,3,74,40,,,
+540,Psystrike,5,14,100,10,100,0,10,3,283,,,,
 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,,,,
-545,kaendan,5,10,100,5,100,0,9,3,5,30,,,
-546,techno buster,5,1,85,5,100,0,10,3,269,,,,
-547,ancient song,5,1,75,10,100,0,11,3,330,10,,,
-548,mystery sword,5,2,85,10,100,0,10,3,283,,,,
-549,frozen world,5,15,65,10,95,0,11,3,331,100,,,
-550,lightning strike,5,13,130,5,85,0,10,2,7,20,,,
-551,blue flame,5,10,130,5,85,0,10,3,5,20,,,
-552,flame dance,5,10,80,10,100,0,10,3,277,50,,,
-553,freezebolt,5,15,140,5,90,0,10,2,332,30,,,
-554,cold flare,5,15,140,5,90,0,10,3,333,30,,,
-555,bark out,5,17,55,15,95,0,11,3,72,100,,,
-556,icicle drop,5,15,85,10,90,0,10,2,32,30,,,
-557,v-generate,5,10,180,5,95,0,10,2,335,,,,
-558,cross flame,5,10,100,5,100,0,10,3,336,,,,
-559,cross thunder,5,13,100,5,100,0,10,2,337,,,,
+543,Head Charge,5,1,120,15,100,0,10,2,49,,,,
+544,Gear Grind,5,9,50,15,85,0,10,2,45,,,,
+545,Searing Shot,5,10,100,5,100,0,9,3,5,30,,,
+546,Techno Blast,5,1,85,5,100,0,10,3,269,,,,
+547,Relic Song,5,1,75,10,100,0,11,3,330,10,,,
+548,Secret Sword,5,2,85,10,100,0,10,3,283,,,,
+549,Glaciate,5,15,65,10,95,0,11,3,331,100,,,
+550,Bolt Strike,5,13,130,5,85,0,10,2,7,20,,,
+551,Blue Flare,5,10,130,5,85,0,10,3,5,20,,,
+552,Fiery Dance,5,10,80,10,100,0,10,3,277,50,,,
+553,Freeze Shock,5,15,140,5,90,0,10,2,332,30,,,
+554,Ice Burn,5,15,140,5,90,0,10,3,333,30,,,
+555,Snarl,5,17,55,15,95,0,11,3,72,100,,,
+556,Icicle Crash,5,15,85,10,90,0,10,2,32,30,,,
+557,V-create,5,10,180,5,95,0,10,2,335,,,,
+558,Fusion Flare,5,10,100,5,100,0,10,3,336,,,,
+559,Fusion Bolt,5,13,100,5,100,0,10,2,337,,,,
 10001,Shadow Rush,3,10002,55,,100,0,2,2,10001,,,,
 10002,Shadow Blast,3,10002,80,,100,0,2,3,44,,,,
 10003,Shadow Blitz,3,10002,40,,100,0,2,2,1,,,,
diff --git a/pokedex/data/csv/pokemon.csv b/pokedex/data/csv/pokemon.csv
index b97bdc3..6ea398b 100644
--- a/pokedex/data/csv/pokemon.csv
+++ b/pokedex/data/csv/pokemon.csv
@@ -494,160 +494,160 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 493,Arceus,4,254,32,3200,Alpha,4,8,,-1,3,255,0,0,120,0,508
 494,Victini,5,255,4,40,Victory,10,,,-1,3,270,100,0,120,0,509
 495,Snivy,5,256,6,81,Grass Snake,5,,,1,45,28,70,0,20,0,510
-496,janobii,5,256,8,160,くさへび,5,,,1,45,145,70,0,20,0,511
-497,jarooda,5,256,33,630,ロイヤル,5,,,1,45,238,70,0,20,0,512
+496,Servine,5,256,8,160,Grass Snake,5,,,1,45,145,70,0,20,0,511
+497,Serperior,5,256,33,630,Regal,5,,,1,45,238,70,0,20,0,512
 498,Tepig,5,257,5,99,Fire Pig,8,,,1,45,28,70,0,20,0,513
-499,chaobuu,5,257,10,555,ひぶた,8,,,1,45,146,70,0,20,0,514
-500,enbuoo,5,257,16,1500,おおひぶた,8,,,1,45,238,70,0,20,0,515
+499,Pignite,5,257,10,555,Fire Pig,8,,,1,45,146,70,0,20,0,514
+500,Emboar,5,257,16,1500,Mega Fire Pig,8,,,1,45,238,70,0,20,0,515
 501,Oshawott,5,258,5,59,Sea Otter,2,,,1,45,28,70,0,20,0,516
-502,futachimaru,5,258,8,245,しゅぎょう,2,,,1,45,145,70,0,20,0,517
-503,daikenki,5,258,15,946,かんろく,2,,,1,45,238,70,0,20,0,518
+502,Dewott,5,258,8,245,Discipline,2,,,1,45,145,70,0,20,0,517
+503,Samurott,5,258,15,946,Formidable,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,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,Stoutland,5,260,12,610,Big-Hearted,4,,,4,45,221,70,0,15,0,523
 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
+512,Simisage,5,262,11,305,Thorn Monkey,5,,,1,75,174,70,0,20,0,527
 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,Simisear,5,263,10,280,Ember,8,,,1,75,174,70,0,20,0,529
 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
+516,Simipour,5,264,10,290,Geyser,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
 519,Pidove,5,266,3,21,Tiny Pigeon,4,,,4,255,53,70,0,15,0,534
-520,hatooboo,5,266,6,150,のばと,4,,,4,120,125,70,0,15,0,535
-521,kenhorou,5,266,12,290,プライド,4,,,4,45,215,70,0,15,1,536
+520,Tranquill,5,266,6,150,Wild Pigeon,4,,,4,120,125,70,0,15,0,535
+521,Unfezant,5,266,12,290,Proud,4,,,4,45,215,70,0,15,1,536
 522,Blitzle,5,267,8,298,Electrified,1,,,4,190,59,70,0,20,0,537
-523,zeburaika,5,267,16,795,らいでん,1,,,4,75,174,70,0,20,0,538
-524,dangoro,5,268,4,180,マントル,2,,,4,255,56,70,0,15,0,539
-525,gantoru,5,268,9,1020,こうせき,2,,,4,120,137,70,0,15,0,540
+523,Zebstrika,5,267,16,795,Thunderbolt,1,,,4,75,174,70,0,20,0,538
+524,Roggenrola,5,268,4,180,Mantle,2,,,4,255,56,70,0,15,0,539
+525,Boldore,5,268,9,1020,Ore,2,,,4,120,137,70,0,15,0,540
 526,Gigalith,5,268,17,2600,Compressed,2,,,4,45,227,70,0,15,0,541
 527,Woobat,5,269,4,21,Bat,2,,,4,190,63,70,0,15,0,542
-528,kokoromori,5,269,9,105,きゅうあい,2,,,4,45,149,70,0,15,0,543
+528,Swoobat,5,269,9,105,Courting,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,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
-535,Tympole,5,273,5,45,おたま,2,,,4,255,59,70,0,20,0,550
-536,gamagaru,5,273,8,170,しんどう,2,,,4,120,134,70,0,20,0,551
-537,gamageroge,5,273,15,620,しんどう,2,,,4,45,225,70,0,20,0,552
-538,nageki,5,274,13,555,じゅうどう,8,,,0,45,163,70,0,20,0,553
-539,dageki,5,275,14,510,からて,2,,,0,45,163,70,0,20,0,554
+532,Timburr,5,272,6,125,Muscular,4,,,2,180,61,70,0,20,0,547
+533,Gurdurr,5,272,12,400,Muscular,4,,,2,90,142,70,0,20,0,548
+534,Conkeldurr,5,272,14,870,Muscular,3,,,2,45,227,70,0,20,0,549
+535,Tympole,5,273,5,45,Tadpole,2,,,4,255,59,70,0,20,0,550
+536,Palpitoad,5,273,8,170,Vibration,2,,,4,120,134,70,0,20,0,551
+537,Seismitoad,5,273,15,620,Vibration,2,,,4,45,225,70,0,20,0,552
+538,Throh,5,274,13,555,Judo,8,,,0,45,163,70,0,20,0,553
+539,Sawk,5,275,14,510,Karate,2,,,0,45,163,70,0,20,0,554
 540,Sewaddle,5,276,3,25,Sewing,10,,,4,255,62,70,0,15,0,555
-541,kurumayu,5,276,5,73,はごもり,5,,,4,120,133,70,0,15,0,556
-542,hahakomori,5,276,12,205,こそだて,10,,,4,45,221,70,0,15,0,557
-543,fushide,5,277,4,53,ムカデ,8,,,4,255,52,70,0,15,0,558
-544,hoiiga,5,277,12,585,まゆムカデ,4,,,4,120,126,70,0,15,0,559
-545,pendoraa,5,277,25,2005,メガムカデ,8,,,4,45,214,70,0,20,0,560
-546,monmen,5,278,3,6,わたたま,5,,,4,190,56,70,0,20,0,561
-547,erufuun,5,278,7,66,かぜかくれ,5,,,4,75,168,70,0,20,0,562
-548,churine,5,279,5,66,ねっこ,5,,,8,190,56,70,0,20,0,563
-549,doredia,5,279,11,163,はなかざり,5,,,8,75,168,70,0,20,0,564
+541,Swadloon,5,276,5,73,Leaf-Wrapped,5,,,4,120,133,70,0,15,0,556
+542,Leavanny,5,276,12,205,Nurturing,10,,,4,45,221,70,0,15,0,557
+543,Venipede,5,277,4,53,Centipede,8,,,4,255,52,70,0,15,0,558
+544,Whirlipede,5,277,12,585,Curlipede,4,,,4,120,126,70,0,15,0,559
+545,Scolipede,5,277,25,2005,Megapede,8,,,4,45,214,70,0,20,0,560
+546,Cottonee,5,278,3,6,Cotton Puff,5,,,4,190,56,70,0,20,0,561
+547,Whimsicott,5,278,7,66,Windveiled,5,,,4,75,168,70,0,20,0,562
+548,Petilil,5,279,5,66,Bulb,5,,,8,190,56,70,0,20,0,563
+549,Lilligant,5,279,11,163,Flowering,5,,,8,75,168,70,0,20,0,564
 550,Basculin,5,280,10,180,Hostile,5,,,4,25,161,70,0,40,0,565
 551,Sandile,5,281,7,152,Desert Croc,3,,,4,180,58,70,0,20,0,567
-552,warubiru,5,281,10,334,さばくワニ,3,,,4,90,123,70,0,20,0,568
-553,warubiaru,5,281,15,963,いかく,8,,,4,45,229,70,0,20,0,569
-554,darumakka,5,282,6,375,だるま,8,,,4,120,63,70,0,20,0,570
+552,Krokorok,5,281,10,334,Desert Croc,3,,,4,90,123,70,0,20,0,568
+553,Krookodile,5,281,15,963,Intimidation,8,,,4,45,229,70,0,20,0,569
+554,Darumaka,5,282,6,375,Zen Charm,8,,,4,120,63,70,0,20,0,570
 555,Darmanitan,5,282,13,929,Blazing,8,,,4,60,168,70,0,20,0,571
-556,marakacchi,5,283,10,280,サボテン,5,,,4,255,161,70,0,20,0,573
-557,ishizumai,5,284,3,145,いしやど,8,,,4,190,65,70,0,20,0,574
-558,iwaparesu,5,284,14,2000,いわやど,8,,,4,75,166,70,0,20,0,575
-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
+556,Maractus,5,283,10,280,Cactus,5,,,4,255,161,70,0,20,0,573
+557,Dwebble,5,284,3,145,Rock Inn,8,,,4,190,65,70,0,20,0,574
+558,Crustle,5,284,14,2000,Stone Home,8,,,4,75,166,70,0,20,0,575
+559,Scraggy,5,285,6,118,Shedding,10,,,4,180,70,35,0,15,0,576
+560,Scrafty,5,285,11,300,Hoodlum,8,,,4,90,171,70,0,15,0,577
+561,Sigilyph,5,286,14,140,Avianoid,1,,,4,45,172,70,0,20,0,578
 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
-566,aaken,5,289,5,95,さいこどり,10,,,1,45,71,70,0,30,0,583
-567,aakeosu,5,289,14,320,さいこどり,10,,,1,45,177,70,0,30,0,584
-568,yabukuron,5,290,6,310,ゴミぶくろ,5,,,4,190,66,70,0,20,0,585
-569,dasutodasu,5,290,19,1073,ゴミすてば,5,,,4,60,166,70,0,20,0,586
+564,Tirtouga,5,288,7,165,Prototurtle,2,,,1,45,71,70,0,30,0,581
+565,Carracosta,5,288,12,810,Prototurtle,2,,,1,45,173,70,0,30,0,582
+566,Archen,5,289,5,95,First Bird,10,,,1,45,71,70,0,30,0,583
+567,Archeops,5,289,14,320,First Bird,10,,,1,45,177,70,0,30,0,584
+568,Trubbish,5,290,6,310,Trash Bag,5,,,4,190,66,70,0,20,0,585
+569,Garbodor,5,290,19,1073,Trash Heap,5,,,4,60,166,70,0,20,0,586
 570,Zorua,5,291,7,125,Tricky Fox,4,,,1,75,66,70,0,25,0,587
 571,Zoroark,5,291,16,811,Illusion Fox,4,,,1,45,179,70,0,20,0,588
 572,Minccino,5,292,4,58,Chinchilla,4,,,6,255,60,70,0,15,0,589
-573,chirachiino,5,292,5,75,スカーフ,4,,,6,60,165,70,0,15,0,590
-574,gochimu,5,293,4,58,ぎょうし,7,,,6,200,58,70,0,20,0,591
-575,gochimiru,5,293,7,180,あやつり,7,,,6,100,137,70,0,20,0,592
+573,Cinccino,5,292,5,75,Scarf,4,,,6,60,165,70,0,15,0,590
+574,Gothita,5,293,4,58,Fixation,7,,,6,200,58,70,0,20,0,591
+575,Gothorita,5,293,7,180,Manipulate,7,,,6,100,137,70,0,20,0,592
 576,Gothitelle,5,293,15,440,Astral Body,7,,,6,50,221,70,0,20,0,593
-577,yuniran,5,294,3,10,さいぼう,5,,,4,200,58,70,0,20,0,594
-578,daburan,5,294,6,80,ぶんかつ,5,,,4,100,130,70,0,20,0,595
+577,Solosis,5,294,3,10,Cell,5,,,4,200,58,70,0,20,0,594
+578,Duosion,5,294,6,80,Mitosis,5,,,4,100,130,70,0,20,0,595
 579,Reuniclus,5,294,10,201,Multiplying,5,,,4,50,221,70,0,20,0,596
-580,koaruhii,5,295,5,55,みずどり,2,,,4,190,61,70,0,20,0,597
+580,Ducklett,5,295,5,55,Water Bird,2,,,4,190,61,70,0,20,0,597
 581,Swanna,5,295,13,242,White Bird,9,,,4,45,166,70,0,20,0,598
-582,banipucchi,5,296,4,57,しんせつ,9,,,4,255,61,70,0,20,0,599
-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
+582,Vanillite,5,296,4,57,Fresh Snow,9,,,4,255,61,70,0,20,0,599
+583,Vanillish,5,296,11,410,Icy Snow,9,,,4,120,138,70,0,20,0,600
+584,Vanilluxe,5,296,13,575,Snowstorm,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,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
-591,morobareru,5,300,6,105,きのこ,9,,,4,75,162,70,0,20,0,608
-592,pururiru,5,301,12,330,ふゆう,9,,,4,190,67,70,0,20,1,609
-593,burungeru,5,301,22,1350,ふゆう,9,,,4,60,168,70,0,20,1,610
+588,Karrablast,5,299,5,59,Clamping,2,,,4,200,63,70,0,15,0,605
+589,Escavalier,5,299,10,330,Cavalry,4,,,4,75,173,70,0,15,0,606
+590,Foongus,5,300,2,10,Mushroom,9,,,4,190,59,70,0,20,0,607
+591,Amoonguss,5,300,6,105,Mushroom,9,,,4,75,162,70,0,20,0,608
+592,Frillish,5,301,12,330,Floating,9,,,4,190,67,70,0,20,1,609
+593,Jellicent,5,301,22,1350,Floating,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
+595,Joltik,5,303,1,6,Attaching,10,,,4,190,64,70,0,20,0,612
 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
+597,Ferroseed,5,304,6,188,Thorn Seed,4,,,4,255,61,70,0,20,0,614
+598,Ferrothorn,5,304,10,1100,Thorn Pod,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
-600,gigiaru,5,305,6,510,はぐるま,4,,,-1,60,154,70,0,20,0,617
-601,gigigiaru,5,305,6,810,はぐるま,4,,,-1,30,234,70,0,20,0,618
-602,shibishirasu,5,306,2,3,でんきうお,9,,,4,190,55,70,0,20,0,619
-603,shibibiiru,5,306,12,220,でんきうお,2,,,4,60,142,70,0,20,0,620
-604,shibirudon,5,306,21,805,でんきうお,2,,,4,30,232,70,0,20,0,621
-605,riguree,5,307,5,90,ブレイン,2,,,4,255,67,70,0,20,0,622
-606,oobemu,5,307,10,345,ブレイン,3,,,4,90,170,70,0,20,0,623
-607,hitomoshi,5,308,3,31,ろうそく,9,,,4,190,55,70,0,20,0,624
-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
+600,Klang,5,305,6,510,Gear,4,,,-1,60,154,70,0,20,0,617
+601,Klinklang,5,305,6,810,Gear,4,,,-1,30,234,70,0,20,0,618
+602,Tynamo,5,306,2,3,EleFish,9,,,4,190,55,70,0,20,0,619
+603,Eelektrik,5,306,12,220,EleFish,2,,,4,60,142,70,0,20,0,620
+604,Eelektross,5,306,21,805,EleFish,2,,,4,30,232,70,0,20,0,621
+605,Elgyem,5,307,5,90,Cerebral,2,,,4,255,67,70,0,20,0,622
+606,Beheeyem,5,307,10,345,Cerebral,3,,,4,90,170,70,0,20,0,623
+607,Litwick,5,308,3,31,Candle,9,,,4,190,55,70,0,20,0,624
+608,Lampent,5,308,6,130,Lamp,1,,,4,90,130,70,0,20,0,625
+609,Chandelure,5,308,10,343,Luring,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,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
-616,chobomaki,5,312,4,77,マイマイ,8,,,4,200,61,70,0,15,0,633
-617,agirudaa,5,312,8,253,からぬけ,8,,,4,75,173,70,0,15,0,634
-618,maggyo,5,313,7,110,トラップ,3,,,4,75,165,70,0,20,0,635
-619,kojofuu,5,314,9,200,ぶじゅつ,10,,,4,180,70,70,0,25,0,636
-620,kojondo,5,314,14,355,ぶじゅつ,7,,,4,45,179,70,0,25,0,637
-621,kurimugan,5,315,16,1390,ほらあな,8,,,4,45,170,70,0,30,0,638
-622,gobitto,5,316,10,920,ゴーレム,5,,,-1,190,61,70,0,25,0,639
-623,goruugu,5,316,28,3300,ゴーレム,5,,,-1,90,169,70,0,25,0,640
-624,komatana,5,317,5,102,はもの,8,,,4,120,68,35,0,20,0,641
-625,kirikizan,5,317,16,700,とうじん,8,,,4,45,172,35,0,20,0,642
-626,baffuron,5,318,16,946,ずつきうし,3,,,4,45,172,70,0,20,0,643
-627,washibon,5,319,5,105,ヒナわし,9,,,0,190,70,70,0,20,0,644
+613,Cubchoo,5,310,5,85,Chill,9,,,4,120,61,70,0,20,0,630
+614,Beartic,5,310,26,2600,Freezing,9,,,4,60,170,70,0,20,0,631
+615,Cryogonal,5,311,11,1480,Crystallizing,2,,,-1,25,170,70,0,25,0,632
+616,Shelmet,5,312,4,77,Snail,8,,,4,200,61,70,0,15,0,633
+617,Accelgor,5,312,8,253,Shell Out,8,,,4,75,173,70,0,15,0,634
+618,Stunfisk,5,313,7,110,Trap,3,,,4,75,165,70,0,20,0,635
+619,Mienfoo,5,314,9,200,Martial Arts,10,,,4,180,70,70,0,25,0,636
+620,Mienshao,5,314,14,355,Martial Arts,7,,,4,45,179,70,0,25,0,637
+621,Druddigon,5,315,16,1390,Cave,8,,,4,45,170,70,0,30,0,638
+622,Golett,5,316,10,920,Automaton,5,,,-1,190,61,70,0,25,0,639
+623,Golurk,5,316,28,3300,Automaton,5,,,-1,90,169,70,0,25,0,640
+624,Pawniard,5,317,5,102,Sharp Blade,8,,,4,120,68,35,0,20,0,641
+625,Bisharp,5,317,16,700,Sword Blade,8,,,4,45,172,35,0,20,0,642
+626,Bouffalant,5,318,16,946,Bash Buffalo,3,,,4,45,172,70,0,20,0,643
+627,Rufflet,5,319,5,105,Eaglet,9,,,0,190,70,70,0,20,0,644
 628,Braviary,5,319,15,410,Valiant,8,,,0,60,179,70,0,20,0,645
-629,baruchai,5,320,5,90,おむつ,3,,,8,190,74,35,0,20,0,646
-630,barujiina,5,320,12,395,ほねわし,3,,,8,60,179,35,0,20,0,647
-631,kuitaran,5,321,14,580,アリクイ,8,,,4,90,169,70,0,20,0,648
-632,aianto,5,322,3,330,てつアリ,4,,,4,90,169,70,0,20,0,649
-633,monozu,5,323,8,173,そぼう,2,,,4,45,60,35,0,40,0,650
-634,jiheddo,5,323,14,500,らんぼう,2,,,4,45,147,35,0,40,0,651
-635,sazandora,5,323,18,1600,きょうぼう,2,,,4,45,270,35,0,40,0,652
-636,meraruba,5,324,11,288,たいまつ,9,,,4,45,72,70,0,40,0,653
-637,urugamosu,5,324,16,460,たいよう,9,,,4,15,248,70,0,40,0,654
-638,kobaruon,5,325,21,2500,てっしん,2,,,-1,3,261,35,0,80,0,655
-639,terakion,5,326,19,2600,がんくつ,4,,,-1,3,261,35,0,80,0,656
-640,birijion,5,327,20,2000,そうげん,5,,,-1,3,261,35,0,80,0,657
-641,torunerosu,5,328,15,630,せんぷう,5,,,0,3,261,90,0,120,0,658
-642,borutorosu,5,329,15,610,らいげき,2,,,0,3,261,90,0,120,0,659
+629,Vullaby,5,320,5,90,Diapered,3,,,8,190,74,35,0,20,0,646
+630,Mandibuzz,5,320,12,395,Bone Vulture,3,,,8,60,179,35,0,20,0,647
+631,Heatmor,5,321,14,580,Anteater,8,,,4,90,169,70,0,20,0,648
+632,Durant,5,322,3,330,Iron Ant,4,,,4,90,169,70,0,20,0,649
+633,Deino,5,323,8,173,Irate,2,,,4,45,60,35,0,40,0,650
+634,Zweilous,5,323,14,500,Hostile,2,,,4,45,147,35,0,40,0,651
+635,Hydreigon,5,323,18,1600,Brutal,2,,,4,45,270,35,0,40,0,652
+636,Larvesta,5,324,11,288,Torch,9,,,4,45,72,70,0,40,0,653
+637,Volcarona,5,324,16,460,Sun,9,,,4,15,248,70,0,40,0,654
+638,Cobalion,5,325,21,2500,Iron Will,2,,,-1,3,261,35,0,80,0,655
+639,Terrakion,5,326,19,2600,Cavern,4,,,-1,3,261,35,0,80,0,656
+640,Virizion,5,327,20,2000,Grassland,5,,,-1,3,261,35,0,80,0,657
+641,Tornadus,5,328,15,630,Cyclone,5,,,0,3,261,90,0,120,0,658
+642,Thundurus,5,329,15,610,Bolt Strike,2,,,0,3,261,90,0,120,0,659
 643,Reshiram,5,330,32,3300,Vast White,9,,,-1,45,306,0,0,120,0,660
 644,Zekrom,5,331,29,3450,Deep Black,1,,,-1,45,306,0,0,120,0,661
-645,randorosu,5,332,15,680,ほうじょう,3,,,0,3,270,90,0,120,0,662
-646,kyuremu,5,333,30,3250,きょうかい,4,,,-1,3,297,0,0,120,0,663
-647,kerudio,5,334,14,485,わかごま,10,,,-1,3,261,35,0,80,0,664
-648,meroetta,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,665
-649,genosekuto,5,336,15,825,こせいだい,7,,,-1,3,270,0,0,120,0,667
+645,Landorus,5,332,15,680,Abundance,3,,,0,3,270,90,0,120,0,662
+646,Kyurem,5,333,30,3250,Boundary,4,,,-1,3,297,0,0,120,0,663
+647,Keldeo,5,334,14,485,Colt,10,,,-1,3,261,35,0,80,0,664
+648,Meloetta,5,335,6,65,Melody,9,,,-1,3,270,100,0,120,0,665
+649,Genesect,5,336,15,825,Paleozoic,7,,,-1,3,270,0,0,120,0,667
 10001,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,419
 10002,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,420
 10003,Deoxys,3,202,17,608,DNA,8,12,5,-1,3,215,0,0,120,0,421
@@ -665,4 +665,4 @@ id,name,generation_id,evolution_chain_id,height,weight,species,color_id,pokemon_
 10015,Castform,3,179,3,8,Weather,9,1,3,4,45,147,70,0,25,0,381
 10016,Basculin,5,280,10,180,Hostile,5,,,4,25,161,70,0,40,0,566
 10017,Darmanitan,5,282,13,929,Blazing,8,,,4,60,189,70,0,20,0,572
-10018,meroetta,5,335,6,65,せんりつ,9,,,-1,3,270,100,0,120,0,666
+10018,Meloetta,5,335,6,65,Melody,9,,,-1,3,270,100,0,120,0,666
diff --git a/pokedex/data/csv/pokemon_form_groups.csv b/pokedex/data/csv/pokemon_form_groups.csv
index 8ccebea..c6ec5ca 100644
--- a/pokedex/data/csv/pokemon_form_groups.csv
+++ b/pokedex/data/csv/pokemon_form_groups.csv
@@ -13,8 +13,8 @@ pokemon_id,term,is_battle_only,description
 492,Forme,0,"Forms have different stats and movepools.  Shaymin transforms into Sky Forme with the use of a [Gracidea]{item}.  It is limited to Land Forme at night, when [frozen]{mechanic}, in the storage system boxes, in the Wi-Fi Club, and in the Union Room; under these conditions, Sky Shaymin reverts to Land Forme, and the Gracidea has no effect.  The Gracidea must be used again to return to Sky Forme.  A Gracidea may be received by showing a woman in southwest [Floaroma Town]{location} or the [Goldenrod City]{location} flower shop a Shaymin met in a fateful encounter."
 493,Type,0,"Form changes along with type to match a held Plate, due to [Multitype]{ability}."
 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."
+555,Mode,0,"Forms have different stats and types.  Darmanitan changes to Zen Mode below 50% HP if it has [Zen Mode]{ability} as its ability, and back to Standard 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, 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.  Meloetta changes form upon using [Relic Song]{move} in battle, and reverts to Aria Forme outside of battle."
+649,Drive,0,Form changes to match Genesect's held Drive.  The only differences are the color of its weapon and [Techno Blast]{move}'s type.
diff --git a/pokedex/data/csv/pokemon_forms.csv b/pokedex/data/csv/pokemon_forms.csv
index f6df6c7..ce36d72 100644
--- a/pokedex/data/csv/pokemon_forms.csv
+++ b/pokedex/data/csv/pokemon_forms.csv
@@ -553,7 +553,7 @@ id,name,form_base_pokemon_id,unique_pokemon_id,introduced_in_version_group_id,is
 552,,552,,11,1,1
 553,,553,,11,1,1
 554,,554,,11,1,1
-555,normal,555,555,11,1,1
+555,Standard,555,555,11,1,1
 556,,556,,11,1,1
 557,,557,,11,1,1
 558,,558,,11,1,1
@@ -646,8 +646,8 @@ id,name,form_base_pokemon_id,unique_pokemon_id,introduced_in_version_group_id,is
 645,,645,,11,1,1
 646,,646,,11,1,1
 647,,647,,11,1,1
-648,voice,648,648,11,1,1
-649,orange,649,,11,1,1
+648,Aria,648,648,11,1,1
+649,,649,,11,1,1
 10001,B,201,,3,0,2
 10002,C,201,,3,0,3
 10003,D,201,,3,0,4
@@ -714,15 +714,15 @@ id,name,form_base_pokemon_id,unique_pokemon_id,introduced_in_version_group_id,is
 10064,Sky,492,10006,9,0,2
 10065,Spiky-eared,172,,10,0,2
 10066,Blue-Striped,550,10016,11,0,2
-10067,daruma,555,10017,11,0,2
+10067,Zen,555,10017,11,0,2
 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
-10074,step,648,10018,11,0,2
-10075,blue,649,,11,0,2
-10076,yellow,649,,11,0,2
-10077,red,649,,11,0,2
-10078,white,649,,11,0,2
+10074,Pirouette,648,10018,11,0,2
+10075,Douse,649,,11,0,2
+10076,Shock,649,,11,0,2
+10077,Burn,649,,11,0,2
+10078,Chill,649,,11,0,2
diff --git a/pokedex/data/media/black-white/555-normal.png b/pokedex/data/media/black-white/555-standard.png
similarity index 100%
rename from pokedex/data/media/black-white/555-normal.png
rename to pokedex/data/media/black-white/555-standard.png
diff --git a/pokedex/data/media/black-white/555-daruma.png b/pokedex/data/media/black-white/555-zen.png
similarity index 100%
rename from pokedex/data/media/black-white/555-daruma.png
rename to pokedex/data/media/black-white/555-zen.png
diff --git a/pokedex/data/media/black-white/648-voice.png b/pokedex/data/media/black-white/648-aria.png
similarity index 100%
rename from pokedex/data/media/black-white/648-voice.png
rename to pokedex/data/media/black-white/648-aria.png
diff --git a/pokedex/data/media/black-white/648-step.png b/pokedex/data/media/black-white/648-pirouette.png
similarity index 100%
rename from pokedex/data/media/black-white/648-step.png
rename to pokedex/data/media/black-white/648-pirouette.png
diff --git a/pokedex/data/media/black-white/649-red.png b/pokedex/data/media/black-white/649-burn.png
similarity index 100%
rename from pokedex/data/media/black-white/649-red.png
rename to pokedex/data/media/black-white/649-burn.png
diff --git a/pokedex/data/media/black-white/649-white.png b/pokedex/data/media/black-white/649-chill.png
similarity index 100%
rename from pokedex/data/media/black-white/649-white.png
rename to pokedex/data/media/black-white/649-chill.png
diff --git a/pokedex/data/media/black-white/649-blue.png b/pokedex/data/media/black-white/649-douse.png
similarity index 100%
rename from pokedex/data/media/black-white/649-blue.png
rename to pokedex/data/media/black-white/649-douse.png
diff --git a/pokedex/data/media/black-white/649-orange.png b/pokedex/data/media/black-white/649-orange.png
deleted file mode 100644
index 5d3a8f0..0000000
Binary files a/pokedex/data/media/black-white/649-orange.png and /dev/null differ
diff --git a/pokedex/data/media/black-white/649-yellow.png b/pokedex/data/media/black-white/649-shock.png
similarity index 100%
rename from pokedex/data/media/black-white/649-yellow.png
rename to pokedex/data/media/black-white/649-shock.png
diff --git a/pokedex/data/media/black-white/back/555-normal.png b/pokedex/data/media/black-white/back/555-standard.png
similarity index 100%
rename from pokedex/data/media/black-white/back/555-normal.png
rename to pokedex/data/media/black-white/back/555-standard.png
diff --git a/pokedex/data/media/black-white/back/555-daruma.png b/pokedex/data/media/black-white/back/555-zen.png
similarity index 100%
rename from pokedex/data/media/black-white/back/555-daruma.png
rename to pokedex/data/media/black-white/back/555-zen.png
diff --git a/pokedex/data/media/black-white/back/648-voice.png b/pokedex/data/media/black-white/back/648-aria.png
similarity index 100%
rename from pokedex/data/media/black-white/back/648-voice.png
rename to pokedex/data/media/black-white/back/648-aria.png
diff --git a/pokedex/data/media/black-white/back/648-step.png b/pokedex/data/media/black-white/back/648-pirouette.png
similarity index 100%
rename from pokedex/data/media/black-white/back/648-step.png
rename to pokedex/data/media/black-white/back/648-pirouette.png
diff --git a/pokedex/data/media/black-white/back/649-red.png b/pokedex/data/media/black-white/back/649-burn.png
similarity index 100%
rename from pokedex/data/media/black-white/back/649-red.png
rename to pokedex/data/media/black-white/back/649-burn.png
diff --git a/pokedex/data/media/black-white/back/649-white.png b/pokedex/data/media/black-white/back/649-chill.png
similarity index 100%
rename from pokedex/data/media/black-white/back/649-white.png
rename to pokedex/data/media/black-white/back/649-chill.png
diff --git a/pokedex/data/media/black-white/back/649-blue.png b/pokedex/data/media/black-white/back/649-douse.png
similarity index 100%
rename from pokedex/data/media/black-white/back/649-blue.png
rename to pokedex/data/media/black-white/back/649-douse.png
diff --git a/pokedex/data/media/black-white/back/649-orange.png b/pokedex/data/media/black-white/back/649-orange.png
deleted file mode 100644
index 7c7f39e..0000000
Binary files a/pokedex/data/media/black-white/back/649-orange.png and /dev/null differ
diff --git a/pokedex/data/media/black-white/back/649-yellow.png b/pokedex/data/media/black-white/back/649-shock.png
similarity index 100%
rename from pokedex/data/media/black-white/back/649-yellow.png
rename to pokedex/data/media/black-white/back/649-shock.png
diff --git a/pokedex/data/media/black-white/back/shiny/555-normal.png b/pokedex/data/media/black-white/back/shiny/555-standard.png
similarity index 100%
rename from pokedex/data/media/black-white/back/shiny/555-normal.png
rename to pokedex/data/media/black-white/back/shiny/555-standard.png
diff --git a/pokedex/data/media/black-white/back/shiny/555-daruma.png b/pokedex/data/media/black-white/back/shiny/555-zen.png
similarity index 100%
rename from pokedex/data/media/black-white/back/shiny/555-daruma.png
rename to pokedex/data/media/black-white/back/shiny/555-zen.png
diff --git a/pokedex/data/media/black-white/back/shiny/648-voice.png b/pokedex/data/media/black-white/back/shiny/648-aria.png
similarity index 100%
rename from pokedex/data/media/black-white/back/shiny/648-voice.png
rename to pokedex/data/media/black-white/back/shiny/648-aria.png
diff --git a/pokedex/data/media/black-white/back/shiny/648-step.png b/pokedex/data/media/black-white/back/shiny/648-pirouette.png
similarity index 100%
rename from pokedex/data/media/black-white/back/shiny/648-step.png
rename to pokedex/data/media/black-white/back/shiny/648-pirouette.png
diff --git a/pokedex/data/media/black-white/back/shiny/649-red.png b/pokedex/data/media/black-white/back/shiny/649-burn.png
similarity index 100%
rename from pokedex/data/media/black-white/back/shiny/649-red.png
rename to pokedex/data/media/black-white/back/shiny/649-burn.png
diff --git a/pokedex/data/media/black-white/back/shiny/649-white.png b/pokedex/data/media/black-white/back/shiny/649-chill.png
similarity index 100%
rename from pokedex/data/media/black-white/back/shiny/649-white.png
rename to pokedex/data/media/black-white/back/shiny/649-chill.png
diff --git a/pokedex/data/media/black-white/back/shiny/649-blue.png b/pokedex/data/media/black-white/back/shiny/649-douse.png
similarity index 100%
rename from pokedex/data/media/black-white/back/shiny/649-blue.png
rename to pokedex/data/media/black-white/back/shiny/649-douse.png
diff --git a/pokedex/data/media/black-white/back/shiny/649-orange.png b/pokedex/data/media/black-white/back/shiny/649-orange.png
deleted file mode 100644
index ae86574..0000000
Binary files a/pokedex/data/media/black-white/back/shiny/649-orange.png and /dev/null differ
diff --git a/pokedex/data/media/black-white/back/shiny/649-yellow.png b/pokedex/data/media/black-white/back/shiny/649-shock.png
similarity index 100%
rename from pokedex/data/media/black-white/back/shiny/649-yellow.png
rename to pokedex/data/media/black-white/back/shiny/649-shock.png
diff --git a/pokedex/data/media/black-white/shiny/555-normal.png b/pokedex/data/media/black-white/shiny/555-standard.png
similarity index 100%
rename from pokedex/data/media/black-white/shiny/555-normal.png
rename to pokedex/data/media/black-white/shiny/555-standard.png
diff --git a/pokedex/data/media/black-white/shiny/555-daruma.png b/pokedex/data/media/black-white/shiny/555-zen.png
similarity index 100%
rename from pokedex/data/media/black-white/shiny/555-daruma.png
rename to pokedex/data/media/black-white/shiny/555-zen.png
diff --git a/pokedex/data/media/black-white/shiny/648-voice.png b/pokedex/data/media/black-white/shiny/648-aria.png
similarity index 100%
rename from pokedex/data/media/black-white/shiny/648-voice.png
rename to pokedex/data/media/black-white/shiny/648-aria.png
diff --git a/pokedex/data/media/black-white/shiny/648-step.png b/pokedex/data/media/black-white/shiny/648-pirouette.png
similarity index 100%
rename from pokedex/data/media/black-white/shiny/648-step.png
rename to pokedex/data/media/black-white/shiny/648-pirouette.png
diff --git a/pokedex/data/media/black-white/shiny/649-red.png b/pokedex/data/media/black-white/shiny/649-burn.png
similarity index 100%
rename from pokedex/data/media/black-white/shiny/649-red.png
rename to pokedex/data/media/black-white/shiny/649-burn.png
diff --git a/pokedex/data/media/black-white/shiny/649-white.png b/pokedex/data/media/black-white/shiny/649-chill.png
similarity index 100%
rename from pokedex/data/media/black-white/shiny/649-white.png
rename to pokedex/data/media/black-white/shiny/649-chill.png
diff --git a/pokedex/data/media/black-white/shiny/649-blue.png b/pokedex/data/media/black-white/shiny/649-douse.png
similarity index 100%
rename from pokedex/data/media/black-white/shiny/649-blue.png
rename to pokedex/data/media/black-white/shiny/649-douse.png
diff --git a/pokedex/data/media/black-white/shiny/649-orange.png b/pokedex/data/media/black-white/shiny/649-orange.png
deleted file mode 100644
index 040e2f9..0000000
Binary files a/pokedex/data/media/black-white/shiny/649-orange.png and /dev/null differ
diff --git a/pokedex/data/media/black-white/shiny/649-yellow.png b/pokedex/data/media/black-white/shiny/649-shock.png
similarity index 100%
rename from pokedex/data/media/black-white/shiny/649-yellow.png
rename to pokedex/data/media/black-white/shiny/649-shock.png
diff --git a/pokedex/data/media/cropped-pokemon/555-normal.png b/pokedex/data/media/cropped-pokemon/555-standard.png
similarity index 100%
rename from pokedex/data/media/cropped-pokemon/555-normal.png
rename to pokedex/data/media/cropped-pokemon/555-standard.png
diff --git a/pokedex/data/media/cropped-pokemon/555-daruma.png b/pokedex/data/media/cropped-pokemon/555-zen.png
similarity index 100%
rename from pokedex/data/media/cropped-pokemon/555-daruma.png
rename to pokedex/data/media/cropped-pokemon/555-zen.png
diff --git a/pokedex/data/media/cropped-pokemon/648-voice.png b/pokedex/data/media/cropped-pokemon/648-aria.png
similarity index 100%
rename from pokedex/data/media/cropped-pokemon/648-voice.png
rename to pokedex/data/media/cropped-pokemon/648-aria.png
diff --git a/pokedex/data/media/cropped-pokemon/648-step.png b/pokedex/data/media/cropped-pokemon/648-pirouette.png
similarity index 100%
rename from pokedex/data/media/cropped-pokemon/648-step.png
rename to pokedex/data/media/cropped-pokemon/648-pirouette.png
diff --git a/pokedex/data/media/cropped-pokemon/649-red.png b/pokedex/data/media/cropped-pokemon/649-burn.png
similarity index 100%
rename from pokedex/data/media/cropped-pokemon/649-red.png
rename to pokedex/data/media/cropped-pokemon/649-burn.png
diff --git a/pokedex/data/media/cropped-pokemon/649-white.png b/pokedex/data/media/cropped-pokemon/649-chill.png
similarity index 100%
rename from pokedex/data/media/cropped-pokemon/649-white.png
rename to pokedex/data/media/cropped-pokemon/649-chill.png
diff --git a/pokedex/data/media/cropped-pokemon/649-blue.png b/pokedex/data/media/cropped-pokemon/649-douse.png
similarity index 100%
rename from pokedex/data/media/cropped-pokemon/649-blue.png
rename to pokedex/data/media/cropped-pokemon/649-douse.png
diff --git a/pokedex/data/media/cropped-pokemon/649-orange.png b/pokedex/data/media/cropped-pokemon/649-orange.png
deleted file mode 100644
index 8b61772..0000000
Binary files a/pokedex/data/media/cropped-pokemon/649-orange.png and /dev/null differ
diff --git a/pokedex/data/media/cropped-pokemon/649-yellow.png b/pokedex/data/media/cropped-pokemon/649-shock.png
similarity index 100%
rename from pokedex/data/media/cropped-pokemon/649-yellow.png
rename to pokedex/data/media/cropped-pokemon/649-shock.png
diff --git a/pokedex/data/media/icons/555-normal.png b/pokedex/data/media/icons/555-standard.png
similarity index 100%
rename from pokedex/data/media/icons/555-normal.png
rename to pokedex/data/media/icons/555-standard.png
diff --git a/pokedex/data/media/icons/555-daruma.png b/pokedex/data/media/icons/555-zen.png
similarity index 100%
rename from pokedex/data/media/icons/555-daruma.png
rename to pokedex/data/media/icons/555-zen.png
diff --git a/pokedex/data/media/icons/648-voice.png b/pokedex/data/media/icons/648-aria.png
similarity index 100%
rename from pokedex/data/media/icons/648-voice.png
rename to pokedex/data/media/icons/648-aria.png
diff --git a/pokedex/data/media/icons/648-step.png b/pokedex/data/media/icons/648-pirouette.png
similarity index 100%
rename from pokedex/data/media/icons/648-step.png
rename to pokedex/data/media/icons/648-pirouette.png
diff --git a/pokedex/data/media/icons/649-blue.png b/pokedex/data/media/icons/649-blue.png
deleted file mode 100644
index 74442a1..0000000
Binary files a/pokedex/data/media/icons/649-blue.png and /dev/null differ
diff --git a/pokedex/data/media/icons/649-yellow.png b/pokedex/data/media/icons/649-burn.png
similarity index 100%
rename from pokedex/data/media/icons/649-yellow.png
rename to pokedex/data/media/icons/649-burn.png
diff --git a/pokedex/data/media/icons/649-white.png b/pokedex/data/media/icons/649-chill.png
similarity index 100%
rename from pokedex/data/media/icons/649-white.png
rename to pokedex/data/media/icons/649-chill.png
diff --git a/pokedex/data/media/icons/649-red.png b/pokedex/data/media/icons/649-douse.png
similarity index 100%
rename from pokedex/data/media/icons/649-red.png
rename to pokedex/data/media/icons/649-douse.png
diff --git a/pokedex/data/media/icons/649-orange.png b/pokedex/data/media/icons/649-shock.png
similarity index 100%
rename from pokedex/data/media/icons/649-orange.png
rename to pokedex/data/media/icons/649-shock.png