B/W: Real form names for basurao, hihidaruma, and meroetta.

[zzz-pokedex.git] / pokedex / data / csv / moves.csv

diff --git a/pokedex/data/csv/moves.csv b/pokedex/data/csv/moves.csv
index 8374104..88b532f 100644 (file)
--- a/pokedex/data/csv/moves.csv
+++ b/pokedex/data/csv/moves.csv
@@ -12,13 +12,13 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 11,ViceGrip,1,1,55,30,100,10,2,1,,5,1,5
 12,Guillotine,1,1,1,5,30,10,2,39,,1,14,9
 13,Razor Wind,1,1,80,10,100,11,3,40,,1,2,6
 11,ViceGrip,1,1,55,30,100,10,2,1,,5,1,5
 12,Guillotine,1,1,1,5,30,10,2,39,,1,14,9
 13,Razor Wind,1,1,80,10,100,11,3,40,,1,2,6

-14,Swords Dance,1,1,0,30,100,7,1,51,,2,32,11
+14,Swords Dance,1,1,0,30,,7,1,51,,2,32,11

 15,Cut,1,1,50,30,95,10,2,1,,1,14,5
 16,Gust,1,3,40,35,100,10,3,150,,4,21,5
 17,Wing Attack,1,3,60,35,100,10,2,1,,1,12,5
 18,Whirlwind,1,1,0,20,100,10,1,29,,4,21,9
 19,Fly,1,3,90,15,95,10,2,156,,4,15,6
 15,Cut,1,1,50,30,95,10,2,1,,1,14,5
 16,Gust,1,3,40,35,100,10,3,150,,4,21,5
 17,Wing Attack,1,3,60,35,100,10,2,1,,1,12,5
 18,Whirlwind,1,1,0,20,100,10,1,29,,4,21,9
 19,Fly,1,3,90,15,95,10,2,156,,4,15,6

-20,Bind,1,1,15,20,75,10,2,43,,5,24,21
+20,Bind,1,1,15,20,75,10,2,43,100,5,24,21

 21,Slam,1,1,80,20,75,10,2,1,,5,23,5
 22,Vine Whip,1,12,35,15,100,10,2,1,,1,1,5
 23,Stomp,1,1,65,20,100,10,2,151,30,5,4,5
 21,Slam,1,1,80,20,75,10,2,1,,5,23,5
 22,Vine Whip,1,12,35,15,100,10,2,1,,1,1,5
 23,Stomp,1,1,65,20,100,10,2,151,30,5,4,5


@@ -33,7 +33,7 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 32,Horn Drill,1,1,1,5,30,10,2,39,,1,14,9
 33,Tackle,1,1,35,35,95,10,2,1,,5,1,5
 34,Body Slam,1,1,85,15,100,10,2,7,30,5,4,5
 32,Horn Drill,1,1,1,5,30,10,2,39,,1,14,9
 33,Tackle,1,1,35,35,95,10,2,1,,5,1,5
 34,Body Slam,1,1,85,15,100,10,2,7,30,5,4,5

-35,Wrap,1,1,15,20,85,10,2,43,,5,24,21
+35,Wrap,1,1,15,20,85,10,2,43,100,5,24,21

 36,Take Down,1,1,90,20,85,10,2,49,,5,3,5
 37,Thrash,1,1,90,20,100,8,2,28,,5,6,7
 38,Double-Edge,1,1,120,15,100,10,2,199,,5,3,9
 36,Take Down,1,1,90,20,85,10,2,49,,5,3,5
 37,Thrash,1,1,90,20,100,8,2,28,,5,6,7
 38,Double-Edge,1,1,120,15,100,10,2,199,,5,3,9


@@ -52,7 +52,7 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 51,Acid,1,4,40,30,100,11,3,73,10,4,4,5
 52,Ember,1,10,40,25,100,10,3,5,10,2,1,5
 53,Flamethrower,1,10,95,15,100,10,3,5,10,2,1,17
 51,Acid,1,4,40,30,100,11,3,73,10,4,4,5
 52,Ember,1,10,40,25,100,10,3,5,10,2,1,5
 53,Flamethrower,1,10,95,15,100,10,3,5,10,2,1,17

-54,Mist,1,15,0,30,100,4,1,47,,2,15,13
+54,Mist,1,15,0,30,,4,1,47,,2,15,13

 55,Water Gun,1,11,40,25,100,10,3,1,,3,1,5
 56,Hydro Pump,1,11,120,5,80,10,3,1,,2,1,17
 57,Surf,1,11,95,15,100,9,3,258,,2,2,17
 55,Water Gun,1,11,40,25,100,10,3,1,,3,1,5
 56,Hydro Pump,1,11,120,5,80,10,3,1,,2,1,17
 57,Surf,1,11,95,15,100,9,3,258,,2,2,17


@@ -72,7 +72,7 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 71,Absorb,1,12,20,25,100,10,3,4,,4,9,20
 72,Mega Drain,1,12,40,15,100,10,3,4,,4,4,20
 73,Leech Seed,1,12,0,10,90,10,1,85,,4,8,21
 71,Absorb,1,12,20,25,100,10,3,4,,4,9,20
 72,Mega Drain,1,12,40,15,100,10,3,4,,4,4,20
 73,Leech Seed,1,12,0,10,90,10,1,85,,4,8,21

-74,Growth,1,1,0,40,100,7,1,14,,2,32,11
+74,Growth,1,1,0,40,,7,1,317,,2,32,11

 75,Razor Leaf,1,12,55,25,95,11,2,44,,1,2,5
 76,SolarBeam,1,12,120,10,100,10,3,152,,1,1,6
 77,PoisonPowder,1,4,0,35,75,10,1,67,,4,33,19
 75,Razor Leaf,1,12,55,25,95,11,2,44,,1,2,5
 76,SolarBeam,1,12,120,10,100,10,3,152,,1,1,6
 77,PoisonPowder,1,4,0,35,75,10,1,67,,4,33,19


@@ -81,7 +81,7 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 80,Petal Dance,1,12,90,20,100,8,3,28,,2,6,21
 81,String Shot,1,7,0,40,95,11,1,21,,4,9,19
 82,Dragon Rage,1,16,1,10,100,10,3,42,,1,26,5
 80,Petal Dance,1,12,90,20,100,8,3,28,,2,6,21
 81,String Shot,1,7,0,40,95,11,1,21,,4,9,19
 82,Dragon Rage,1,16,1,10,100,10,3,42,,1,26,5

-83,Fire Spin,1,10,15,15,70,10,3,43,,2,24,21
+83,Fire Spin,1,10,15,15,70,10,3,43,100,2,24,21

 84,ThunderShock,1,13,40,30,100,10,3,7,10,1,1,5
 85,Thunderbolt,1,13,95,15,100,10,3,7,10,1,1,17
 86,Thunder Wave,1,13,0,20,100,10,1,68,,1,14,19
 84,ThunderShock,1,13,40,30,100,10,3,7,10,1,1,5
 85,Thunderbolt,1,13,95,15,100,10,3,7,10,1,1,17
 86,Thunder Wave,1,13,0,20,100,10,1,68,,1,14,19


@@ -94,30 +94,30 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 93,Confusion,1,14,50,25,100,10,3,77,10,4,9,5
 94,Psychic,1,14,90,10,100,10,3,73,10,4,5,17
 95,Hypnosis,1,14,0,20,70,10,1,2,,4,5,19
 93,Confusion,1,14,50,25,100,10,3,77,10,4,9,5
 94,Psychic,1,14,90,10,100,10,3,73,10,4,5,17
 95,Hypnosis,1,14,0,20,70,10,1,2,,4,5,19

-96,Meditate,1,14,0,40,100,7,1,11,,2,32,11
-97,Agility,1,14,0,30,100,7,1,53,,1,30,1
+96,Meditate,1,14,0,40,,7,1,11,,2,32,11
+97,Agility,1,14,0,30,,7,1,53,,1,30,1

 98,Quick Attack,1,1,40,30,100,10,2,104,,1,30,1
 99,Rage,1,1,20,20,100,10,2,82,,1,17,11
 98,Quick Attack,1,1,40,30,100,10,2,104,,1,30,1
 99,Rage,1,1,20,20,100,10,2,82,,1,17,11

-100,Teleport,1,14,0,20,100,7,1,154,,1,15,1
+100,Teleport,1,14,0,20,,7,1,154,,1,15,1

 101,Night Shade,1,8,1,15,100,10,3,88,,4,23,5
 101,Night Shade,1,8,1,15,100,10,3,88,,4,23,5

