From e967edb4b1fea5c538d85dcd4ee9edd814458cd8 Mon Sep 17 00:00:00 2001 From: "Lynn \"Zhorken\" Vaughan" Date: Tue, 5 Nov 2013 01:33:51 -0500 Subject: [PATCH] Make Gen VI move IDs match internal IDs. --- pokedex/data/csv/move_names.csv | 96 ++++++++++++++++----------------- pokedex/data/csv/moves.csv | 96 ++++++++++++++++----------------- 2 files changed, 96 insertions(+), 96 deletions(-) diff --git a/pokedex/data/csv/move_names.csv b/pokedex/data/csv/move_names.csv index 218eea8..b2a2dc2 100644 --- a/pokedex/data/csv/move_names.csv +++ b/pokedex/data/csv/move_names.csv @@ -3353,54 +3353,54 @@ move_id,local_language_id,name 559,7,Rayo Fusión 559,8,Incrotuono 559,9,Fusion Bolt -560,9,Baby-Doll Eyes -561,9,Belch -562,9,Boomburst -563,9,Confide -564,9,Crafty Shield -565,9,Dazzling Gleam -566,9,Disarming Voice -567,9,Draining Kiss -568,9,Eerie Impulse -569,9,Electric Terrain -570,9,Electrify -571,9,Fairy Lock -572,9,Fairy Wind -573,9,Fell Stinger -574,9,Flower Shield -575,9,Flying Press -576,9,Forest's Curse -577,9,Freeze-Dry -578,9,Geomancy -579,9,Grassy Terrain -580,9,Infestation -581,9,Ion Deluge -582,9,King's Shield -583,9,Land's Wrath -584,9,Magnetic Flux -585,9,Mat Block -586,9,Misty Terrain -587,9,Moonblast -588,9,Mystical Fire -589,9,Noble Roar -590,9,Nuzzle -591,9,Oblivion Wing -592,9,Parabolic Charge -593,9,Parting Shot -594,9,Petal Blizzard -595,9,Phantom Force -596,9,Play Nice -597,9,Play Rough -598,9,Powder -599,9,Power-Up Punch -600,9,Rototiller -601,9,Spiky Shield -602,9,Sticky Web -603,9,Topsy-Turvy -604,9,Trick-or-Treat -605,9,Venom Drench -606,9,Water Shuriken -607,9,Aromatic Mist +560,9,Flying Press +561,9,Mat Block +562,9,Belch +563,9,Rototiller +564,9,Sticky Web +565,9,Fell Stinger +566,9,Phantom Force +567,9,Trick-or-Treat +568,9,Noble Roar +569,9,Ion Deluge +570,9,Parabolic Charge +571,9,Forest's Curse +572,9,Petal Blizzard +573,9,Freeze-Dry +574,9,Disarming Voice +575,9,Parting Shot +576,9,Topsy-Turvy +577,9,Draining Kiss +578,9,Crafty Shield +579,9,Flower Shield +580,9,Grassy Terrain +581,9,Misty Terrain +582,9,Electrify +583,9,Play Rough +584,9,Fairy Wind +585,9,Moonblast +586,9,Boomburst +587,9,Fairy Lock +588,9,King's Shield +589,9,Play Nice +590,9,Confide +594,9,Water Shuriken +595,9,Mystical Fire +596,9,Spiky Shield +597,9,Aromatic Mist +598,9,Eerie Impulse +599,9,Venom Drench +600,9,Powder +601,9,Geomancy +602,9,Magnetic Flux +604,9,Electric Terrain +605,9,Dazzling Gleam +608,9,Baby-Doll Eyes +609,9,Nuzzle +611,9,Infestation +612,9,Power-Up Punch +613,9,Oblivion Wing +616,9,Land's Wrath 10001,1,ダークラッシュ 10001,5,Charge Noire 10001,6,Cryptoschlag diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv index d962393..17f8b81 100644 --- a/pokedex/data/csv/moves.csv +++ b/pokedex/data/csv/moves.csv @@ -558,54 +558,54 @@ id,identifier,generation_id,type_id,power,pp,accuracy,priority,target_id,damage_ 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,,,, -560,baby-doll-eyes,6,18,0,30,100,1,10,1,10007,,,, -561,belch,6,4,120,10,90,0,10,3,10007,,,, -562,boomburst,6,1,140,10,100,0,9,3,10007,,,, -563,confide,6,1,0,20,,0,10,1,10007,,,, -564,crafty-shield,6,18,0,10,,4,4,1,10007,,,, -565,dazzling-gleam,6,18,80,10,100,0,11,3,10007,,,, -566,disarming-voice,6,18,40,15,,0,10,3,10007,,,, -567,draining-kiss,6,18,50,20,100,0,10,3,10007,,,, -568,eerie-impulse,6,13,0,15,100,0,10,1,10007,,,, -569,electric-terrain,6,13,0,10,,0,12,1,10007,,,, -570,electrify,6,13,0,20,,0,10,1,10007,,,, -571,fairy-lock,6,18,0,10,,0,12,1,10007,,,, -572,fairy-wind,6,18,40,30,100,0,10,3,10007,,,, -573,fell-stinger,6,7,30,25,100,0,10,2,10007,,,, -574,flower-shield,6,18,0,10,,0,4,1,10007,,,, -575,flying-press,6,2,80,10,95,0,10,2,10007,,,, -576,forests-curse,6,12,0,20,100,0,10,1,10007,,,, -577,freeze-dry,6,15,70,15,100,0,10,3,10007,,,, -578,geomancy,6,18,0,10,,0,7,1,10007,,,, -579,grassy-terrain,6,12,0,10,,0,12,1,10007,,,, -580,infestation,6,7,20,35,100,0,10,3,10007,,,, -581,ion-deluge,6,13,0,25,,0,10,1,10007,,,, -582,kings-shield,6,9,0,10,,4,7,1,10007,,,, -583,lands-wrath,6,5,90,10,100,0,10,2,10007,,,, -584,magnetic-flux,6,13,0,20,,0,4,1,10007,,,, -585,mat-block,6,2,0,10,,0,10,1,10007,,,, -586,misty-terrain,6,18,0,15,,0,12,1,10007,,,, -587,moonblast,6,18,95,15,100,0,10,3,10007,,,, -588,mystical-fire,6,10,65,10,100,0,10,3,10007,,,, -589,noble-roar,6,1,0,30,100,0,10,1,10007,,,, -590,nuzzle,6,13,20,20,100,0,10,2,10007,,,, -591,oblivion-wing,6,3,80,10,100,0,10,3,10007,,,, -592,parabolic-charge,6,13,50,20,100,0,11,3,10007,,,, -593,parting-shot,6,17,0,20,100,0,10,1,10007,,,, -594,petal-blizzard,6,12,90,15,100,0,9,2,10007,,,, -595,phantom-force,6,8,90,10,100,0,10,2,10007,,,, -596,play-nice,6,1,0,20,,0,10,1,10007,,,, -597,play-rough,6,18,90,10,90,0,10,2,10007,,,, -598,powder,6,7,0,20,100,1,10,1,10007,,,, -599,power-up-punch,6,2,40,30,100,0,10,2,10007,,,, -600,rototiller,6,5,0,10,,0,12,1,10007,,,, -601,spiky-shield,6,12,0,20,,4,7,1,10007,,,, -602,sticky-web,6,7,0,20,,0,10,1,10007,,,, -603,topsy-turvy,6,17,0,10,,0,10,1,10007,,,, -604,trick-or-treat,6,8,0,20,100,0,10,1,10007,,,, -605,venom-drench,6,4,0,20,100,0,10,1,10007,,,, -606,water-shuriken,6,11,15,20,100,1,10,2,10007,,,, -607,aromatic-mist,6,18,0,20,100,0,4,1,10007,,,, +560,flying-press,6,2,80,10,95,0,10,2,10007,,,, +561,mat-block,6,2,0,10,,0,10,1,10007,,,, +562,belch,6,4,120,10,90,0,10,3,10007,,,, +563,rototiller,6,5,0,10,,0,12,1,10007,,,, +564,sticky-web,6,7,0,20,,0,10,1,10007,,,, +565,fell-stinger,6,7,30,25,100,0,10,2,10007,,,, +566,phantom-force,6,8,90,10,100,0,10,2,10007,,,, +567,trick-or-treat,6,8,0,20,100,0,10,1,10007,,,, +568,noble-roar,6,1,0,30,100,0,10,1,10007,,,, +569,ion-deluge,6,13,0,25,,0,10,1,10007,,,, +570,parabolic-charge,6,13,50,20,100,0,11,3,10007,,,, +571,forests-curse,6,12,0,20,100,0,10,1,10007,,,, +572,petal-blizzard,6,12,90,15,100,0,9,2,10007,,,, +573,freeze-dry,6,15,70,15,100,0,10,3,10007,,,, +574,disarming-voice,6,18,40,15,,0,10,3,10007,,,, +575,parting-shot,6,17,0,20,100,0,10,1,10007,,,, +576,topsy-turvy,6,17,0,10,,0,10,1,10007,,,, +577,draining-kiss,6,18,50,20,100,0,10,3,10007,,,, +578,crafty-shield,6,18,0,10,,4,4,1,10007,,,, +579,flower-shield,6,18,0,10,,0,4,1,10007,,,, +580,grassy-terrain,6,12,0,10,,0,12,1,10007,,,, +581,misty-terrain,6,18,0,15,,0,12,1,10007,,,, +582,electrify,6,13,0,20,,0,10,1,10007,,,, +583,play-rough,6,18,90,10,90,0,10,2,10007,,,, +584,fairy-wind,6,18,40,30,100,0,10,3,10007,,,, +585,moonblast,6,18,95,15,100,0,10,3,10007,,,, +586,boomburst,6,1,140,10,100,0,9,3,10007,,,, +587,fairy-lock,6,18,0,10,,0,12,1,10007,,,, +588,kings-shield,6,9,0,10,,4,7,1,10007,,,, +589,play-nice,6,1,0,20,,0,10,1,10007,,,, +590,confide,6,1,0,20,,0,10,1,10007,,,, +594,water-shuriken,6,11,15,20,100,1,10,2,10007,,,, +595,mystical-fire,6,10,65,10,100,0,10,3,10007,,,, +596,spiky-shield,6,12,0,20,,4,7,1,10007,,,, +597,aromatic-mist,6,18,0,20,,0,4,1,10007,,,, +598,eerie-impulse,6,13,0,15,100,0,10,1,10007,,,, +599,venom-drench,6,4,0,20,100,0,10,1,10007,,,, +600,powder,6,7,0,20,100,1,10,1,10007,,,, +601,geomancy,6,18,0,10,,0,7,1,10007,,,, +602,magnetic-flux,6,13,0,20,,0,4,1,10007,,,, +604,electric-terrain,6,13,0,10,,0,12,1,10007,,,, +605,dazzling-gleam,6,18,80,10,100,0,11,3,10007,,,, +608,baby-doll-eyes,6,18,0,30,100,1,10,1,10007,,,, +609,nuzzle,6,13,20,20,100,0,10,2,10007,,,, +611,infestation,6,7,20,35,100,0,10,3,10007,,,, +612,power-up-punch,6,2,40,30,100,0,10,2,10007,,,, +613,oblivion-wing,6,3,80,10,100,0,10,3,10007,,,, +616,lands-wrath,6,5,90,10,100,0,10,2,10007,,,, 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,,,,