Update Shiny Garchomp Line & Various Movesets

src/Egg_Moves.c

@@ -125,7 +125,8 @@ const u16 gEggMoves[] =
 		MOVE_CHIPAWAY,
 		MOVE_ROCKCLIMB,
 		MOVE_ROTOTILLER,
-		MOVE_HONECLAWS),
+		MOVE_HONECLAWS,
+		MOVE_MUDSLAP),
 
 	egg_moves(NIDORAN_F,
 		MOVE_SUPERSONIC,
@@ -347,7 +348,9 @@ const u16 gEggMoves[] =
 		MOVE_SKILLSWAP,
 		MOVE_GUARDSPLIT,
 		MOVE_PSYCHOSHIFT,
-		MOVE_PSYCHICTERRAIN),
+		MOVE_PSYCHICTERRAIN,
+		MOVE_CONFUSION,
+		MOVE_MAGICCOAT),
 
 	egg_moves(MACHOP,
 		MOVE_MEDITATE,
@@ -595,7 +598,10 @@ const u16 gEggMoves[] =
 		MOVE_SKILLSWAP,
 		MOVE_NATURALGIFT,
 		MOVE_BLOCK,
-		MOVE_GRASSYTERRAIN),
+		MOVE_GRASSYTERRAIN,
+		MOVE_SLEEPPOWDER,
+		MOVE_STUNSPORE,
+		MOVE_POISONPOWDER),
 
 	egg_moves(CUBONE,
 		MOVE_ANCIENTPOWER,
@@ -608,7 +614,8 @@ const u16 gEggMoves[] =
 		MOVE_DETECT,
 		MOVE_ENDURE,
 		MOVE_CHIPAWAY,
-		MOVE_CURSE),
+		MOVE_CURSE,
+		MOVE_LEER),
 
 	egg_moves(LICKITUNG,
 		MOVE_BELLYDRUM,
@@ -758,7 +765,9 @@ const u16 gEggMoves[] =
 		MOVE_NIGHTSLASH,
 		MOVE_DEFOG,
 		MOVE_STEELWING,
-		MOVE_QUICKGUARD),
+		MOVE_QUICKGUARD,
+		MOVE_FEINT,
+		MOVE_DUALWINGBEAT),
 
 	egg_moves(PINSIR,
 		MOVE_FURYATTACK,
@@ -769,6 +778,7 @@ const u16 gEggMoves[] =
 		MOVE_FEINT,
 		MOVE_MEFIRST,
 		MOVE_BUGBITE,
+		MOVE_THRASH,
 		MOVE_SUPERPOWER),
 
 	egg_moves(LAPRAS,
@@ -846,7 +856,8 @@ const u16 gEggMoves[] =
 		MOVE_ASSURANCE,
 		MOVE_ROOST,
 		MOVE_TAILWIND,
-		MOVE_WIDEGUARD),
+		MOVE_WIDEGUARD,
+		MOVE_DUALWINGBEAT),
 
 	egg_moves(SNORLAX,
 		MOVE_LICK,
@@ -1103,7 +1114,11 @@ const u16 gEggMoves[] =
 		MOVE_BODYSLAM,
 		MOVE_WATERSPORT,
 		MOVE_MUDDYWATER,
-		MOVE_CAMOUFLAGE),
+		MOVE_CAMOUFLAGE,
+		MOVE_COPYCAT,
+		MOVE_SING,
+		MOVE_SOAK,
+		MOVE_TICKLE),
 
 	egg_moves(SUDOWOODO,
 		MOVE_SELFDESTRUCT,
@@ -1270,7 +1285,9 @@ const u16 gEggMoves[] =
 		MOVE_AGILITY,
 		MOVE_SECRETPOWER,
 		MOVE_SLEEPTALK,
-		MOVE_HEX),
+		MOVE_HEX,
+		MOVE_AQUATAIL,
+		MOVE_LASTRESORT),
 
 	egg_moves(GLIGAR,
 		MOVE_METALCLAW,
@@ -1342,7 +1359,10 @@ const u16 gEggMoves[] =
 		MOVE_SEISMICTOSS,
 		MOVE_FOCUSPUNCH,
 		MOVE_MEGAHORN,
-		MOVE_ROCKBLAST),
+		MOVE_ROCKBLAST,
+		MOVE_NIGHTSLASH,
+		MOVE_FEINT,
+		MOVE_TAKEDOWN),
 
 	egg_moves(SNEASEL,
 		MOVE_COUNTER,
@@ -1485,7 +1505,11 @@ const u16 gEggMoves[] =
 		MOVE_ASSURANCE,
 		MOVE_GUARDSWAP,
 		MOVE_STEALTHROCK,
-		MOVE_ENDURE),
+		MOVE_ENDURE,
+		MOVE_AIRCUTTER,
+		MOVE_NIGHTSLASH,
+		MOVE_FEINT,
+		MOVE_ROOST),
 
 	egg_moves(HOUNDOUR,
 		MOVE_FIRESPIN,
@@ -1597,7 +1621,8 @@ const u16 gEggMoves[] =
 		MOVE_PUNISHMENT,
 		MOVE_NATURALGIFT,
 		MOVE_HEARTSTAMP,
-		MOVE_BELCH),
+		MOVE_BELCH,
+		MOVE_FOCUSPUNCH),
 
 	egg_moves(LARVITAR,
 		MOVE_PURSUIT,
@@ -1949,7 +1974,8 @@ const u16 gEggMoves[] =
 		MOVE_SWIFT,
 		MOVE_BRINE,
 		MOVE_DESTINYBOND,
-		MOVE_PSYCHICFANGS),
+		MOVE_PSYCHICFANGS,
+		MOVE_WATERPULSE),
 
 	egg_moves(TRAPINCH,
 		MOVE_FOCUSENERGY,
@@ -2075,7 +2101,12 @@ const u16 gEggMoves[] =
 		MOVE_SOAK,
 		MOVE_MUDDYWATER,
 		MOVE_COPYCAT,
-		MOVE_CAMOUFLAGE),
+		MOVE_CAMOUFLAGE,
+		MOVE_AQUAJET,
+		MOVE_BELLYDRUM,
+		MOVE_PERISHSONG,
+		MOVE_PRESENT,
+		MOVE_SUPERSONIC),
 
 	egg_moves(SPOINK,
 		MOVE_FUTURESIGHT,
@@ -2529,7 +2560,8 @@ const u16 gEggMoves[] =
 		MOVE_SIGNALBEAM,
 		MOVE_HELPINGHAND,
 		MOVE_EERIEIMPULSE,
-		MOVE_FAKETEARS),
+		MOVE_FAKETEARS,
+		MOVE_BABYDOLLEYES),
 
 	egg_moves(BUDEW,
 		MOVE_SPIKES,
@@ -2674,7 +2706,8 @@ const u16 gEggMoves[] =
 		MOVE_TEETERDANCE,
 		MOVE_COSMICPOWER,
 		MOVE_MUDSPORT,
-		MOVE_POWERUPPUNCH),
+		MOVE_POWERUPPUNCH,
+		MOVE_TRIPLEAXEL),
 
 	egg_moves(GLAMEOW,
 		MOVE_BITE,
@@ -2753,7 +2786,8 @@ const u16 gEggMoves[] =
 		MOVE_GRAVITY,
 		MOVE_MUDBOMB,
 		MOVE_NATURALGIFT,
-		MOVE_ENDURE),
+		MOVE_ENDURE,
+		MOVE_SEISMICTOSS),
 
 	egg_moves(CHATOT,
 		MOVE_ENCORE,
@@ -2989,7 +3023,8 @@ const u16 gEggMoves[] =
 		MOVE_THUNDERFANG,
 		MOVE_ICEFANG,
 		MOVE_AFTERYOU,
-		MOVE_PSYCHICFANGS),
+		MOVE_PSYCHICFANGS,
+		MOVE_COVET),
 
 	egg_moves(PURRLOIN,
 		MOVE_PAYDAY,
@@ -3179,7 +3214,9 @@ const u16 gEggMoves[] =
 		MOVE_TOXICSPIKES,
 		MOVE_SPIKES,
 		MOVE_TAKEDOWN,
-		MOVE_ROCKCLIMB),
+		MOVE_ROCKCLIMB,
+		MOVE_BITE,
+		MOVE_FURYCUTTER),
 
 	egg_moves(COTTONEE,
 		MOVE_NATURALGIFT,
@@ -3232,7 +3269,9 @@ const u16 gEggMoves[] =
 		MOVE_COUNTER,
 		MOVE_MEANLOOK,
 		MOVE_MEFIRST,
-		MOVE_POWERTRIP),
+		MOVE_POWERTRIP,
+		MOVE_AQUATAIL,
+		MOVE_SPITE),
 
 	egg_moves(DARUMAKA,
 		MOVE_SLEEPTALK,
@@ -3362,7 +3401,8 @@ const u16 gEggMoves[] =
 		MOVE_FAKETEARS,
 		MOVE_SLEEPTALK,
 		MOVE_ENDURE,
-		MOVE_FLAIL),
+		MOVE_FLAIL,
+		MOVE_TRIPLEAXEL),
 
 	egg_moves(GOTHITA,
 		MOVE_MIRRORCOAT,
@@ -3433,7 +3473,8 @@ const u16 gEggMoves[] =
 		MOVE_TICKLE,
 		MOVE_BATONPASS,
 		MOVE_IONDELUGE,
-		MOVE_SPEEDSWAP),
+		MOVE_SPEEDSWAP,
+		MOVE_DEFOG),
 
 	egg_moves(KARRABLAST,
 		MOVE_MEGAHORN,
@@ -3456,7 +3497,8 @@ const u16 gEggMoves[] =
 		MOVE_ROLLOUT,
 		MOVE_DEFENSECURL,
 		MOVE_ENDURE,
-		MOVE_BODYSLAM),
+		MOVE_BODYSLAM,
+		MOVE_WORRYSEED),
 
 	egg_moves(FRILLISH,
 		MOVE_ACIDARMOR,
@@ -3585,7 +3627,8 @@ const u16 gEggMoves[] =
 		MOVE_LOWKICK,
 		MOVE_FEINT,
 		MOVE_MEFIRST,
-		MOVE_KNOCKOFF),
+		MOVE_KNOCKOFF,
+		MOVE_FOCUSPUNCH),
 
 	egg_moves(DRUDDIGON,
 		MOVE_FIREFANG,
@@ -3598,7 +3641,8 @@ const u16 gEggMoves[] =
 		MOVE_SNATCH,
 		MOVE_METALCLAW,
 		MOVE_GLARE,
-		MOVE_SUCKERPUNCH),
+		MOVE_SUCKERPUNCH,
+		MOVE_NIGHTSLASH),
 
 	egg_moves(PAWNIARD,
 		MOVE_REVENGE,
@@ -3620,7 +3664,8 @@ const u16 gEggMoves[] =
 		MOVE_IRONHEAD,
 		MOVE_AMNESIA,
 		MOVE_BELCH,
-		MOVE_COTTONGUARD),
+		MOVE_COTTONGUARD,
+		MOVE_ENDEAVOR),
 
 	egg_moves(VULLABY,
 		MOVE_STEELWING,
@@ -3678,7 +3723,9 @@ const u16 gEggMoves[] =
 		MOVE_ENDURE,
 		MOVE_ZENHEADBUTT,
 		MOVE_MORNINGSUN,
-		MOVE_MAGNETRISE),
+		MOVE_MAGNETRISE,
+		MOVE_LEECHLIFE,
+		MOVE_THRASH),
 
 	egg_moves(SHELLOS_EAST,
 		MOVE_COUNTER,
@@ -3782,7 +3829,9 @@ const u16 gEggMoves[] =
 	egg_moves(FLETCHLING,
 		MOVE_TAILWIND,
 		MOVE_SNATCH,
-		MOVE_QUICKGUARD),
+		MOVE_QUICKGUARD,
+		MOVE_FLAMECHARGE,
+		MOVE_DEFOG),
 
 	egg_moves(LITLEO,
 		MOVE_ENTRAINMENT,
@@ -3871,14 +3920,18 @@ const u16 gEggMoves[] =
 		MOVE_PLAYROUGH,
 		MOVE_HAZE,
 		MOVE_ACIDARMOR,
-		MOVE_VENOMDRENCH),
+		MOVE_VENOMDRENCH,
+		MOVE_TWISTER,
+		MOVE_DRAGONTAIL),
 
 	egg_moves(CLAUNCHER,
 		MOVE_AQUAJET,
 		MOVE_ENTRAINMENT,
 		MOVE_ENDURE,
 		MOVE_CRABHAMMER,
-		MOVE_HELPINGHAND),
+		MOVE_HELPINGHAND,
+		MOVE_AQUATAIL,
+		MOVE_BUBBLEBEAM),
 
 	egg_moves(HELIOPTILE,
 		MOVE_AGILITY,
@@ -3921,7 +3974,8 @@ const u16 gEggMoves[] =
 		MOVE_COVET,
 		MOVE_HELPINGHAND,
 		MOVE_NATURALGIFT,
-		MOVE_TEARFULLOOK),
+		MOVE_TEARFULLOOK,
+		MOVE_MAGNETRISE),
 
 	egg_moves(GOOMY,
 		MOVE_ACIDARMOR,
@@ -3936,7 +3990,8 @@ const u16 gEggMoves[] =
 		MOVE_SWITCHEROO,
 		MOVE_THIEF,
 		MOVE_LOCKON,
-		MOVE_IRONDEFENSE),
+		MOVE_IRONDEFENSE,
+		MOVE_MAGNETRISE),
 
 	egg_moves(PHANTUMP,
 		MOVE_GRUDGE,
@@ -4085,7 +4140,9 @@ const u16 gEggMoves[] =
 		MOVE_FIREFANG,
 		MOVE_THUNDERFANG,
 		MOVE_SUCKERPUNCH,
-		MOVE_THRASH),
+		MOVE_THRASH,
+		MOVE_ENDEAVOR,
+		MOVE_LASTRESORT),
 
 	egg_moves(WISHIWASHI,
 		MOVE_MUDDYWATER,
@@ -4124,7 +4181,8 @@ const u16 gEggMoves[] =
 		MOVE_GIGADRAIN,
 		MOVE_AROMATHERAPY,
 		MOVE_DEFOG,
-		MOVE_LEAFSTORM),
+		MOVE_LEAFSTORM,
+		MOVE_WORRYSEED),
 
 	egg_moves(MORELULL,
 		MOVE_AMNESIA,
@@ -4166,7 +4224,9 @@ const u16 gEggMoves[] =
 		MOVE_ENDURE,
 		MOVE_AMNESIA,
 		MOVE_AFTERYOU,
-		MOVE_LUCKYCHANT),
+		MOVE_LUCKYCHANT,
+		MOVE_WORRYSEED,
+		MOVE_LEAFTORNADO),
 
 	egg_moves(ORANGURU,
 		MOVE_EXTRASENSORY,

src/Learnsets.c

@@ -2133,59 +2133,58 @@ static const struct LevelUpMove sMarowakLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sHitmonleeLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE( 1, MOVE_REVERSAL),
-	LEVEL_UP_MOVE( 1, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE( 1, MOVE_MEGAKICK),
-	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
+	LEVEL_UP_MOVE( 0, MOVE_BRICKBREAK),
+	LEVEL_UP_MOVE( 1, MOVE_FEINT),
+	LEVEL_UP_MOVE( 1, MOVE_LOWSWEEP),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
+	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_MEDITATE),
 	LEVEL_UP_MOVE( 1, MOVE_ROLLINGKICK),
-	LEVEL_UP_MOVE( 1, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE( 5, MOVE_MEDITATE),
-	LEVEL_UP_MOVE( 9, MOVE_ROLLINGKICK),
-	LEVEL_UP_MOVE(13, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(17, MOVE_BRICKBREAK),
-	LEVEL_UP_MOVE(19, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(21, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(25, MOVE_FEINT),
-	LEVEL_UP_MOVE(29, MOVE_HIGHJUMPKICK),
-	LEVEL_UP_MOVE(33, MOVE_MINDREADER),
-	LEVEL_UP_MOVE(37, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE(41, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(45, MOVE_BLAZEKICK),
-	LEVEL_UP_MOVE(49, MOVE_ENDURE),
-	LEVEL_UP_MOVE(53, MOVE_MEGAKICK),
-	LEVEL_UP_MOVE(57, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(61, MOVE_REVERSAL),
+	LEVEL_UP_MOVE( 4, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE( 8, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(12, MOVE_ENDURE),
+	LEVEL_UP_MOVE(16, MOVE_REVENGE),
+	LEVEL_UP_MOVE(19, MOVE_BRICKBREAK),
+	LEVEL_UP_MOVE(21, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(25, MOVE_BLAZEKICK),
+	LEVEL_UP_MOVE(30, MOVE_MINDREADER),
+	LEVEL_UP_MOVE(35, MOVE_MEGAKICK),
+	LEVEL_UP_MOVE(40, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE(45, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(50, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(55, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sHitmonchanLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_COMETPUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE( 1, MOVE_COUNTER),
-	LEVEL_UP_MOVE( 1, MOVE_FOCUSPUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
-	LEVEL_UP_MOVE( 1, MOVE_AGILITY),
+	LEVEL_UP_MOVE( 1, MOVE_DRAINPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_FEINT),
+	LEVEL_UP_MOVE( 1, MOVE_VACUUMWAVE),
+	LEVEL_UP_MOVE( 1, MOVE_BULLETPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
+	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
-	LEVEL_UP_MOVE( 1, MOVE_MACHPUNCH),
-	LEVEL_UP_MOVE( 6, MOVE_AGILITY),
-	LEVEL_UP_MOVE(11, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(16, MOVE_MACHPUNCH),
-	LEVEL_UP_MOVE(16, MOVE_BULLETPUNCH),
+	LEVEL_UP_MOVE( 4, MOVE_MACHPUNCH),
+	LEVEL_UP_MOVE( 8, MOVE_POWERUPPUNCH),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(16, MOVE_REVENGE),
 	LEVEL_UP_MOVE(19, MOVE_COMETPUNCH),
-	LEVEL_UP_MOVE(21, MOVE_FEINT),
-	LEVEL_UP_MOVE(26, MOVE_VACUUMWAVE),
-	LEVEL_UP_MOVE(31, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(36, MOVE_THUNDERPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_ICEPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_FIREPUNCH),
-	LEVEL_UP_MOVE(41, MOVE_SKYUPPERCUT),
-	LEVEL_UP_MOVE(46, MOVE_MEGAPUNCH),
-	LEVEL_UP_MOVE(50, MOVE_DETECT),
-	LEVEL_UP_MOVE(56, MOVE_FOCUSPUNCH),
-	LEVEL_UP_MOVE(61, MOVE_COUNTER),
-	LEVEL_UP_MOVE(66, MOVE_CLOSECOMBAT),
+	LEVEL_UP_MOVE(21, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(25, MOVE_THUNDERPUNCH),
+	LEVEL_UP_MOVE(25, MOVE_ICEPUNCH),
+	LEVEL_UP_MOVE(25, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(30, MOVE_AGILITY),
+	LEVEL_UP_MOVE(35, MOVE_MEGAPUNCH),
+	LEVEL_UP_MOVE(40, MOVE_SKYUPPERCUT),
+	LEVEL_UP_MOVE(45, MOVE_COUNTER),
+	LEVEL_UP_MOVE(50, MOVE_FOCUSPUNCH),
+	LEVEL_UP_MOVE(55, MOVE_CLOSECOMBAT),
 	LEVEL_UP_END
 };
 
@@ -4447,12 +4446,13 @@ static const struct LevelUpMove sSneaselLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(20, MOVE_AGILITY),
 	LEVEL_UP_MOVE(22, MOVE_METALCLAW),
 	LEVEL_UP_MOVE(25, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(28, MOVE_BEATUP),
+	LEVEL_UP_MOVE(28, MOVE_ICESHARD),
+	LEVEL_UP_MOVE(30, MOVE_BEATUP),
 	LEVEL_UP_MOVE(32, MOVE_SCREECH),
-	LEVEL_UP_MOVE(35, MOVE_SLASH),
+	LEVEL_UP_MOVE(35, MOVE_PUNISHMENT),
 	LEVEL_UP_MOVE(40, MOVE_SNATCH),
-	LEVEL_UP_MOVE(44, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(47, MOVE_ICESHARD),
+	LEVEL_UP_MOVE(44, MOVE_SLASH),
+	LEVEL_UP_MOVE(52, MOVE_TRIPLEAXEL),
 	LEVEL_UP_END
 };
 
@@ -4872,28 +4872,27 @@ static const struct LevelUpMove sTyrogueLevelUpLearnset[] = {
 
 static const struct LevelUpMove sHitmontopLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_ROLLINGKICK),
-	LEVEL_UP_MOVE( 1, MOVE_ROLLINGKICK),
-	LEVEL_UP_MOVE( 1, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE( 1, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE( 1, MOVE_DETECT),
-	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
+	LEVEL_UP_MOVE( 1, MOVE_FEINT),
+	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_FAKEOUT),
 	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
-	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 6, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(10, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(15, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(19, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(24, MOVE_FEINT),
-	LEVEL_UP_MOVE(28, MOVE_COUNTER),
-	LEVEL_UP_MOVE(33, MOVE_TRIPLEKICK),
-	LEVEL_UP_MOVE(37, MOVE_AGILITY),
-	LEVEL_UP_MOVE(42, MOVE_GYROBALL),
-	LEVEL_UP_MOVE(46, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(46, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(50, MOVE_DETECT),
+	LEVEL_UP_MOVE( 4, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE( 8, MOVE_GYROBALL),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(16, MOVE_REVENGE),
+	LEVEL_UP_MOVE(19, MOVE_ROLLINGKICK),
+	LEVEL_UP_MOVE(21, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(21, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(25, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(30, MOVE_AGILITY),
+	LEVEL_UP_MOVE(35, MOVE_DIG),
+	LEVEL_UP_MOVE(40, MOVE_TRIPLEKICK),
+	LEVEL_UP_MOVE(45, MOVE_COUNTER),
+	LEVEL_UP_MOVE(50, MOVE_ENDEAVOR),
 	LEVEL_UP_MOVE(55, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(60, MOVE_ENDEAVOR),
 	LEVEL_UP_END
 };
 
@@ -8756,50 +8755,53 @@ static const struct LevelUpMove sDrifblimLevelUpLearnset[] = {
 
 static const struct LevelUpMove sBunearyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_FRUSTRATION),
-	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
+	LEVEL_UP_MOVE( 4, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 6, MOVE_ENDURE),
-	LEVEL_UP_MOVE(13, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE( 8, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(12, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE(16, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(23, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(26, MOVE_BATONPASS),
-	LEVEL_UP_MOVE(33, MOVE_AGILITY),
-	LEVEL_UP_MOVE(36, MOVE_DIZZYPUNCH),
-	LEVEL_UP_MOVE(43, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE(46, MOVE_CHARM),
-	LEVEL_UP_MOVE(50, MOVE_ENTRAINMENT),
-	LEVEL_UP_MOVE(56, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(63, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE(20, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(24, MOVE_CHARM),
+	LEVEL_UP_MOVE(28, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(32, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(36, MOVE_AGILITY),
+	LEVEL_UP_MOVE(40, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(44, MOVE_DIZZYPUNCH),
+	LEVEL_UP_MOVE(48, MOVE_FLATTER),
+	LEVEL_UP_MOVE(52, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE(46, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(60, MOVE_HEALINGWISH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sLopunnyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_RETURN),
-	LEVEL_UP_MOVE( 1, MOVE_RETURN),
-	LEVEL_UP_MOVE( 1, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE( 1, MOVE_BOUNCE),
-	LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
+	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_MIRRORCOAT),
 	LEVEL_UP_MOVE( 1, MOVE_MAGICCOAT),
-	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE( 6, MOVE_ENDURE),
-	LEVEL_UP_MOVE(13, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_ENDURE),
+	LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(12, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE(16, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(23, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(26, MOVE_BATONPASS),
-	LEVEL_UP_MOVE(33, MOVE_AGILITY),
-	LEVEL_UP_MOVE(36, MOVE_DIZZYPUNCH),
-	LEVEL_UP_MOVE(43, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE(46, MOVE_CHARM),
-	LEVEL_UP_MOVE(53, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(20, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(24, MOVE_CHARM),
+	LEVEL_UP_MOVE(28, MOVE_BATONPASS),
+	LEVEL_UP_MOVE(32, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(36, MOVE_AGILITY),
+	LEVEL_UP_MOVE(40, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(44, MOVE_DIZZYPUNCH),
+	LEVEL_UP_MOVE(48, MOVE_FLATTER),
+	LEVEL_UP_MOVE(52, MOVE_JUMPKICK),
 	LEVEL_UP_MOVE(56, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(63, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE(66, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(60, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE(64, MOVE_HIGHJUMPKICK),
 	LEVEL_UP_END
 };
 
@@ -9445,13 +9447,14 @@ static const struct LevelUpMove sAbomasnowLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sWeavileLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_ASSURANCE),
 	LEVEL_UP_MOVE( 1, MOVE_EMBARGO),
 	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
-	LEVEL_UP_MOVE( 1, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE( 1, MOVE_BEATUP),
+	LEVEL_UP_MOVE( 1, MOVE_SLASH),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
-	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 8, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE(10, MOVE_FEINTATTACK),
 	LEVEL_UP_MOVE(14, MOVE_ICYWIND),
@@ -9459,12 +9462,14 @@ static const struct LevelUpMove sWeavileLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(20, MOVE_NASTYPLOT),
 	LEVEL_UP_MOVE(22, MOVE_METALCLAW),
 	LEVEL_UP_MOVE(25, MOVE_HONECLAWS),
-	LEVEL_UP_MOVE(28, MOVE_FLING),
+	LEVEL_UP_MOVE(28, MOVE_ICESHARD),
+	LEVEL_UP_MOVE(30, MOVE_FLING),
 	LEVEL_UP_MOVE(32, MOVE_SCREECH),
-	LEVEL_UP_MOVE(35, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(35, MOVE_PUNISHMENT),
 	LEVEL_UP_MOVE(40, MOVE_SNATCH),
-	LEVEL_UP_MOVE(44, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(47, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(44, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(52, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(58, MOVE_TRIPLEAXEL),
 	LEVEL_UP_END
 };
 
@@ -11792,32 +11797,46 @@ static const struct LevelUpMove sZoroarkLevelUpLearnset[] = {
 
 static const struct LevelUpMove sMinccinoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 3, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE( 7, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE( 9, MOVE_TICKLE),
+	LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE( 4, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 7, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE(10, MOVE_SING),
 	LEVEL_UP_MOVE(13, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(15, MOVE_ENCORE),
+	LEVEL_UP_MOVE(16, MOVE_CHARM),
 	LEVEL_UP_MOVE(19, MOVE_SWIFT),
-	LEVEL_UP_MOVE(21, MOVE_SING),
-	LEVEL_UP_MOVE(25, MOVE_TAILSLAP),
-	LEVEL_UP_MOVE(27, MOVE_CHARM),
+	LEVEL_UP_MOVE(22, MOVE_ENCORE),
+	LEVEL_UP_MOVE(25, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(28, MOVE_TAILSLAP),
 	LEVEL_UP_MOVE(31, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(33, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE(34, MOVE_TICKLE),
 	LEVEL_UP_MOVE(37, MOVE_SLAM),
-	LEVEL_UP_MOVE(39, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(40, MOVE_CAPTIVATE),
 	LEVEL_UP_MOVE(43, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(45, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(49, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(46, MOVE_LASTRESORT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCinccinoLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_TAILSLAP),
 	LEVEL_UP_MOVE( 1, MOVE_BULLETSEED),
 	LEVEL_UP_MOVE( 1, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
+	LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES),
 	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_ECHOEDVOICE),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
+	LEVEL_UP_MOVE( 1, MOVE_SWIFT),
+	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE( 1, MOVE_TICKLE),
-	LEVEL_UP_MOVE( 1, MOVE_SING),
+	LEVEL_UP_MOVE( 1, MOVE_SLAM),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE( 1, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE( 1, MOVE_LASTRESORT),
 	LEVEL_UP_MOVE( 1, MOVE_TAILSLAP),
+	LEVEL_UP_MOVE( 1, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE( 1, MOVE_SING),
+	LEVEL_UP_MOVE( 1, MOVE_ENCORE),
 	LEVEL_UP_END
 };
 
@@ -15988,61 +16007,58 @@ static const struct LevelUpMove sBewearLevelUpLearnset[] = {
 
 static const struct LevelUpMove sBounsweetLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
-	LEVEL_UP_MOVE( 5, MOVE_PLAYNICE),
-	LEVEL_UP_MOVE( 9, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(13, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(17, MOVE_SWEETSCENT),
-	LEVEL_UP_MOVE(21, MOVE_MAGICALLEAF),
-	LEVEL_UP_MOVE(25, MOVE_TEETERDANCE),
-	LEVEL_UP_MOVE(29, MOVE_FLAIL),
-	LEVEL_UP_MOVE(33, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE( 4, MOVE_PLAYNICE),
+	LEVEL_UP_MOVE( 8, MOVE_RAPIDSPIN),
+	LEVEL_UP_MOVE(12, MOVE_RAZORLEAF),
+	LEVEL_UP_MOVE(16, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(20, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(24, MOVE_FLAIL),
+	LEVEL_UP_MOVE(28, MOVE_TEETERDANCE),
+	LEVEL_UP_MOVE(32, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE(36, MOVE_AROMATHERAPY),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSteeneeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
 	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
 	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
 	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE( 5, MOVE_PLAYNICE),
-	LEVEL_UP_MOVE( 9, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(13, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(17, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(16, MOVE_SWEETSCENT),
 	LEVEL_UP_MOVE(17, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(21, MOVE_MAGICALLEAF),
-	LEVEL_UP_MOVE(25, MOVE_TEETERDANCE),
-	LEVEL_UP_MOVE(29, MOVE_STOMP),
-	LEVEL_UP_MOVE(33, MOVE_AROMATICMIST),
-	LEVEL_UP_MOVE(37, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(41, MOVE_AROMATHERAPY),
-	LEVEL_UP_MOVE(45, MOVE_LEAFSTORM),
+	LEVEL_UP_MOVE(22, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(28, MOVE_STOMP),
+	LEVEL_UP_MOVE(34, MOVE_TEETERDANCE),
+	LEVEL_UP_MOVE(40, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE(46, MOVE_AROMATHERAPY),
+	LEVEL_UP_MOVE(52, MOVE_LEAFSTORM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sTsareenaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_TROPKICK),
 	LEVEL_UP_MOVE( 1, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
 	LEVEL_UP_MOVE( 1, MOVE_SWAGGER),
 	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
 	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE( 5, MOVE_SWAGGER),
-	LEVEL_UP_MOVE( 9, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE(13, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(17, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(16, MOVE_SWEETSCENT),
 	LEVEL_UP_MOVE(17, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(21, MOVE_MAGICALLEAF),
-	LEVEL_UP_MOVE(25, MOVE_TEETERDANCE),
-	LEVEL_UP_MOVE(28, MOVE_TROPKICK),
-	LEVEL_UP_MOVE(29, MOVE_STOMP),
-	LEVEL_UP_MOVE(33, MOVE_AROMATICMIST),
-	LEVEL_UP_MOVE(37, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(41, MOVE_AROMATHERAPY),
-	LEVEL_UP_MOVE(45, MOVE_LEAFSTORM),
-	LEVEL_UP_MOVE(49, MOVE_HIGHJUMPKICK),
-	LEVEL_UP_MOVE(53, MOVE_POWERWHIP),
+	LEVEL_UP_MOVE(22, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(27, MOVE_TROPKICK),
+	LEVEL_UP_MOVE(28, MOVE_STOMP),
+	LEVEL_UP_MOVE(34, MOVE_TEETERDANCE),
+	LEVEL_UP_MOVE(40, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE(46, MOVE_AROMATHERAPY),
+	LEVEL_UP_MOVE(52, MOVE_LEAFSTORM),
+	LEVEL_UP_MOVE(58, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE(64, MOVE_POWERWHIP),
 	LEVEL_UP_END
 };