-102,Mimic,1,1,0,10,100,10,1,83,,3,19,12
+102,Mimic,1,1,0,10,,10,1,83,,3,19,12

 103,Screech,1,1,0,40,85,10,1,60,,4,5,10
 103,Screech,1,1,0,40,85,10,1,60,,4,5,10

-104,Double Team,1,1,0,15,100,7,1,17,,1,16,1
-105,Recover,1,1,0,10,100,7,1,33,,4,23,8
-106,Harden,1,1,0,30,100,7,1,12,,5,16,13
-107,Minimize,1,1,0,20,100,7,1,109,,3,16,13
+104,Double Team,1,1,0,15,,7,1,17,,1,16,1
+105,Recover,1,1,0,10,,7,1,33,,4,23,8
+106,Harden,1,1,0,30,,7,1,12,,5,16,13
+107,Minimize,1,1,0,20,,7,1,109,,3,16,13

 108,SmokeScreen,1,1,0,20,100,10,1,24,,4,21,10
 109,Confuse Ray,1,8,0,10,100,10,1,50,,4,21,10
 108,SmokeScreen,1,1,0,20,100,10,1,24,,4,21,10
 109,Confuse Ray,1,8,0,10,100,10,1,50,,4,21,10

-110,Withdraw,1,11,0,40,100,7,1,12,,3,15,13
-111,Defense Curl,1,1,0,40,100,7,1,157,,3,16,13
-112,Barrier,1,14,0,30,100,7,1,52,,1,15,13
-113,Light Screen,1,14,0,30,100,4,1,36,,2,15,13
-114,Haze,1,15,0,30,100,12,1,26,,2,33,13
-115,Reflect,1,14,0,20,100,4,1,66,,4,15,13
-116,Focus Energy,1,1,0,30,100,7,1,48,,1,5,11
-117,Bide,1,1,1,10,100,7,2,27,,5,15,15
-118,Metronome,1,1,0,10,100,1,1,84,,3,17,14
-119,Mirror Move,1,3,0,20,100,1,1,10,,4,19,15
+110,Withdraw,1,11,0,40,,7,1,12,,3,15,13
+111,Defense Curl,1,1,0,40,,7,1,157,,3,16,13
+112,Barrier,1,14,0,30,,7,1,52,,1,15,13
+113,Light Screen,1,14,0,30,,4,1,36,,2,15,13
+114,Haze,1,15,0,30,,12,1,26,,2,33,13
+115,Reflect,1,14,0,20,,4,1,66,,4,15,13
+116,Focus Energy,1,1,0,30,,7,1,48,,1,5,11
+117,Bide,1,1,1,10,,7,2,27,,5,15,15
+118,Metronome,1,1,0,10,,7,1,84,,3,17,14
+119,Mirror Move,1,3,0,20,,10,1,10,,4,19,15

 120,Selfdestruct,1,1,200,5,100,9,2,8,,2,7,9
 121,Egg Bomb,1,1,100,10,75,10,2,1,,5,1,5
 122,Lick,1,8,20,30,100,10,2,7,30,5,4,16
 120,Selfdestruct,1,1,200,5,100,9,2,8,,2,7,9
 121,Egg Bomb,1,1,100,10,75,10,2,1,,5,1,5
 122,Lick,1,8,20,30,100,10,2,7,30,5,4,16


@@ -126,137 +126,137 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 125,Bone Club,1,5,65,20,85,10,2,32,10,5,10,5
 126,Fire Blast,1,10,120,5,85,10,3,5,10,2,1,17
 127,Waterfall,1,11,80,15,100,10,2,32,20,5,28,5
 125,Bone Club,1,5,65,20,85,10,2,32,10,5,10,5
 126,Fire Blast,1,10,120,5,85,10,3,5,10,2,1,17
 127,Waterfall,1,11,80,15,100,10,2,32,20,5,28,5

-128,Clamp,1,11,35,10,75,10,2,43,,5,24,5
-129,Swift,1,1,60,20,100,11,3,18,,1,27,17
+128,Clamp,1,11,35,10,75,10,2,43,100,5,24,5
+129,Swift,1,1,60,20,,11,3,18,,1,27,17

 130,Skull Bash,1,1,100,15,100,10,2,146,100,5,4,6
 131,Spike Cannon,1,1,20,15,100,10,2,30,,1,10,7
 132,Constrict,1,1,10,35,100,10,2,71,10,5,9,21
 130,Skull Bash,1,1,100,15,100,10,2,146,100,5,4,6
 131,Spike Cannon,1,1,20,15,100,10,2,30,,1,10,7
 132,Constrict,1,1,10,35,100,10,2,71,10,5,9,21

-133,Amnesia,1,14,0,20,100,7,1,55,,3,32,11
+133,Amnesia,1,14,0,20,,7,1,55,,3,32,11

 134,Kinesis,1,14,0,15,80,10,1,24,,4,24,11
 134,Kinesis,1,14,0,15,80,10,1,24,,4,24,11

-135,Softboiled,1,1,0,10,100,7,1,33,,2,1,8
+135,Softboiled,1,1,0,10,,7,1,33,,2,1,8

 136,Hi Jump Kick,1,2,100,20,90,10,2,46,,1,3,5
 137,Glare,1,1,0,30,75,10,1,68,,5,5,19
 138,Dream Eater,1,14,100,15,100,10,3,9,,4,8,20
 136,Hi Jump Kick,1,2,100,20,90,10,2,46,,1,3,5
 137,Glare,1,1,0,30,75,10,1,68,,5,5,19
 138,Dream Eater,1,14,100,15,100,10,3,9,,4,8,20

-139,Poison Gas,1,4,0,40,55,10,1,67,,4,33,5
+139,Poison Gas,1,4,0,40,55,11,1,67,,4,33,5

 140,Barrage,1,1,15,20,85,10,2,30,,5,12,7
 141,Leech Life,1,7,20,15,100,10,2,4,,4,9,20
 142,Lovely Kiss,1,1,0,10,75,10,1,2,,2,5,19
 143,Sky Attack,1,3,140,5,90,10,2,76,30,1,2,6
 140,Barrage,1,1,15,20,85,10,2,30,,5,12,7
 141,Leech Life,1,7,20,15,100,10,2,4,,4,9,20
 142,Lovely Kiss,1,1,0,10,75,10,1,2,,2,5,19
 143,Sky Attack,1,3,140,5,90,10,2,76,30,1,2,6

-144,Transform,1,1,0,10,100,10,1,58,,4,17,23
+144,Transform,1,1,0,10,,10,1,58,,4,17,23

 145,Bubble,1,11,20,30,100,11,3,71,10,3,8,2
 146,Dizzy Punch,1,1,70,10,100,10,2,77,20,1,4,16
 147,Spore,1,12,0,15,100,10,1,2,,2,5,10
 148,Flash,1,1,0,20,100,10,1,24,,2,21,10
 149,Psywave,1,14,1,15,80,10,3,89,,4,14,5
 145,Bubble,1,11,20,30,100,11,3,71,10,3,8,2
 146,Dizzy Punch,1,1,70,10,100,10,2,77,20,1,4,16
 147,Spore,1,12,0,15,100,10,1,2,,2,5,10
 148,Flash,1,1,0,20,100,10,1,24,,2,21,10
 149,Psywave,1,14,1,15,80,10,3,89,,4,14,5

-150,Splash,1,1,0,40,100,7,1,86,,3,28,16
-151,Acid Armor,1,4,0,40,100,7,1,52,,5,32,11
+150,Splash,1,1,0,40,,7,1,86,,3,28,16
+151,Acid Armor,1,4,0,40,,7,1,52,,5,32,11

 152,Crabhammer,1,11,90,10,85,10,2,44,,5,2,18
 153,Explosion,1,1,250,5,100,9,2,8,,2,7,9
 154,Fury Swipes,1,1,18,15,80,10,2,30,,5,10,7
 155,Bonemerang,1,5,50,10,90,10,2,45,,5,1,7
 152,Crabhammer,1,11,90,10,85,10,2,44,,5,2,18
 153,Explosion,1,1,250,5,100,9,2,8,,2,7,9
 154,Fury Swipes,1,1,18,15,80,10,2,30,,5,10,7
 155,Bonemerang,1,5,50,10,90,10,2,45,,5,1,7

-156,Rest,1,14,0,10,100,7,1,38,,3,16,8
+156,Rest,1,14,0,10,,7,1,38,,3,16,8

 157,Rock Slide,1,6,75,10,90,11,2,32,30,5,5,5
 158,Hyper Fang,1,1,80,15,90,10,2,32,10,1,4,18
 157,Rock Slide,1,6,75,10,90,11,2,32,30,5,5,5
 158,Hyper Fang,1,1,80,15,90,10,2,32,10,1,4,18

