diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c
index 946e5ef..d838874 100644
--- a/src/Egg_Moves.c
+++ b/src/Egg_Moves.c
@@ -137,7 +137,8 @@ const u16 gEggMoves[] =
 		MOVE_POISONTAIL,
 		MOVE_ENDURE,
 		MOVE_CHIPAWAY,
-		MOVE_VENOMDRENCH),
+		MOVE_VENOMDRENCH,
+		MOVE_SUCKERPUNCH),
 
 	egg_moves(NIDORAN_M,
 		MOVE_COUNTER,
@@ -399,7 +400,8 @@ const u16 gEggMoves[] =
 		MOVE_ROCKCLIMB,
 		MOVE_ENDURE,
 		MOVE_AUTOTOMIZE,
-		MOVE_WIDEGUARD),
+		MOVE_WIDEGUARD,
+		MOVE_SUCKERPUNCH),
 
 	egg_moves(PONYTA,
 		MOVE_FLAMEWHEEL,
@@ -799,7 +801,9 @@ const u16 gEggMoves[] =
 		MOVE_BIDE,
 		MOVE_WATERPULSE,
 		MOVE_WHIRLPOOL,
-		MOVE_REFLECTTYPE),
+		MOVE_REFLECTTYPE,
+		MOVE_BITE,
+		MOVE_TICKLE),
 
 	egg_moves(KABUTO,
 		MOVE_BUBBLEBEAM,
@@ -808,12 +812,13 @@ const u16 gEggMoves[] =
 		MOVE_FLAIL,
 		MOVE_KNOCKOFF,
 		MOVE_CONFUSERAY,
-		MOVE_MUDSHOT,
 		MOVE_ICYWIND,
 		MOVE_SCREECH,
 		MOVE_GIGADRAIN,
 		MOVE_FORESIGHT,
-		MOVE_TAKEDOWN),
+		MOVE_TAKEDOWN,
+		MOVE_MEGADRAIN,
+		MOVE_WRINGOUT),
 
 	egg_moves(AERODACTYL,
 		MOVE_WHIRLWIND,
@@ -1555,7 +1560,8 @@ const u16 gEggMoves[] =
 		MOVE_IRONTAIL,
 		MOVE_FOCUSENERGY,
 		MOVE_POWERSWAP,
-		MOVE_BELCH),
+		MOVE_BELCH,
+		MOVE_FIRESPIN),
 
 	egg_moves(MILTANK,
 		MOVE_PRESENT,
@@ -1604,7 +1610,10 @@ const u16 gEggMoves[] =
 		MOVE_RAZORWIND,
 		MOVE_BULLETSEED,
 		MOVE_NATURALGIFT,
-		MOVE_GRASSYTERRAIN),
+		MOVE_GRASSYTERRAIN,
+		MOVE_ABSORB,
+		MOVE_PURSUIT,
+		MOVE_AGILITY),
 
 	egg_moves(TORCHIC,
 		MOVE_COUNTER,
@@ -1619,7 +1628,9 @@ const u16 gEggMoves[] =
 		MOVE_FEATHERDANCE,
 		MOVE_CURSE,
 		MOVE_FLAMEBURST,
-		MOVE_LOWKICK),
+		MOVE_LOWKICK,
+		MOVE_FIRESPIN,
+		MOVE_SANDATTACK),
 
 	egg_moves(MUDKIP,
 		MOVE_REFRESH,
@@ -1638,7 +1649,11 @@ const u16 gEggMoves[] =
 		MOVE_SLUDGE,
 		MOVE_AVALANCHE,
 		MOVE_WIDEGUARD,
-		MOVE_BARRIER),
+		MOVE_BARRIER,
+		MOVE_MUDSLAP,
+		MOVE_FORESIGHT,
+		MOVE_BIDE,
+		MOVE_MUDSPORT),
 
 	egg_moves(POOCHYENA,
 		MOVE_ASTONISH,
@@ -2169,7 +2184,8 @@ const u16 gEggMoves[] =
 		MOVE_HAMMERARM,
 		MOVE_NIGHTSLASH,
 		MOVE_AFTERYOU,
-		MOVE_TICKLE),
+		MOVE_TICKLE,
+		MOVE_SUCKERPUNCH),
 
 	egg_moves(GULPIN,
 		MOVE_ACIDARMOR,
@@ -2261,7 +2277,8 @@ const u16 gEggMoves[] =
 		MOVE_IRONTAIL,
 		MOVE_WRINGOUT,
 		MOVE_PUNISHMENT,
-		MOVE_FINALGAMBIT),
+		MOVE_FINALGAMBIT,
+		MOVE_SUCKERPUNCH),
 
 	egg_moves(ZANGOOSE,
 		MOVE_FLAIL,
@@ -2653,7 +2670,8 @@ const u16 gEggMoves[] =
 		MOVE_ASSURANCE,
 		MOVE_FLAIL,
 		MOVE_SNATCH,
-		MOVE_METALCLAW),
+		MOVE_METALCLAW,
+		MOVE_SUCKERPUNCH),
 
 	egg_moves(CHINGLING,
 		MOVE_DISABLE,
@@ -3291,7 +3309,9 @@ const u16 gEggMoves[] =
 		MOVE_BODYSLAM,
 		MOVE_BIDE,
 		MOVE_GUARDSWAP,
-		MOVE_LIQUIDATION),
+		MOVE_LIQUIDATION,
+		MOVE_ROLLOUT,
+		MOVE_BLOCK),
 
 	egg_moves(ARCHEN,
 		MOVE_STEELWING,
@@ -3892,7 +3912,8 @@ const u16 gEggMoves[] =
 		MOVE_BARRIER,
 		MOVE_MIRRORCOAT,
 		MOVE_MAGNETRISE,
-		MOVE_DISCHARGE),
+		MOVE_DISCHARGE,
+		MOVE_TAKEDOWN),
 
 	egg_moves(HAWLUCHA,
 		MOVE_AGILITY,
@@ -4348,7 +4369,8 @@ const u16 gEggMoves[] =
 		MOVE_WIDEGUARD,
 		MOVE_COUNTER,
 		MOVE_CURSE,
-		MOVE_SCREECH),
+		MOVE_SCREECH,
+		MOVE_SUCKERPUNCH),
 
 	egg_moves(GRIMER_A,
 		MOVE_CLEARSMOG,
diff --git a/src/Learnsets.c b/src/Learnsets.c
index 32d764f..56ce715 100644
--- a/src/Learnsets.c
+++ b/src/Learnsets.c
@@ -554,95 +554,132 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = {
 
 static const struct LevelUpMove sNidoranFLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-	LEVEL_UP_MOVE( 7, MOVE_TAILWHIP),
-	LEVEL_UP_MOVE( 9, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(13, MOVE_POISONSTING),
-	LEVEL_UP_MOVE(19, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(21, MOVE_BITE),
-	LEVEL_UP_MOVE(25, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(31, MOVE_TOXICSPIKES),
-	LEVEL_UP_MOVE(33, MOVE_FLATTER),
-	LEVEL_UP_MOVE(37, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(43, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(45, MOVE_POISONFANG),
+	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
+	LEVEL_UP_MOVE( 4, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 8, MOVE_TAILWHIP),
+	LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(16, MOVE_TOXICSPIKES),
+	LEVEL_UP_MOVE(19, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(23, MOVE_POISONFANG),
+	LEVEL_UP_MOVE(27, MOVE_BITE),
+	LEVEL_UP_MOVE(31, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(34, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(37, MOVE_TOXIC),
+	LEVEL_UP_MOVE(40, MOVE_FLATTER),
+	LEVEL_UP_MOVE(43, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(47, MOVE_EARTHPOWER),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sNidorinaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-	LEVEL_UP_MOVE( 7, MOVE_TAILWHIP),
-	LEVEL_UP_MOVE( 9, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(13, MOVE_POISONSTING),
-	LEVEL_UP_MOVE(20, MOVE_FURYSWIPES),
-	LEVEL_UP_MOVE(23, MOVE_BITE),
-	LEVEL_UP_MOVE(28, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(35, MOVE_TOXICSPIKES),
-	LEVEL_UP_MOVE(38, MOVE_FLATTER),
-	LEVEL_UP_MOVE(43, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(50, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(58, MOVE_POISONFANG),
+	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
+	LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE(16, MOVE_TOXICSPIKES),
+	LEVEL_UP_MOVE(21, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(26, MOVE_POISONFANG),
+	LEVEL_UP_MOVE(31, MOVE_BITE),
+	LEVEL_UP_MOVE(36, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(40, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(44, MOVE_TOXIC),
+	LEVEL_UP_MOVE(48, MOVE_FLATTER),
+	LEVEL_UP_MOVE(52, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(57, MOVE_EARTHPOWER),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sNidoqueenLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_CHIPAWAY),
 	LEVEL_UP_MOVE( 1, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
+	LEVEL_UP_MOVE( 1, MOVE_FURYSWIPES),
+	LEVEL_UP_MOVE( 1, MOVE_TOXICSPIKES),
 	LEVEL_UP_MOVE( 1, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
-	LEVEL_UP_MOVE(23, MOVE_CHIPAWAY),
-	LEVEL_UP_MOVE(35, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(43, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(58, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_POISONFANG),
+	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE( 1, MOVE_TOXIC),
+	LEVEL_UP_MOVE( 1, MOVE_FLATTER),
+	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_CHIPAWAY),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE( 1, MOVE_POISONFANG),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sNidoranMLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_PECK),
-	LEVEL_UP_MOVE( 7, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE( 9, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(13, MOVE_POISONSTING),
-	LEVEL_UP_MOVE(19, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE(21, MOVE_HORNATTACK),
-	LEVEL_UP_MOVE(25, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(31, MOVE_TOXICSPIKES),
-	LEVEL_UP_MOVE(33, MOVE_FLATTER),
-	LEVEL_UP_MOVE(37, MOVE_POISONJAB),
-	LEVEL_UP_MOVE(43, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(45, MOVE_HORNDRILL),
+	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
+	LEVEL_UP_MOVE( 4, MOVE_PECK),
+	LEVEL_UP_MOVE( 8, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(12, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(16, MOVE_TOXICSPIKES),
+	LEVEL_UP_MOVE(19, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(23, MOVE_POISONTAIL),
+	LEVEL_UP_MOVE(27, MOVE_HORNATTACK),
+	LEVEL_UP_MOVE(31, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(34, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(37, MOVE_TOXIC),
+	LEVEL_UP_MOVE(40, MOVE_FLATTER),
+	LEVEL_UP_MOVE(43, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(47, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(51, MOVE_HORNDRILL),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sNidorinoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
-	LEVEL_UP_MOVE( 7, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE( 9, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(13, MOVE_POISONSTING),
-	LEVEL_UP_MOVE(20, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE(23, MOVE_HORNATTACK),
-	LEVEL_UP_MOVE(28, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(35, MOVE_TOXICSPIKES),
-	LEVEL_UP_MOVE(38, MOVE_FLATTER),
-	LEVEL_UP_MOVE(43, MOVE_POISONJAB),
-	LEVEL_UP_MOVE(50, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(58, MOVE_HORNDRILL),
+	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(12, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(16, MOVE_TOXICSPIKES),
+	LEVEL_UP_MOVE(21, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(26, MOVE_POISONTAIL),
+	LEVEL_UP_MOVE(31, MOVE_HORNATTACK),
+	LEVEL_UP_MOVE(36, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(40, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(44, MOVE_TOXIC),
+	LEVEL_UP_MOVE(48, MOVE_FLATTER),
+	LEVEL_UP_MOVE(52, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(57, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(62, MOVE_HORNDRILL),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sNidokingLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_CHIPAWAY),
 	LEVEL_UP_MOVE( 1, MOVE_MEGAHORN),
+	LEVEL_UP_MOVE( 1, MOVE_THRASH),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
 	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE( 1, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_TOXICSPIKES),
 	LEVEL_UP_MOVE( 1, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE( 1, MOVE_POISONSTING),
-	LEVEL_UP_MOVE(23, MOVE_CHIPAWAY),
-	LEVEL_UP_MOVE(35, MOVE_THRASH),
-	LEVEL_UP_MOVE(43, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(58, MOVE_MEGAHORN),
+	LEVEL_UP_MOVE( 1, MOVE_POISONTAIL),
+	LEVEL_UP_MOVE( 1, MOVE_HORNATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE( 1, MOVE_TOXIC),
+	LEVEL_UP_MOVE( 1, MOVE_FLATTER),
+	LEVEL_UP_MOVE( 1, MOVE_POISONJAB),
+	LEVEL_UP_MOVE( 1, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_HORNDRILL),
+	LEVEL_UP_MOVE( 1, MOVE_CHIPAWAY),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE( 1, MOVE_POISONTAIL),
+	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
 	LEVEL_UP_END
 };
 
@@ -805,46 +842,42 @@ static const struct LevelUpMove sWigglytuffLevelUpLearnset[] = {
 
 static const struct LevelUpMove sZubatLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE),
-	LEVEL_UP_MOVE( 5, MOVE_SUPERSONIC),
-	LEVEL_UP_MOVE( 7, MOVE_ASTONISH),
-	LEVEL_UP_MOVE(11, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE(17, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(19, MOVE_AIRCUTTER),
-	LEVEL_UP_MOVE(23, MOVE_SWIFT),
-	LEVEL_UP_MOVE(25, MOVE_POISONFANG),
-	LEVEL_UP_MOVE(29, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(31, MOVE_LEECHFANG),
-	LEVEL_UP_MOVE(33, MOVE_DUALWINGBEAT),
-	LEVEL_UP_MOVE(35, MOVE_HAZE),
-	LEVEL_UP_MOVE(37, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(41, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(43, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
+	LEVEL_UP_MOVE( 5, MOVE_ASTONISH),
+	LEVEL_UP_MOVE( 9, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(12, MOVE_SWIFT),
+	LEVEL_UP_MOVE(16, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE(20, MOVE_BITE),
+	LEVEL_UP_MOVE(24, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(27, MOVE_POISONFANG),
+	LEVEL_UP_MOVE(31, MOVE_AIRCUTTER),
+	LEVEL_UP_MOVE(35, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(38, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(42, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(46, MOVE_HAZE),
+	LEVEL_UP_MOVE(50, MOVE_LEECHFANG),
+	LEVEL_UP_MOVE(54, MOVE_ACROBATICS),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sGolbatLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_SCREECH),
 	LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE),
 	LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 5, MOVE_SUPERSONIC),
-	LEVEL_UP_MOVE( 7, MOVE_ASTONISH),
-	LEVEL_UP_MOVE(11, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE(17, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(19, MOVE_AIRCUTTER),
-	LEVEL_UP_MOVE(24, MOVE_SWIFT),
-	LEVEL_UP_MOVE(27, MOVE_POISONFANG),
-	LEVEL_UP_MOVE(32, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(35, MOVE_LEECHFANG),
-	LEVEL_UP_MOVE(37, MOVE_DUALWINGBEAT),
-	LEVEL_UP_MOVE(40, MOVE_HAZE),
-	LEVEL_UP_MOVE(43, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(48, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(51, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE( 1, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(12, MOVE_SWIFT),
+	LEVEL_UP_MOVE(16, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE(20, MOVE_BITE),
+	LEVEL_UP_MOVE(26, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(31, MOVE_POISONFANG),
+	LEVEL_UP_MOVE(36, MOVE_AIRCUTTER),
+	LEVEL_UP_MOVE(41, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(45, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(50, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(55, MOVE_HAZE),
+	LEVEL_UP_MOVE(59, MOVE_LEECHFANG),
+	LEVEL_UP_MOVE(64, MOVE_ACROBATICS),
 	LEVEL_UP_END
 };
 
@@ -2660,25 +2693,27 @@ static const struct LevelUpMove sScytherLevelUpLearnset[] = {
 
 static const struct LevelUpMove sJynxLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_DRAININGKISS),
-	LEVEL_UP_MOVE( 1, MOVE_PERISHSONG),
-	LEVEL_UP_MOVE( 1, MOVE_POUND),
+	LEVEL_UP_MOVE( 1, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE( 1, MOVE_COVET),
+	LEVEL_UP_MOVE( 1, MOVE_FAKETEARS),
+	LEVEL_UP_MOVE( 1, MOVE_SWEETKISS),
+	LEVEL_UP_MOVE( 1, MOVE_MEANLOOK),
 	LEVEL_UP_MOVE( 1, MOVE_LICK),
-	LEVEL_UP_MOVE( 1, MOVE_LOVELYKISS),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 5, MOVE_LICK),
-	LEVEL_UP_MOVE( 8, MOVE_LOVELYKISS),
-	LEVEL_UP_MOVE(11, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE(15, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(18, MOVE_ICEPUNCH),
-	LEVEL_UP_MOVE(21, MOVE_HEARTSTAMP),
-	LEVEL_UP_MOVE(25, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(28, MOVE_FAKETEARS),
-	LEVEL_UP_MOVE(33, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(39, MOVE_AVALANCHE),
-	LEVEL_UP_MOVE(44, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
+	LEVEL_UP_MOVE(12, MOVE_CONFUSION),
+	LEVEL_UP_MOVE(16, MOVE_DOUBLESLAP),
+	LEVEL_UP_MOVE(20, MOVE_SING),
+	LEVEL_UP_MOVE(23, MOVE_HEARTSTAMP),
+	LEVEL_UP_MOVE(27, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE(30, MOVE_ICEPUNCH),
+	LEVEL_UP_MOVE(36, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(41, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE(45, MOVE_LOVELYKISS),
 	LEVEL_UP_MOVE(49, MOVE_WRINGOUT),
-	LEVEL_UP_MOVE(55, MOVE_PERISHSONG),
-	LEVEL_UP_MOVE(60, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(54, MOVE_PERISHSONG),
+	LEVEL_UP_MOVE(58, MOVE_BLIZZARD),
 	LEVEL_UP_END
 };
 
@@ -2686,18 +2721,19 @@ static const struct LevelUpMove sElectabuzzLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 8, MOVE_LOWKICK),
-	LEVEL_UP_MOVE(12, MOVE_SWIFT),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	LEVEL_UP_MOVE(11, MOVE_SWIFT),
 	LEVEL_UP_MOVE(15, MOVE_SHOCKWAVE),
 	LEVEL_UP_MOVE(19, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(22, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(26, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(29, MOVE_THUNDERPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(42, MOVE_SCREECH),
-	LEVEL_UP_MOVE(49, MOVE_THUNDERBOLT),
-	LEVEL_UP_MOVE(55, MOVE_THUNDER),
+	LEVEL_UP_MOVE(22, MOVE_SCREECH),
+	LEVEL_UP_MOVE(25, MOVE_THUNDERPUNCH),
+	LEVEL_UP_MOVE(29, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(35, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(41, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(47, MOVE_THUNDERBOLT),
+	LEVEL_UP_MOVE(53, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(58, MOVE_THUNDER),
+	LEVEL_UP_MOVE(64, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
@@ -2705,18 +2741,20 @@ static const struct LevelUpMove sMagmarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SMOG),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
-	LEVEL_UP_MOVE( 5, MOVE_EMBER),
-	LEVEL_UP_MOVE( 8, MOVE_SMOKESCREEN),
-	LEVEL_UP_MOVE(12, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(15, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(19, MOVE_CLEARSMOG),
-	LEVEL_UP_MOVE(22, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(26, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(29, MOVE_FIREPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE(42, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(49, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(55, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_SMOKESCREEN),
+	LEVEL_UP_MOVE(11, MOVE_CLEARSMOG),
+	LEVEL_UP_MOVE(15, MOVE_FLAMEWHEEL),
+	LEVEL_UP_MOVE(19, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(23, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(27, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(36, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(41, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE(46, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(51, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(56, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(60, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(65, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
@@ -2775,21 +2813,21 @@ static const struct LevelUpMove sGyaradosLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_TWISTER),
-	LEVEL_UP_MOVE( 4, MOVE_WHIRLPOOL),
-	LEVEL_UP_MOVE( 8, MOVE_ICEFANG),
-	LEVEL_UP_MOVE(12, MOVE_BRINE),
+	LEVEL_UP_MOVE( 8, MOVE_WHIRLPOOL),
+	LEVEL_UP_MOVE(12, MOVE_ICEFANG),
 	LEVEL_UP_MOVE(16, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(19, MOVE_BITE),
-	LEVEL_UP_MOVE(21, MOVE_WATERFALL),
-	LEVEL_UP_MOVE(24, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(28, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE(32, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(36, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(21, MOVE_BRINE),
+	LEVEL_UP_MOVE(25, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(29, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(36, MOVE_WATERFALL),
 	LEVEL_UP_MOVE(40, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(44, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(48, MOVE_HURRICANE),
-	LEVEL_UP_MOVE(52, MOVE_THRASH),
-	LEVEL_UP_MOVE(56, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(43, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(47, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(51, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(55, MOVE_THRASH),
+	LEVEL_UP_MOVE(59, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
@@ -2954,58 +2992,60 @@ static const struct LevelUpMove sPorygonLevelUpLearnset[] = {
 
 static const struct LevelUpMove sOmanyteLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_CONSTRICT),
+	LEVEL_UP_MOVE( 1, MOVE_BIND),
 	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
-	LEVEL_UP_MOVE( 7, MOVE_BITE),
-	LEVEL_UP_MOVE(10, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(16, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE(19, MOVE_LEER),
+	LEVEL_UP_MOVE( 5, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE(10, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE(15, MOVE_WATERGUN),
+	LEVEL_UP_MOVE(20, MOVE_LEER),
 	LEVEL_UP_MOVE(25, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(28, MOVE_BRINE),
-	LEVEL_UP_MOVE(34, MOVE_PROTECT),
-	LEVEL_UP_MOVE(37, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(43, MOVE_TICKLE),
-	LEVEL_UP_MOVE(46, MOVE_ROCKBLAST),
-	LEVEL_UP_MOVE(50, MOVE_SHELLSMASH),
-	LEVEL_UP_MOVE(55, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(30, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(35, MOVE_BRINE),
+	LEVEL_UP_MOVE(41, MOVE_PROTECT),
+	LEVEL_UP_MOVE(45, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE(50, MOVE_SURF),
+	LEVEL_UP_MOVE(55, MOVE_SHELLSMASH),
+	LEVEL_UP_MOVE(60, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sOmastarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_SPIKECANNON),
-	LEVEL_UP_MOVE( 1, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_CONSTRICT),
+	LEVEL_UP_MOVE( 1, MOVE_BIND),
 	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 7, MOVE_BITE),
-	LEVEL_UP_MOVE(10, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(16, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE(19, MOVE_LEER),
+	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE(15, MOVE_WATERGUN),
+	LEVEL_UP_MOVE(20, MOVE_LEER),
 	LEVEL_UP_MOVE(25, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(28, MOVE_BRINE),
-	LEVEL_UP_MOVE(34, MOVE_PROTECT),
-	LEVEL_UP_MOVE(37, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(30, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(35, MOVE_BRINE),
 	LEVEL_UP_MOVE(39, MOVE_SPIKECANNON),
-	LEVEL_UP_MOVE(48, MOVE_TICKLE),
-	LEVEL_UP_MOVE(56, MOVE_ROCKBLAST),
-	LEVEL_UP_MOVE(67, MOVE_SHELLSMASH),
-	LEVEL_UP_MOVE(75, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(43, MOVE_PROTECT),
+	LEVEL_UP_MOVE(49, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE(56, MOVE_SURF),
+	LEVEL_UP_MOVE(63, MOVE_SHELLSMASH),
+	LEVEL_UP_MOVE(70, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sKabutoLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
-	LEVEL_UP_MOVE( 6, MOVE_ABSORB),
-	LEVEL_UP_MOVE(11, MOVE_LEER),
-	LEVEL_UP_MOVE(16, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(21, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(26, MOVE_ENDURE),
-	LEVEL_UP_MOVE(31, MOVE_AQUAJET),
-	LEVEL_UP_MOVE(36, MOVE_MEGADRAIN),
-	LEVEL_UP_MOVE(41, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(43, MOVE_LEECHFANG),
-	LEVEL_UP_MOVE(46, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(50, MOVE_WRINGOUT),
+	LEVEL_UP_MOVE( 5, MOVE_SCRATCH),
+	LEVEL_UP_MOVE(10, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE(15, MOVE_AQUAJET),
+	LEVEL_UP_MOVE(20, MOVE_LEER),
+	LEVEL_UP_MOVE(25, MOVE_MUDSHOT),
+	LEVEL_UP_MOVE(30, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(35, MOVE_BRINE),
+	LEVEL_UP_MOVE(41, MOVE_PROTECT),
+	LEVEL_UP_MOVE(45, MOVE_LEECHFANG),
+	LEVEL_UP_MOVE(50, MOVE_LIQUIDATION),
+	LEVEL_UP_MOVE(55, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(60, MOVE_STONEEDGE),
 	LEVEL_UP_END
 };
 
@@ -3013,23 +3053,21 @@ static const struct LevelUpMove sKabutopsLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_SLASH),
 	LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH),
 	LEVEL_UP_MOVE( 1, MOVE_FEINT),
-	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
-	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 6, MOVE_ABSORB),
-	LEVEL_UP_MOVE(11, MOVE_LEER),
-	LEVEL_UP_MOVE(16, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(21, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(26, MOVE_ENDURE),
-	LEVEL_UP_MOVE(31, MOVE_AQUAJET),
-	LEVEL_UP_MOVE(36, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
+	LEVEL_UP_MOVE(15, MOVE_AQUAJET),
+	LEVEL_UP_MOVE(20, MOVE_LEER),
+	LEVEL_UP_MOVE(25, MOVE_MUDSHOT),
+	LEVEL_UP_MOVE(30, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(35, MOVE_BRINE),
 	LEVEL_UP_MOVE(39, MOVE_SLASH),
-	LEVEL_UP_MOVE(45, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(51, MOVE_LEECHFANG),
-	LEVEL_UP_MOVE(54, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(63, MOVE_WRINGOUT),
-	LEVEL_UP_MOVE(72, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(43, MOVE_PROTECT),
+	LEVEL_UP_MOVE(49, MOVE_LEECHFANG),
+	LEVEL_UP_MOVE(56, MOVE_LIQUIDATION),
+	LEVEL_UP_MOVE(63, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(70, MOVE_STONEEDGE),
 	LEVEL_UP_END
 };
 
@@ -3038,20 +3076,20 @@ static const struct LevelUpMove sAerodactylLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_ICEFANG),
 	LEVEL_UP_MOVE( 1, MOVE_FIREFANG),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG),
-	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
 	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE( 9, MOVE_ROAR),
-	LEVEL_UP_MOVE(17, MOVE_AGILITY),
-	LEVEL_UP_MOVE(25, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(41, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(49, MOVE_SKYDROP),
-	LEVEL_UP_MOVE(57, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(65, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(73, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(81, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE( 5, MOVE_SUPERSONIC),
+	LEVEL_UP_MOVE(10, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE(15, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(20, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(25, MOVE_ROAR),
+	LEVEL_UP_MOVE(30, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(35, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(40, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(45, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(50, MOVE_AGILITY),
+	LEVEL_UP_MOVE(55, MOVE_SKYDROP),
+	LEVEL_UP_MOVE(60, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
@@ -3092,127 +3130,128 @@ static const struct LevelUpMove sSnorlaxLevelUpLearnset[] = {
 
 static const struct LevelUpMove sArticunoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_GUST),
-	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 8, MOVE_MIST),
+	LEVEL_UP_MOVE( 1, MOVE_MIST),
+	LEVEL_UP_MOVE( 5, MOVE_POWDERSNOW),
+	LEVEL_UP_MOVE(10, MOVE_REFLECT),
 	LEVEL_UP_MOVE(15, MOVE_ICESHARD),
-	LEVEL_UP_MOVE(22, MOVE_MINDREADER),
-	LEVEL_UP_MOVE(29, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(36, MOVE_AGILITY),
-	LEVEL_UP_MOVE(43, MOVE_FREEZEDRY),
-	LEVEL_UP_MOVE(50, MOVE_REFLECT),
-	LEVEL_UP_MOVE(57, MOVE_HAIL),
-	LEVEL_UP_MOVE(64, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(71, MOVE_ICEBEAM),
-	LEVEL_UP_MOVE(78, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(85, MOVE_ROOST),
-	LEVEL_UP_MOVE(92, MOVE_HURRICANE),
-	LEVEL_UP_MOVE(99, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE(20, MOVE_AGILITY),
+	LEVEL_UP_MOVE(25, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(30, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(35, MOVE_FREEZEDRY),
+	LEVEL_UP_MOVE(40, MOVE_ROOST),
+	LEVEL_UP_MOVE(45, MOVE_ICEBEAM),
+	LEVEL_UP_MOVE(50, MOVE_HAIL),
+	LEVEL_UP_MOVE(55, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(60, MOVE_MINDREADER),
+	LEVEL_UP_MOVE(65, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(70, MOVE_SHEERCOLD),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sZapdosLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_MAGNETICFLUX),
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
-	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 8, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(15, MOVE_DETECT),
-	LEVEL_UP_MOVE(22, MOVE_PLUCK),
-	LEVEL_UP_MOVE(29, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(36, MOVE_CHARGE),
-	LEVEL_UP_MOVE(43, MOVE_AGILITY),
-	LEVEL_UP_MOVE(50, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(57, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE(64, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(71, MOVE_DRILLPECK),
-	LEVEL_UP_MOVE(78, MOVE_THUNDER),
-	LEVEL_UP_MOVE(85, MOVE_ROOST),
-	LEVEL_UP_MOVE(92, MOVE_BOLTBEAK),
-	LEVEL_UP_MOVE(99, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE( 5, MOVE_THUNDERSHOCK),
+	LEVEL_UP_MOVE(10, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(15, MOVE_PLUCK),
+	LEVEL_UP_MOVE(20, MOVE_AGILITY),
+	LEVEL_UP_MOVE(25, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(30, MOVE_CHARGE),
+	LEVEL_UP_MOVE(35, MOVE_DRILLPECK),
+	LEVEL_UP_MOVE(40, MOVE_ROOST),
+	LEVEL_UP_MOVE(45, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(50, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(55, MOVE_THUNDER),
+	LEVEL_UP_MOVE(60, MOVE_DETECT),
+	LEVEL_UP_MOVE(65, MOVE_MAGNETICFLUX),
+	LEVEL_UP_MOVE(70, MOVE_BOLTBEAK),
+	LEVEL_UP_MOVE(75, MOVE_ZAPCANNON),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sMoltresLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_EMBER),
-	LEVEL_UP_MOVE( 8, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(15, MOVE_AGILITY),
-	LEVEL_UP_MOVE(22, MOVE_ENDURE),
-	LEVEL_UP_MOVE(29, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(36, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(43, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(50, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(57, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(64, MOVE_HEATWAVE),
-	LEVEL_UP_MOVE(71, MOVE_SOLARBEAM),
-	LEVEL_UP_MOVE(78, MOVE_SKYATTACK),
-	LEVEL_UP_MOVE(85, MOVE_ROOST),
-	LEVEL_UP_MOVE(92, MOVE_HURRICANE),
-	LEVEL_UP_MOVE(99, MOVE_BURNUP),
+	LEVEL_UP_MOVE( 1, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE( 1, MOVE_GUST),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 5, MOVE_EMBER),
+	LEVEL_UP_MOVE(10, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(15, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE(20, MOVE_AGILITY),
+	LEVEL_UP_MOVE(25, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(30, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(35, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(40, MOVE_ROOST),
+	LEVEL_UP_MOVE(45, MOVE_HEATWAVE),
+	LEVEL_UP_MOVE(50, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(55, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(60, MOVE_ENDURE),
+	LEVEL_UP_MOVE(65, MOVE_BURNUP),
+	LEVEL_UP_MOVE(70, MOVE_SOLARBEAM),
+	LEVEL_UP_MOVE(75, MOVE_SKYATTACK),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDratiniLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_WRAP),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(11, MOVE_TWISTER),
-	LEVEL_UP_MOVE(15, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(21, MOVE_SLAM),
-	LEVEL_UP_MOVE(25, MOVE_AGILITY),
-	LEVEL_UP_MOVE(31, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(35, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(41, MOVE_DRAGONRUSH),
-	LEVEL_UP_MOVE(45, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(51, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE( 5, MOVE_TWISTER),
+	LEVEL_UP_MOVE(10, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(15, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(20, MOVE_AGILITY),
+	LEVEL_UP_MOVE(25, MOVE_SLAM),
+	LEVEL_UP_MOVE(31, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(34, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(37, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(40, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(45, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(50, MOVE_DRAGONDANCE),
 	LEVEL_UP_MOVE(55, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(61, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(60, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDragonairLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_WRAP),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_TWISTER),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(11, MOVE_TWISTER),
-	LEVEL_UP_MOVE(15, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(21, MOVE_SLAM),
-	LEVEL_UP_MOVE(25, MOVE_AGILITY),
-	LEVEL_UP_MOVE(33, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(39, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(47, MOVE_DRAGONRUSH),
-	LEVEL_UP_MOVE(53, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(61, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(15, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(20, MOVE_AGILITY),
+	LEVEL_UP_MOVE(25, MOVE_SLAM),
+	LEVEL_UP_MOVE(33, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(37, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(42, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(46, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(53, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(60, MOVE_DRAGONDANCE),
 	LEVEL_UP_MOVE(67, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(75, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(74, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDragoniteLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_HURRICANE),
+	LEVEL_UP_MOVE( 0, MOVE_HURRICANE),
+	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_ROOST),
+	LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED),
 	LEVEL_UP_MOVE( 1, MOVE_FIREPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERPUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_ROOST),
 	LEVEL_UP_MOVE( 1, MOVE_WRAP),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_TWISTER),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(11, MOVE_TWISTER),
-	LEVEL_UP_MOVE(15, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(21, MOVE_SLAM),
-	LEVEL_UP_MOVE(25, MOVE_AGILITY),
-	LEVEL_UP_MOVE(33, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(39, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(47, MOVE_DRAGONRUSH),
-	LEVEL_UP_MOVE(53, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(54, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE(61, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(67, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(75, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(81, MOVE_HURRICANE),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(15, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(20, MOVE_AGILITY),
+	LEVEL_UP_MOVE(25, MOVE_SLAM),
+	LEVEL_UP_MOVE(33, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(37, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(42, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(46, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(53, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(54, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(62, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(41, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(80, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
@@ -3622,28 +3661,26 @@ static const struct LevelUpMove sAriadosLevelUpLearnset[] = {
 
 static const struct LevelUpMove sCrobatLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_CROSSPOISON),
-	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_TAILWIND),
+	LEVEL_UP_MOVE( 1, MOVE_TOXIC),
 	LEVEL_UP_MOVE( 1, MOVE_SCREECH),
+	LEVEL_UP_MOVE( 1, MOVE_ACROBATICS),
 	LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE),
 	LEVEL_UP_MOVE( 1, MOVE_SUPERSONIC),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 5, MOVE_SUPERSONIC),
-	LEVEL_UP_MOVE( 7, MOVE_ASTONISH),
-	LEVEL_UP_MOVE(11, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE(17, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(19, MOVE_AIRCUTTER),
-	LEVEL_UP_MOVE(22, MOVE_CROSSPOISON),
-	LEVEL_UP_MOVE(24, MOVE_SWIFT),
-	LEVEL_UP_MOVE(27, MOVE_POISONFANG),
-	LEVEL_UP_MOVE(32, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(35, MOVE_LEECHFANG),
-	LEVEL_UP_MOVE(37, MOVE_DUALWINGBEAT),
-	LEVEL_UP_MOVE(40, MOVE_HAZE),
-	LEVEL_UP_MOVE(43, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(48, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(51, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE( 1, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(12, MOVE_SWIFT),
+	LEVEL_UP_MOVE(16, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE(20, MOVE_BITE),
+	LEVEL_UP_MOVE(26, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(31, MOVE_POISONFANG),
+	LEVEL_UP_MOVE(36, MOVE_AIRCUTTER),
+	LEVEL_UP_MOVE(41, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(45, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(50, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(55, MOVE_HAZE),
+	LEVEL_UP_MOVE(59, MOVE_LEECHFANG),
+	LEVEL_UP_MOVE(64, MOVE_BRAVEBIRD),
 	LEVEL_UP_END
 };
 
@@ -5112,57 +5149,61 @@ static const struct LevelUpMove sHitmontopLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sSmoochumLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_LICK),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 5, MOVE_LICK),
-	LEVEL_UP_MOVE( 8, MOVE_SWEETKISS),
-	LEVEL_UP_MOVE(11, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE(15, MOVE_CONFUSION),
-	LEVEL_UP_MOVE(18, MOVE_SING),
-	LEVEL_UP_MOVE(21, MOVE_HEARTSTAMP),
-	LEVEL_UP_MOVE(25, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE(28, MOVE_FAKETEARS),
-	LEVEL_UP_MOVE(31, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(35, MOVE_AVALANCHE),
-	LEVEL_UP_MOVE(38, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(41, MOVE_COPYCAT),
-	LEVEL_UP_MOVE(45, MOVE_PERISHSONG),
-	LEVEL_UP_MOVE(48, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE( 4, MOVE_POWDERSNOW),
+	LEVEL_UP_MOVE( 8, MOVE_COPYCAT),
+	LEVEL_UP_MOVE(12, MOVE_CONFUSION),
+	LEVEL_UP_MOVE(16, MOVE_COVET),
+	LEVEL_UP_MOVE(20, MOVE_SING),
+	LEVEL_UP_MOVE(23, MOVE_HEARTSTAMP),
+	LEVEL_UP_MOVE(27, MOVE_FAKETEARS),
+	LEVEL_UP_MOVE(30, MOVE_ICEPUNCH),
+	LEVEL_UP_MOVE(34, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(38, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE(41, MOVE_SWEETKISS),
+	LEVEL_UP_MOVE(44, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(47, MOVE_PERISHSONG),
+	LEVEL_UP_MOVE(50, MOVE_BLIZZARD),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sElekidLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 8, MOVE_LOWKICK),
-	LEVEL_UP_MOVE(12, MOVE_SWIFT),
+	LEVEL_UP_MOVE( 4, MOVE_THUNDERSHOCK),
+	LEVEL_UP_MOVE( 8, MOVE_CHARGE),
+	LEVEL_UP_MOVE(11, MOVE_SWIFT),
 	LEVEL_UP_MOVE(15, MOVE_SHOCKWAVE),
 	LEVEL_UP_MOVE(19, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(22, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(26, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(29, MOVE_THUNDERPUNCH),
+	LEVEL_UP_MOVE(22, MOVE_SCREECH),
+	LEVEL_UP_MOVE(25, MOVE_THUNDERPUNCH),
+	LEVEL_UP_MOVE(29, MOVE_ELECTROBALL),
 	LEVEL_UP_MOVE(33, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(36, MOVE_SCREECH),
-	LEVEL_UP_MOVE(40, MOVE_THUNDERBOLT),
-	LEVEL_UP_MOVE(43, MOVE_THUNDER),
+	LEVEL_UP_MOVE(37, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(41, MOVE_THUNDERBOLT),
+	LEVEL_UP_MOVE(45, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(48, MOVE_THUNDER),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sMagbyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SMOG),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 5, MOVE_EMBER),
+	LEVEL_UP_MOVE( 4, MOVE_EMBER),
 	LEVEL_UP_MOVE( 8, MOVE_SMOKESCREEN),
-	LEVEL_UP_MOVE(12, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(15, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(19, MOVE_CLEARSMOG),
-	LEVEL_UP_MOVE(22, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(26, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(29, MOVE_FIREPUNCH),
-	LEVEL_UP_MOVE(33, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE(36, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(40, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(43, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(11, MOVE_CLEARSMOG),
+	LEVEL_UP_MOVE(15, MOVE_FLAMEWHEEL),
+	LEVEL_UP_MOVE(19, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(23, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(27, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(34, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(38, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE(42, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(46, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(48, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(51, MOVE_FIREBLAST),
 	LEVEL_UP_END
 };
 
@@ -5218,65 +5259,73 @@ static const struct LevelUpMove sBlisseyLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sRaikouLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE( 1, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 8, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE(15, MOVE_ROAR),
-	LEVEL_UP_MOVE(22, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(29, MOVE_SPARK),
-	LEVEL_UP_MOVE(36, MOVE_REFLECT),
-	LEVEL_UP_MOVE(43, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(50, MOVE_THUNDERFANG),
-	LEVEL_UP_MOVE(57, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(64, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(71, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE(78, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(85, MOVE_THUNDER),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE( 6, MOVE_SPARK),
+	LEVEL_UP_MOVE(12, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(24, MOVE_ROAR),
+	LEVEL_UP_MOVE(30, MOVE_THUNDERFANG),
+	LEVEL_UP_MOVE(36, MOVE_HOWL),
+	LEVEL_UP_MOVE(42, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(48, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(54, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(60, MOVE_REFLECT),
+	LEVEL_UP_MOVE(66, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(72, MOVE_THUNDER),
+	LEVEL_UP_MOVE(78, MOVE_ZAPCANNON),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sEnteiLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SACREDFIRE),
-	LEVEL_UP_MOVE( 1, MOVE_ERUPTION),
-	LEVEL_UP_MOVE( 1, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE( 1, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED),
+	LEVEL_UP_MOVE( 1, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 8, MOVE_EMBER),
-	LEVEL_UP_MOVE(15, MOVE_ROAR),
-	LEVEL_UP_MOVE(22, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(29, MOVE_STOMP),
-	LEVEL_UP_MOVE(36, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(43, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(50, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(57, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE(64, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(71, MOVE_FIREBLAST),
-	LEVEL_UP_MOVE(78, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(85, MOVE_ERUPTION),
+	LEVEL_UP_MOVE( 1, MOVE_STOMP),
+	LEVEL_UP_MOVE( 1, MOVE_SMOKESCREEN),
+	LEVEL_UP_MOVE( 6, MOVE_FLAMEWHEEL),
+	LEVEL_UP_MOVE(12, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(24, MOVE_ROAR),
+	LEVEL_UP_MOVE(30, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(36, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(42, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(48, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(54, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE(60, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(66, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(72, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(78, MOVE_ERUPTION),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSuicuneLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SHEERCOLD),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_EXTREMESPEED),
+	LEVEL_UP_MOVE( 1, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE( 1, MOVE_ICEFANG),
+	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_BUBBLEBEAM),
-	LEVEL_UP_MOVE( 1, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE( 8, MOVE_BUBBLEBEAM),
-	LEVEL_UP_MOVE(15, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE(22, MOVE_GUST),
-	LEVEL_UP_MOVE(29, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(36, MOVE_MIST),
-	LEVEL_UP_MOVE(43, MOVE_MIRRORCOAT),
-	LEVEL_UP_MOVE(50, MOVE_ICEFANG),
-	LEVEL_UP_MOVE(57, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(64, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(71, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(78, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(85, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE( 1, MOVE_GUST),
+	LEVEL_UP_MOVE( 1, MOVE_MIST),
+	LEVEL_UP_MOVE( 6, MOVE_BUBBLEBEAM),
+	LEVEL_UP_MOVE(12, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(24, MOVE_ROAR),
+	LEVEL_UP_MOVE(30, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(36, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(42, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(48, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(54, MOVE_SURF),
+	LEVEL_UP_MOVE(60, MOVE_MIRRORCOAT),
+	LEVEL_UP_MOVE(66, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(72, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(78, MOVE_BLIZZARD),
 	LEVEL_UP_END
 };
 
@@ -5322,7 +5371,7 @@ static const struct LevelUpMove sPupitarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(43, MOVE_THRASH),
 	LEVEL_UP_MOVE(47, MOVE_STONEEDGE),
 	LEVEL_UP_MOVE(51, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(55, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(56, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
@@ -5349,48 +5398,49 @@ static const struct LevelUpMove sTyranitarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(43, MOVE_THRASH),
 	LEVEL_UP_MOVE(47, MOVE_STONEEDGE),
 	LEVEL_UP_MOVE(51, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(55, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(61, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(58, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(64, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sLugiaLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE( 1, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE( 1, MOVE_GUST),
 	LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND),
 	LEVEL_UP_MOVE( 1, MOVE_WEATHERBALL),
-	LEVEL_UP_MOVE( 9, MOVE_GUST),
-	LEVEL_UP_MOVE(15, MOVE_DRAGONRUSH),
-	LEVEL_UP_MOVE(23, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(29, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE(37, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(43, MOVE_AEROBLAST),
-	LEVEL_UP_MOVE(50, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(57, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(65, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(71, MOVE_RECOVER),
-	LEVEL_UP_MOVE(79, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(85, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(93, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(99, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_MIST),
+	LEVEL_UP_MOVE( 9, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(18, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(27, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(36, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(45, MOVE_RECOVER),
+	LEVEL_UP_MOVE(54, MOVE_AEROBLAST),
+	LEVEL_UP_MOVE(63, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(72, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(81, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(90, MOVE_SKYATTACK),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sHoOhLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_BRAVEBIRD),
+	LEVEL_UP_MOVE( 1, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE( 1, MOVE_GUST),
 	LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND),
 	LEVEL_UP_MOVE( 1, MOVE_WEATHERBALL),
-	LEVEL_UP_MOVE( 9, MOVE_GUST),
-	LEVEL_UP_MOVE(15, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE(23, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(29, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(37, MOVE_FIREBLAST),
-	LEVEL_UP_MOVE(43, MOVE_SACREDFIRE),
-	LEVEL_UP_MOVE(50, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(57, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(65, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(71, MOVE_RECOVER),
-	LEVEL_UP_MOVE(79, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(85, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(93, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(99, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_LIFEDEW),
+	LEVEL_UP_MOVE( 9, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(18, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(27, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(36, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(45, MOVE_RECOVER),
+	LEVEL_UP_MOVE(54, MOVE_SACREDFIRE),
+	LEVEL_UP_MOVE(63, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(72, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(81, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(90, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE(99, MOVE_BURNUP),
 	LEVEL_UP_END
 };
 
@@ -5415,190 +5465,208 @@ static const struct LevelUpMove sCelebiLevelUpLearnset[] = {
 static const struct LevelUpMove sTreeckoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 5, MOVE_ABSORB),
-	LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(13, MOVE_MEGADRAIN),
-	LEVEL_UP_MOVE(17, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(21, MOVE_GIGADRAIN),
-	LEVEL_UP_MOVE(25, MOVE_AGILITY),
-	LEVEL_UP_MOVE(29, MOVE_SLAM),
-	LEVEL_UP_MOVE(33, MOVE_DETECT),
-	LEVEL_UP_MOVE(37, MOVE_ENERGYBALL),
-	LEVEL_UP_MOVE(41, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(45, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(49, MOVE_SCREECH),
+	LEVEL_UP_MOVE( 3, MOVE_LEAFAGE),
+	LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE( 9, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(15, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(18, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(22, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(26, MOVE_SLAM),
+	LEVEL_UP_MOVE(30, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(33, MOVE_ENERGYBALL),
+	LEVEL_UP_MOVE(37, MOVE_SCREECH),
+	LEVEL_UP_MOVE(40, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(44, MOVE_LEAFSTORM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sGrovyleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_FURYCUTTER),
+	LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE( 1, MOVE_ENERGYBALL),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
+	LEVEL_UP_MOVE( 1, MOVE_LEAFAGE),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_ABSORB),
-	LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(13, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE( 9, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(15, MOVE_QUICKGUARD),
 	LEVEL_UP_MOVE(15, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(18, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(23, MOVE_LEAFBLADE),
-	LEVEL_UP_MOVE(28, MOVE_AGILITY),
-	LEVEL_UP_MOVE(33, MOVE_SLAM),
-	LEVEL_UP_MOVE(38, MOVE_DETECT),
-	LEVEL_UP_MOVE(43, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(48, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(53, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(20, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(25, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(30, MOVE_SLAM),
+	LEVEL_UP_MOVE(35, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE(39, MOVE_LEAFBLADE),
+	LEVEL_UP_MOVE(44, MOVE_XSCISSOR),
+	LEVEL_UP_MOVE(49, MOVE_SCREECH),
+	LEVEL_UP_MOVE(53, MOVE_ENDEAVOR),
 	LEVEL_UP_MOVE(58, MOVE_LEAFSTORM),
-	LEVEL_UP_MOVE(63, MOVE_SCREECH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSceptileLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE( 1, MOVE_LEAFSTORM),
+	LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE( 1, MOVE_XSCISSOR),
 	LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE( 1, MOVE_ENERGYBALL),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
+	LEVEL_UP_MOVE( 1, MOVE_LEAFAGE),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_ABSORB),
-	LEVEL_UP_MOVE( 9, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(13, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE( 5, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(15, MOVE_QUICKGUARD),
 	LEVEL_UP_MOVE(15, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(18, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(23, MOVE_LEAFBLADE),
-	LEVEL_UP_MOVE(28, MOVE_AGILITY),
-	LEVEL_UP_MOVE(33, MOVE_SLAM),
+	LEVEL_UP_MOVE(20, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(25, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(30, MOVE_SLAM),
+	LEVEL_UP_MOVE(35, MOVE_DOUBLETEAM),
 	LEVEL_UP_MOVE(35, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(39, MOVE_DETECT),
-	LEVEL_UP_MOVE(45, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(51, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(57, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(63, MOVE_LEAFSTORM),
-	LEVEL_UP_MOVE(69, MOVE_SCREECH),
+	LEVEL_UP_MOVE(41, MOVE_LEAFBLADE),
+	LEVEL_UP_MOVE(47, MOVE_XSCISSOR),
+	LEVEL_UP_MOVE(53, MOVE_SCREECH),
+	LEVEL_UP_MOVE(58, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(64, MOVE_LEAFSTORM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sTorchicLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 5, MOVE_EMBER),
-	LEVEL_UP_MOVE(10, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(14, MOVE_PECK),
-	LEVEL_UP_MOVE(19, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(23, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(28, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(32, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(37, MOVE_SLASH),
-	LEVEL_UP_MOVE(41, MOVE_MIRRORMOVE),
-	LEVEL_UP_MOVE(46, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE( 3, MOVE_EMBER),
+	LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE( 9, MOVE_PECK),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(15, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE(18, MOVE_AERIALACE),
+	LEVEL_UP_MOVE(21, MOVE_SLASH),
+	LEVEL_UP_MOVE(24, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(27, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(30, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(33, MOVE_FEATHERDANCE),
+	LEVEL_UP_MOVE(36, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(39, MOVE_MIRRORMOVE),
+	LEVEL_UP_MOVE(42, MOVE_FLAREBLITZ),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCombuskenLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE( 1, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE( 1, MOVE_FEATHERDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_REVERSAL),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
-	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_EMBER),
-	LEVEL_UP_MOVE(10, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(14, MOVE_PECK),
+	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE( 9, MOVE_PECK),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(15, MOVE_FLAMECHARGE),
 	LEVEL_UP_MOVE(15, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(20, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(25, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(31, MOVE_BULKUP),
-	LEVEL_UP_MOVE(36, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(42, MOVE_SLASH),
-	LEVEL_UP_MOVE(47, MOVE_MIRRORMOVE),
-	LEVEL_UP_MOVE(53, MOVE_SKYUPPERCUT),
+	LEVEL_UP_MOVE(20, MOVE_AERIALACE),
+	LEVEL_UP_MOVE(25, MOVE_SLASH),
+	LEVEL_UP_MOVE(30, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(35, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(39, MOVE_BLAZEKICK),
+	LEVEL_UP_MOVE(44, MOVE_BULKUP),
+	LEVEL_UP_MOVE(48, MOVE_SKYUPPERCUT),
+	LEVEL_UP_MOVE(53, MOVE_MIRRORMOVE),
 	LEVEL_UP_MOVE(58, MOVE_FLAREBLITZ),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBlazikenLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_BLAZEKICK),
-	LEVEL_UP_MOVE( 1, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE( 1, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE( 0, MOVE_FIREPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_HIGHJUMPKICK),
+	LEVEL_UP_MOVE( 1, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE( 1, MOVE_FEATHERDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_MIRRORMOVE),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
-	LEVEL_UP_MOVE( 1, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_EMBER),
-	LEVEL_UP_MOVE(10, MOVE_SANDATTACK),
-	LEVEL_UP_MOVE(14, MOVE_PECK),
+	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE( 9, MOVE_PECK),
+	LEVEL_UP_MOVE(12, MOVE_DETECT),
+	LEVEL_UP_MOVE(15, MOVE_FLAMECHARGE),
 	LEVEL_UP_MOVE(15, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE(20, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(25, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(31, MOVE_BULKUP),
-	LEVEL_UP_MOVE(35, MOVE_BLAZEKICK),
-	LEVEL_UP_MOVE(37, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(44, MOVE_SLASH),
-	LEVEL_UP_MOVE(50, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE(57, MOVE_SKYUPPERCUT),
-	LEVEL_UP_MOVE(63, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(20, MOVE_AERIALACE),
+	LEVEL_UP_MOVE(25, MOVE_SLASH),
+	LEVEL_UP_MOVE(30, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(35, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(35, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(41, MOVE_BLAZEKICK),
+	LEVEL_UP_MOVE(47, MOVE_BULKUP),
+	LEVEL_UP_MOVE(52, MOVE_SKYUPPERCUT),
+	LEVEL_UP_MOVE(58, MOVE_BRAVEBIRD),
+	LEVEL_UP_MOVE(64, MOVE_FLAREBLITZ),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sMudkipLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 4, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 9, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE(12, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE(17, MOVE_BIDE),
-	LEVEL_UP_MOVE(20, MOVE_MUDSPORT),
-	LEVEL_UP_MOVE(25, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(28, MOVE_PROTECT),
-	LEVEL_UP_MOVE(33, MOVE_WHIRLPOOL),
-	LEVEL_UP_MOVE(36, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(41, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(44, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE( 3, MOVE_WATERGUN),
+	LEVEL_UP_MOVE( 6, MOVE_ROCKSMASH),
+	LEVEL_UP_MOVE( 9, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE(12, MOVE_PROTECT),
+	LEVEL_UP_MOVE(15, MOVE_SUPERSONIC),
+	LEVEL_UP_MOVE(18, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE(21, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(24, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(27, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(30, MOVE_SURF),
+	LEVEL_UP_MOVE(33, MOVE_SCREECH),
+	LEVEL_UP_MOVE(36, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(39, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sMarshtompLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_MUDSHOT),
+	LEVEL_UP_MOVE( 1, MOVE_SURF),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 4, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 9, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE(12, MOVE_FORESIGHT),
+	LEVEL_UP_MOVE( 1, MOVE_ROCKSMASH),
+	LEVEL_UP_MOVE( 9, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE(12, MOVE_PROTECT),
+	LEVEL_UP_MOVE(15, MOVE_SUPERSONIC),
 	LEVEL_UP_MOVE(15, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(18, MOVE_BIDE),
-	LEVEL_UP_MOVE(22, MOVE_MUDBOMB),
-	LEVEL_UP_MOVE(28, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(32, MOVE_PROTECT),
-	LEVEL_UP_MOVE(38, MOVE_MUDDYWATER),
-	LEVEL_UP_MOVE(42, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(48, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(52, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(20, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE(25, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(30, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(35, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(39, MOVE_MUDDYWATER),
+	LEVEL_UP_MOVE(44, MOVE_MUDBOMB),
+	LEVEL_UP_MOVE(49, MOVE_SCREECH),
+	LEVEL_UP_MOVE(53, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(58, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSwampertLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE( 1, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE( 1, MOVE_SURF),
+	LEVEL_UP_MOVE( 1, MOVE_MUDBOMB),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 4, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 9, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE(12, MOVE_FORESIGHT),
+	LEVEL_UP_MOVE( 1, MOVE_ROCKSMASH),
+	LEVEL_UP_MOVE( 9, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE(12, MOVE_PROTECT),
+	LEVEL_UP_MOVE(15, MOVE_SUPERSONIC),
 	LEVEL_UP_MOVE(15, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(18, MOVE_BIDE),
-	LEVEL_UP_MOVE(22, MOVE_MUDBOMB),
-	LEVEL_UP_MOVE(28, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(32, MOVE_PROTECT),
-	LEVEL_UP_MOVE(39, MOVE_MUDDYWATER),
-	LEVEL_UP_MOVE(44, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(51, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(56, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(63, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(20, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE(25, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(30, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(35, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(41, MOVE_MUDDYWATER),
+	LEVEL_UP_MOVE(47, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(53, MOVE_SCREECH),
+	LEVEL_UP_MOVE(58, MOVE_ENDEAVOR),
+	LEVEL_UP_MOVE(64, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(70, MOVE_HAMMERARM),
 	LEVEL_UP_END
 };
 
@@ -5959,6 +6027,7 @@ static const struct LevelUpMove sNinjaskLevelUpLearnset[] = {
 
 static const struct LevelUpMove sShedinjaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SHADOWCLAW),
+	LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_GRUDGE),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
 	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
@@ -6809,66 +6878,69 @@ static const struct LevelUpMove sCameruptLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sSphealLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 5, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 9, MOVE_ENCORE),
-	LEVEL_UP_MOVE(13, MOVE_ICEBALL),
-	LEVEL_UP_MOVE(17, MOVE_BRINE),
-	LEVEL_UP_MOVE(21, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(26, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(31, MOVE_REST),
-	LEVEL_UP_MOVE(31, MOVE_SNORE),
-	LEVEL_UP_MOVE(36, MOVE_HAIL),
-	LEVEL_UP_MOVE(41, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(46, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 4, MOVE_GROWL),
+	LEVEL_UP_MOVE( 8, MOVE_WATERGUN),
+	LEVEL_UP_MOVE(12, MOVE_ICEBALL),
+	LEVEL_UP_MOVE(16, MOVE_REST),
+	LEVEL_UP_MOVE(19, MOVE_SNORE),
+	LEVEL_UP_MOVE(23, MOVE_BRINE),
+	LEVEL_UP_MOVE(27, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(31, MOVE_ENCORE),
+	LEVEL_UP_MOVE(34, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(38, MOVE_SURF),
+	LEVEL_UP_MOVE(42, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(46, MOVE_HAIL),
+	LEVEL_UP_MOVE(49, MOVE_SHEERCOLD),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSealeoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_SWAGGER),
-	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
+	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 5, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 9, MOVE_ENCORE),
-	LEVEL_UP_MOVE(13, MOVE_ICEBALL),
-	LEVEL_UP_MOVE(17, MOVE_BRINE),
-	LEVEL_UP_MOVE(21, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(26, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(31, MOVE_REST),
-	LEVEL_UP_MOVE(31, MOVE_SNORE),
+	LEVEL_UP_MOVE( 8, MOVE_WATERGUN),
+	LEVEL_UP_MOVE(12, MOVE_ICEBALL),
+	LEVEL_UP_MOVE(16, MOVE_REST),
+	LEVEL_UP_MOVE(19, MOVE_SNORE),
+	LEVEL_UP_MOVE(23, MOVE_BRINE),
+	LEVEL_UP_MOVE(27, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(31, MOVE_ENCORE),
 	LEVEL_UP_MOVE(31, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(38, MOVE_HAIL),
-	LEVEL_UP_MOVE(45, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(52, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE(36, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(41, MOVE_SURF),
+	LEVEL_UP_MOVE(46, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(51, MOVE_HAIL),
+	LEVEL_UP_MOVE(56, MOVE_SHEERCOLD),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sWalreinLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_ICEFANG),
-	LEVEL_UP_MOVE( 1, MOVE_SWAGGER),
 	LEVEL_UP_MOVE( 1, MOVE_CRUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_ICEFANG),
 	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
+	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 7, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 7, MOVE_ENCORE),
-	LEVEL_UP_MOVE(13, MOVE_ICEBALL),
-	LEVEL_UP_MOVE(19, MOVE_BRINE),
-	LEVEL_UP_MOVE(19, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(25, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(31, MOVE_REST),
-	LEVEL_UP_MOVE(31, MOVE_SNORE),
+	LEVEL_UP_MOVE( 8, MOVE_WATERGUN),
+	LEVEL_UP_MOVE(12, MOVE_ICEBALL),
+	LEVEL_UP_MOVE(16, MOVE_REST),
+	LEVEL_UP_MOVE(19, MOVE_SNORE),
+	LEVEL_UP_MOVE(23, MOVE_BRINE),
+	LEVEL_UP_MOVE(27, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(31, MOVE_ENCORE),
 	LEVEL_UP_MOVE(31, MOVE_SWAGGER),
-	LEVEL_UP_MOVE(38, MOVE_HAIL),
-	LEVEL_UP_MOVE(43, MOVE_ICEFANG),
-	LEVEL_UP_MOVE(49, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(60, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE(36, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(41, MOVE_ICEFANG),
+	LEVEL_UP_MOVE(41, MOVE_SURF),
+	LEVEL_UP_MOVE(50, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(57, MOVE_HAIL),
+	LEVEL_UP_MOVE(64, MOVE_SHEERCOLD),
 	LEVEL_UP_END
 };
 
@@ -7180,48 +7252,48 @@ static const struct LevelUpMove sSwabluLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 3, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 5, MOVE_SING),
-	LEVEL_UP_MOVE( 7, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE( 9, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(11, MOVE_DISARMINGVOICE),
-	LEVEL_UP_MOVE(14, MOVE_MIST),
-	LEVEL_UP_MOVE(17, MOVE_ROUND),
-	LEVEL_UP_MOVE(20, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(23, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(26, MOVE_REFRESH),
-	LEVEL_UP_MOVE(30, MOVE_MIRRORMOVE),
+	LEVEL_UP_MOVE( 5, MOVE_DISARMINGVOICE),
+	LEVEL_UP_MOVE( 8, MOVE_MIST),
+	LEVEL_UP_MOVE(12, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(16, MOVE_ROUND),
+	LEVEL_UP_MOVE(20, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(24, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(27, MOVE_SING),
+	LEVEL_UP_MOVE(30, MOVE_NATURALGIFT),
 	LEVEL_UP_MOVE(34, MOVE_COTTONGUARD),
-	LEVEL_UP_MOVE(38, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(42, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(46, MOVE_PERISHSONG),
-	LEVEL_UP_MOVE(50, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(37, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(41, MOVE_REFRESH),
+	LEVEL_UP_MOVE(44, MOVE_MIRRORMOVE),
+	LEVEL_UP_MOVE(47, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(51, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(55, MOVE_PERISHSONG),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sAltariaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE( 1, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE( 0, MOVE_DRAGONPULSE),
 	LEVEL_UP_MOVE( 1, MOVE_PLUCK),
+	LEVEL_UP_MOVE( 1, MOVE_MIRRORMOVE),
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 1, MOVE_SING),
-	LEVEL_UP_MOVE( 1, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(11, MOVE_DISARMINGVOICE),
-	LEVEL_UP_MOVE(14, MOVE_MIST),
-	LEVEL_UP_MOVE(17, MOVE_ROUND),
-	LEVEL_UP_MOVE(20, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(23, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(26, MOVE_REFRESH),
-	LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE),
+	LEVEL_UP_MOVE( 8, MOVE_MIST),
+	LEVEL_UP_MOVE(12, MOVE_FURYATTACK),
+	LEVEL_UP_MOVE(16, MOVE_ROUND),
+	LEVEL_UP_MOVE(20, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(24, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(27, MOVE_SING),
+	LEVEL_UP_MOVE(30, MOVE_NATURALGIFT),
 	LEVEL_UP_MOVE(34, MOVE_COTTONGUARD),
-	LEVEL_UP_MOVE(34, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(40, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(46, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(50, MOVE_PERISHSONG),
+	LEVEL_UP_MOVE(34, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(38, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(43, MOVE_REFRESH),
+	LEVEL_UP_MOVE(47, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(51, MOVE_HYPERVOICE),
 	LEVEL_UP_MOVE(56, MOVE_MOONBLAST),
-	LEVEL_UP_MOVE(59, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE(61, MOVE_PERISHSONG),
+	LEVEL_UP_MOVE(65, MOVE_SKYATTACK),
 	LEVEL_UP_END
 };
 
@@ -7555,28 +7627,26 @@ static const struct LevelUpMove sGorebyssLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sAbsolLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_PERISHSONG),
-	LEVEL_UP_MOVE( 1, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_FEINT),
+	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 4, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE(10, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(13, MOVE_TAUNT),
-	LEVEL_UP_MOVE(16, MOVE_BITE),
-	LEVEL_UP_MOVE(19, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(22, MOVE_SLASH),
-	LEVEL_UP_MOVE(25, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(29, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(33, MOVE_DETECT),
-	LEVEL_UP_MOVE(37, MOVE_PSYCHOCUT),
-	LEVEL_UP_MOVE(41, MOVE_MEFIRST),
-	LEVEL_UP_MOVE(45, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(49, MOVE_RAZORWIND),
-	LEVEL_UP_MOVE(53, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(57, MOVE_PERISHSONG),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE( 8, MOVE_QUICKATTACK),
+	LEVEL_UP_MOVE(12, MOVE_BITE),
+	LEVEL_UP_MOVE(16, MOVE_DETECT),
+	LEVEL_UP_MOVE(19, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(22, MOVE_TAUNT),
+	LEVEL_UP_MOVE(25, MOVE_SLASH),
+	LEVEL_UP_MOVE(30, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(35, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(38, MOVE_PSYCHOCUT),
+	LEVEL_UP_MOVE(42, MOVE_MEFIRST),
+	LEVEL_UP_MOVE(46, MOVE_RAZORWIND),
+	LEVEL_UP_MOVE(50, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(54, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(57, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(61, MOVE_PERISHSONG),
 	LEVEL_UP_END
 };
 
@@ -7673,45 +7743,43 @@ static const struct LevelUpMove sZangooseLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sRelicanthLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
-	LEVEL_UP_MOVE( 1, MOVE_HEADSMASH),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSPORT),
-	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 6, MOVE_MUDSPORT),
-	LEVEL_UP_MOVE(10, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(15, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(26, MOVE_DIVE),
-	LEVEL_UP_MOVE(31, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(35, MOVE_YAWN),
-	LEVEL_UP_MOVE(41, MOVE_REST),
-	LEVEL_UP_MOVE(46, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(50, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(56, MOVE_HEADSMASH),
+	LEVEL_UP_MOVE( 3, MOVE_WATERGUN),
+	LEVEL_UP_MOVE( 6, MOVE_ROCKTOMB),
+	LEVEL_UP_MOVE(11, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(17, MOVE_YAWN),
+	LEVEL_UP_MOVE(22, MOVE_DIVE),
+	LEVEL_UP_MOVE(28, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(34, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(40, MOVE_REST),
+	LEVEL_UP_MOVE(45, MOVE_FLAIL),
+	LEVEL_UP_MOVE(51, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(57, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(63, MOVE_HEADSMASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sAronLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
-	LEVEL_UP_MOVE( 4, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 7, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(10, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(13, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(16, MOVE_PROTECT),
-	LEVEL_UP_MOVE(19, MOVE_ROAR),
-	LEVEL_UP_MOVE(22, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(25, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(28, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(31, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(34, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(37, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(40, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(43, MOVE_AUTOTOMIZE),
-	LEVEL_UP_MOVE(46, MOVE_HEAVYSLAM),
-	LEVEL_UP_MOVE(49, MOVE_METALBURST),
+	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
+	LEVEL_UP_MOVE( 4, MOVE_METALCLAW),
+	LEVEL_UP_MOVE( 8, MOVE_ROCKTOMB),
+	LEVEL_UP_MOVE(12, MOVE_ROAR),
+	LEVEL_UP_MOVE(15, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(19, MOVE_PROTECT),
+	LEVEL_UP_MOVE(22, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(26, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(30, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(33, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(37, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(40, MOVE_IRONTAIL),
+	LEVEL_UP_MOVE(44, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(47, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(51, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(55, MOVE_METALBURST),
 	LEVEL_UP_END
 };
 
@@ -7719,23 +7787,21 @@ static const struct LevelUpMove sLaironLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE( 4, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 7, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(10, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(13, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(16, MOVE_PROTECT),
-	LEVEL_UP_MOVE(19, MOVE_ROAR),
-	LEVEL_UP_MOVE(22, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(25, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(28, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(31, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(35, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(39, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(43, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(47, MOVE_AUTOTOMIZE),
-	LEVEL_UP_MOVE(51, MOVE_HEAVYSLAM),
-	LEVEL_UP_MOVE(55, MOVE_METALBURST),
+	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
+	LEVEL_UP_MOVE( 8, MOVE_ROCKTOMB),
+	LEVEL_UP_MOVE(12, MOVE_ROAR),
+	LEVEL_UP_MOVE(15, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(19, MOVE_PROTECT),
+	LEVEL_UP_MOVE(22, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(26, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(30, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(35, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(40, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(44, MOVE_IRONTAIL),
+	LEVEL_UP_MOVE(49, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(53, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(58, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(63, MOVE_METALBURST),
 	LEVEL_UP_END
 };
 
@@ -7743,23 +7809,21 @@ static const struct LevelUpMove sAggronLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 1, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE( 4, MOVE_MUDSLAP),
-	LEVEL_UP_MOVE( 7, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(10, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(13, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE(16, MOVE_PROTECT),
-	LEVEL_UP_MOVE(19, MOVE_ROAR),
-	LEVEL_UP_MOVE(22, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(25, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(28, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(31, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(35, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(39, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(45, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(51, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
+	LEVEL_UP_MOVE( 8, MOVE_ROCKTOMB),
+	LEVEL_UP_MOVE(12, MOVE_ROAR),
+	LEVEL_UP_MOVE(15, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(19, MOVE_PROTECT),
+	LEVEL_UP_MOVE(22, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(26, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(30, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(35, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(40, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(46, MOVE_IRONTAIL),
+	LEVEL_UP_MOVE(52, MOVE_IRONDEFENSE),
 	LEVEL_UP_MOVE(57, MOVE_HEAVYSLAM),
-	LEVEL_UP_MOVE(63, MOVE_METALBURST),
+	LEVEL_UP_MOVE(63, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(69, MOVE_METALBURST),
 	LEVEL_UP_END
 };
 
@@ -7821,83 +7885,84 @@ static const struct LevelUpMove sIllumiseLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sLileepLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
 	LEVEL_UP_MOVE( 1, MOVE_CONSTRICT),
-	LEVEL_UP_MOVE( 5, MOVE_ACID),
-	LEVEL_UP_MOVE( 9, MOVE_INGRAIN),
-	LEVEL_UP_MOVE(13, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(17, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(21, MOVE_BRINE),
-	LEVEL_UP_MOVE(26, MOVE_GIGADRAIN),
-	LEVEL_UP_MOVE(31, MOVE_GASTROACID),
-	LEVEL_UP_MOVE(36, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(41, MOVE_ENERGYBALL),
-	LEVEL_UP_MOVE(46, MOVE_STOCKPILE),
-	LEVEL_UP_MOVE(46, MOVE_SPITUP),
-	LEVEL_UP_MOVE(46, MOVE_SWALLOW),
-	LEVEL_UP_MOVE(52, MOVE_WRINGOUT),
+	LEVEL_UP_MOVE( 1, MOVE_WRAP),
+	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
+	LEVEL_UP_MOVE( 4, MOVE_ACID),
+	LEVEL_UP_MOVE( 8, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(12, MOVE_INGRAIN),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(20, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(24, MOVE_BRINE),
+	LEVEL_UP_MOVE(28, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(32, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(36, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(41, MOVE_STOCKPILE),
+	LEVEL_UP_MOVE(41, MOVE_SPITUP),
+	LEVEL_UP_MOVE(41, MOVE_SWALLOW),
+	LEVEL_UP_MOVE(44, MOVE_ENERGYBALL),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCradilyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_WRINGOUT),
-	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
+	LEVEL_UP_MOVE( 1, MOVE_LEECHSEED),
 	LEVEL_UP_MOVE( 1, MOVE_CONSTRICT),
+	LEVEL_UP_MOVE( 1, MOVE_WRAP),
+	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
 	LEVEL_UP_MOVE( 1, MOVE_ACID),
-	LEVEL_UP_MOVE( 1, MOVE_INGRAIN),
-	LEVEL_UP_MOVE( 5, MOVE_ACID),
-	LEVEL_UP_MOVE( 9, MOVE_INGRAIN),
-	LEVEL_UP_MOVE(13, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(17, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(21, MOVE_BRINE),
-	LEVEL_UP_MOVE(26, MOVE_GIGADRAIN),
-	LEVEL_UP_MOVE(31, MOVE_GASTROACID),
-	LEVEL_UP_MOVE(36, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(44, MOVE_ENERGYBALL),
-	LEVEL_UP_MOVE(52, MOVE_STOCKPILE),
-	LEVEL_UP_MOVE(52, MOVE_SPITUP),
-	LEVEL_UP_MOVE(52, MOVE_SWALLOW),
-	LEVEL_UP_MOVE(61, MOVE_WRINGOUT),
+	LEVEL_UP_MOVE( 1, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(12, MOVE_INGRAIN),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(20, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(24, MOVE_BRINE),
+	LEVEL_UP_MOVE(28, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(32, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(36, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(43, MOVE_STOCKPILE),
+	LEVEL_UP_MOVE(43, MOVE_SPITUP),
+	LEVEL_UP_MOVE(43, MOVE_SWALLOW),
+	LEVEL_UP_MOVE(48, MOVE_ENERGYBALL),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sAnorithLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
-	LEVEL_UP_MOVE( 4, MOVE_MUDSPORT),
-	LEVEL_UP_MOVE( 7, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(10, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(13, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(17, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(25, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(29, MOVE_BRINE),
-	LEVEL_UP_MOVE(34, MOVE_SLASH),
-	LEVEL_UP_MOVE(39, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE( 1, MOVE_MUDSPORT),
+	LEVEL_UP_MOVE( 4, MOVE_WATERGUN),
+	LEVEL_UP_MOVE( 8, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(12, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(20, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(24, MOVE_BRINE),
+	LEVEL_UP_MOVE(28, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE(36, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE(41, MOVE_PROTECT),
 	LEVEL_UP_MOVE(44, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(49, MOVE_PROTECT),
-	LEVEL_UP_MOVE(55, MOVE_ROCKBLAST),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sArmaldoLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_AQUATAIL),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSPORT),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 4, MOVE_MUDSPORT),
-	LEVEL_UP_MOVE( 7, MOVE_WATERGUN),
-	LEVEL_UP_MOVE(10, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(13, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(17, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(25, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(29, MOVE_BRINE),
-	LEVEL_UP_MOVE(34, MOVE_SLASH),
-	LEVEL_UP_MOVE(39, MOVE_CRUSHCLAW),
-	LEVEL_UP_MOVE(46, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(53, MOVE_PROTECT),
-	LEVEL_UP_MOVE(61, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE( 8, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(12, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(20, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(24, MOVE_BRINE),
+	LEVEL_UP_MOVE(28, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_CRUSHCLAW),
+	LEVEL_UP_MOVE(36, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE(39, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(43, MOVE_PROTECT),
+	LEVEL_UP_MOVE(48, MOVE_XSCISSOR),
 	LEVEL_UP_END
 };
 
@@ -7976,18 +8041,19 @@ static const struct LevelUpMove sGardevoirLevelUpLearnset[] = {
 
 static const struct LevelUpMove sBagonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_RAGE),
-	LEVEL_UP_MOVE( 4, MOVE_EMBER),
-	LEVEL_UP_MOVE( 7, MOVE_LEER),
-	LEVEL_UP_MOVE(10, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(17, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(21, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE( 1, MOVE_EMBER),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 5, MOVE_BITE),
+	LEVEL_UP_MOVE(10, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(15, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(20, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(25, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(29, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(34, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(39, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(44, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(49, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(31, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(35, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(40, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(45, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(50, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(55, MOVE_DOUBLEEDGE),
 	LEVEL_UP_END
 };
 
@@ -7997,25 +8063,23 @@ static const struct LevelUpMove sShelgonLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 4, MOVE_EMBER),
-	LEVEL_UP_MOVE( 7, MOVE_LEER),
-	LEVEL_UP_MOVE(10, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(17, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(21, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(15, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(20, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(25, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(29, MOVE_DRAGONCLAW),
 	LEVEL_UP_MOVE(29, MOVE_PROTECT),
-	LEVEL_UP_MOVE(35, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(42, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(49, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(56, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(33, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(39, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(46, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(53, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(60, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(67, MOVE_DOUBLEEDGE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sSalamenceLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_FLY),
-	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
+	LEVEL_UP_MOVE( 1, MOVE_FLY),
 	LEVEL_UP_MOVE( 1, MOVE_DRAGONTAIL),
 	LEVEL_UP_MOVE( 1, MOVE_FIREFANG),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG),
@@ -8023,26 +8087,24 @@ static const struct LevelUpMove sSalamenceLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 4, MOVE_EMBER),
-	LEVEL_UP_MOVE( 7, MOVE_LEER),
-	LEVEL_UP_MOVE(10, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(17, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(21, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(15, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(20, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(25, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(29, MOVE_DRAGONCLAW),
 	LEVEL_UP_MOVE(29, MOVE_PROTECT),
-	LEVEL_UP_MOVE(35, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(42, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(49, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(33, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(39, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(46, MOVE_FOCUSENERGY),
 	LEVEL_UP_MOVE(49, MOVE_FLY),
-	LEVEL_UP_MOVE(63, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(55, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(64, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(73, MOVE_DOUBLEEDGE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBeldumLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_STEELYHIT),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_END
 };
 
@@ -8051,19 +8113,21 @@ static const struct LevelUpMove sMetangLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_METALCLAW),
 	LEVEL_UP_MOVE( 1, MOVE_MAGNETRISE),
 	LEVEL_UP_MOVE( 1, MOVE_STEELYHIT),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE(19, MOVE_CONFUSION),
 	LEVEL_UP_MOVE(19, MOVE_METALCLAW),
 	LEVEL_UP_MOVE(23, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(26, MOVE_BULLETPUNCH),
-	LEVEL_UP_MOVE(29, MOVE_MIRACLEEYE),
-	LEVEL_UP_MOVE(32, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(35, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(38, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(41, MOVE_AGILITY),
-	LEVEL_UP_MOVE(44, MOVE_METEORMASH),
-	LEVEL_UP_MOVE(47, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(50, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(27, MOVE_BULLETPUNCH),
+	LEVEL_UP_MOVE(31, MOVE_MIRACLEEYE),
+	LEVEL_UP_MOVE(34, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(38, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(42, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(45, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(49, MOVE_AGILITY),
+	LEVEL_UP_MOVE(52, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(56, MOVE_METEORMASH),
+	LEVEL_UP_MOVE(60, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(64, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
@@ -8071,186 +8135,185 @@ static const struct LevelUpMove sMetagrossLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_HAMMERARM),
 	LEVEL_UP_MOVE( 1, MOVE_MAGNETRISE),
 	LEVEL_UP_MOVE( 1, MOVE_STEELYHIT),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE(19, MOVE_CONFUSION),
 	LEVEL_UP_MOVE(19, MOVE_METALCLAW),
 	LEVEL_UP_MOVE(23, MOVE_PURSUIT),
-	LEVEL_UP_MOVE(26, MOVE_BULLETPUNCH),
-	LEVEL_UP_MOVE(29, MOVE_MIRACLEEYE),
-	LEVEL_UP_MOVE(32, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(35, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(38, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(41, MOVE_AGILITY),
-	LEVEL_UP_MOVE(44, MOVE_METEORMASH),
+	LEVEL_UP_MOVE(27, MOVE_BULLETPUNCH),
+	LEVEL_UP_MOVE(31, MOVE_MIRACLEEYE),
+	LEVEL_UP_MOVE(34, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(38, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(42, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(44, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(52, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(60, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(45, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(52, MOVE_AGILITY),
+	LEVEL_UP_MOVE(56, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(61, MOVE_METEORMASH),
+	LEVEL_UP_MOVE(66, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(70, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sRegirockLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_EXPLOSION),
-	LEVEL_UP_MOVE( 1, MOVE_STOMP),
-	LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW),
 	LEVEL_UP_MOVE( 1, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE( 7, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(13, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE(19, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE(25, MOVE_CURSE),
-	LEVEL_UP_MOVE(31, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(37, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(43, MOVE_STONEEDGE),
-	LEVEL_UP_MOVE(49, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(55, MOVE_LOCKON),
-	LEVEL_UP_MOVE(55, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE(61, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(67, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE( 6, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(12, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(18, MOVE_STOMP),
+	LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(30, MOVE_CURSE),
+	LEVEL_UP_MOVE(36, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(42, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(48, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(54, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE(60, MOVE_LOCKON),
+	LEVEL_UP_MOVE(66, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(72, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(78, MOVE_EXPLOSION),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sRegiceLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_EXPLOSION),
-	LEVEL_UP_MOVE( 1, MOVE_STOMP),
-	LEVEL_UP_MOVE( 1, MOVE_ICYWIND),
 	LEVEL_UP_MOVE( 1, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE( 7, MOVE_ICYWIND),
-	LEVEL_UP_MOVE(13, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE(19, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE(25, MOVE_CURSE),
-	LEVEL_UP_MOVE(31, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(37, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(43, MOVE_ICEBEAM),
-	LEVEL_UP_MOVE(49, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(55, MOVE_LOCKON),
-	LEVEL_UP_MOVE(55, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE(61, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(67, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_ICYWIND),
+	LEVEL_UP_MOVE( 6, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(12, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(18, MOVE_STOMP),
+	LEVEL_UP_MOVE(24, MOVE_ICEBEAM),
+	LEVEL_UP_MOVE(30, MOVE_CURSE),
+	LEVEL_UP_MOVE(36, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(42, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(48, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(54, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE(60, MOVE_LOCKON),
+	LEVEL_UP_MOVE(66, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(72, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(78, MOVE_EXPLOSION),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sRegisteelLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_EXPLOSION),
-	LEVEL_UP_MOVE( 1, MOVE_STOMP),
-	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
 	LEVEL_UP_MOVE( 1, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE( 7, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(13, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE(19, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE(25, MOVE_CURSE),
-	LEVEL_UP_MOVE(31, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(37, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(37, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(43, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(43, MOVE_FLASHCANNON),
-	LEVEL_UP_MOVE(49, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(55, MOVE_LOCKON),
-	LEVEL_UP_MOVE(55, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE(61, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(67, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
+	LEVEL_UP_MOVE( 6, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(12, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(18, MOVE_STOMP),
+	LEVEL_UP_MOVE(24, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(24, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(30, MOVE_CURSE),
+	LEVEL_UP_MOVE(36, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(36, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(42, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(48, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(54, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE(60, MOVE_LOCKON),
+	LEVEL_UP_MOVE(66, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(72, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(78, MOVE_EXPLOSION),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sKyogreLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE( 1, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE( 5, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(15, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(20, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(30, MOVE_AQUARING),
-	LEVEL_UP_MOVE(35, MOVE_ICEBEAM),
-	LEVEL_UP_MOVE(45, MOVE_ORIGINPULSE),
-	LEVEL_UP_MOVE(50, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(60, MOVE_MUDDYWATER),
-	LEVEL_UP_MOVE(65, MOVE_SHEERCOLD),
-	LEVEL_UP_MOVE(75, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(80, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE( 9, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(18, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(27, MOVE_MUDDYWATER),
+	LEVEL_UP_MOVE(36, MOVE_ICEBEAM),
+	LEVEL_UP_MOVE(45, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE(54, MOVE_AQUARING),
+	LEVEL_UP_MOVE(63, MOVE_ORIGINPULSE),
+	LEVEL_UP_MOVE(72, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(81, MOVE_DOUBLEEDGE),
 	LEVEL_UP_MOVE(90, MOVE_WATERSPOUT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sGroudonLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE( 5, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(15, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(20, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE(30, MOVE_REST),
-	LEVEL_UP_MOVE(35, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(45, MOVE_PRECIPICEBLADES),
-	LEVEL_UP_MOVE(50, MOVE_BULKUP),
-	LEVEL_UP_MOVE(60, MOVE_SOLARBEAM),
-	LEVEL_UP_MOVE(65, MOVE_FISSURE),
-	LEVEL_UP_MOVE(75, MOVE_FIREBLAST),
-	LEVEL_UP_MOVE(80, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE( 9, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(18, MOVE_BULKUP),
+	LEVEL_UP_MOVE(27, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(36, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(45, MOVE_FISSURE),
+	LEVEL_UP_MOVE(54, MOVE_REST),
+	LEVEL_UP_MOVE(63, MOVE_PRECIPICEBLADES),
+	LEVEL_UP_MOVE(72, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(81, MOVE_SOLARBEAM),
 	LEVEL_UP_MOVE(90, MOVE_ERUPTION),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sRayquazaLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONASCENT),
 	LEVEL_UP_MOVE( 1, MOVE_TWISTER),
-	LEVEL_UP_MOVE( 5, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(15, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(20, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(30, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(35, MOVE_REST),
-	LEVEL_UP_MOVE(45, MOVE_EXTREMESPEED),
-	LEVEL_UP_MOVE(50, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(60, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(65, MOVE_FLY),
-	LEVEL_UP_MOVE(75, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(80, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE( 9, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(18, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(27, MOVE_EXTREMESPEED),
+	LEVEL_UP_MOVE(36, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(45, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(54, MOVE_REST),
+	LEVEL_UP_MOVE(63, MOVE_FLY),
+	LEVEL_UP_MOVE(72, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(81, MOVE_OUTRAGE),
 	LEVEL_UP_MOVE(90, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sLatiasLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE( 1, MOVE_WISH),
+	LEVEL_UP_MOVE( 1, MOVE_STOREDPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_WATERSPORT),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
+	LEVEL_UP_MOVE( 1, MOVE_REFRESH),
 	LEVEL_UP_MOVE( 1, MOVE_PSYWAVE),
-	LEVEL_UP_MOVE( 1, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE( 4, MOVE_WATERSPORT),
-	LEVEL_UP_MOVE( 7, MOVE_CHARM),
-	LEVEL_UP_MOVE(10, MOVE_STOREDPOWER),
-	LEVEL_UP_MOVE(13, MOVE_REFRESH),
-	LEVEL_UP_MOVE(16, MOVE_HEALPULSE),
-	LEVEL_UP_MOVE(20, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(24, MOVE_MISTBALL),
-	LEVEL_UP_MOVE(28, MOVE_PSYCHOSHIFT),
-	LEVEL_UP_MOVE(32, MOVE_RECOVER),
-	LEVEL_UP_MOVE(36, MOVE_REFLECTTYPE),
-	LEVEL_UP_MOVE(41, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(46, MOVE_GUARDSPLIT),
-	LEVEL_UP_MOVE(51, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(56, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(61, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE( 5, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(10, MOVE_RECOVER),
+	LEVEL_UP_MOVE(15, MOVE_CONFUSION),
+	LEVEL_UP_MOVE(20, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(25, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(30, MOVE_WISH),
+	LEVEL_UP_MOVE(35, MOVE_MISTBALL),
+	LEVEL_UP_MOVE(40, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(45, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(50, MOVE_HEALPULSE),
+	LEVEL_UP_MOVE(55, MOVE_REFLECTTYPE),
+	LEVEL_UP_MOVE(60, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(65, MOVE_GUARDSPLIT),
+	LEVEL_UP_MOVE(70, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE(75, MOVE_PSYCHOSHIFT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sLatiosLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_MEMENTO),
-	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
 	LEVEL_UP_MOVE( 1, MOVE_HEALBLOCK),
+	LEVEL_UP_MOVE( 1, MOVE_STOREDPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE( 1, MOVE_REFRESH),
 	LEVEL_UP_MOVE( 1, MOVE_PSYWAVE),
-	LEVEL_UP_MOVE( 1, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE( 4, MOVE_PROTECT),
-	LEVEL_UP_MOVE( 7, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(10, MOVE_STOREDPOWER),
-	LEVEL_UP_MOVE(13, MOVE_REFRESH),
-	LEVEL_UP_MOVE(16, MOVE_HEALPULSE),
-	LEVEL_UP_MOVE(20, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(24, MOVE_LUSTERPURGE),
-	LEVEL_UP_MOVE(28, MOVE_PSYCHOSHIFT),
-	LEVEL_UP_MOVE(32, MOVE_RECOVER),
-	LEVEL_UP_MOVE(36, MOVE_TELEKINESIS),
-	LEVEL_UP_MOVE(41, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(46, MOVE_POWERSPLIT),
-	LEVEL_UP_MOVE(51, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(56, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(61, MOVE_MEMENTO),
+	LEVEL_UP_MOVE( 5, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(10, MOVE_RECOVER),
+	LEVEL_UP_MOVE(15, MOVE_CONFUSION),
+	LEVEL_UP_MOVE(20, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(25, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(30, MOVE_TELEKINESIS),
+	LEVEL_UP_MOVE(35, MOVE_LUSTERPURGE),
+	LEVEL_UP_MOVE(40, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(45, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(50, MOVE_HEALPULSE),
+	LEVEL_UP_MOVE(55, MOVE_SIMPLEBEAM),
+	LEVEL_UP_MOVE(60, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(65, MOVE_POWERSPLIT),
+	LEVEL_UP_MOVE(70, MOVE_MEMENTO),
+	LEVEL_UP_MOVE(75, MOVE_PSYCHOSHIFT),
 	LEVEL_UP_END
 };
 
@@ -9407,19 +9470,21 @@ static const struct LevelUpMove sChatotLevelUpLearnset[] = {
 
 static const struct LevelUpMove sSpiritombLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_PURSUIT),
+	LEVEL_UP_MOVE( 1, MOVE_NIGHTSHADE),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE( 1, MOVE_SPITE),
-	LEVEL_UP_MOVE( 4, MOVE_SHADOWSNEAK),
-	LEVEL_UP_MOVE( 7, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(13, MOVE_HYPNOSIS),
-	LEVEL_UP_MOVE(18, MOVE_DREAMEATER),
-	LEVEL_UP_MOVE(24, MOVE_OMINOUSWIND),
-	LEVEL_UP_MOVE(30, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_CURSE),
-	LEVEL_UP_MOVE(41, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(46, MOVE_MEMENTO),
+	LEVEL_UP_MOVE( 5, MOVE_SHADOWSNEAK),
+	LEVEL_UP_MOVE(10, MOVE_SPITE),
+	LEVEL_UP_MOVE(14, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(19, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(23, MOVE_HEX),
+	LEVEL_UP_MOVE(28, MOVE_MEMENTO),
+	LEVEL_UP_MOVE(32, MOVE_OMINOUSWIND),
+	LEVEL_UP_MOVE(37, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(42, MOVE_CURSE),
+	LEVEL_UP_MOVE(46, MOVE_SHADOWBALL),
 	LEVEL_UP_MOVE(51, MOVE_DARKPULSE),
-	LEVEL_UP_MOVE(57, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE(56, MOVE_HYPNOSIS),
+	LEVEL_UP_MOVE(60, MOVE_DREAMEATER),
 	LEVEL_UP_END
 };
 
@@ -9429,17 +9494,18 @@ static const struct LevelUpMove sGibleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 7, MOVE_FIREFANG),
 	LEVEL_UP_MOVE(13, MOVE_SANDSTORM),
 	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(18, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(20, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(25, MOVE_SLASH),
-	LEVEL_UP_MOVE(27, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(30, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(33, MOVE_DIG),
-	LEVEL_UP_MOVE(36, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(39, MOVE_STOMPINGTANTRUM),
-	LEVEL_UP_MOVE(42, MOVE_DRAGONRUSH),
-	LEVEL_UP_MOVE(45, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(48, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(18, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(21, MOVE_BITE),
+	LEVEL_UP_MOVE(24, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(27, MOVE_SLASH),
+	LEVEL_UP_MOVE(30, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(33, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(36, MOVE_DIG),
+	LEVEL_UP_MOVE(39, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(42, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(45, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(48, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(51, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
@@ -9450,13 +9516,14 @@ static const struct LevelUpMove sGabiteLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_FIREFANG),
 	LEVEL_UP_MOVE( 1, MOVE_SANDSTORM),
 	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(18, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(20, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(18, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(21, MOVE_BITE),
 	LEVEL_UP_MOVE(23, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(28, MOVE_SLASH),
-	LEVEL_UP_MOVE(32, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(36, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(40, MOVE_DIG),
+	LEVEL_UP_MOVE(24, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(29, MOVE_SLASH),
+	LEVEL_UP_MOVE(33, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(37, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(41, MOVE_DIG),
 	LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW),
 	LEVEL_UP_MOVE(47, MOVE_STOMPINGTANTRUM),
 	LEVEL_UP_MOVE(52, MOVE_DRAGONRUSH),
@@ -9472,13 +9539,14 @@ static const struct LevelUpMove sGarchompLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_FIREFANG),
 	LEVEL_UP_MOVE( 1, MOVE_SANDSTORM),
 	LEVEL_UP_MOVE(15, MOVE_SANDTOMB),
-	LEVEL_UP_MOVE(18, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(20, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(18, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(21, MOVE_BITE),
 	LEVEL_UP_MOVE(23, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(28, MOVE_SLASH),
-	LEVEL_UP_MOVE(32, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE(36, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(40, MOVE_DIG),
+	LEVEL_UP_MOVE(24, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(29, MOVE_SLASH),
+	LEVEL_UP_MOVE(33, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(37, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(41, MOVE_DIG),
 	LEVEL_UP_MOVE(44, MOVE_DRAGONCLAW),
 	LEVEL_UP_MOVE(47, MOVE_STOMPINGTANTRUM),
 	LEVEL_UP_MOVE(47, MOVE_CRUNCH),
@@ -9622,9 +9690,9 @@ static const struct LevelUpMove sSkorupiLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(26, MOVE_KNOCKOFF),
 	LEVEL_UP_MOVE(29, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(31, MOVE_PINMISSILE),
-	LEVEL_UP_MOVE(34, MOVE_TOXIC),
-	LEVEL_UP_MOVE(36, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(39, MOVE_CROSSPOISON),
+	LEVEL_UP_MOVE(34, MOVE_CROSSPOISON),
+	LEVEL_UP_MOVE(37, MOVE_TOXIC),
+	LEVEL_UP_MOVE(39, MOVE_NIGHTSLASH),
 	LEVEL_UP_MOVE(42, MOVE_XSCISSOR),
 	LEVEL_UP_MOVE(45, MOVE_ACUPRESSURE),
 	LEVEL_UP_MOVE(48, MOVE_CRUNCH),
@@ -9649,9 +9717,9 @@ static const struct LevelUpMove sDrapionLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(26, MOVE_KNOCKOFF),
 	LEVEL_UP_MOVE(29, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(31, MOVE_PINMISSILE),
-	LEVEL_UP_MOVE(34, MOVE_TOXIC),
-	LEVEL_UP_MOVE(36, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(39, MOVE_CROSSPOISON),
+	LEVEL_UP_MOVE(34, MOVE_CROSSPOISON),
+	LEVEL_UP_MOVE(37, MOVE_TOXIC),
+	LEVEL_UP_MOVE(39, MOVE_NIGHTSLASH),
 	LEVEL_UP_MOVE(44, MOVE_XSCISSOR),
 	LEVEL_UP_MOVE(49, MOVE_ACUPRESSURE),
 	LEVEL_UP_MOVE(54, MOVE_CRUNCH),
@@ -9941,25 +10009,23 @@ static const struct LevelUpMove sElectivireLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_ELECTRICTERRAIN),
 	LEVEL_UP_MOVE( 1, MOVE_IONDELUGE),
 	LEVEL_UP_MOVE( 1, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERBOLT),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 1, MOVE_LOWKICK),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 8, MOVE_LOWKICK),
-	LEVEL_UP_MOVE(12, MOVE_SWIFT),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	LEVEL_UP_MOVE(11, MOVE_SWIFT),
 	LEVEL_UP_MOVE(15, MOVE_SHOCKWAVE),
 	LEVEL_UP_MOVE(19, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(22, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(26, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(29, MOVE_THUNDERPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(42, MOVE_SCREECH),
-	LEVEL_UP_MOVE(49, MOVE_THUNDERBOLT),
-	LEVEL_UP_MOVE(55, MOVE_PLASMAFISTS),
-	LEVEL_UP_MOVE(62, MOVE_THUNDER),
-	LEVEL_UP_MOVE(65, MOVE_GIGAIMPACT),
-	LEVEL_UP_MOVE(69, MOVE_ELECTRICTERRAIN),
+	LEVEL_UP_MOVE(22, MOVE_SCREECH),
+	LEVEL_UP_MOVE(25, MOVE_THUNDERPUNCH),
+	LEVEL_UP_MOVE(29, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(35, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(41, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(47, MOVE_PLASMAFISTS),
+	LEVEL_UP_MOVE(53, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(58, MOVE_THUNDER),
+	LEVEL_UP_MOVE(64, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
@@ -9969,19 +10035,19 @@ static const struct LevelUpMove sMagmortarLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
 	LEVEL_UP_MOVE( 1, MOVE_EMBER),
 	LEVEL_UP_MOVE( 1, MOVE_SMOKESCREEN),
-	LEVEL_UP_MOVE( 5, MOVE_EMBER),
-	LEVEL_UP_MOVE( 8, MOVE_SMOKESCREEN),
-	LEVEL_UP_MOVE(12, MOVE_FEINTATTACK),
-	LEVEL_UP_MOVE(15, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(19, MOVE_CLEARSMOG),
-	LEVEL_UP_MOVE(22, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(26, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(29, MOVE_FIREPUNCH),
-	LEVEL_UP_MOVE(36, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE(42, MOVE_SUNNYDAY),
-	LEVEL_UP_MOVE(49, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(55, MOVE_FIREBLAST),
-	LEVEL_UP_MOVE(62, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(11, MOVE_CLEARSMOG),
+	LEVEL_UP_MOVE(15, MOVE_FLAMEWHEEL),
+	LEVEL_UP_MOVE(19, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(23, MOVE_FEINTATTACK),
+	LEVEL_UP_MOVE(27, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(36, MOVE_FIREPUNCH),
+	LEVEL_UP_MOVE(41, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE(46, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(51, MOVE_FLAMETHROWER),
+	LEVEL_UP_MOVE(56, MOVE_SUNNYDAY),
+	LEVEL_UP_MOVE(60, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(65, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
@@ -10320,172 +10386,170 @@ static const struct LevelUpMove sRotomLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sUxieLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_MEMENTO),
 	LEVEL_UP_MOVE( 1, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE( 1, MOVE_FLAIL),
-	LEVEL_UP_MOVE( 1, MOVE_REST),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
-	LEVEL_UP_MOVE( 6, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(16, MOVE_ENDURE),
-	LEVEL_UP_MOVE(21, MOVE_SWIFT),
-	LEVEL_UP_MOVE(31, MOVE_YAWN),
-	LEVEL_UP_MOVE(36, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(46, MOVE_AMNESIA),
-	LEVEL_UP_MOVE(50, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(61, MOVE_FLAIL),
-	LEVEL_UP_MOVE(66, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(76, MOVE_MEMENTO),
+	LEVEL_UP_MOVE( 1, MOVE_REST),
+	LEVEL_UP_MOVE( 7, MOVE_SWIFT),
+	LEVEL_UP_MOVE(14, MOVE_ENDURE),
+	LEVEL_UP_MOVE(21, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(28, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(35, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(42, MOVE_AMNESIA),
+	LEVEL_UP_MOVE(49, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(56, MOVE_YAWN),
+	LEVEL_UP_MOVE(63, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(70, MOVE_FLAIL),
+	LEVEL_UP_MOVE(77, MOVE_MEMENTO),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sMespritLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE( 1, MOVE_LUCKYCHANT),
 	LEVEL_UP_MOVE( 1, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
-	LEVEL_UP_MOVE( 1, MOVE_REST),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
-	LEVEL_UP_MOVE( 6, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(16, MOVE_PROTECT),
-	LEVEL_UP_MOVE(21, MOVE_SWIFT),
-	LEVEL_UP_MOVE(31, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(36, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(46, MOVE_CHARM),
-	LEVEL_UP_MOVE(50, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(61, MOVE_COPYCAT),
-	LEVEL_UP_MOVE(66, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(76, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE( 1, MOVE_REST),
+	LEVEL_UP_MOVE( 7, MOVE_SWIFT),
+	LEVEL_UP_MOVE(14, MOVE_PROTECT),
+	LEVEL_UP_MOVE(21, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(28, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(35, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(42, MOVE_CHARM),
+	LEVEL_UP_MOVE(49, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(56, MOVE_FLATTER),
+	LEVEL_UP_MOVE(63, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(70, MOVE_COPYCAT),
+	LEVEL_UP_MOVE(77, MOVE_HEALINGWISH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sAzelfLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE( 1, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE( 1, MOVE_REST),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
-	LEVEL_UP_MOVE( 6, MOVE_IMPRISON),
-	LEVEL_UP_MOVE(16, MOVE_DETECT),
-	LEVEL_UP_MOVE(21, MOVE_SWIFT),
-	LEVEL_UP_MOVE(31, MOVE_UPROAR),
-	LEVEL_UP_MOVE(36, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(46, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(50, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(61, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE(66, MOVE_NATURALGIFT),
-	LEVEL_UP_MOVE(76, MOVE_EXPLOSION),
+	LEVEL_UP_MOVE( 1, MOVE_REST),
+	LEVEL_UP_MOVE( 7, MOVE_SWIFT),
+	LEVEL_UP_MOVE(14, MOVE_DETECT),
+	LEVEL_UP_MOVE(21, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(28, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(35, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(42, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(49, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(56, MOVE_UPROAR),
+	LEVEL_UP_MOVE(63, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(70, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE(77, MOVE_EXPLOSION),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDialgaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
 	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE( 6, MOVE_METALCLAW),
-	LEVEL_UP_MOVE(10, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(15, MOVE_SLASH),
-	LEVEL_UP_MOVE(19, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(24, MOVE_METALBURST),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(33, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(37, MOVE_AURASPHERE),
-	LEVEL_UP_MOVE(42, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(46, MOVE_ROAROFTIME),
-	LEVEL_UP_MOVE(50, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
+	LEVEL_UP_MOVE( 8, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(24, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(40, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(48, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(56, MOVE_POWERGEM),
+	LEVEL_UP_MOVE(64, MOVE_METALBURST),
+	LEVEL_UP_MOVE(72, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(80, MOVE_IRONTAIL),
+	LEVEL_UP_MOVE(88, MOVE_ROAROFTIME),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sPalkiaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
 	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE( 6, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE(10, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(15, MOVE_SLASH),
-	LEVEL_UP_MOVE(19, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(24, MOVE_AQUARING),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(33, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(37, MOVE_AURASPHERE),
-	LEVEL_UP_MOVE(42, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(46, MOVE_SPACIALREND),
-	LEVEL_UP_MOVE(50, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE( 1, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE( 8, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(24, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_AQUARING),
+	LEVEL_UP_MOVE(40, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(48, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(56, MOVE_POWERGEM),
+	LEVEL_UP_MOVE(64, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(72, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(80, MOVE_SPACIALREND),
+	LEVEL_UP_MOVE(88, MOVE_HYDROPUMP),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sHeatranLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_MAGMASTORM),
-	LEVEL_UP_MOVE( 1, MOVE_HEATWAVE),
-	LEVEL_UP_MOVE( 1, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE( 1, MOVE_IRONHEAD),
 	LEVEL_UP_MOVE( 1, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE( 9, MOVE_LEER),
-	LEVEL_UP_MOVE(17, MOVE_FIREFANG),
-	LEVEL_UP_MOVE(25, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(33, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(41, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(49, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE(57, MOVE_FIRESPIN),
-	LEVEL_UP_MOVE(65, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(73, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(81, MOVE_HEATWAVE),
-	LEVEL_UP_MOVE(88, MOVE_STONEEDGE),
-	LEVEL_UP_MOVE(96, MOVE_MAGMASTORM),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 6, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(12, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(18, MOVE_FIREFANG),
+	LEVEL_UP_MOVE(24, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(36, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(42, MOVE_LAVAPLUME),
+	LEVEL_UP_MOVE(48, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(54, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(60, MOVE_HEATWAVE),
+	LEVEL_UP_MOVE(66, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(72, MOVE_MAGMASTORM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sRegigigasLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_HEAVYSLAM),
-	LEVEL_UP_MOVE( 1, MOVE_CRUSHGRIP),
 	LEVEL_UP_MOVE( 1, MOVE_FIREPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_ICEPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_DIZZYPUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSERAY),
 	LEVEL_UP_MOVE( 1, MOVE_FORESIGHT),
-	LEVEL_UP_MOVE(25, MOVE_REVENGE),
-	LEVEL_UP_MOVE(40, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(50, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(65, MOVE_PAYBACK),
-	LEVEL_UP_MOVE(75, MOVE_CRUSHGRIP),
-	LEVEL_UP_MOVE(90, MOVE_HEAVYSLAM),
-	LEVEL_UP_MOVE(100, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE( 1, MOVE_PAYBACK),
+	LEVEL_UP_MOVE(12, MOVE_REVENGE),
+	LEVEL_UP_MOVE(18, MOVE_STOMP),
+	LEVEL_UP_MOVE(24, MOVE_PROTECT),
+	LEVEL_UP_MOVE(30, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(36, MOVE_MEGAPUNCH),
+	LEVEL_UP_MOVE(42, MOVE_BODYPRESS),
+	LEVEL_UP_MOVE(48, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(54, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(60, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(66, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(72, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(78, MOVE_CRUSHGRIP),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sGiratinaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE( 1, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE( 6, MOVE_OMINOUSWIND),
-	LEVEL_UP_MOVE(10, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(15, MOVE_SLASH),
-	LEVEL_UP_MOVE(19, MOVE_SHADOWSNEAK),
-	LEVEL_UP_MOVE(24, MOVE_DESTINYBOND),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(33, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(37, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE( 1, MOVE_SHADOWSNEAK),
+	LEVEL_UP_MOVE( 1, MOVE_OMINOUSWIND),
+	LEVEL_UP_MOVE( 1, MOVE_DEFOG),
+	LEVEL_UP_MOVE( 7, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(14, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(21, MOVE_HEX),
+	LEVEL_UP_MOVE(28, MOVE_SLASH),
+	LEVEL_UP_MOVE(35, MOVE_SCARYFACE),
 	LEVEL_UP_MOVE(42, MOVE_SHADOWCLAW),
-	LEVEL_UP_MOVE(46, MOVE_SHADOWFORCE),
-	LEVEL_UP_MOVE(50, MOVE_HEX),
+	LEVEL_UP_MOVE(49, MOVE_PAINSPLIT),
+	LEVEL_UP_MOVE(56, MOVE_AURASPHERE),
+	LEVEL_UP_MOVE(63, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(70, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(77, MOVE_SHADOWFORCE),
+	LEVEL_UP_MOVE(84, MOVE_DESTINYBOND),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCresseliaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_LUNARDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_PSYCHOSHIFT),
-	LEVEL_UP_MOVE( 1, MOVE_PSYCHOCUT),
-	LEVEL_UP_MOVE( 1, MOVE_MOONLIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
 	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(11, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(20, MOVE_MIST),
-	LEVEL_UP_MOVE(29, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(38, MOVE_FUTURESIGHT),
-	LEVEL_UP_MOVE(47, MOVE_SLASH),
-	LEVEL_UP_MOVE(57, MOVE_MOONLIGHT),
-	LEVEL_UP_MOVE(66, MOVE_PSYCHOCUT),
-	LEVEL_UP_MOVE(75, MOVE_PSYCHOSHIFT),
-	LEVEL_UP_MOVE(84, MOVE_LUNARDANCE),
-	LEVEL_UP_MOVE(93, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(99, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE( 6, MOVE_MIST),
+	LEVEL_UP_MOVE(12, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(18, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(24, MOVE_PSYCHOSHIFT),
+	LEVEL_UP_MOVE(30, MOVE_SLASH),
+	LEVEL_UP_MOVE(36, MOVE_PSYCHOCUT),
+	LEVEL_UP_MOVE(42, MOVE_MOONLIGHT),
+	LEVEL_UP_MOVE(48, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(54, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(60, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(66, MOVE_FUTURESIGHT),
+	LEVEL_UP_MOVE(72, MOVE_LUNARDANCE),
 	LEVEL_UP_END
 };
 
@@ -10581,26 +10645,27 @@ static const struct LevelUpMove sArceusLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sVictiniLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_VCREATE),
 	LEVEL_UP_MOVE( 1, MOVE_BOLTSTRIKE),
 	LEVEL_UP_MOVE( 1, MOVE_BLUEFLARE),
-	LEVEL_UP_MOVE( 1, MOVE_SEARINGSHOT),
-	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
-	LEVEL_UP_MOVE( 1, MOVE_INCINERATE),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 9, MOVE_ENDURE),
-	LEVEL_UP_MOVE(17, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(25, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(33, MOVE_REVERSAL),
-	LEVEL_UP_MOVE(41, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(49, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(57, MOVE_INFERNO),
-	LEVEL_UP_MOVE(65, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(73, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE(81, MOVE_FINALGAMBIT),
-	LEVEL_UP_MOVE(89, MOVE_STOREDPOWER),
-	LEVEL_UP_MOVE(97, MOVE_OVERHEAT),
-	LEVEL_UP_MOVE(100, MOVE_VCREATE),
+	LEVEL_UP_MOVE( 1, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
+	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE( 7, MOVE_WORKUP),
+	LEVEL_UP_MOVE(14, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(21, MOVE_STOREDPOWER),
+	LEVEL_UP_MOVE(28, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(33, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(38, MOVE_ENDURE),
+	LEVEL_UP_MOVE(42, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(49, MOVE_INFERNO),
+	LEVEL_UP_MOVE(56, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(63, MOVE_SEARINGSHOT),
+	LEVEL_UP_MOVE(70, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(77, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(84, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE(91, MOVE_FINALGAMBIT),
 	LEVEL_UP_END
 };
 
@@ -11340,27 +11405,25 @@ static const struct LevelUpMove sExcadrillLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sAudinoLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE( 1, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE( 1, MOVE_MISTYTERRAIN),
-	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 1, MOVE_GROWL),
-	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE( 5, MOVE_BABYDOLLEYES),
-	LEVEL_UP_MOVE( 9, MOVE_REFRESH),
-	LEVEL_UP_MOVE(13, MOVE_DISARMINGVOICE),
-	LEVEL_UP_MOVE(17, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(21, MOVE_ATTRACT),
-	LEVEL_UP_MOVE(25, MOVE_SECRETPOWER),
-	LEVEL_UP_MOVE(29, MOVE_ENTRAINMENT),
-	LEVEL_UP_MOVE(33, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(37, MOVE_HEALPULSE),
-	LEVEL_UP_MOVE(41, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE(45, MOVE_SIMPLEBEAM),
-	LEVEL_UP_MOVE(49, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(53, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(57, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
+	LEVEL_UP_MOVE( 4, MOVE_DISARMINGVOICE),
+	LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES),
+	LEVEL_UP_MOVE(12, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(16, MOVE_GROWL),
+	LEVEL_UP_MOVE(19, MOVE_SECRETPOWER),
+	LEVEL_UP_MOVE(23, MOVE_REFRESH),
+	LEVEL_UP_MOVE(26, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(30, MOVE_LIFEDEW),
+	LEVEL_UP_MOVE(33, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(36, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(40, MOVE_SIMPLEBEAM),
+	LEVEL_UP_MOVE(44, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE(48, MOVE_HEALPULSE),
+	LEVEL_UP_MOVE(51, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(55, MOVE_ENTRAINMENT),
+	LEVEL_UP_MOVE(58, MOVE_MISTYTERRAIN),
+	LEVEL_UP_MOVE(60, MOVE_LASTRESORT),
 	LEVEL_UP_END
 };
 
@@ -12034,92 +12097,89 @@ static const struct LevelUpMove sCofagrigusLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sTirtougaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_BIDE),
-	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 5, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 8, MOVE_BITE),
-	LEVEL_UP_MOVE(11, MOVE_PROTECT),
-	LEVEL_UP_MOVE(15, MOVE_AQUAJET),
-	LEVEL_UP_MOVE(18, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(21, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(25, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(28, MOVE_BRINE),
-	LEVEL_UP_MOVE(31, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(35, MOVE_CURSE),
-	LEVEL_UP_MOVE(38, MOVE_SHELLSMASH),
-	LEVEL_UP_MOVE(41, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(45, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(48, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE(50, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
+	LEVEL_UP_MOVE( 3, MOVE_PROTECT),
+	LEVEL_UP_MOVE( 6, MOVE_AQUAJET),
+	LEVEL_UP_MOVE( 9, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(12, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(21, MOVE_BRINE),
+	LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(30, MOVE_CURSE),
+	LEVEL_UP_MOVE(33, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(36, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(39, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(42, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(45, MOVE_SHELLSMASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCarracostaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_BIDE),
-	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 1, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 5, MOVE_ROLLOUT),
-	LEVEL_UP_MOVE( 8, MOVE_BITE),
-	LEVEL_UP_MOVE(11, MOVE_PROTECT),
-	LEVEL_UP_MOVE(15, MOVE_AQUAJET),
-	LEVEL_UP_MOVE(18, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(21, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(25, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(28, MOVE_BRINE),
-	LEVEL_UP_MOVE(31, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(35, MOVE_CURSE),
-	LEVEL_UP_MOVE(40, MOVE_SHELLSMASH),
-	LEVEL_UP_MOVE(45, MOVE_AQUATAIL),
-	LEVEL_UP_MOVE(51, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(56, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE(61, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
+	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
+	LEVEL_UP_MOVE( 1, MOVE_AQUAJET),
+	LEVEL_UP_MOVE( 9, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(12, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(18, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(21, MOVE_BRINE),
+	LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(30, MOVE_CURSE),
+	LEVEL_UP_MOVE(33, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(36, MOVE_AQUATAIL),
+	LEVEL_UP_MOVE(41, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(46, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(51, MOVE_SHELLSMASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sArchenLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
-	LEVEL_UP_MOVE( 5, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE( 8, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(11, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE( 3, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE( 6, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE( 9, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(12, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE(15, MOVE_PLUCK),
-	LEVEL_UP_MOVE(18, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(21, MOVE_AGILITY),
-	LEVEL_UP_MOVE(25, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(28, MOVE_ACROBATICS),
-	LEVEL_UP_MOVE(31, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(35, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(38, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(41, MOVE_UTURN),
-	LEVEL_UP_MOVE(45, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(48, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(50, MOVE_THRASH),
+	LEVEL_UP_MOVE(18, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(21, MOVE_UTURN),
+	LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(27, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(33, MOVE_AGILITY),
+	LEVEL_UP_MOVE(36, MOVE_ACROBATICS),
+	LEVEL_UP_MOVE(39, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(42, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(45, MOVE_THRASH),
+	LEVEL_UP_MOVE(48, MOVE_ENDEAVOR),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sArcheopsLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
 	LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE( 5, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE( 8, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(11, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE( 1, MOVE_WINGATTACK),
+	LEVEL_UP_MOVE( 9, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE(12, MOVE_ANCIENTPOWER),
 	LEVEL_UP_MOVE(15, MOVE_PLUCK),
-	LEVEL_UP_MOVE(18, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(21, MOVE_AGILITY),
-	LEVEL_UP_MOVE(25, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE(28, MOVE_ACROBATICS),
-	LEVEL_UP_MOVE(31, MOVE_DRAGONBREATH),
-	LEVEL_UP_MOVE(35, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(40, MOVE_ENDEAVOR),
-	LEVEL_UP_MOVE(45, MOVE_UTURN),
-	LEVEL_UP_MOVE(51, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(56, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(61, MOVE_THRASH),
+	LEVEL_UP_MOVE(18, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(21, MOVE_UTURN),
+	LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(27, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(30, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(33, MOVE_AGILITY),
+	LEVEL_UP_MOVE(36, MOVE_ACROBATICS),
+	LEVEL_UP_MOVE(39, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(43, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(48, MOVE_THRASH),
+	LEVEL_UP_MOVE(53, MOVE_ENDEAVOR),
 	LEVEL_UP_END
 };
 
@@ -13006,68 +13066,70 @@ static const struct LevelUpMove sChandelureLevelUpLearnset[] = {
 
 static const struct LevelUpMove sAxewLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-	LEVEL_UP_MOVE( 4, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(10, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(13, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(16, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(20, MOVE_SLASH),
-	LEVEL_UP_MOVE(24, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(32, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(36, MOVE_TAUNT),
-	LEVEL_UP_MOVE(41, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(50, MOVE_GUILLOTINE),
-	LEVEL_UP_MOVE(56, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(61, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE( 3, MOVE_BITE),
+	LEVEL_UP_MOVE( 6, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE( 9, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(12, MOVE_TAUNT),
+	LEVEL_UP_MOVE(15, MOVE_SLASH),
+	LEVEL_UP_MOVE(18, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(24, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(33, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(36, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(39, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(42, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(45, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(48, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE(51, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sFraxureLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE( 4, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(10, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(13, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(16, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(20, MOVE_SLASH),
-	LEVEL_UP_MOVE(24, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(32, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(36, MOVE_TAUNT),
-	LEVEL_UP_MOVE(42, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(48, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(54, MOVE_GUILLOTINE),
-	LEVEL_UP_MOVE(60, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(66, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE( 3, MOVE_BITE),
+	LEVEL_UP_MOVE( 6, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE( 9, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(12, MOVE_TAUNT),
+	LEVEL_UP_MOVE(15, MOVE_SLASH),
+	LEVEL_UP_MOVE(18, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(24, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(33, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(36, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(41, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(51, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(56, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE(61, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sHaxorusLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_OUTRAGE),
 	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE( 4, MOVE_LEER),
-	LEVEL_UP_MOVE( 7, MOVE_ASSURANCE),
-	LEVEL_UP_MOVE(10, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE(13, MOVE_DUALCHOP),
-	LEVEL_UP_MOVE(16, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(20, MOVE_SLASH),
-	LEVEL_UP_MOVE(24, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(28, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(32, MOVE_DRAGONDANCE),
-	LEVEL_UP_MOVE(36, MOVE_TAUNT),
-	LEVEL_UP_MOVE(42, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(50, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(58, MOVE_GUILLOTINE),
-	LEVEL_UP_MOVE(66, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE(74, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE( 3, MOVE_BITE),
+	LEVEL_UP_MOVE( 6, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE( 9, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(12, MOVE_TAUNT),
+	LEVEL_UP_MOVE(15, MOVE_SLASH),
+	LEVEL_UP_MOVE(18, MOVE_DRAGONRAGE),
+	LEVEL_UP_MOVE(21, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(24, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(27, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(30, MOVE_DRAGONDANCE),
+	LEVEL_UP_MOVE(33, MOVE_DUALCHOP),
+	LEVEL_UP_MOVE(36, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(41, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE(46, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(53, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(60, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE(67, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
@@ -13121,28 +13183,27 @@ static const struct LevelUpMove sBearticLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sCryogonalLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_SHEERCOLD),
-	LEVEL_UP_MOVE( 1, MOVE_NIGHTSLASH),
 	LEVEL_UP_MOVE( 1, MOVE_BIND),
 	LEVEL_UP_MOVE( 1, MOVE_ICESHARD),
 	LEVEL_UP_MOVE( 1, MOVE_SHARPEN),
-	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
-	LEVEL_UP_MOVE( 5, MOVE_ICYWIND),
-	LEVEL_UP_MOVE( 9, MOVE_MIST),
-	LEVEL_UP_MOVE( 9, MOVE_HAZE),
-	LEVEL_UP_MOVE(13, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(17, MOVE_ACIDARMOR),
-	LEVEL_UP_MOVE(21, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(25, MOVE_ICEBEAM),
-	LEVEL_UP_MOVE(29, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(33, MOVE_REFLECT),
-	LEVEL_UP_MOVE(37, MOVE_SLASH),
-	LEVEL_UP_MOVE(41, MOVE_CONFUSERAY),
-	LEVEL_UP_MOVE(45, MOVE_RECOVER),
-	LEVEL_UP_MOVE(49, MOVE_FREEZEDRY),
-	LEVEL_UP_MOVE(50, MOVE_SOLARBEAM),
-	LEVEL_UP_MOVE(53, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(57, MOVE_SHEERCOLD),
+	LEVEL_UP_MOVE( 4, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE( 8, MOVE_RAPIDSPIN),
+	LEVEL_UP_MOVE(12, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(16, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(20, MOVE_MIST),
+	LEVEL_UP_MOVE(20, MOVE_HAZE),
+	LEVEL_UP_MOVE(24, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(28, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(32, MOVE_SLASH),
+	LEVEL_UP_MOVE(32, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(36, MOVE_FREEZEDRY),
+	LEVEL_UP_MOVE(40, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(40, MOVE_REFLECT),
+	LEVEL_UP_MOVE(44, MOVE_RECOVER),
+	LEVEL_UP_MOVE(48, MOVE_ICEBEAM),
+	LEVEL_UP_MOVE(52, MOVE_ACIDARMOR),
+	LEVEL_UP_MOVE(56, MOVE_SOLARBEAM),
+	LEVEL_UP_MOVE(60, MOVE_SHEERCOLD),
 	LEVEL_UP_END
 };
 
@@ -13711,50 +13772,48 @@ static const struct LevelUpMove sVirizionLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sTornadusLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_THRASH),
-	LEVEL_UP_MOVE( 1, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE( 1, MOVE_HURRICANE),
-	LEVEL_UP_MOVE( 1, MOVE_UPROAR),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
+	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
 	LEVEL_UP_MOVE( 1, MOVE_GUST),
-	LEVEL_UP_MOVE( 1, MOVE_SWAGGER),
-	LEVEL_UP_MOVE( 7, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_REVENGE),
-	LEVEL_UP_MOVE(19, MOVE_AIRCUTTER),
-	LEVEL_UP_MOVE(25, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(31, MOVE_AGILITY),
-	LEVEL_UP_MOVE(37, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(43, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(49, MOVE_TAILWIND),
-	LEVEL_UP_MOVE(55, MOVE_RAINDANCE),
-	LEVEL_UP_MOVE(61, MOVE_HURRICANE),
-	LEVEL_UP_MOVE(67, MOVE_DARKPULSE),
-	LEVEL_UP_MOVE(73, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(79, MOVE_THRASH),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE(10, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(20, MOVE_AIRCUTTER),
+	LEVEL_UP_MOVE(25, MOVE_AGILITY),
+	LEVEL_UP_MOVE(30, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(35, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(40, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(45, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(50, MOVE_UPROAR),
+	LEVEL_UP_MOVE(55, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(60, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(65, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(70, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(75, MOVE_THRASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sThundurusLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_THRASH),
-	LEVEL_UP_MOVE( 1, MOVE_HAMMERARM),
 	LEVEL_UP_MOVE( 1, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE( 1, MOVE_UPROAR),
+	LEVEL_UP_MOVE( 1, MOVE_HEALBLOCK),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
+	LEVEL_UP_MOVE( 1, MOVE_REVENGE),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 1, MOVE_SWAGGER),
-	LEVEL_UP_MOVE( 7, MOVE_BITE),
-	LEVEL_UP_MOVE(13, MOVE_REVENGE),
-	LEVEL_UP_MOVE(19, MOVE_SHOCKWAVE),
-	LEVEL_UP_MOVE(25, MOVE_HEALBLOCK),
-	LEVEL_UP_MOVE(31, MOVE_AGILITY),
-	LEVEL_UP_MOVE(37, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(43, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(49, MOVE_CHARGE),
-	LEVEL_UP_MOVE(55, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(61, MOVE_THUNDER),
-	LEVEL_UP_MOVE(67, MOVE_DARKPULSE),
-	LEVEL_UP_MOVE(73, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(79, MOVE_THRASH),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE(10, MOVE_SWAGGER),
+	LEVEL_UP_MOVE(15, MOVE_BITE),
+	LEVEL_UP_MOVE(20, MOVE_SHOCKWAVE),
+	LEVEL_UP_MOVE(25, MOVE_AGILITY),
+	LEVEL_UP_MOVE(30, MOVE_CHARGE),
+	LEVEL_UP_MOVE(35, MOVE_VOLTSWITCH),
+	LEVEL_UP_MOVE(40, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(45, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(50, MOVE_UPROAR),
+	LEVEL_UP_MOVE(55, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(60, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(65, MOVE_RAINDANCE),
+	LEVEL_UP_MOVE(70, MOVE_THUNDER),
+	LEVEL_UP_MOVE(75, MOVE_THRASH),
 	LEVEL_UP_END
 };
 
@@ -13799,26 +13858,25 @@ static const struct LevelUpMove sZekromLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sLandorusLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_OUTRAGE),
-	LEVEL_UP_MOVE( 1, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE( 1, MOVE_FISSURE),
-	LEVEL_UP_MOVE( 1, MOVE_BLOCK),
+	LEVEL_UP_MOVE( 1, MOVE_PUNISHMENT),
 	LEVEL_UP_MOVE( 1, MOVE_MUDSHOT),
-	LEVEL_UP_MOVE( 1, MOVE_ROCKTOMB),
-	LEVEL_UP_MOVE( 1, MOVE_IMPRISON),
-	LEVEL_UP_MOVE( 7, MOVE_PUNISHMENT),
-	LEVEL_UP_MOVE(13, MOVE_BULLDOZE),
-	LEVEL_UP_MOVE(19, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(25, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(31, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(37, MOVE_EARTHPOWER),
-	LEVEL_UP_MOVE(43, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(49, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(55, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(61, MOVE_FISSURE),
-	LEVEL_UP_MOVE(67, MOVE_STONEEDGE),
-	LEVEL_UP_MOVE(73, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(79, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE( 1, MOVE_SANDTOMB),
+	LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE( 1, MOVE_LEER),
+	LEVEL_UP_MOVE(10, MOVE_BLOCK),
+	LEVEL_UP_MOVE(15, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE(20, MOVE_ROCKTOMB),
+	LEVEL_UP_MOVE(25, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(30, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(35, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(40, MOVE_EARTHPOWER),
+	LEVEL_UP_MOVE(45, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(50, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(55, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(60, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(65, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(70, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(75, MOVE_FISSURE),
 	LEVEL_UP_END
 };
 
@@ -13885,26 +13943,27 @@ static const struct LevelUpMove sMeloettaLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sGenesectLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_FELLSTINGER),
-	LEVEL_UP_MOVE( 1, MOVE_TECHNOBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_BLAZEKICK),
+	LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_MAGNETRISE),
-	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
 	LEVEL_UP_MOVE( 1, MOVE_SCREECH),
-	LEVEL_UP_MOVE( 7, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(11, MOVE_LOCKON),
-	LEVEL_UP_MOVE(18, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(22, MOVE_MAGNETBOMB),
-	LEVEL_UP_MOVE(29, MOVE_SLASH),
-	LEVEL_UP_MOVE(33, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(40, MOVE_SIGNALBEAM),
-	LEVEL_UP_MOVE(44, MOVE_TRIATTACK),
-	LEVEL_UP_MOVE(51, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(55, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(62, MOVE_SIMPLEBEAM),
-	LEVEL_UP_MOVE(66, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE(73, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(77, MOVE_SELFDESTRUCT),
+	LEVEL_UP_MOVE( 1, MOVE_METALCLAW),
+	LEVEL_UP_MOVE(19, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE(25, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE(31, MOVE_MAGNETBOMB),
+	LEVEL_UP_MOVE(37, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(42, MOVE_SLASH),
+	LEVEL_UP_MOVE(48, MOVE_SIGNALBEAM),
+	LEVEL_UP_MOVE(54, MOVE_TRIATTACK),
+	LEVEL_UP_MOVE(60, MOVE_XSCISSOR),
+	LEVEL_UP_MOVE(66, MOVE_MAGNETRISE),
+	LEVEL_UP_MOVE(71, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(77, MOVE_SIMPLEBEAM),
+	LEVEL_UP_MOVE(82, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(82, MOVE_LOCKON),
+	LEVEL_UP_MOVE(88, MOVE_TECHNOBLAST),
+	LEVEL_UP_MOVE(94, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE(100, MOVE_SELFDESTRUCT),
 	LEVEL_UP_END
 };
 
@@ -14975,95 +15034,86 @@ static const struct LevelUpMove sHelioliskLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sTyruntLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
+	LEVEL_UP_MOVE( 1, MOVE_BIDE),
+	LEVEL_UP_MOVE( 1, MOVE_STEALTHROCK),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 6, MOVE_ROAR),
-	LEVEL_UP_MOVE(10, MOVE_STOMP),
-	LEVEL_UP_MOVE(12, MOVE_BIDE),
-	LEVEL_UP_MOVE(15, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(17, MOVE_BITE),
-	LEVEL_UP_MOVE(20, MOVE_CHARM),
-	LEVEL_UP_MOVE(26, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(30, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(34, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(37, MOVE_DRAGONCLAW),
+	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
+	LEVEL_UP_MOVE( 4, MOVE_ROAR),
+	LEVEL_UP_MOVE( 8, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(12, MOVE_CHARM),
+	LEVEL_UP_MOVE(16, MOVE_BITE),
+	LEVEL_UP_MOVE(20, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(24, MOVE_STOMP),
+	LEVEL_UP_MOVE(28, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(36, MOVE_DRAGONCLAW),
 	LEVEL_UP_MOVE(40, MOVE_THRASH),
 	LEVEL_UP_MOVE(44, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(49, MOVE_HORNDRILL),
+	LEVEL_UP_MOVE(48, MOVE_HORNDRILL),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sTyrantrumLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE( 1, MOVE_HEADSMASH),
-	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
+	LEVEL_UP_MOVE( 1, MOVE_BIDE),
+	LEVEL_UP_MOVE( 1, MOVE_STEALTHROCK),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_TAILWHIP),
 	LEVEL_UP_MOVE( 1, MOVE_ROAR),
-	LEVEL_UP_MOVE( 1, MOVE_STOMP),
-	LEVEL_UP_MOVE( 6, MOVE_ROAR),
-	LEVEL_UP_MOVE(10, MOVE_STOMP),
-	LEVEL_UP_MOVE(12, MOVE_BIDE),
-	LEVEL_UP_MOVE(15, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(17, MOVE_BITE),
-	LEVEL_UP_MOVE(20, MOVE_CHARM),
-	LEVEL_UP_MOVE(26, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(30, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(34, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(37, MOVE_DRAGONCLAW),
-	LEVEL_UP_MOVE(38, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE( 1, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(12, MOVE_CHARM),
+	LEVEL_UP_MOVE(16, MOVE_BITE),
+	LEVEL_UP_MOVE(20, MOVE_DRAGONTAIL),
+	LEVEL_UP_MOVE(24, MOVE_STOMP),
+	LEVEL_UP_MOVE(28, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(36, MOVE_DRAGONCLAW),
 	LEVEL_UP_MOVE(42, MOVE_THRASH),
-	LEVEL_UP_MOVE(47, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(53, MOVE_HORNDRILL),
-	LEVEL_UP_MOVE(58, MOVE_HEADSMASH),
-	LEVEL_UP_MOVE(68, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(48, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(54, MOVE_HORNDRILL),
+	LEVEL_UP_MOVE(60, MOVE_GIGAIMPACT),
+	LEVEL_UP_MOVE(66, MOVE_HEADSMASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sAmauraLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(10, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(13, MOVE_ICYWIND),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(18, MOVE_MIST),
-	LEVEL_UP_MOVE(20, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(26, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(30, MOVE_ROUND),
-	LEVEL_UP_MOVE(34, MOVE_AVALANCHE),
-	LEVEL_UP_MOVE(38, MOVE_HAIL),
-	LEVEL_UP_MOVE(41, MOVE_NATUREPOWER),
-	LEVEL_UP_MOVE(44, MOVE_ENCORE),
-	LEVEL_UP_MOVE(47, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(50, MOVE_ICEBEAM),
-	LEVEL_UP_MOVE(57, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(65, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 4, MOVE_ENCORE),
+	LEVEL_UP_MOVE( 8, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(12, MOVE_ROUND),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(20, MOVE_MIST),
+	LEVEL_UP_MOVE(24, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(28, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(32, MOVE_NATUREPOWER),
+	LEVEL_UP_MOVE(36, MOVE_FREEZEDRY),
+	LEVEL_UP_MOVE(40, MOVE_ICEBEAM),
+	LEVEL_UP_MOVE(44, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(48, MOVE_HAIL),
+	LEVEL_UP_MOVE(52, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(56, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sAurorusLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_FREEZEDRY),
-	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW),
-	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE( 5, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(10, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(13, MOVE_ICYWIND),
-	LEVEL_UP_MOVE(15, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(18, MOVE_MIST),
-	LEVEL_UP_MOVE(20, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(26, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(30, MOVE_ROUND),
-	LEVEL_UP_MOVE(34, MOVE_AVALANCHE),
-	LEVEL_UP_MOVE(38, MOVE_HAIL),
-	LEVEL_UP_MOVE(38, MOVE_FREEZEDRY),
-	LEVEL_UP_MOVE(43, MOVE_NATUREPOWER),
-	LEVEL_UP_MOVE(46, MOVE_ENCORE),
-	LEVEL_UP_MOVE(50, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(56, MOVE_ICEBEAM),
-	LEVEL_UP_MOVE(63, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(74, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 4, MOVE_ENCORE),
+	LEVEL_UP_MOVE( 8, MOVE_ICYWIND),
+	LEVEL_UP_MOVE(12, MOVE_ROUND),
+	LEVEL_UP_MOVE(16, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(20, MOVE_MIST),
+	LEVEL_UP_MOVE(24, MOVE_AURORABEAM),
+	LEVEL_UP_MOVE(28, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(32, MOVE_NATUREPOWER),
+	LEVEL_UP_MOVE(36, MOVE_FREEZEDRY),
+	LEVEL_UP_MOVE(42, MOVE_ICEBEAM),
+	LEVEL_UP_MOVE(48, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(54, MOVE_HAIL),
+	LEVEL_UP_MOVE(60, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(66, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
@@ -15142,21 +15192,23 @@ static const struct LevelUpMove sDedenneLevelUpLearnset[] = {
 
 static const struct LevelUpMove sCarbinkLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW),
 	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
-	LEVEL_UP_MOVE( 5, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE( 8, MOVE_SHARPEN),
-	LEVEL_UP_MOVE(12, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(18, MOVE_REFLECT),
-	LEVEL_UP_MOVE(21, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(27, MOVE_GUARDSPLIT),
-	LEVEL_UP_MOVE(31, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(35, MOVE_FLAIL),
+	LEVEL_UP_MOVE( 1, MOVE_SHARPEN),
+	LEVEL_UP_MOVE( 5, MOVE_GUARDSPLIT),
+	LEVEL_UP_MOVE(10, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(15, MOVE_FLAIL),
+	LEVEL_UP_MOVE(20, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(25, MOVE_ROCKPOLISH),
+	LEVEL_UP_MOVE(30, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(35, MOVE_ROCKSLIDE),
 	LEVEL_UP_MOVE(40, MOVE_SKILLSWAP),
-	LEVEL_UP_MOVE(46, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(49, MOVE_STONEEDGE),
-	LEVEL_UP_MOVE(50, MOVE_MOONBLAST),
-	LEVEL_UP_MOVE(60, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(70, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(45, MOVE_POWERGEM),
+	LEVEL_UP_MOVE(50, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(55, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(60, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(65, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(70, MOVE_REFLECT),
 	LEVEL_UP_END
 };
 
@@ -15431,88 +15483,94 @@ static const struct LevelUpMove sNoivernLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sXerneasLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_HEALPULSE),
-	LEVEL_UP_MOVE( 1, MOVE_AROMATHERAPY),
-	LEVEL_UP_MOVE( 1, MOVE_INGRAIN),
-	LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_GRAVITY),
 	LEVEL_UP_MOVE( 5, MOVE_LIGHTSCREEN),
 	LEVEL_UP_MOVE(10, MOVE_AURORABEAM),
-	LEVEL_UP_MOVE(18, MOVE_GRAVITY),
-	LEVEL_UP_MOVE(26, MOVE_GEOMANCY),
-	LEVEL_UP_MOVE(35, MOVE_MOONBLAST),
-	LEVEL_UP_MOVE(44, MOVE_MEGAHORN),
-	LEVEL_UP_MOVE(51, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(55, MOVE_HORNLEECH),
-	LEVEL_UP_MOVE(59, MOVE_PSYCHUP),
-	LEVEL_UP_MOVE(63, MOVE_MISTYTERRAIN),
-	LEVEL_UP_MOVE(72, MOVE_NATUREPOWER),
-	LEVEL_UP_MOVE(80, MOVE_CLOSECOMBAT),
-	LEVEL_UP_MOVE(88, MOVE_GIGAIMPACT),
-	LEVEL_UP_MOVE(93, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(15, MOVE_NATUREPOWER),
+	LEVEL_UP_MOVE(20, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(25, MOVE_AROMATHERAPY),
+	LEVEL_UP_MOVE(30, MOVE_PSYCHUP),
+	LEVEL_UP_MOVE(35, MOVE_HORNLEECH),
+	LEVEL_UP_MOVE(40, MOVE_MISTYTERRAIN),
+	LEVEL_UP_MOVE(45, MOVE_INGRAIN),
+	LEVEL_UP_MOVE(50, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(55, MOVE_GEOMANCY),
+	LEVEL_UP_MOVE(60, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(65, MOVE_HEALPULSE),
+	LEVEL_UP_MOVE(70, MOVE_MEGAHORN),
+	LEVEL_UP_MOVE(75, MOVE_CLOSECOMBAT),
+	LEVEL_UP_MOVE(80, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE(85, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE(90, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sYveltalLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_HURRICANE),
 	LEVEL_UP_MOVE( 1, MOVE_RAZORWIND),
-	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
-	LEVEL_UP_MOVE( 1, MOVE_ROOST),
-	LEVEL_UP_MOVE( 5, MOVE_DOUBLETEAM),
-	LEVEL_UP_MOVE(10, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(18, MOVE_SNARL),
-	LEVEL_UP_MOVE(26, MOVE_OBLIVIONWING),
-	LEVEL_UP_MOVE(35, MOVE_DISABLE),
-	LEVEL_UP_MOVE(44, MOVE_DARKPULSE),
-	LEVEL_UP_MOVE(51, MOVE_FOULPLAY),
+	LEVEL_UP_MOVE( 1, MOVE_GUST),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM),
+	LEVEL_UP_MOVE( 5, MOVE_TAUNT),
+	LEVEL_UP_MOVE(10, MOVE_SNARL),
+	LEVEL_UP_MOVE(15, MOVE_DISABLE),
+	LEVEL_UP_MOVE(20, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(25, MOVE_TAILWIND),
+	LEVEL_UP_MOVE(30, MOVE_ROOST),
+	LEVEL_UP_MOVE(35, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE(40, MOVE_DARKPULSE),
+	LEVEL_UP_MOVE(45, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE(50, MOVE_OBLIVIONWING),
 	LEVEL_UP_MOVE(55, MOVE_PHANTOMFORCE),
-	LEVEL_UP_MOVE(59, MOVE_PSYCHIC),
-	LEVEL_UP_MOVE(63, MOVE_DRAGONRUSH),
-	LEVEL_UP_MOVE(72, MOVE_FOCUSBLAST),
-	LEVEL_UP_MOVE(80, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(88, MOVE_HYPERBEAM),
-	LEVEL_UP_MOVE(93, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE(60, MOVE_FOULPLAY),
+	LEVEL_UP_MOVE(65, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(70, MOVE_HURRICANE),
+	LEVEL_UP_MOVE(75, MOVE_FOCUSBLAST),
+	LEVEL_UP_MOVE(80, MOVE_SKYATTACK),
+	LEVEL_UP_MOVE(85, MOVE_LASHOUT),
+	LEVEL_UP_MOVE(90, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sZygardeLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_GLARE),
-	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
+	LEVEL_UP_MOVE( 1, MOVE_BIND),
 	LEVEL_UP_MOVE( 1, MOVE_DRAGONBREATH),
+	LEVEL_UP_MOVE( 1, MOVE_BULLDOZE),
 	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 5, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(10, MOVE_DIG),
-	LEVEL_UP_MOVE(18, MOVE_BIND),
-	LEVEL_UP_MOVE(26, MOVE_LANDSWRATH),
-	LEVEL_UP_MOVE(35, MOVE_SANDSTORM),
-	LEVEL_UP_MOVE(44, MOVE_HAZE),
-	LEVEL_UP_MOVE(51, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(55, MOVE_EARTHQUAKE),
-	LEVEL_UP_MOVE(59, MOVE_CAMOUFLAGE),
-	LEVEL_UP_MOVE(63, MOVE_DRAGONPULSE),
-	LEVEL_UP_MOVE(72, MOVE_COIL),
-	LEVEL_UP_MOVE(80, MOVE_OUTRAGE),
+	LEVEL_UP_MOVE( 8, MOVE_HAZE),
+	LEVEL_UP_MOVE(16, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(24, MOVE_DIG),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(40, MOVE_CAMOUFLAGE),
+	LEVEL_UP_MOVE(48, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(54, MOVE_LANDSWRATH),
+	LEVEL_UP_MOVE(60, MOVE_GLARE),
+	LEVEL_UP_MOVE(68, MOVE_SANDSTORM),
+	LEVEL_UP_MOVE(76, MOVE_COIL),
+	LEVEL_UP_MOVE(84, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(92, MOVE_OUTRAGE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sDiancieLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE( 5, MOVE_SHARPEN),
-	LEVEL_UP_MOVE( 8, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(12, MOVE_REFLECT),
-	LEVEL_UP_MOVE(18, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(21, MOVE_GUARDSPLIT),
-	LEVEL_UP_MOVE(27, MOVE_ANCIENTPOWER),
-	LEVEL_UP_MOVE(31, MOVE_FLAIL),
-	LEVEL_UP_MOVE(35, MOVE_SKILLSWAP),
-	LEVEL_UP_MOVE(40, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(46, MOVE_TRICKROOM),
-	LEVEL_UP_MOVE(49, MOVE_STONEEDGE),
-	LEVEL_UP_MOVE(50, MOVE_MOONBLAST),
-	LEVEL_UP_MOVE(50, MOVE_DIAMONDSTORM),
-	LEVEL_UP_MOVE(60, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(70, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 1, MOVE_SHARPEN),
+	LEVEL_UP_MOVE( 7, MOVE_GUARDSPLIT),
+	LEVEL_UP_MOVE(14, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(21, MOVE_FLAIL),
+	LEVEL_UP_MOVE(28, MOVE_ANCIENTPOWER),
+	LEVEL_UP_MOVE(35, MOVE_ROCKPOLISH),
+	LEVEL_UP_MOVE(42, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(42, MOVE_REFLECT),
+	LEVEL_UP_MOVE(49, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(56, MOVE_SKILLSWAP),
+	LEVEL_UP_MOVE(63, MOVE_POWERGEM),
+	LEVEL_UP_MOVE(70, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(77, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(84, MOVE_STONEEDGE),
+	LEVEL_UP_MOVE(91, MOVE_DIAMONDSTORM),
+	LEVEL_UP_MOVE(98, MOVE_SAFEGUARD),
 	LEVEL_UP_END
 };
 
@@ -15563,22 +15621,24 @@ static const struct LevelUpMove sHoopaUnboundLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sVolcanionLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_STEAMERUPTION),
-	LEVEL_UP_MOVE( 1, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE( 8, MOVE_MIST),
-	LEVEL_UP_MOVE(11, MOVE_HAZE),
-	LEVEL_UP_MOVE(15, MOVE_FLAMECHARGE),
-	LEVEL_UP_MOVE(21, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE(28, MOVE_STOMP),
-	LEVEL_UP_MOVE(32, MOVE_SCALD),
-	LEVEL_UP_MOVE(40, MOVE_WEATHERBALL),
-	LEVEL_UP_MOVE(46, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(50, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE(58, MOVE_FLAREBLITZ),
-	LEVEL_UP_MOVE(65, MOVE_OVERHEAT),
-	LEVEL_UP_MOVE(76, MOVE_EXPLOSION),
-	LEVEL_UP_MOVE(85, MOVE_STEAMERUPTION),
+	LEVEL_UP_MOVE( 1, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
+	LEVEL_UP_MOVE( 6, MOVE_LEER),
+	LEVEL_UP_MOVE(12, MOVE_WEATHERBALL),
+	LEVEL_UP_MOVE(18, MOVE_FLAMECHARGE),
+	LEVEL_UP_MOVE(24, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE(30, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(36, MOVE_INCINERATE),
+	LEVEL_UP_MOVE(42, MOVE_STOMP),
+	LEVEL_UP_MOVE(48, MOVE_SCALD),
+	LEVEL_UP_MOVE(54, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(60, MOVE_MIST),
+	LEVEL_UP_MOVE(60, MOVE_HAZE),
+	LEVEL_UP_MOVE(66, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(72, MOVE_STEAMERUPTION),
+	LEVEL_UP_MOVE(78, MOVE_FLAREBLITZ),
+	LEVEL_UP_MOVE(84, MOVE_OVERHEAT),
+	LEVEL_UP_MOVE(90, MOVE_EXPLOSION),
 	LEVEL_UP_END
 };
 
@@ -16905,90 +16965,95 @@ static const struct LevelUpMove sKommoOLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sTapuKokoLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_ELECTRICTERRAIN),
-	LEVEL_UP_MOVE( 1, MOVE_BRAVEBIRD),
-	LEVEL_UP_MOVE( 1, MOVE_POWERSWAP),
-	LEVEL_UP_MOVE( 1, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE( 1, MOVE_MIRRORMOVE),
+	LEVEL_UP_MOVE( 1, MOVE_ELECTROBALL),
 	LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK),
-	LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 8, MOVE_SPARK),
-	LEVEL_UP_MOVE(14, MOVE_SHOCKWAVE),
-	LEVEL_UP_MOVE(20, MOVE_SCREECH),
-	LEVEL_UP_MOVE(26, MOVE_CHARGE),
-	LEVEL_UP_MOVE(32, MOVE_WILDCHARGE),
-	LEVEL_UP_MOVE(38, MOVE_MIRRORMOVE),
-	LEVEL_UP_MOVE(43, MOVE_NATURESMADNESS),
-	LEVEL_UP_MOVE(48, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(53, MOVE_AGILITY),
-	LEVEL_UP_MOVE(58, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
+	LEVEL_UP_MOVE( 1, MOVE_FAIRYWIND),
+	LEVEL_UP_MOVE(15, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE(20, MOVE_SPARK),
+	LEVEL_UP_MOVE(25, MOVE_SHOCKWAVE),
+	LEVEL_UP_MOVE(30, MOVE_CHARGE),
+	LEVEL_UP_MOVE(35, MOVE_AGILITY),
+	LEVEL_UP_MOVE(40, MOVE_SCREECH),
+	LEVEL_UP_MOVE(45, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(50, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(55, MOVE_NATURESMADNESS),
+	LEVEL_UP_MOVE(60, MOVE_WILDCHARGE),
+	LEVEL_UP_MOVE(65, MOVE_BRAVEBIRD),
+	LEVEL_UP_MOVE(70, MOVE_POWERSWAP),
+	LEVEL_UP_MOVE(75, MOVE_ELECTRICTERRAIN),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sTapuLeleLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_PSYCHICTERRAIN),
-	LEVEL_UP_MOVE( 1, MOVE_AROMATICMIST),
-	LEVEL_UP_MOVE( 1, MOVE_AROMATHERAPY),
-	LEVEL_UP_MOVE( 1, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE( 1, MOVE_DRAININGKISS),
+	LEVEL_UP_MOVE( 1, MOVE_PSYWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
 	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
-	LEVEL_UP_MOVE( 8, MOVE_PSYWAVE),
-	LEVEL_UP_MOVE(14, MOVE_PSYBEAM),
-	LEVEL_UP_MOVE(20, MOVE_SWEETSCENT),
-	LEVEL_UP_MOVE(26, MOVE_SKILLSWAP),
-	LEVEL_UP_MOVE(32, MOVE_PSYSHOCK),
-	LEVEL_UP_MOVE(38, MOVE_TICKLE),
-	LEVEL_UP_MOVE(43, MOVE_NATURESMADNESS),
-	LEVEL_UP_MOVE(48, MOVE_EXTRASENSORY),
-	LEVEL_UP_MOVE(53, MOVE_FLATTER),
-	LEVEL_UP_MOVE(58, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
+	LEVEL_UP_MOVE( 1, MOVE_AROMATHERAPY),
+	LEVEL_UP_MOVE(15, MOVE_DRAININGKISS),
+	LEVEL_UP_MOVE(20, MOVE_PSYBEAM),
+	LEVEL_UP_MOVE(25, MOVE_FLATTER),
+	LEVEL_UP_MOVE(30, MOVE_AROMATICMIST),
+	LEVEL_UP_MOVE(35, MOVE_SWEETSCENT),
+	LEVEL_UP_MOVE(40, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(45, MOVE_PSYSHOCK),
+	LEVEL_UP_MOVE(50, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(55, MOVE_NATURESMADNESS),
+	LEVEL_UP_MOVE(60, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(65, MOVE_TICKLE),
+	LEVEL_UP_MOVE(70, MOVE_SKILLSWAP),
+	LEVEL_UP_MOVE(75, MOVE_PSYCHICTERRAIN),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sTapuBuluLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_GRASSYTERRAIN),
-	LEVEL_UP_MOVE( 1, MOVE_WOODHAMMER),
+	LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
+	LEVEL_UP_MOVE( 1, MOVE_GIGADRAIN),
 	LEVEL_UP_MOVE( 1, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE( 1, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE( 1, MOVE_DISABLE),
-	LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND),
-	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
 	LEVEL_UP_MOVE( 1, MOVE_LEAFAGE),
-	LEVEL_UP_MOVE( 8, MOVE_HORNATTACK),
-	LEVEL_UP_MOVE(14, MOVE_GIGADRAIN),
-	LEVEL_UP_MOVE(20, MOVE_SCARYFACE),
-	LEVEL_UP_MOVE(26, MOVE_LEECHSEED),
-	LEVEL_UP_MOVE(32, MOVE_HORNLEECH),
-	LEVEL_UP_MOVE(38, MOVE_ROTOTILLER),
-	LEVEL_UP_MOVE(43, MOVE_NATURESMADNESS),
-	LEVEL_UP_MOVE(48, MOVE_ZENHEADBUTT),
-	LEVEL_UP_MOVE(53, MOVE_MEGAHORN),
-	LEVEL_UP_MOVE(58, MOVE_SKULLBASH),
+	LEVEL_UP_MOVE( 1, MOVE_ROCKSMASH),
+	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
+	LEVEL_UP_MOVE( 1, MOVE_DISABLE),
+	LEVEL_UP_MOVE(15, MOVE_LEECHSEED),
+	LEVEL_UP_MOVE(20, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(25, MOVE_WHIRLWIND),
+	LEVEL_UP_MOVE(30, MOVE_HORNATTACK),
+	LEVEL_UP_MOVE(35, MOVE_SCARYFACE),
+	LEVEL_UP_MOVE(40, MOVE_HORNLEECH),
+	LEVEL_UP_MOVE(45, MOVE_ZENHEADBUTT),
+	LEVEL_UP_MOVE(50, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(55, MOVE_NATURESMADNESS),
+	LEVEL_UP_MOVE(60, MOVE_WOODHAMMER),
+	LEVEL_UP_MOVE(65, MOVE_MEGAHORN),
+	LEVEL_UP_MOVE(70, MOVE_SKULLBASH),
+	LEVEL_UP_MOVE(75, MOVE_GRASSYTERRAIN),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sTapuFiniLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_MISTYTERRAIN),
-	LEVEL_UP_MOVE( 1, MOVE_MOONBLAST),
-	LEVEL_UP_MOVE( 1, MOVE_HEALPULSE),
-	LEVEL_UP_MOVE( 1, MOVE_MEANLOOK),
-	LEVEL_UP_MOVE( 1, MOVE_HAZE),
-	LEVEL_UP_MOVE( 1, MOVE_MIST),
-	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
+	LEVEL_UP_MOVE( 1, MOVE_WHIRLPOOL),
+	LEVEL_UP_MOVE( 1, MOVE_REFRESH),
+	LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE),
 	LEVEL_UP_MOVE( 1, MOVE_WATERGUN),
-	LEVEL_UP_MOVE( 8, MOVE_WATERPULSE),
-	LEVEL_UP_MOVE(14, MOVE_WHIRLPOOL),
-	LEVEL_UP_MOVE(20, MOVE_SOAK),
-	LEVEL_UP_MOVE(26, MOVE_REFRESH),
-	LEVEL_UP_MOVE(32, MOVE_BRINE),
-	LEVEL_UP_MOVE(38, MOVE_DEFOG),
-	LEVEL_UP_MOVE(43, MOVE_NATURESMADNESS),
-	LEVEL_UP_MOVE(48, MOVE_MUDDYWATER),
-	LEVEL_UP_MOVE(53, MOVE_AQUARING),
-	LEVEL_UP_MOVE(58, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE( 1, MOVE_WITHDRAW),
+	LEVEL_UP_MOVE( 1, MOVE_MIST),
+	LEVEL_UP_MOVE(10, MOVE_HAZE),
+	LEVEL_UP_MOVE(15, MOVE_AQUARING),
+	LEVEL_UP_MOVE(20, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE(25, MOVE_BRINE),
+	LEVEL_UP_MOVE(30, MOVE_DEFOG),
+	LEVEL_UP_MOVE(35, MOVE_HEALPULSE),
+	LEVEL_UP_MOVE(40, MOVE_SURF),
+	LEVEL_UP_MOVE(45, MOVE_MUDDYWATER),
+	LEVEL_UP_MOVE(50, MOVE_MEANLOOK),
+	LEVEL_UP_MOVE(55, MOVE_NATURESMADNESS),
+	LEVEL_UP_MOVE(60, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(65, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(70, MOVE_SOAK),
+	LEVEL_UP_MOVE(75, MOVE_MISTYTERRAIN),
 	LEVEL_UP_END
 };
 
@@ -17001,7 +17066,7 @@ static const struct LevelUpMove sCosmogLevelUpLearnset[] = {
 static const struct LevelUpMove sCosmoemLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_COSMICPOWER),
 	LEVEL_UP_MOVE( 1, MOVE_TELEPORT),
-	LEVEL_UP_MOVE( 42, MOVE_COSMICPOWER),
+	LEVEL_UP_MOVE(42, MOVE_COSMICPOWER),
 	LEVEL_UP_END
 };
 
@@ -17051,163 +17116,166 @@ static const struct LevelUpMove sLunalaLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sNihilegoLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_POWERSPLIT),
-	LEVEL_UP_MOVE( 1, MOVE_GUARDSPLIT),
-	LEVEL_UP_MOVE( 1, MOVE_TICKLE),
-	LEVEL_UP_MOVE( 1, MOVE_ACID),
+	LEVEL_UP_MOVE( 1, MOVE_PSYWAVE),
 	LEVEL_UP_MOVE( 1, MOVE_CONSTRICT),
+	LEVEL_UP_MOVE( 1, MOVE_WRAP),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
-	LEVEL_UP_MOVE( 7, MOVE_CLEARSMOG),
-	LEVEL_UP_MOVE(13, MOVE_PSYWAVE),
-	LEVEL_UP_MOVE(19, MOVE_HEADBUTT),
-	LEVEL_UP_MOVE(23, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(29, MOVE_TOXICSPIKES),
-	LEVEL_UP_MOVE(31, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(37, MOVE_POWERGEM),
-	LEVEL_UP_MOVE(43, MOVE_MIRRORCOAT),
-	LEVEL_UP_MOVE(47, MOVE_ACIDSPRAY),
-	LEVEL_UP_MOVE(53, MOVE_VENOMDRENCH),
-	LEVEL_UP_MOVE(59, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(67, MOVE_WONDERROOM),
-	LEVEL_UP_MOVE(73, MOVE_HEADSMASH),
+	LEVEL_UP_MOVE( 1, MOVE_ACID),
+	LEVEL_UP_MOVE(10, MOVE_TICKLE),
+	LEVEL_UP_MOVE(15, MOVE_ACIDSPRAY),
+	LEVEL_UP_MOVE(20, MOVE_CLEARSMOG),
+	LEVEL_UP_MOVE(25, MOVE_POWERSPLIT),
+	LEVEL_UP_MOVE(25, MOVE_GUARDSPLIT),
+	LEVEL_UP_MOVE(30, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(35, MOVE_HEADBUTT),
+	LEVEL_UP_MOVE(40, MOVE_TOXICSPIKES),
+	LEVEL_UP_MOVE(45, MOVE_VENOMDRENCH),
+	LEVEL_UP_MOVE(50, MOVE_POWERGEM),
+	LEVEL_UP_MOVE(55, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(60, MOVE_MIRRORCOAT),
+	LEVEL_UP_MOVE(65, MOVE_WONDERROOM),
+	LEVEL_UP_MOVE(70, MOVE_HEADSMASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBuzzwoleLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE( 1, MOVE_LEECHFANG),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_ICEPUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_REVERSAL),
-	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 1, MOVE_COMETPUNCH),
 	LEVEL_UP_MOVE( 1, MOVE_POWERUPPUNCH),
-	LEVEL_UP_MOVE( 1, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE( 7, MOVE_COMETPUNCH),
-	LEVEL_UP_MOVE(13, MOVE_BULKUP),
-	LEVEL_UP_MOVE(19, MOVE_VITALTHROW),
-	LEVEL_UP_MOVE(23, MOVE_ENDURE),
-	LEVEL_UP_MOVE(29, MOVE_LEECHFANG),
-	LEVEL_UP_MOVE(31, MOVE_TAUNT),
-	LEVEL_UP_MOVE(37, MOVE_MEGAPUNCH),
-	LEVEL_UP_MOVE(43, MOVE_COUNTER),
-	LEVEL_UP_MOVE(47, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(53, MOVE_LUNGE),
-	LEVEL_UP_MOVE(59, MOVE_DYNAMICPUNCH),
-	LEVEL_UP_MOVE(67, MOVE_SUPERPOWER),
-	LEVEL_UP_MOVE(73, MOVE_FOCUSPUNCH),
+	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 1, MOVE_TAUNT),
+	LEVEL_UP_MOVE( 1, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE(15, MOVE_VITALTHROW),
+	LEVEL_UP_MOVE(20, MOVE_BULKUP),
+	LEVEL_UP_MOVE(25, MOVE_ENDURE),
+	LEVEL_UP_MOVE(30, MOVE_REVERSAL),
+	LEVEL_UP_MOVE(35, MOVE_MEGAPUNCH),
+	LEVEL_UP_MOVE(40, MOVE_LUNGE),
+	LEVEL_UP_MOVE(45, MOVE_FOCUSENERGY),
+	LEVEL_UP_MOVE(50, MOVE_DYNAMICPUNCH),
+	LEVEL_UP_MOVE(55, MOVE_COUNTER),
+	LEVEL_UP_MOVE(60, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(65, MOVE_SUPERPOWER),
+	LEVEL_UP_MOVE(70, MOVE_FOCUSPUNCH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sPheromosaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_QUIVERDANCE),
-	LEVEL_UP_MOVE( 1, MOVE_QUICKGUARD),
-	LEVEL_UP_MOVE( 1, MOVE_LOWKICK),
+	LEVEL_UP_MOVE( 1, MOVE_JUMPKICK),
+	LEVEL_UP_MOVE( 1, MOVE_SWIFT),
+	LEVEL_UP_MOVE( 1, MOVE_MEFIRST),
+	LEVEL_UP_MOVE( 1, MOVE_FEINT),
 	LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN),
 	LEVEL_UP_MOVE( 1, MOVE_LEER),
-	LEVEL_UP_MOVE( 1, MOVE_DOUBLEKICK),
-	LEVEL_UP_MOVE( 7, MOVE_SWIFT),
-	LEVEL_UP_MOVE(13, MOVE_STOMP),
-	LEVEL_UP_MOVE(19, MOVE_FEINT),
-	LEVEL_UP_MOVE(23, MOVE_SILVERWIND),
-	LEVEL_UP_MOVE(29, MOVE_BOUNCE),
-	LEVEL_UP_MOVE(31, MOVE_JUMPKICK),
-	LEVEL_UP_MOVE(37, MOVE_AGILITY),
-	LEVEL_UP_MOVE(43, MOVE_TRIPLEKICK),
-	LEVEL_UP_MOVE(47, MOVE_LUNGE),
-	LEVEL_UP_MOVE(53, MOVE_BUGBUZZ),
-	LEVEL_UP_MOVE(59, MOVE_MEFIRST),
-	LEVEL_UP_MOVE(67, MOVE_HIGHJUMPKICK),
-	LEVEL_UP_MOVE(73, MOVE_SPEEDSWAP),
+	LEVEL_UP_MOVE( 1, MOVE_QUICKGUARD),
+	LEVEL_UP_MOVE(15, MOVE_BUGBITE),
+	LEVEL_UP_MOVE(20, MOVE_LOWKICK),
+	LEVEL_UP_MOVE(25, MOVE_DOUBLEKICK),
+	LEVEL_UP_MOVE(30, MOVE_TRIPLEKICK),
+	LEVEL_UP_MOVE(35, MOVE_STOMP),
+	LEVEL_UP_MOVE(40, MOVE_AGILITY),
+	LEVEL_UP_MOVE(45, MOVE_LUNGE),
+	LEVEL_UP_MOVE(50, MOVE_BOUNCE),
+	LEVEL_UP_MOVE(55, MOVE_SPEEDSWAP),
+	LEVEL_UP_MOVE(60, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(65, MOVE_QUIVERDANCE),
+	LEVEL_UP_MOVE(70, MOVE_HIGHJUMPKICK),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sXurkitreeLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_TAILGLOW),
-	LEVEL_UP_MOVE( 1, MOVE_SPARK),
-	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	LEVEL_UP_MOVE( 1, MOVE_SIGNALBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_IONDELUGE),
 	LEVEL_UP_MOVE( 1, MOVE_WRAP),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 7, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE(13, MOVE_SHOCKWAVE),
-	LEVEL_UP_MOVE(19, MOVE_INGRAIN),
-	LEVEL_UP_MOVE(23, MOVE_THUNDERPUNCH),
-	LEVEL_UP_MOVE(29, MOVE_EERIEIMPULSE),
-	LEVEL_UP_MOVE(31, MOVE_SIGNALBEAM),
-	LEVEL_UP_MOVE(37, MOVE_THUNDERBOLT),
-	LEVEL_UP_MOVE(43, MOVE_HYPNOSIS),
-	LEVEL_UP_MOVE(47, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(53, MOVE_ELECTRICTERRAIN),
-	LEVEL_UP_MOVE(59, MOVE_POWERWHIP),
-	LEVEL_UP_MOVE(67, MOVE_IONDELUGE),
-	LEVEL_UP_MOVE(73, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(15, MOVE_INGRAIN),
+	LEVEL_UP_MOVE(20, MOVE_SPARK),
+	LEVEL_UP_MOVE(25, MOVE_SHOCKWAVE),
+	LEVEL_UP_MOVE(30, MOVE_HYPNOSIS),
+	LEVEL_UP_MOVE(35, MOVE_EERIEIMPULSE),
+	LEVEL_UP_MOVE(40, MOVE_THUNDERPUNCH),
+	LEVEL_UP_MOVE(45, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(50, MOVE_MAGNETRISE),
+	LEVEL_UP_MOVE(55, MOVE_THUNDERBOLT),
+	LEVEL_UP_MOVE(60, MOVE_ELECTRICTERRAIN),
+	LEVEL_UP_MOVE(65, MOVE_POWERWHIP),
+	LEVEL_UP_MOVE(70, MOVE_ZAPCANNON),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCelesteelaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_WIDEGUARD),
 	LEVEL_UP_MOVE( 1, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE( 1, MOVE_INGRAIN),
+	LEVEL_UP_MOVE( 1, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE( 1, MOVE_SEEDBOMB),
 	LEVEL_UP_MOVE( 1, MOVE_ABSORB),
-	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 7, MOVE_SMACKDOWN),
-	LEVEL_UP_MOVE(13, MOVE_MEGADRAIN),
-	LEVEL_UP_MOVE(19, MOVE_LEECHSEED),
-	LEVEL_UP_MOVE(23, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(29, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(31, MOVE_GIGADRAIN),
-	LEVEL_UP_MOVE(37, MOVE_FLASHCANNON),
-	LEVEL_UP_MOVE(43, MOVE_AUTOTOMIZE),
-	LEVEL_UP_MOVE(47, MOVE_SEEDBOMB),
-	LEVEL_UP_MOVE(53, MOVE_SKULLBASH),
-	LEVEL_UP_MOVE(59, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(67, MOVE_HEAVYSLAM),
-	LEVEL_UP_MOVE(73, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 1, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(15, MOVE_MEGADRAIN),
+	LEVEL_UP_MOVE(20, MOVE_SMACKDOWN),
+	LEVEL_UP_MOVE(25, MOVE_INGRAIN),
+	LEVEL_UP_MOVE(30, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(35, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(40, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(45, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(50, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(55, MOVE_LEECHSEED),
+	LEVEL_UP_MOVE(60, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(65, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(70, MOVE_SKULLBASH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sKartanaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_SACREDSWORD),
-	LEVEL_UP_MOVE( 1, MOVE_DEFOG),
-	LEVEL_UP_MOVE( 1, MOVE_VACUUMWAVE),
-	LEVEL_UP_MOVE( 1, MOVE_AIRCUTTER),
+	LEVEL_UP_MOVE( 1, MOVE_PSYCHOCUT),
+	LEVEL_UP_MOVE( 1, MOVE_AIRSLASH),
+	LEVEL_UP_MOVE( 1, MOVE_XSCISSOR),
 	LEVEL_UP_MOVE( 1, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE( 1, MOVE_CUT),
-	LEVEL_UP_MOVE( 7, MOVE_FALSESWIPE),
-	LEVEL_UP_MOVE(13, MOVE_RAZORLEAF),
-	LEVEL_UP_MOVE(19, MOVE_SYNTHESIS),
-	LEVEL_UP_MOVE(23, MOVE_AERIALACE),
-	LEVEL_UP_MOVE(29, MOVE_LASERFOCUS),
-	LEVEL_UP_MOVE(31, MOVE_NIGHTSLASH),
-	LEVEL_UP_MOVE(37, MOVE_SWORDSDANCE),
-	LEVEL_UP_MOVE(43, MOVE_LEAFBLADE),
-	LEVEL_UP_MOVE(47, MOVE_XSCISSOR),
-	LEVEL_UP_MOVE(53, MOVE_DETECT),
-	LEVEL_UP_MOVE(59, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(67, MOVE_PSYCHOCUT),
-	LEVEL_UP_MOVE(73, MOVE_GUILLOTINE),
+	LEVEL_UP_MOVE( 1, MOVE_VACUUMWAVE),
+	LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF),
+	LEVEL_UP_MOVE( 1, MOVE_FALSESWIPE),
+	LEVEL_UP_MOVE(15, MOVE_CUT),
+	LEVEL_UP_MOVE(20, MOVE_AIRCUTTER),
+	LEVEL_UP_MOVE(25, MOVE_AERIALACE),
+	LEVEL_UP_MOVE(30, MOVE_DETECT),
+	LEVEL_UP_MOVE(35, MOVE_NIGHTSLASH),
+	LEVEL_UP_MOVE(40, MOVE_SYNTHESIS),
+	LEVEL_UP_MOVE(45, MOVE_LASERFOCUS),
+	LEVEL_UP_MOVE(50, MOVE_DEFOG),
+	LEVEL_UP_MOVE(55, MOVE_LEAFBLADE),
+	LEVEL_UP_MOVE(60, MOVE_SACREDSWORD),
+	LEVEL_UP_MOVE(65, MOVE_SWORDSDANCE),
+	LEVEL_UP_MOVE(70, MOVE_GUILLOTINE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sGuzzlordLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_BELCH),
-	LEVEL_UP_MOVE( 1, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE( 1, MOVE_WRINGOUT),
+	LEVEL_UP_MOVE( 1, MOVE_IRONTAIL),
+	LEVEL_UP_MOVE( 1, MOVE_STEAMROLLER),
+	LEVEL_UP_MOVE( 1, MOVE_BRUTALSWING),
+	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_DRAGONTAIL),
 	LEVEL_UP_MOVE( 1, MOVE_SWALLOW),
 	LEVEL_UP_MOVE( 1, MOVE_STOCKPILE),
-	LEVEL_UP_MOVE( 1, MOVE_DRAGONRAGE),
-	LEVEL_UP_MOVE( 1, MOVE_BITE),
-	LEVEL_UP_MOVE( 7, MOVE_STOMP),
-	LEVEL_UP_MOVE(13, MOVE_BRUTALSWING),
-	LEVEL_UP_MOVE(19, MOVE_STEAMROLLER),
-	LEVEL_UP_MOVE(23, MOVE_DRAGONTAIL),
-	LEVEL_UP_MOVE(29, MOVE_IRONTAIL),
-	LEVEL_UP_MOVE(31, MOVE_STOMPINGTANTRUM),
-	LEVEL_UP_MOVE(37, MOVE_CRUNCH),
-	LEVEL_UP_MOVE(43, MOVE_HAMMERARM),
-	LEVEL_UP_MOVE(47, MOVE_THRASH),
-	LEVEL_UP_MOVE(53, MOVE_GASTROACID),
-	LEVEL_UP_MOVE(59, MOVE_HEAVYSLAM),
-	LEVEL_UP_MOVE(67, MOVE_WRINGOUT),
-	LEVEL_UP_MOVE(73, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(10, MOVE_KNOCKOFF),
+	LEVEL_UP_MOVE(15, MOVE_STOMP),
+	LEVEL_UP_MOVE(20, MOVE_STOMPINGTANTRUM),
+	LEVEL_UP_MOVE(25, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(30, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(35, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(40, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(45, MOVE_HAMMERARM),
+	LEVEL_UP_MOVE(50, MOVE_HEAVYSLAM),
+	LEVEL_UP_MOVE(55, MOVE_DRAGONRUSH),
+	LEVEL_UP_MOVE(60, MOVE_BELCH),
+	LEVEL_UP_MOVE(65, MOVE_THRASH),
+	LEVEL_UP_MOVE(70, MOVE_GIGAIMPACT),
 	LEVEL_UP_END
 };
 
@@ -17786,67 +17854,77 @@ static const struct LevelUpMove sPoipoleLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
 	LEVEL_UP_MOVE( 1, MOVE_ACID),
 	LEVEL_UP_MOVE( 7, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE(13, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(19, MOVE_CHARM),
-	LEVEL_UP_MOVE(23, MOVE_VENOMDRENCH),
-	LEVEL_UP_MOVE(31, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(37, MOVE_POISONJAB),
-	LEVEL_UP_MOVE(41, MOVE_TOXIC),
-	LEVEL_UP_MOVE(47, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE(14, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE(21, MOVE_CHARM),
+	LEVEL_UP_MOVE(28, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(35, MOVE_VENOMDRENCH),
+	LEVEL_UP_MOVE(42, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(49, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(56, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(63, MOVE_TOXIC),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sNaganadelLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_AIRCUTTER),
-	LEVEL_UP_MOVE( 1, MOVE_AIRCUTTER),
+	LEVEL_UP_MOVE( 1, MOVE_AIRSLASH),
 	LEVEL_UP_MOVE( 1, MOVE_DRAGONPULSE),
 	LEVEL_UP_MOVE( 1, MOVE_PECK),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
 	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
 	LEVEL_UP_MOVE( 1, MOVE_ACID),
 	LEVEL_UP_MOVE( 7, MOVE_FURYATTACK),
-	LEVEL_UP_MOVE(13, MOVE_VENOSHOCK),
-	LEVEL_UP_MOVE(19, MOVE_CHARM),
-	LEVEL_UP_MOVE(23, MOVE_VENOMDRENCH),
-	LEVEL_UP_MOVE(31, MOVE_NASTYPLOT),
-	LEVEL_UP_MOVE(37, MOVE_POISONJAB),
-	LEVEL_UP_MOVE(41, MOVE_TOXIC),
-	LEVEL_UP_MOVE(47, MOVE_FELLSTINGER),
-	LEVEL_UP_MOVE(53, MOVE_AIRSLASH),
-	LEVEL_UP_MOVE(61, MOVE_DRAGONPULSE),
+	LEVEL_UP_MOVE(14, MOVE_FELLSTINGER),
+	LEVEL_UP_MOVE(21, MOVE_CHARM),
+	LEVEL_UP_MOVE(28, MOVE_VENOSHOCK),
+	LEVEL_UP_MOVE(35, MOVE_VENOMDRENCH),
+	LEVEL_UP_MOVE(42, MOVE_NASTYPLOT),
+	LEVEL_UP_MOVE(49, MOVE_POISONJAB),
+	LEVEL_UP_MOVE(56, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(63, MOVE_TOXIC),
+	LEVEL_UP_MOVE(70, MOVE_DRAGONRUSH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sStakatakaLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_PROTECT),
+	LEVEL_UP_MOVE( 1, MOVE_BIDE),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-	LEVEL_UP_MOVE( 5, MOVE_ROCKSLIDE),
-	LEVEL_UP_MOVE(11, MOVE_STEALTHROCK),
-	LEVEL_UP_MOVE(17, MOVE_BIDE),
-	LEVEL_UP_MOVE(19, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(23, MOVE_ROCKTHROW),
-	LEVEL_UP_MOVE(31, MOVE_AUTOTOMIZE),
-	LEVEL_UP_MOVE(37, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(43, MOVE_IRONHEAD),
-	LEVEL_UP_MOVE(47, MOVE_ROCKBLAST),
-	LEVEL_UP_MOVE(53, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(61, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 5, MOVE_ROCKTHROW),
+	LEVEL_UP_MOVE(10, MOVE_PROTECT),
+	LEVEL_UP_MOVE(15, MOVE_STOMP),
+	LEVEL_UP_MOVE(20, MOVE_BLOCK),
+	LEVEL_UP_MOVE(25, MOVE_ROCKSLIDE),
+	LEVEL_UP_MOVE(30, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(35, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(40, MOVE_ROCKBLAST),
+	LEVEL_UP_MOVE(45, MOVE_MAGNETRISE),
+	LEVEL_UP_MOVE(50, MOVE_IRONDEFENSE),
+	LEVEL_UP_MOVE(55, MOVE_IRONHEAD),
+	LEVEL_UP_MOVE(60, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(65, MOVE_STEALTHROCK),
+	LEVEL_UP_MOVE(70, MOVE_DOUBLEEDGE),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sBlacephalonLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_EMBER),
+	LEVEL_UP_MOVE( 1, MOVE_STOREDPOWER),
 	LEVEL_UP_MOVE( 1, MOVE_ASTONISH),
-	LEVEL_UP_MOVE( 7, MOVE_MAGICCOAT),
-	LEVEL_UP_MOVE(13, MOVE_STOREDPOWER),
-	LEVEL_UP_MOVE(17, MOVE_FLAMEBURST),
-	LEVEL_UP_MOVE(23, MOVE_NIGHTSHADE),
-	LEVEL_UP_MOVE(29, MOVE_LIGHTSCREEN),
-	LEVEL_UP_MOVE(31, MOVE_CALMMIND),
-	LEVEL_UP_MOVE(37, MOVE_FIREBLAST),
-	LEVEL_UP_MOVE(41, MOVE_SHADOWBALL),
-	LEVEL_UP_MOVE(47, MOVE_TRICK),
-	LEVEL_UP_MOVE(59, MOVE_MINDBLOWN),
+	LEVEL_UP_MOVE( 1, MOVE_FIRESPIN),
+	LEVEL_UP_MOVE( 5, MOVE_LIGHTSCREEN),
+	LEVEL_UP_MOVE(10, MOVE_EMBER),
+	LEVEL_UP_MOVE(15, MOVE_NIGHTSHADE),
+	LEVEL_UP_MOVE(20, MOVE_CONFUSERAY),
+	LEVEL_UP_MOVE(25, MOVE_MAGICCOAT),
+	LEVEL_UP_MOVE(30, MOVE_FLAMEBURST),
+	LEVEL_UP_MOVE(35, MOVE_HYPNOSIS),
+	LEVEL_UP_MOVE(40, MOVE_MYSTICALFIRE),
+	LEVEL_UP_MOVE(45, MOVE_SHADOWBALL),
+	LEVEL_UP_MOVE(50, MOVE_CALMMIND),
+	LEVEL_UP_MOVE(55, MOVE_WILLOWISP),
+	LEVEL_UP_MOVE(60, MOVE_TRICK),
+	LEVEL_UP_MOVE(65, MOVE_FIREBLAST),
+	LEVEL_UP_MOVE(70, MOVE_MINDBLOWN),
 	LEVEL_UP_END
 };
 
diff --git a/src/tm_compatibility/127 - Waterfall.txt b/src/tm_compatibility/127 - Waterfall.txt
index c661b12..18127aa 100644
--- a/src/tm_compatibility/127 - Waterfall.txt	
+++ b/src/tm_compatibility/127 - Waterfall.txt	
@@ -113,6 +113,7 @@ BASCULIN_RED
 BASCULIN_BLUE
 TIRTOUGA
 CARRACOSTA
+SWANNA
 FRILLISH
 FRILLISH_F
 JELLICENT
diff --git a/src/updated_code.c b/src/updated_code.c
index c677407..97a21a9 100644
--- a/src/updated_code.c
+++ b/src/updated_code.c
@@ -162,7 +162,7 @@ const u32* GetFrontSpritePalFromSpeciesAndPersonality(u16 species, u32 otId, u32
 		return (u32*) gMonPaletteTable[0].data;
 
 	shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality);
-	if (shinyValue < 8)
+	if (shinyValue < 16)
 		return (u32*) gMonShinyPaletteTable[species].data;
 	else
 		return (u32*) gMonPaletteTable[species].data;
@@ -174,7 +174,7 @@ const struct CompressedSpritePalette* GetMonSpritePalStructFromOtIdPersonality(u
 	species = TryGetFemaleGenderedSpecies(species, personality);
 
 	shinyValue = HIHALF(otId) ^ LOHALF(otId) ^ HIHALF(personality) ^ LOHALF(personality);
-	if (shinyValue < 8)
+	if (shinyValue < 16)
 		return &gMonShinyPaletteTable[species];
 	else
 		return &gMonPaletteTable[species];