From 225d8c72257079ba91f2fce04386a6d7b42ff90a Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Sat, 9 Nov 2013 03:08:14 -0500 Subject: [PATCH] Update move names. This may be incomplete; this is just all the changes Showdown has so that I can sync moves again. --- pokedex/data/csv/move_names.csv | 48 ++++++++++++++++----------------- pokedex/data/csv/moves.csv | 40 +++++++++++++-------------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/pokedex/data/csv/move_names.csv b/pokedex/data/csv/move_names.csv index b2a2dc2..cae4559 100644 --- a/pokedex/data/csv/move_names.csv +++ b/pokedex/data/csv/move_names.csv @@ -16,7 +16,7 @@ move_id,local_language_id,name 3,6,Duplexhieb 3,7,Doblebofetón 3,8,Doppiasberla -3,9,DoubleSlap +3,9,Double Slap 4,1,れんぞくパンチ 4,5,Poing Comète 4,6,Kometenhieb @@ -52,7 +52,7 @@ move_id,local_language_id,name 9,6,Donnerschlag 9,7,Puño Trueno 9,8,Tuonopugno -9,9,ThunderPunch +9,9,Thunder Punch 10,1,ひっかく 10,5,Griffe 10,6,Kratzer @@ -64,7 +64,7 @@ move_id,local_language_id,name 11,6,Klammer 11,7,Agarre 11,8,Presa -11,9,ViceGrip +11,9,Vice Grip 12,1,ハサミギロチン 12,5,Guillotine 12,6,Guillotine @@ -166,7 +166,7 @@ move_id,local_language_id,name 28,6,Sandwirbel 28,7,Ataque Arena 28,8,Turbosabbia -28,9,Sand-Attack +28,9,Sand Attack 29,1,ずつき 29,5,Coup d'Boule 29,6,Kopfnuss @@ -292,7 +292,7 @@ move_id,local_language_id,name 49,6,Ultraschall 49,7,Bomba Sónica 49,8,Sonicboom -49,9,SonicBoom +49,9,Sonic Boom 50,1,かなしばり 50,5,Entrave 50,6,Aussetzer @@ -364,7 +364,7 @@ move_id,local_language_id,name 61,6,Blubbstrahl 61,7,Rayo Burbuja 61,8,Bollaraggio -61,9,BubbleBeam +61,9,Bubble Beam 62,1,オーロラビーム 62,5,Onde Boréale 62,6,Aurorastrahl @@ -454,13 +454,13 @@ move_id,local_language_id,name 76,6,Solarstrahl 76,7,Rayo Solar 76,8,Solarraggio -76,9,SolarBeam +76,9,Solar Beam 77,1,どくのこな 77,5,Poudre Toxik 77,6,Giftpuder 77,7,Polvo Veneno 77,8,Velenpolvere -77,9,PoisonPowder +77,9,Poison Powder 78,1,しびれごな 78,5,Para-Spore 78,6,Stachelspore @@ -502,7 +502,7 @@ move_id,local_language_id,name 84,6,Donnerschock 84,7,Impactrueno 84,8,Tuonoshock -84,9,ThunderShock +84,9,Thunder Shock 85,1,１０まんボルト 85,5,Tonnerre 85,6,Donnerblitz @@ -646,7 +646,7 @@ move_id,local_language_id,name 108,6,Rauchwolke 108,7,Pantallahumo 108,8,Muro di Fumo -108,9,SmokeScreen +108,9,Smokescreen 109,1,あやしいひかり 109,5,Onde Folie 109,6,Konfustrahl @@ -718,7 +718,7 @@ move_id,local_language_id,name 120,6,Finale 120,7,Autodestruc 120,8,Autodistruz. -120,9,Selfdestruct +120,9,Self-Destruct 121,1,タマゴばくだん 121,5,Bomb'Œuf 121,6,Eierbombe @@ -808,13 +808,13 @@ move_id,local_language_id,name 135,6,Weichei 135,7,Amortiguador 135,8,Covauova -135,9,Softboiled +135,9,Soft-Boiled 136,1,とびひざげり 136,5,Pied Voltige 136,6,Turmkick 136,7,Pat. S. Alta 136,8,Calcinvolo -136,9,Hi Jump Kick +136,9,High Jump Kick 137,1,へびにらみ 137,5,Intimidation 137,6,Giftblick @@ -1108,7 +1108,7 @@ move_id,local_language_id,name 185,6,Finte 185,7,Finta 185,8,Finta -185,9,Faint Attack +185,9,Feint Attack 186,1,てんしのキッス 186,5,Doux Baiser 186,6,Bitterkuss @@ -1192,7 +1192,7 @@ move_id,local_language_id,name 199,6,Zielschuss 199,7,Fijar Blanco 199,8,Localizza -199,9,Lock-On +199,9,Lock On 200,1,げきりん 200,5,Colère 200,6,Wutanfall @@ -1228,7 +1228,7 @@ move_id,local_language_id,name 205,6,Walzer 205,7,Desenrollar 205,8,Rotolamento -205,9,Rollout +205,9,Roll Out 206,1,みねうち 206,5,Faux-Chage 206,6,Trugschlag @@ -1336,7 +1336,7 @@ move_id,local_language_id,name 223,6,Wuchtschlag 223,7,Puñodinámico 223,8,Dinamipugno -223,9,DynamicPunch +223,9,Dynamic Punch 224,1,メガホーン 224,5,Mégacorne 224,6,Vielender @@ -1348,7 +1348,7 @@ move_id,local_language_id,name 225,6,Feuerodem 225,7,Dragoaliento 225,8,Dragospiro -225,9,DragonBreath +225,9,Dragon Breath 226,1,バトンタッチ 226,5,Relais 226,6,Staffette @@ -1468,13 +1468,13 @@ move_id,local_language_id,name 245,6,Turbotempo 245,7,Vel. Extrema 245,8,Extrarapido -245,9,ExtremeSpeed +245,9,Extreme Speed 246,1,げんしのちから 246,5,Pouv.Antique 246,6,Antik-Kraft 246,7,Poder Pasado 246,8,Forzantica -246,9,AncientPower +246,9,Ancient Power 247,1,シャドーボール 247,5,Ball'Ombre 247,6,Spukball @@ -1588,7 +1588,7 @@ move_id,local_language_id,name 265,6,Riechsalz 265,7,Estímulo 265,8,Maniereforti -265,9,SmellingSalt +265,9,Smelling Salts 266,1,このゆびとまれ 266,5,Par Ici 266,6,Spotlight @@ -1780,7 +1780,7 @@ move_id,local_language_id,name 297,6,Daunenreigen 297,7,Danza Pluma 297,8,Danzadipiume -297,9,FeatherDance +297,9,Feather Dance 298,1,フラフラダンス 298,5,Danse-Folle 298,6,Taumeltanz @@ -1918,7 +1918,7 @@ move_id,local_language_id,name 320,6,Grasflöte 320,7,Silbato 320,8,Meloderba -320,9,GrassWhistle +320,9,Grass Whistle 321,1,くすぐる 321,5,Chatouille 321,6,Spaßkanone @@ -3366,7 +3366,7 @@ move_id,local_language_id,name 570,9,Parabolic Charge 571,9,Forest's Curse 572,9,Petal Blizzard -573,9,Freeze-Dry +573,9,Freeze Dry 574,9,Disarming Voice 575,9,Parting Shot 576,9,Topsy-Turvy diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv index e064dbd..dd8377e 100644 --- a/pokedex/data/csv/moves.csv +++ b/pokedex/data/csv/moves.csv @@ -1,15 +1,15 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_class_id,effect_id,effect_chance,contest_type_id,contest_effect_id,super_contest_effect_id 1,pound,1,1,40,35,100,0,10,2,1,,5,1,5 2,karate-chop,1,2,50,25,100,0,10,2,44,,5,2,5 -3,doubleslap,1,1,15,10,85,0,10,2,30,,5,10,7 +3,double-slap,1,1,15,10,85,0,10,2,30,,5,10,7 4,comet-punch,1,1,18,15,85,0,10,2,30,,5,12,7 5,mega-punch,1,1,80,20,85,0,10,2,1,,5,1,18 6,pay-day,1,1,40,20,100,0,10,2,35,,4,11,23 7,fire-punch,1,10,75,15,100,0,10,2,5,10,2,1,17 8,ice-punch,1,15,75,15,100,0,10,2,6,10,2,1,17 -9,thunderpunch,1,13,75,15,100,0,10,2,7,10,1,1,17 +9,thunder-punch,1,13,75,15,100,0,10,2,7,10,1,1,17 10,scratch,1,1,40,35,100,0,10,2,1,,5,1,5 -11,vicegrip,1,1,55,30,100,0,10,2,1,,5,1,5 +11,vice-grip,1,1,55,30,100,0,10,2,1,,5,1,5 12,guillotine,1,1,1,5,30,0,10,2,39,,1,14,9 13,razor-wind,1,1,80,10,100,0,11,3,40,,1,2,6 14,swords-dance,1,1,0,30,,0,7,1,51,,2,32,11 @@ -47,7 +47,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 46,roar,1,1,0,20,100,-6,10,1,29,,1,21,19 47,sing,1,1,0,15,55,0,10,1,2,,3,18,19 48,supersonic,1,1,0,20,55,0,10,1,50,,4,21,19 -49,sonicboom,1,1,1,20,90,0,10,3,131,,1,12,5 +49,sonic-boom,1,1,1,20,90,0,10,3,131,,1,12,5 50,disable,1,1,0,20,100,0,10,1,87,,4,18,19 51,acid,1,4,40,30,100,0,11,3,73,10,4,4,5 52,ember,1,10,40,25,100,0,10,3,5,10,2,1,5 @@ -59,7 +59,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 58,ice-beam,1,15,95,10,100,0,10,3,6,10,2,23,17 59,blizzard,1,15,120,5,70,0,11,3,261,10,2,1,17 60,psybeam,1,14,65,20,100,0,10,3,77,10,2,21,17 -61,bubblebeam,1,11,65,20,100,0,10,3,71,10,2,5,2 +61,bubble-beam,1,11,65,20,100,0,10,3,71,10,2,5,2 62,aurora-beam,1,15,65,20,100,0,10,3,69,10,2,23,17 63,hyper-beam,1,1,150,5,90,0,10,3,81,,1,6,22 64,peck,1,3,35,35,100,0,10,2,1,,1,1,5 @@ -74,15 +74,15 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 73,leech-seed,1,12,0,10,90,0,10,1,85,,4,8,21 74,growth,1,1,0,40,,0,7,1,317,,2,32,11 75,razor-leaf,1,12,55,25,95,0,11,2,44,,1,2,5 -76,solarbeam,1,12,120,10,100,0,10,3,152,,1,1,6 -77,poisonpowder,1,4,0,35,75,0,10,1,67,,4,33,19 +76,solar-beam,1,12,120,10,100,0,10,3,152,,1,1,6 +77,poison-powder,1,4,0,35,75,0,10,1,67,,4,33,19 78,stun-spore,1,12,0,30,75,0,10,1,68,,4,14,19 79,sleep-powder,1,12,0,15,75,0,10,1,2,,4,5,19 80,petal-dance,1,12,120,10,100,0,8,3,28,,2,6,21 81,string-shot,1,7,0,40,95,0,11,1,21,,4,9,19 82,dragon-rage,1,16,1,10,100,0,10,3,42,,1,26,5 83,fire-spin,1,10,35,15,85,0,10,3,43,100,2,24,21 -84,thundershock,1,13,40,30,100,0,10,3,7,10,1,1,5 +84,thunder-shock,1,13,40,30,100,0,10,3,7,10,1,1,5 85,thunderbolt,1,13,95,15,100,0,10,3,7,10,1,1,17 86,thunder-wave,1,13,0,20,100,0,10,1,68,,1,14,19 87,thunder,1,13,120,10,70,0,10,3,153,30,1,8,17 @@ -118,7 +118,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 117,bide,1,1,1,10,,1,7,2,27,,5,15,15 118,metronome,1,1,0,10,,0,7,1,84,,3,17,14 119,mirror-move,1,3,0,20,,0,10,1,10,,4,19,15 -120,selfdestruct,1,1,200,5,100,0,9,2,8,,2,7,9 +120,self-destruct,1,1,200,5,100,0,9,2,8,,2,7,9 121,egg-bomb,1,1,100,10,75,0,10,2,1,,5,1,5 122,lick,1,8,20,30,100,0,10,2,7,30,5,4,16 123,smog,1,4,20,20,70,0,10,3,3,40,5,5,5 @@ -133,8 +133,8 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 132,constrict,1,1,10,35,100,0,10,2,71,10,5,9,21 133,amnesia,1,14,0,20,,0,7,1,55,,3,32,11 134,kinesis,1,14,0,15,80,0,10,1,24,,4,24,11 -135,softboiled,1,1,0,10,,0,7,1,33,,2,1,8 -136,hi-jump-kick,1,2,130,10,90,0,10,2,46,,1,3,5 +135,soft-boiled,1,1,0,10,,0,7,1,33,,2,1,8 +136,high-jump-kick,1,2,130,10,90,0,10,2,46,,1,3,5 137,glare,1,1,0,30,90,0,10,1,68,,5,5,19 138,dream-eater,1,14,100,15,100,0,10,3,9,,4,8,20 139,poison-gas,1,4,0,40,80,0,11,1,67,,4,33,5 @@ -183,7 +183,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 182,protect,2,1,0,10,,4,7,1,112,,3,15,16 183,mach-punch,2,2,40,30,100,1,10,2,104,,1,30,1 184,scary-face,2,1,0,10,100,0,10,1,61,,5,10,2 -185,faint-attack,2,17,60,20,,0,10,2,18,,4,27,18 +185,feint-attack,2,17,60,20,,0,10,2,18,,4,27,18 186,sweet-kiss,2,1,0,10,75,0,10,1,50,,3,18,19 187,belly-drum,2,1,0,10,,0,7,1,143,,3,32,11 188,sludge-bomb,2,4,90,10,100,0,10,3,3,30,5,10,18 @@ -203,7 +203,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 202,giga-drain,2,12,75,10,100,0,10,3,4,,4,10,20 203,endure,2,1,0,10,,4,7,1,117,,5,16,13 204,charm,2,1,0,20,100,0,10,1,59,,3,23,19 -205,rollout,2,6,30,20,90,0,10,2,118,,5,24,7 +205,roll-out,2,6,30,20,90,0,10,2,118,,5,24,7 206,false-swipe,2,1,40,40,100,0,10,2,102,,1,5,16 207,swagger,2,1,0,15,90,0,10,1,119,,3,27,19 208,milk-drink,2,1,0,10,,0,7,1,33,,3,12,8 @@ -221,9 +221,9 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 220,pain-split,2,1,0,20,,0,10,1,92,,4,4,10 221,sacred-fire,2,10,100,5,95,0,10,2,126,50,2,1,22 222,magnitude,2,5,1,30,100,0,9,2,127,,5,11,18 -223,dynamicpunch,2,2,100,5,50,0,10,2,77,100,1,10,18 +223,dynamic-punch,2,2,100,5,50,0,10,2,77,100,1,10,18 224,megahorn,2,7,120,10,85,0,10,2,1,,1,12,18 -225,dragonbreath,2,16,60,20,100,0,10,3,7,30,1,5,17 +225,dragon-breath,2,16,60,20,100,0,10,3,7,30,1,5,17 226,baton-pass,2,1,0,40,,0,7,1,128,,3,18,16 227,encore,2,1,0,5,100,0,10,1,91,,3,18,20 228,pursuit,2,17,40,20,100,0,10,2,129,,4,14,20 @@ -243,8 +243,8 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 242,crunch,2,17,80,15,100,0,10,2,70,20,5,4,18 243,mirror-coat,2,14,1,20,100,-5,1,3,145,,2,16,15 244,psych-up,2,1,0,10,,0,10,1,144,,4,12,11 -245,extremespeed,2,1,80,5,100,2,10,2,104,,1,30,1 -246,ancientpower,2,6,60,5,100,0,10,3,141,10,5,32,18 +245,extreme-speed,2,1,80,5,100,2,10,2,104,,1,30,1 +246,ancient-power,2,6,60,5,100,0,10,3,141,10,5,32,18 247,shadow-ball,2,8,80,15,100,0,10,3,73,20,4,21,17 248,future-sight,2,14,100,10,100,0,10,3,149,,4,24,17 249,rock-smash,2,2,40,15,100,0,10,2,70,50,5,29,18 @@ -263,7 +263,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 262,memento,3,17,0,10,100,0,10,1,169,,5,7,9 263,facade,3,1,70,20,100,0,10,2,170,,3,28,15 264,focus-punch,3,2,150,20,100,-3,10,2,171,,5,31,6 -265,smellingsalt,3,1,60,10,100,0,10,2,172,,4,9,16 +265,smelling-salts,3,1,60,10,100,0,10,2,172,,4,9,16 266,follow-me,3,1,0,20,,3,7,1,173,,3,24,14 267,nature-power,3,1,0,20,,0,1,1,174,,2,11,14 268,charge,3,13,0,20,,0,7,1,175,,4,12,11 @@ -295,7 +295,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 294,tail-glow,3,7,0,20,,0,7,1,322,,2,32,11 295,luster-purge,3,14,70,5,100,0,10,3,73,50,4,9,22 296,mist-ball,3,14,70,5,100,0,10,3,72,50,4,4,22 -297,featherdance,3,3,0,15,100,0,10,1,59,,2,28,19 +297,feather-dance,3,3,0,15,100,0,10,1,59,,2,28,19 298,teeter-dance,3,1,0,20,100,0,9,1,200,,3,6,14 299,blaze-kick,3,10,85,10,90,0,10,2,201,10,2,1,17 300,mud-sport,3,5,0,15,,0,12,1,202,,3,1,13 @@ -318,7 +318,7 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 317,rock-tomb,3,6,50,10,80,0,10,2,71,100,4,24,2 318,silver-wind,3,7,60,5,100,0,10,3,141,10,2,32,4 319,metal-sound,3,9,0,40,85,0,10,1,63,,4,5,10 -320,grasswhistle,3,12,0,15,55,0,10,1,2,,4,5,19 +320,grass-whistle,3,12,0,15,55,0,10,1,2,,4,5,19 321,tickle,3,1,0,20,100,0,10,1,206,,3,33,19 322,cosmic-power,3,14,0,20,,0,7,1,207,,1,32,11 323,water-spout,3,11,150,5,100,0,11,3,191,,2,26,22