-159,Sharpen,1,1,0,30,100,7,1,11,,3,32,11
-160,Conversion,1,1,0,30,100,7,1,31,,2,12,23
+159,Sharpen,1,1,0,30,,7,1,11,,3,32,11
+160,Conversion,1,1,0,30,,7,1,31,,2,12,23

 161,Tri Attack,1,1,80,10,100,10,3,37,20,2,8,5
 162,Super Fang,1,1,1,10,90,10,2,41,,5,14,5
 163,Slash,1,1,70,20,100,10,2,44,,1,2,5
 161,Tri Attack,1,1,80,10,100,10,3,37,20,2,8,5
 162,Super Fang,1,1,1,10,90,10,2,41,,5,14,5
 163,Slash,1,1,70,20,100,10,2,44,,1,2,5

-164,Substitute,1,1,0,10,100,7,1,80,,4,16,23
-165,Struggle,1,1,50,1,100,10,2,255,,1,1,5
-166,Sketch,2,1,0,1,100,10,1,96,,4,19,23
+164,Substitute,1,1,0,10,,7,1,80,,4,16,23
+165,Struggle,1,1,50,1,,10,2,255,,1,1,5
+166,Sketch,2,1,0,1,,10,1,96,,4,19,23

 167,Triple Kick,2,2,10,10,90,10,2,105,,1,1,7
 168,Thief,2,17,40,10,100,10,2,106,,5,20,12
 167,Triple Kick,2,2,10,10,90,10,2,105,,1,1,7
 168,Thief,2,17,40,10,100,10,2,106,,5,20,12

-169,Spider Web,2,7,0,10,100,10,1,107,,4,18,13
-170,Mind Reader,2,1,0,40,100,10,1,95,,4,24,20
+169,Spider Web,2,7,0,10,,10,1,107,,4,18,13
+170,Mind Reader,2,1,0,40,,10,1,95,,4,24,20

 171,Nightmare,2,8,0,15,100,10,1,108,,4,5,19
 172,Flame Wheel,2,10,60,25,100,10,2,126,10,2,1,7
 173,Snore,2,1,40,15,100,10,3,93,30,3,1,5
 171,Nightmare,2,8,0,15,100,10,1,108,,4,5,19
 172,Flame Wheel,2,10,60,25,100,10,2,126,10,2,1,7
 173,Snore,2,1,40,15,100,10,3,93,30,3,1,5

-174,Curse,2,18,0,10,100,10,1,110,,5,31,21
+174,Curse,2,8,0,10,,1,1,110,,5,31,21

 175,Flail,2,1,1,15,100,10,2,100,,3,26,15
 175,Flail,2,1,1,15,100,10,2,100,,3,26,15

-176,Conversion 2,2,1,0,30,100,7,1,94,,2,12,23
+176,Conversion 2,2,1,0,30,,10,1,94,,2,12,23

 177,Aeroblast,2,3,100,5,95,10,3,44,,1,2,22
 178,Cotton Spore,2,12,0,40,85,10,1,61,,2,10,1
 179,Reversal,2,2,1,15,100,10,2,100,,1,28,15
 180,Spite,2,8,0,10,100,10,1,101,,5,28,19
 181,Powder Snow,2,15,40,25,100,11,3,6,10,2,1,5
 177,Aeroblast,2,3,100,5,95,10,3,44,,1,2,22
 178,Cotton Spore,2,12,0,40,85,10,1,61,,2,10,1
 179,Reversal,2,2,1,15,100,10,2,100,,1,28,15
 180,Spite,2,8,0,10,100,10,1,101,,5,28,19
 181,Powder Snow,2,15,40,25,100,11,3,6,10,2,1,5

-182,Protect,2,1,0,10,0,7,1,112,,3,15,16
+182,Protect,2,1,0,10,,7,1,112,,3,15,16

 183,Mach Punch,2,2,40,30,100,10,2,104,,1,30,1
 184,Scary Face,2,1,0,10,90,10,1,61,,5,10,2
 183,Mach Punch,2,2,40,30,100,10,2,104,,1,30,1
 184,Scary Face,2,1,0,10,90,10,1,61,,5,10,2

-185,Faint Attack,2,17,60,20,100,10,2,18,,4,27,18
+185,Faint Attack,2,17,60,20,,10,2,18,,4,27,18

 186,Sweet Kiss,2,1,0,10,75,10,1,50,,3,18,19
 186,Sweet Kiss,2,1,0,10,75,10,1,50,,3,18,19

-187,Belly Drum,2,1,0,10,100,7,1,143,,3,32,11
+187,Belly Drum,2,1,0,10,,7,1,143,,3,32,11

 188,Sludge Bomb,2,4,90,10,100,10,3,3,30,5,10,18
 189,Mud-Slap,2,5,20,10,100,10,3,74,100,3,10,5
 190,Octazooka,2,11,65,10,85,10,3,74,50,5,10,4
 188,Sludge Bomb,2,4,90,10,100,10,3,3,30,5,10,18
 189,Mud-Slap,2,5,20,10,100,10,3,74,100,3,10,5
 190,Octazooka,2,11,65,10,85,10,3,74,50,5,10,4

-191,Spikes,2,5,0,20,100,6,1,113,,4,18,13
+191,Spikes,2,5,0,20,,6,1,113,,4,18,13

 192,Zap Cannon,2,13,120,5,50,10,3,7,100,1,1,4
 192,Zap Cannon,2,13,120,5,50,10,3,7,100,1,1,4

-193,Foresight,2,1,0,40,100,10,1,114,,4,33,20
-194,Destiny Bond,2,8,0,5,100,7,1,99,,4,7,9
-195,Perish Song,2,1,0,5,100,12,1,115,,2,14,10
+193,Foresight,2,1,0,40,,10,1,114,,4,33,20
+194,Destiny Bond,2,8,0,5,,7,1,99,,4,7,9
+195,Perish Song,2,1,0,5,,12,1,115,,2,14,10

 196,Icy Wind,2,15,55,15,95,11,3,71,100,2,5,2
 196,Icy Wind,2,15,55,15,95,11,3,71,100,2,5,2

-197,Detect,2,2,0,5,100,7,1,112,,1,16,16
+197,Detect,2,2,0,5,,7,1,112,,1,16,16

 198,Bone Rush,2,5,25,10,80,10,2,30,,5,1,7
 198,Bone Rush,2,5,25,10,80,10,2,30,,5,1,7

-199,Lock-On,2,1,0,5,100,10,1,95,,4,24,20
+199,Lock-On,2,1,0,5,,10,1,95,,4,24,20

 200,Outrage,2,16,120,15,100,8,2,28,,1,6,7
 200,Outrage,2,16,120,15,100,8,2,28,,1,6,7

-201,Sandstorm,2,6,0,10,100,12,1,116,,5,21,13
+201,Sandstorm,2,6,0,10,,12,1,116,,5,21,13

 202,Giga Drain,2,12,60,10,100,10,3,4,,4,10,20
 202,Giga Drain,2,12,60,10,100,10,3,4,,4,10,20

-203,Endure,2,1,0,10,100,7,1,117,,5,16,13
+203,Endure,2,1,0,10,,7,1,117,,5,16,13

 204,Charm,2,1,0,20,100,10,1,59,,3,23,19
 205,Rollout,2,6,30,20,90,10,2,118,,5,24,7
 206,False Swipe,2,1,40,40,100,10,2,102,,1,5,16
 207,Swagger,2,1,0,15,90,10,1,119,,3,27,19
 204,Charm,2,1,0,20,100,10,1,59,,3,23,19
 205,Rollout,2,6,30,20,90,10,2,118,,5,24,7
 206,False Swipe,2,1,40,40,100,10,2,102,,1,5,16
 207,Swagger,2,1,0,15,90,10,1,119,,3,27,19

-208,Milk Drink,2,1,0,10,100,7,1,33,,3,12,8
+208,Milk Drink,2,1,0,10,,7,1,33,,3,12,8

 209,Spark,2,13,65,20,100,10,2,7,30,1,4,5
 210,Fury Cutter,2,7,10,20,95,10,2,120,,1,17,7
 211,Steel Wing,2,9,70,25,90,10,2,139,10,1,12,5
 209,Spark,2,13,65,20,100,10,2,7,30,1,4,5
 210,Fury Cutter,2,7,10,20,95,10,2,120,,1,17,7
 211,Steel Wing,2,9,70,25,90,10,2,139,10,1,12,5

-212,Mean Look,2,1,0,5,100,10,1,107,,2,18,10
+212,Mean Look,2,1,0,5,,10,1,107,,2,18,10

 213,Attract,2,1,0,15,100,10,1,121,,3,18,19
 213,Attract,2,1,0,15,100,10,1,121,,3,18,19

-214,Sleep Talk,2,1,0,10,100,1,1,98,,3,17,5
-215,Heal Bell,2,1,0,5,100,4,1,103,,2,28,8
+214,Sleep Talk,2,1,0,10,,7,1,98,,3,17,5
+215,Heal Bell,2,1,0,5,,4,1,103,,2,28,8

 216,Return,2,1,1,20,100,10,2,122,,3,13,17
 217,Present,2,1,1,15,90,10,2,123,,3,17,16
 218,Frustration,2,1,1,20,100,10,2,124,,3,13,18
 216,Return,2,1,1,20,100,10,2,122,,3,13,17
 217,Present,2,1,1,15,90,10,2,123,,3,17,16
 218,Frustration,2,1,1,20,100,10,2,124,,3,13,18

-219,Safeguard,2,1,0,25,100,4,1,125,,2,15,13
-220,Pain Split,2,1,0,20,0,10,1,92,,4,4,10
+219,Safeguard,2,1,0,25,,4,1,125,,2,15,13
+220,Pain Split,2,1,0,20,,10,1,92,,4,4,10

 221,Sacred Fire,2,10,100,5,95,10,2,126,50,2,1,22
 222,Magnitude,2,5,1,30,100,9,2,127,,5,11,18
 223,DynamicPunch,2,2,100,5,50,10,2,77,100,1,10,18
 224,Megahorn,2,7,120,10,85,10,2,1,,1,12,18
 225,DragonBreath,2,16,60,20,100,10,3,7,30,1,5,17
 221,Sacred Fire,2,10,100,5,95,10,2,126,50,2,1,22
 222,Magnitude,2,5,1,30,100,9,2,127,,5,11,18
 223,DynamicPunch,2,2,100,5,50,10,2,77,100,1,10,18
 224,Megahorn,2,7,120,10,85,10,2,1,,1,12,18
 225,DragonBreath,2,16,60,20,100,10,3,7,30,1,5,17

-226,Baton Pass,2,1,0,40,100,7,1,128,,3,18,16
+226,Baton Pass,2,1,0,40,,7,1,128,,3,18,16

 227,Encore,2,1,0,5,100,10,1,91,,3,18,20
 228,Pursuit,2,17,40,20,100,10,2,129,,4,14,20
 229,Rapid Spin,2,1,20,40,100,10,2,130,,1,16,17
 230,Sweet Scent,2,1,0,20,100,11,1,25,,3,5,19
 231,Iron Tail,2,9,100,15,75,10,2,70,30,1,4,18
 232,Metal Claw,2,9,50,35,95,10,2,140,10,1,1,18
 227,Encore,2,1,0,5,100,10,1,91,,3,18,20
 228,Pursuit,2,17,40,20,100,10,2,129,,4,14,20
 229,Rapid Spin,2,1,20,40,100,10,2,130,,1,16,17
 230,Sweet Scent,2,1,0,20,100,11,1,25,,3,5,19
 231,Iron Tail,2,9,100,15,75,10,2,70,30,1,4,18
 232,Metal Claw,2,9,50,35,95,10,2,140,10,1,1,18

-233,Vital Throw,2,2,70,10,100,10,2,79,,1,31,2
-234,Morning Sun,2,1,0,5,100,7,1,133,,2,25,8
-235,Synthesis,2,12,0,5,100,7,1,133,,4,25,8
-236,Moonlight,2,1,0,5,100,7,1,133,,2,25,8
+233,Vital Throw,2,2,70,10,,10,2,79,,1,31,2
+234,Morning Sun,2,1,0,5,,7,1,133,,2,25,8
+235,Synthesis,2,12,0,5,,7,1,133,,4,25,8
+236,Moonlight,2,1,0,5,,7,1,133,,2,25,8

 237,Hidden Power,2,1,1,15,100,10,3,136,,4,17,23
 238,Cross Chop,2,2,100,5,80,10,2,44,,1,2,18
 239,Twister,2,16,40,20,100,11,3,147,20,1,21,5
 237,Hidden Power,2,1,1,15,100,10,3,136,,4,17,23
 238,Cross Chop,2,2,100,5,80,10,2,44,,1,2,18
 239,Twister,2,16,40,20,100,11,3,147,20,1,21,5

-240,Rain Dance,2,11,0,5,0,12,1,137,,5,11,13
-241,Sunny Day,2,10,0,5,0,12,1,138,,2,11,13
+240,Rain Dance,2,11,0,5,,12,1,137,,5,11,13
+241,Sunny Day,2,10,0,5,,12,1,138,,2,11,13

 242,Crunch,2,17,80,15,100,10,2,70,20,5,4,18
 243,Mirror Coat,2,14,1,20,100,1,3,145,,2,16,15
 242,Crunch,2,17,80,15,100,10,2,70,20,5,4,18
 243,Mirror Coat,2,14,1,20,100,1,3,145,,2,16,15

-244,Psych Up,2,1,0,10,100,10,1,144,,4,12,11
+244,Psych Up,2,1,0,10,,10,1,144,,4,12,11

 245,ExtremeSpeed,2,1,80,5,100,10,2,104,,1,30,1
 246,AncientPower,2,6,60,5,100,10,3,141,10,5,32,18
 247,Shadow Ball,2,8,80,15,100,10,3,73,20,4,21,17
 248,Future Sight,2,14,80,15,90,10,3,149,,4,24,17
 249,Rock Smash,2,2,40,15,100,10,2,70,50,5,29,18
 245,ExtremeSpeed,2,1,80,5,100,10,2,104,,1,30,1
 246,AncientPower,2,6,60,5,100,10,3,141,10,5,32,18
 247,Shadow Ball,2,8,80,15,100,10,3,73,20,4,21,17
 248,Future Sight,2,14,80,15,90,10,3,149,,4,24,17
 249,Rock Smash,2,2,40,15,100,10,2,70,50,5,29,18

-250,Whirlpool,2,11,15,15,70,10,3,262,,2,24,21
+250,Whirlpool,2,11,15,15,70,10,3,262,100,2,24,21

 251,Beat Up,2,17,10,10,100,10,2,155,,4,14,7
 252,Fake Out,3,1,40,10,100,10,2,159,100,3,23,17
 253,Uproar,3,1,50,10,100,8,3,160,,3,21,10
 251,Beat Up,2,17,10,10,100,10,2,155,,4,14,7
 252,Fake Out,3,1,40,10,100,10,2,159,100,3,23,17
 253,Uproar,3,1,50,10,100,8,3,160,,3,21,10

-254,Stockpile,3,1,0,20,100,7,1,161,,5,16,11
+254,Stockpile,3,1,0,20,,7,1,161,,5,16,11

 255,Spit Up,3,1,1,10,100,10,3,162,,5,1,18
 255,Spit Up,3,1,1,10,100,10,3,162,,5,1,18

-256,Swallow,3,1,0,10,100,7,1,163,,5,32,8
+256,Swallow,3,1,0,10,,7,1,163,,5,32,8

 257,Heat Wave,3,10,100,10,90,11,3,5,10,2,1,17
 257,Heat Wave,3,10,100,10,90,11,3,5,10,2,1,17

-258,Hail,3,15,0,10,100,12,1,165,,2,5,13
+258,Hail,3,15,0,10,,12,1,165,,2,5,13

 259,Torment,3,17,0,15,100,10,1,166,,5,18,16
 260,Flatter,3,17,0,15,100,10,1,167,,4,18,19
 261,Will-O-Wisp,3,10,0,15,75,10,1,168,,2,4,17
 259,Torment,3,17,0,15,100,10,1,166,,5,18,16
 260,Flatter,3,17,0,15,100,10,1,167,,4,18,19
 261,Will-O-Wisp,3,10,0,15,75,10,1,168,,2,4,17


@@ -264,44 +264,44 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 263,Facade,3,1,70,20,100,10,2,170,,3,28,15
 264,Focus Punch,3,2,150,20,100,10,2,171,,5,31,6
 265,SmellingSalt,3,1,60,10,100,10,2,172,,4,9,16
 263,Facade,3,1,70,20,100,10,2,170,,3,28,15
 264,Focus Punch,3,2,150,20,100,10,2,171,,5,31,6
 265,SmellingSalt,3,1,60,10,100,10,2,172,,4,9,16

-266,Follow Me,3,1,0,20,100,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,100,7,1,175,,4,12,11
+266,Follow Me,3,1,0,20,,7,1,173,,3,24,14
+267,Nature Power,3,1,0,20,,1,1,174,,2,11,14
+268,Charge,3,13,0,20,,7,1,175,,4,12,11

 269,Taunt,3,17,0,20,100,10,1,176,,4,18,16
 269,Taunt,3,17,0,20,100,10,1,176,,4,18,16

-270,Helping Hand,3,1,0,20,100,3,1,177,,4,18,20
+270,Helping Hand,3,1,0,20,,3,1,177,,4,18,20

 271,Trick,3,14,0,10,100,10,1,178,,4,12,12
 271,Trick,3,14,0,10,100,10,1,178,,4,12,12

-272,Role Play,3,14,0,10,100,10,1,179,,3,20,23
-273,Wish,3,1,0,10,100,7,1,180,,3,24,8
-274,Assist,3,1,0,20,100,1,1,181,,3,25,14
-275,Ingrain,3,12,0,20,100,7,1,182,,4,15,21
-276,Superpower,3,2,120,5,100,10,2,183,,5,3,18
-277,Magic Coat,3,14,0,15,100,1,1,184,,2,15,15
-278,Recycle,3,1,0,10,100,7,1,185,,4,17,12
+272,Role Play,3,14,0,10,,10,1,179,,3,20,23
+273,Wish,3,1,0,10,,7,1,180,,3,24,8
+274,Assist,3,1,0,20,,7,1,181,,3,25,14
+275,Ingrain,3,12,0,20,,7,1,182,,4,15,21
+276,Superpower,3,2,120,5,100,10,2,183,100,5,3,18
+277,Magic Coat,3,14,0,15,,7,1,184,,2,15,15
+278,Recycle,3,1,0,10,,7,1,185,,4,17,12

 279,Revenge,3,2,60,10,100,10,2,186,,5,31,15
 280,Brick Break,3,2,75,15,100,10,2,187,,1,4,5
 279,Revenge,3,2,60,10,100,10,2,186,,5,31,15
 280,Brick Break,3,2,75,15,100,10,2,187,,1,4,5

-281,Yawn,3,1,0,10,100,10,1,188,,3,18,19
+281,Yawn,3,1,0,10,,10,1,188,,3,18,19

 282,Knock Off,3,17,20,20,100,10,2,189,,4,4,5
 283,Endeavor,3,1,1,5,100,10,2,190,,5,28,15
 284,Eruption,3,10,150,5,100,11,3,191,,2,26,18
 282,Knock Off,3,17,20,20,100,10,2,189,,4,4,5
 283,Endeavor,3,1,1,5,100,10,2,190,,5,28,15
 284,Eruption,3,10,150,5,100,11,3,191,,2,26,18

-285,Skill Swap,3,14,0,10,100,10,1,192,,4,20,12
-286,Imprison,3,14,0,10,100,7,1,193,,4,33,20
-287,Refresh,3,1,0,20,100,7,1,194,,3,32,8
-288,Grudge,3,8,0,5,100,7,1,195,,5,26,10
-289,Snatch,3,17,0,10,100,1,1,196,,4,14,12
+285,Skill Swap,3,14,0,10,,10,1,192,,4,20,12
+286,Imprison,3,14,0,10,,7,1,193,,4,33,20
+287,Refresh,3,1,0,20,,7,1,194,,3,32,8
+288,Grudge,3,8,0,5,,7,1,195,,5,26,10
+289,Snatch,3,17,0,10,,7,1,196,,4,14,12

 290,Secret Power,3,1,70,20,100,10,2,198,30,4,29,14
 291,Dive,3,11,80,10,100,10,2,256,,2,16,6
 292,Arm Thrust,3,2,15,20,100,10,2,30,,5,10,7
 290,Secret Power,3,1,70,20,100,10,2,198,30,4,29,14
 291,Dive,3,11,80,10,100,10,2,256,,2,16,6
 292,Arm Thrust,3,2,15,20,100,10,2,30,,5,10,7

-293,Camouflage,3,1,0,20,100,7,1,214,,4,2,13
-294,Tail Glow,3,7,0,20,100,7,1,54,,2,32,11
+293,Camouflage,3,1,0,20,,7,1,214,,4,2,13
+294,Tail Glow,3,7,0,20,,7,1,322,,2,32,11

 295,Luster Purge,3,14,70,5,100,10,3,73,50,4,9,22
 296,Mist Ball,3,14,70,5,100,10,3,72,50,4,4,22
 297,FeatherDance,3,3,0,15,100,10,1,59,,2,28,19
 298,Teeter Dance,3,1,0,20,100,9,1,200,,3,6,14
 299,Blaze Kick,3,10,85,10,90,10,2,201,10,2,1,17
 295,Luster Purge,3,14,70,5,100,10,3,73,50,4,9,22
 296,Mist Ball,3,14,70,5,100,10,3,72,50,4,4,22
 297,FeatherDance,3,3,0,15,100,10,1,59,,2,28,19
 298,Teeter Dance,3,1,0,20,100,9,1,200,,3,6,14
 299,Blaze Kick,3,10,85,10,90,10,2,201,10,2,1,17

-300,Mud Sport,3,5,0,15,100,12,1,202,,3,1,13
+300,Mud Sport,3,5,0,15,,12,1,202,,3,1,13

 301,Ice Ball,3,15,30,20,90,10,2,118,,2,24,7
 302,Needle Arm,3,12,60,15,100,10,2,32,30,4,4,5
 301,Ice Ball,3,15,30,20,90,10,2,118,,2,24,7
 302,Needle Arm,3,12,60,15,100,10,2,32,30,4,4,5

-303,Slack Off,3,1,0,10,100,7,1,33,,3,26,8
+303,Slack Off,3,1,0,10,,7,1,33,,3,26,8

 304,Hyper Voice,3,1,90,10,100,11,3,1,,1,5,5
 305,Poison Fang,3,4,50,15,100,10,2,203,30,4,33,4
 306,Crush Claw,3,1,75,10,95,10,2,70,50,1,4,5
 304,Hyper Voice,3,1,90,10,100,11,3,1,,1,5,5
 305,Poison Fang,3,4,50,15,100,10,2,203,30,4,33,4
 306,Crush Claw,3,1,75,10,95,10,2,70,50,1,4,5


@@ -310,92 +310,92 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 309,Meteor Mash,3,9,100,10,85,10,2,140,20,1,12,18
 310,Astonish,3,8,30,15,100,10,2,32,30,4,9,5
 311,Weather Ball,3,1,50,10,100,10,3,204,,4,1,4
 309,Meteor Mash,3,9,100,10,85,10,2,140,20,1,12,18
 310,Astonish,3,8,30,15,100,10,2,32,30,4,9,5
 311,Weather Ball,3,1,50,10,100,10,3,204,,4,1,4

-312,Aromatherapy,3,12,0,5,100,4,1,103,,4,28,8
+312,Aromatherapy,3,12,0,5,,4,1,103,,4,28,8

 313,Fake Tears,3,17,0,20,100,10,1,63,,4,28,19
 314,Air Cutter,3,3,55,25,95,11,3,44,,1,23,5
 315,Overheat,3,10,140,5,90,10,3,205,100,2,3,22
 313,Fake Tears,3,17,0,20,100,10,1,63,,4,28,19
 314,Air Cutter,3,3,55,25,95,11,3,44,,1,23,5
 315,Overheat,3,10,140,5,90,10,3,205,100,2,3,22

-316,Odor Sleuth,3,1,0,40,100,10,1,114,,4,33,20
+316,Odor Sleuth,3,1,0,40,,10,1,114,,4,33,20

 317,Rock Tomb,3,6,50,10,80,10,2,71,100,4,24,2
 318,Silver Wind,3,7,60,5,100,10,3,141,10,2,32,4
 319,Metal Sound,3,9,0,40,85,10,1,63,,4,5,10
 320,GrassWhistle,3,12,0,15,55,10,1,2,,4,5,19
 321,Tickle,3,1,0,20,100,10,1,206,,3,33,19
 317,Rock Tomb,3,6,50,10,80,10,2,71,100,4,24,2
 318,Silver Wind,3,7,60,5,100,10,3,141,10,2,32,4
 319,Metal Sound,3,9,0,40,85,10,1,63,,4,5,10
 320,GrassWhistle,3,12,0,15,55,10,1,2,,4,5,19
 321,Tickle,3,1,0,20,100,10,1,206,,3,33,19

-322,Cosmic Power,3,14,0,20,100,7,1,207,,1,32,11
+322,Cosmic Power,3,14,0,20,,7,1,207,,1,32,11

 323,Water Spout,3,11,150,5,100,11,3,191,,2,26,22
 324,Signal Beam,3,7,75,15,100,10,3,77,10,2,21,4
 323,Water Spout,3,11,150,5,100,11,3,191,,2,26,22
 324,Signal Beam,3,7,75,15,100,10,3,77,10,2,21,4

-325,Shadow Punch,3,8,60,20,100,10,2,18,,4,27,17
+325,Shadow Punch,3,8,60,20,,10,2,18,,4,27,17

 326,Extrasensory,3,14,80,30,100,10,3,32,10,1,4,17
 327,Sky Uppercut,3,2,85,15,90,10,2,208,,1,23,17
 326,Extrasensory,3,14,80,30,100,10,3,32,10,1,4,17
 327,Sky Uppercut,3,2,85,15,90,10,2,208,,1,23,17

-328,Sand Tomb,3,5,15,15,70,10,2,43,,4,24,21
+328,Sand Tomb,3,5,15,15,70,10,2,43,100,4,24,21

 329,Sheer Cold,3,15,1,5,30,10,3,39,,2,14,9
 330,Muddy Water,3,11,95,10,85,11,3,74,30,5,10,18
 331,Bullet Seed,3,12,10,30,100,10,2,30,,1,14,7
 329,Sheer Cold,3,15,1,5,30,10,3,39,,2,14,9
 330,Muddy Water,3,11,95,10,85,11,3,74,30,5,10,18
 331,Bullet Seed,3,12,10,30,100,10,2,30,,1,14,7

-332,Aerial Ace,3,3,60,20,100,10,2,18,,1,27,17
+332,Aerial Ace,3,3,60,20,,10,2,18,,1,27,17

 333,Icicle Spear,3,15,10,30,100,10,2,30,,2,23,7
 333,Icicle Spear,3,15,10,30,100,10,2,30,,2,23,7

-334,Iron Defense,3,9,0,15,100,7,1,52,,5,15,13
-335,Block,3,1,0,5,100,10,1,107,,3,18,13
-336,Howl,3,1,0,40,100,7,1,11,,1,32,11
+334,Iron Defense,3,9,0,15,,7,1,52,,5,15,13
+335,Block,3,1,0,5,,10,1,107,,3,18,13
+336,Howl,3,1,0,40,,7,1,11,,1,32,11

 337,Dragon Claw,3,16,80,15,100,10,2,1,,1,23,17
 338,Frenzy Plant,3,12,150,5,90,10,3,81,,1,6,22
 337,Dragon Claw,3,16,80,15,100,10,2,1,,1,23,17
 338,Frenzy Plant,3,12,150,5,90,10,3,81,,1,6,22

-339,Bulk Up,3,2,0,20,100,7,1,209,,2,32,11
+339,Bulk Up,3,2,0,20,,7,1,209,,2,32,11

 340,Bounce,3,3,85,5,85,10,2,264,30,3,15,6
 341,Mud Shot,3,5,55,15,95,10,3,71,100,5,5,2
 342,Poison Tail,3,4,50,25,100,10,2,210,10,4,33,4
 343,Covet,3,1,40,40,100,10,2,106,,3,20,12
 344,Volt Tackle,3,13,120,15,100,10,2,263,10,1,3,22
 340,Bounce,3,3,85,5,85,10,2,264,30,3,15,6
 341,Mud Shot,3,5,55,15,95,10,3,71,100,5,5,2
 342,Poison Tail,3,4,50,25,100,10,2,210,10,4,33,4
 343,Covet,3,1,40,40,100,10,2,106,,3,20,12
 344,Volt Tackle,3,13,120,15,100,10,2,263,10,1,3,22

-345,Magical Leaf,3,12,60,20,100,10,3,18,,2,27,17
-346,Water Sport,3,11,0,15,100,12,1,211,,3,1,13
-347,Calm Mind,3,14,0,20,100,7,1,212,,4,16,11
+345,Magical Leaf,3,12,60,20,,10,3,18,,2,27,17
+346,Water Sport,3,11,0,15,,12,1,211,,3,1,13
+347,Calm Mind,3,14,0,20,,7,1,212,,4,16,11

 348,Leaf Blade,3,12,90,15,100,10,2,44,,1,2,17
 348,Leaf Blade,3,12,90,15,100,10,2,44,,1,2,17

-349,Dragon Dance,3,16,0,20,100,7,1,213,,1,32,11
+349,Dragon Dance,3,16,0,20,,7,1,213,,1,32,11

 350,Rock Blast,3,6,25,10,80,10,2,30,,5,12,7
 350,Rock Blast,3,6,25,10,80,10,2,30,,5,12,7

-351,Shock Wave,3,13,60,20,100,10,3,18,,1,27,17
+351,Shock Wave,3,13,60,20,,10,3,18,,1,27,17

 352,Water Pulse,3,11,60,20,100,10,3,77,20,2,21,17
 353,Doom Desire,3,9,120,5,85,10,3,149,,1,24,17
 354,Psycho Boost,3,14,140,5,90,10,3,205,100,4,3,22
 352,Water Pulse,3,11,60,20,100,10,3,77,20,2,21,17
 353,Doom Desire,3,9,120,5,85,10,3,149,,1,24,17
 354,Psycho Boost,3,14,140,5,90,10,3,205,100,4,3,22

-355,Roost,4,3,0,10,0,7,1,215,,1,,8
-356,Gravity,4,14,0,5,0,12,1,216,,2,,13
-357,Miracle Eye,4,14,0,40,0,10,1,217,,3,,20
+355,Roost,4,3,0,10,,7,1,215,,1,,8
+356,Gravity,4,14,0,5,,12,1,216,,2,,13
+357,Miracle Eye,4,14,0,40,,10,1,217,,3,,20

 358,Wake-Up Slap,4,2,60,10,100,10,2,218,,4,,16
 358,Wake-Up Slap,4,2,60,10,100,10,2,218,,4,,16

-359,Hammer Arm,4,2,100,10,90,10,2,219,,1,,2
+359,Hammer Arm,4,2,100,10,90,10,2,219,100,1,,2

 360,Gyro Ball,4,9,1,5,100,10,2,220,,2,,15
 360,Gyro Ball,4,9,1,5,100,10,2,220,,2,,15

-361,Healing Wish,4,14,0,10,0,7,1,221,,3,,8
+361,Healing Wish,4,14,0,10,,7,1,221,,3,,8

 362,Brine,4,11,65,10,100,10,3,222,,4,,4
 363,Natural Gift,4,1,1,15,100,10,2,223,,1,,18
 364,Feint,4,1,50,10,100,10,2,224,,2,,16
 365,Pluck,4,3,60,20,100,10,2,225,,3,,12
 362,Brine,4,11,65,10,100,10,3,222,,4,,4
 363,Natural Gift,4,1,1,15,100,10,2,223,,1,,18
 364,Feint,4,1,50,10,100,10,2,224,,2,,16
 365,Pluck,4,3,60,20,100,10,2,225,,3,,12

-366,Tailwind,4,3,0,30,0,4,1,226,,4,,1
-367,Acupressure,4,1,0,30,0,5,1,227,,1,,11
+366,Tailwind,4,3,0,30,,4,1,226,,4,,1
+367,Acupressure,4,1,0,30,,5,1,227,,1,,11

 368,Metal Burst,4,9,1,10,100,1,2,228,,2,,15
 369,U-turn,4,7,70,20,100,10,2,229,,3,,16
 368,Metal Burst,4,9,1,10,100,1,2,228,,2,,15
 369,U-turn,4,7,70,20,100,10,2,229,,3,,16

-370,Close Combat,4,2,120,5,100,10,2,230,,4,,22
+370,Close Combat,4,2,120,5,100,10,2,230,100,4,,22

 371,Payback,4,17,50,10,100,10,2,231,,1,,6
 372,Assurance,4,17,50,10,100,10,2,232,,2,,15
 373,Embargo,4,17,0,15,100,10,1,233,,3,,13
 374,Fling,4,17,1,10,100,10,2,234,,5,,23
 375,Psycho Shift,4,14,0,10,90,10,1,235,,1,,16
 371,Payback,4,17,50,10,100,10,2,231,,1,,6
 372,Assurance,4,17,50,10,100,10,2,232,,2,,15
 373,Embargo,4,17,0,15,100,10,1,233,,3,,13
 374,Fling,4,17,1,10,100,10,2,234,,5,,23
 375,Psycho Shift,4,14,0,10,90,10,1,235,,1,,16

-376,Trump Card,4,1,1,5,0,10,3,236,,1,,21
+376,Trump Card,4,1,1,5,,10,3,236,,1,,21

 377,Heal Block,4,14,0,15,100,11,1,237,,3,,13
 378,Wring Out,4,1,1,5,100,10,3,238,,4,,22
 377,Heal Block,4,14,0,15,100,11,1,237,,3,,13
 378,Wring Out,4,1,1,5,100,10,3,238,,4,,22

-379,Power Trick,4,14,0,10,0,7,1,239,,1,,16
+379,Power Trick,4,14,0,10,,7,1,239,,1,,16

 380,Gastro Acid,4,4,0,10,100,10,1,240,,2,,13
 380,Gastro Acid,4,4,0,10,100,10,1,240,,2,,13

-381,Lucky Chant,4,1,0,30,0,4,1,241,,3,,13
-382,Me First,4,1,0,20,0,2,1,242,,3,,1
-383,Copycat,4,1,0,20,0,1,1,243,,1,,12
-384,Power Swap,4,14,0,10,0,10,1,244,,2,,16
-385,Guard Swap,4,14,0,10,0,10,1,245,,3,,16
+381,Lucky Chant,4,1,0,30,,4,1,241,,3,,13
+382,Me First,4,1,0,20,,2,1,242,,3,,1
+383,Copycat,4,1,0,20,,7,1,243,,1,,12
+384,Power Swap,4,14,0,10,,10,1,244,,2,,16
+385,Guard Swap,4,14,0,10,,10,1,245,,3,,16

 386,Punishment,4,17,60,5,100,10,2,246,,4,,23
 387,Last Resort,4,1,130,5,100,10,2,247,,3,,21
 388,Worry Seed,4,12,0,10,100,10,1,248,,2,,19
 389,Sucker Punch,4,17,80,5,100,10,2,249,,4,,1
 386,Punishment,4,17,60,5,100,10,2,246,,4,,23
 387,Last Resort,4,1,130,5,100,10,2,247,,3,,21
 388,Worry Seed,4,12,0,10,100,10,1,248,,2,,19
 389,Sucker Punch,4,17,80,5,100,10,2,249,,4,,1

-390,Toxic Spikes,4,4,0,20,0,6,1,250,,4,,13
-391,Heart Swap,4,14,0,10,0,10,1,251,,1,,16
-392,Aqua Ring,4,11,0,20,0,7,1,252,,2,,8
-393,Magnet Rise,4,13,0,10,0,7,1,253,,3,,13
+390,Toxic Spikes,4,4,0,20,,6,1,250,,4,,13
+391,Heart Swap,4,14,0,10,,10,1,251,,1,,16
+392,Aqua Ring,4,11,0,20,,7,1,252,,2,,8
+393,Magnet Rise,4,13,0,10,,7,1,253,,3,,13

 394,Flare Blitz,4,10,120,15,100,10,2,254,10,4,,22
 395,Force Palm,4,2,60,10,100,10,2,7,30,1,,18
 394,Flare Blitz,4,10,120,15,100,10,2,254,10,4,,22
 395,Force Palm,4,2,60,10,100,10,2,7,30,1,,18

-396,Aura Sphere,4,2,90,20,0,10,3,18,,2,,17
-397,Rock Polish,4,6,0,20,0,7,1,53,,5,,1
+396,Aura Sphere,4,2,90,20,,10,3,18,,2,,17
+397,Rock Polish,4,6,0,20,,7,1,53,,5,,1

 398,Poison Jab,4,4,80,20,100,10,2,3,30,4,,4
 399,Dark Pulse,4,17,80,15,100,10,3,32,20,1,,17
 400,Night Slash,4,17,70,15,100,10,2,44,,2,,5
 398,Poison Jab,4,4,80,20,100,10,2,3,30,4,,4
 399,Dark Pulse,4,17,80,15,100,10,3,32,20,1,,17
 400,Night Slash,4,17,70,15,100,10,2,44,,2,,5


@@ -415,7 +415,7 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 414,Earth Power,4,5,90,10,100,10,3,73,10,4,,18
 415,Switcheroo,4,17,0,10,100,10,1,178,,1,,12
 416,Giga Impact,4,1,150,5,90,10,2,81,,2,,22
 414,Earth Power,4,5,90,10,100,10,3,73,10,4,,18
 415,Switcheroo,4,17,0,10,100,10,1,178,,1,,12
 416,Giga Impact,4,1,150,5,90,10,2,81,,2,,22

-417,Nasty Plot,4,17,0,20,0,7,1,54,,3,,11
+417,Nasty Plot,4,17,0,20,,7,1,54,,3,,11

 418,Bullet Punch,4,9,40,30,100,10,2,104,,4,,1
 419,Avalanche,4,15,60,10,100,10,2,186,,1,,15
 420,Ice Shard,4,15,40,30,100,10,2,104,,2,,1
 418,Bullet Punch,4,9,40,30,100,10,2,104,,4,,1
 419,Avalanche,4,15,60,10,100,10,2,186,,1,,15
 420,Ice Shard,4,15,40,30,100,10,2,104,,2,,1


@@ -430,8 +430,8 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 429,Mirror Shot,4,9,65,10,85,10,3,74,30,3,,17
 430,Flash Cannon,4,9,80,10,100,10,3,73,10,4,,17
 431,Rock Climb,4,1,90,20,85,10,2,77,20,1,,18
 429,Mirror Shot,4,9,65,10,85,10,3,74,30,3,,17
 430,Flash Cannon,4,9,80,10,100,10,3,73,10,4,,17
 431,Rock Climb,4,1,90,20,85,10,2,77,20,1,,18

-432,Defog,4,3,0,15,0,10,1,259,,2,,13
-433,Trick Room,4,14,0,5,0,12,1,260,,3,,14
+432,Defog,4,3,0,15,,10,1,259,,2,,13
+433,Trick Room,4,14,0,5,,12,1,260,,3,,14

 434,Draco Meteor,4,16,140,5,90,10,3,205,100,4,,22
 435,Discharge,4,13,80,15,100,9,3,7,30,1,,17
 436,Lava Plume,4,10,80,15,100,9,3,5,30,5,,17
 434,Draco Meteor,4,16,140,5,90,10,3,205,100,4,,22
 435,Discharge,4,13,80,15,100,9,3,7,30,1,,17
 436,Lava Plume,4,10,80,15,100,9,3,5,30,5,,17


@@ -441,10 +441,10 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 440,Cross Poison,4,4,70,20,100,10,2,210,10,1,,5
 441,Gunk Shot,4,4,120,5,70,10,2,3,30,1,,5
 442,Iron Head,4,9,80,15,100,10,2,32,30,5,,18
 440,Cross Poison,4,4,70,20,100,10,2,210,10,1,,5
 441,Gunk Shot,4,4,120,5,70,10,2,3,30,1,,5
 442,Iron Head,4,9,80,15,100,10,2,32,30,5,,18

-443,Magnet Bomb,4,9,60,20,0,10,2,18,,1,,5
+443,Magnet Bomb,4,9,60,20,,10,2,18,,1,,5

 444,Stone Edge,4,6,100,5,80,10,2,44,,5,,4
 445,Captivate,4,1,0,20,100,11,1,266,,2,,19
 444,Stone Edge,4,6,100,5,80,10,2,44,,5,,4
 445,Captivate,4,1,0,20,100,11,1,266,,2,,19

-446,Stealth Rock,4,6,0,20,0,6,1,267,,1,,13
+446,Stealth Rock,4,6,0,20,,6,1,267,,1,,13

 447,Grass Knot,4,12,1,20,100,10,3,197,,4,,4
 448,Chatter,4,3,60,20,100,10,3,268,,4,,23
 449,Judgment,4,1,100,10,100,10,3,269,,4,,14
 447,Grass Knot,4,12,1,20,100,10,3,197,,4,,4
 448,Chatter,4,3,60,20,100,10,3,268,,4,,23
 449,Judgment,4,1,100,10,100,10,3,269,,4,,14


@@ -453,16 +453,108 @@ id,name,generation_id,type_id,power,pp,accuracy,target_id,damage_class_id,effect
 452,Wood Hammer,4,12,120,15,100,10,2,199,,5,,18
 453,Aqua Jet,4,11,40,20,100,10,2,104,,2,,1
 454,Attack Order,4,7,90,15,100,10,2,44,,4,,4
 452,Wood Hammer,4,12,120,15,100,10,2,199,,5,,18
 453,Aqua Jet,4,11,40,20,100,10,2,104,,2,,1
 454,Attack Order,4,7,90,15,100,10,2,44,,4,,4

-455,Defend Order,4,7,0,10,0,7,1,207,,4,,11
-456,Heal Order,4,7,0,10,0,7,1,33,,4,,8
+455,Defend Order,4,7,0,10,,7,1,207,,4,,11
+456,Heal Order,4,7,0,10,,7,1,33,,4,,8

 457,Head Smash,4,6,150,5,80,10,2,270,,5,,22
 458,Double Hit,4,1,35,10,90,10,2,45,,4,,7
 459,Roar of Time,4,16,150,5,90,10,3,81,,1,,22
 460,Spacial Rend,4,16,100,5,95,10,3,44,,5,,4
 457,Head Smash,4,6,150,5,80,10,2,270,,5,,22
 458,Double Hit,4,1,35,10,90,10,2,45,,4,,7
 459,Roar of Time,4,16,150,5,90,10,3,81,,1,,22
 460,Spacial Rend,4,16,100,5,95,10,3,44,,5,,4

-461,Lunar Dance,4,14,0,10,0,7,1,271,,2,,8
+461,Lunar Dance,4,14,0,10,,7,1,271,,2,,8

 462,Crush Grip,4,1,1,5,100,10,2,238,,5,,15
 462,Crush Grip,4,1,1,5,100,10,2,238,,5,,15

-463,Magma Storm,4,10,120,5,70,10,3,43,,5,,7
+463,Magma Storm,4,10,120,5,70,10,3,43,100,5,,7

 464,Dark Void,4,17,0,10,80,11,1,2,,4,,19
 465,Seed Flare,4,12,120,5,85,10,3,272,40,1,,22
 466,Ominous Wind,4,8,60,5,100,10,3,141,10,4,,11
 467,Shadow Force,4,8,120,5,100,10,2,273,,4,,22
 464,Dark Void,4,17,0,10,80,11,1,2,,4,,19
 465,Seed Flare,4,12,120,5,85,10,3,272,40,1,,22
 466,Ominous Wind,4,8,60,5,100,10,3,141,10,4,,11
 467,Shadow Force,4,8,120,5,100,10,2,273,,4,,22

+468,claw sharpen,5,17,0,15,,7,1,278,,,,
+469,wide guard,5,6,0,10,,4,1,279,,,,
+470,guard share,5,14,0,10,,10,1,280,,,,
+471,power share,5,14,0,10,,10,1,281,,,,
+472,wonder room,5,14,0,10,,12,1,282,,,,
+473,psycho shock,5,14,80,10,100,10,3,283,,,,
+474,venom shock,5,4,65,10,100,10,3,284,,,,
+475,body purge,5,9,0,15,,7,1,285,,,,
+476,anger powder,5,7,0,20,,7,1,173,,,,
+477,telekinesis,5,14,0,15,,10,1,286,,,,
+478,magic room,5,14,0,10,,12,1,287,,,,
+479,knock down,5,6,50,15,100,10,2,288,100,,,
+480,mountain storm,5,2,40,10,100,10,2,289,,,,
+481,flame burst,5,10,70,15,100,10,3,290,,,,
+482,slime wave,5,4,95,10,100,9,3,3,10,,,
+483,butterfly dance,5,7,0,20,,7,1,291,,,,
+484,heavy bomber,5,9,1,10,100,10,2,292,,,,
+485,synchro noise,5,14,70,15,100,9,3,293,,,,
+486,electric ball,5,13,1,10,100,10,3,294,,,,
+487,submersion,5,11,0,20,100,10,1,295,,,,
+488,nitro charge,5,10,50,20,100,10,2,296,100,,,
+489,snake coil,5,4,0,20,,7,1,323,,,,
+490,low kick 2.0,5,2,60,20,100,10,2,21,100,,,
+491,acid bomb,5,4,40,20,100,10,3,297,100,,,
+492,trickery,5,17,95,15,100,10,2,298,,,,
+493,simple beam,5,1,0,15,100,10,1,299,,,,
+494,befriend,5,1,0,15,100,10,1,300,,,,
+495,after you,5,1,0,15,,10,1,301,,,,
+496,a capella,5,1,60,15,100,10,3,302,,,,
+497,echo voice,5,1,40,15,100,10,3,303,,,,
+498,repayment,5,1,70,20,100,10,2,304,,,,
+499,clear smog,5,4,50,15,,10,3,305,,,,
+500,assist power,5,14,20,10,100,10,3,306,,,,
+501,fast guard,5,2,0,15,,4,1,307,,,,
+502,side change,5,14,0,15,,7,1,308,,,,
+503,boil over,5,11,80,15,100,10,3,5,30,,,
+504,shell smash,5,1,0,15,,7,1,309,,,,
+505,healing wave,5,14,0,10,,10,1,310,,,,
+506,evil eye,5,8,50,10,100,10,3,311,,,,
+507,freefall,5,3,60,10,100,10,2,312,,,,
+508,gear change,5,9,0,10,,7,1,313,,,,
+509,overhead throw,5,2,60,10,90,10,2,314,,,,
+510,incinerate,5,10,30,15,100,11,3,315,,,,
+511,postpone,5,17,0,15,100,10,1,316,,,,
+512,acrobat,5,3,55,15,100,10,2,318,,,,
+513,mirror type,5,1,0,15,,10,1,319,,,,
+514,retribution,5,1,70,5,100,10,2,320,,,,
+515,death gambit,5,2,1,5,100,10,3,321,,,,
+516,gift pass,5,1,0,15,,10,1,324,,,,
+517,purgatory,5,10,100,5,50,10,3,5,100,,,
+518,water realm,5,11,50,10,100,10,3,325,,,,
+519,fire realm,5,10,50,10,100,10,3,326,,,,
+520,grass realm,5,12,50,10,100,10,3,327,,,,
+521,volt change,5,13,70,20,100,10,3,229,,,,
+522,bug repellant,5,7,30,20,100,11,3,72,100,,,
+523,level field,5,5,60,20,100,9,2,71,100,,,
+524,ice breath,5,15,40,10,90,10,3,289,100,,,
+525,dragon tail,5,16,60,10,90,10,2,314,,,,
+526,cheer up,5,1,0,30,,7,1,328,,,,
+527,electric net,5,13,55,15,95,11,3,21,100,,,
+528,wild bolt,5,13,90,15,100,10,2,49,,,,
+529,drill liner,5,5,80,10,95,10,2,44,,,,
+530,double chop,5,16,40,15,90,10,2,45,,,,
+531,heart stamp,5,14,60,25,100,10,2,32,30,,,
+532,wood horn,5,12,75,10,100,10,2,4,,,,
+533,holy sword,5,2,90,20,100,10,2,304,,,,
+534,shell blade,5,11,75,10,95,10,2,70,50,,,
+535,heat stamp,5,10,1,10,100,10,2,292,,,,
+536,grass mixer,5,12,65,10,90,10,3,74,50,,,
+537,hard roller,5,7,65,20,100,10,2,151,30,,,
+538,cotton guard,5,12,0,10,,7,1,329,,,,
+539,night burst,5,17,85,10,95,10,3,74,40,,,
+540,psycho break,5,14,100,10,100,10,3,283,,,,
+541,sweep slap,5,1,25,10,85,10,2,30,,,,
+542,hurricane,5,3,120,10,70,10,3,338,30,,,
+543,afro break,5,1,120,15,100,10,2,49,,,,
+544,gear saucer,5,9,50,15,85,10,2,45,,,,
+545,kaendan,5,10,100,5,100,9,3,5,30,,,
+546,techno buster,5,1,85,5,100,10,3,269,,,,
+547,ancient song,5,1,75,10,100,11,3,330,10,,,
+548,mystery sword,5,2,85,10,100,10,3,283,,,,
+549,frozen world,5,15,65,10,95,11,3,331,100,,,
+550,lightning strike,5,13,130,5,85,10,2,7,20,,,
+551,blue flame,5,10,130,5,85,10,3,5,20,,,
+552,flame dance,5,10,80,10,100,10,3,277,50,,,
+553,freezebolt,5,15,140,5,90,10,2,332,30,,,
+554,cold flare,5,15,140,5,90,10,3,333,30,,,
+555,back out,5,17,55,15,95,11,3,72,100,,,
+556,icicle drop,5,15,85,10,90,10,2,32,30,,,
+557,v-generate,5,10,180,5,95,10,2,335,100,,,
+558,cross flame,5,10,100,5,100,10,3,336,,,,
+559,cross thunder,5,13,100,5,100,10,2,337,,,,