diff --git a/src/Base_Stats.c b/src/Base_Stats.c
index d7f9ed8..0e160d2 100644
--- a/src/Base_Stats.c
+++ b/src/Base_Stats.c
@@ -2934,7 +2934,7 @@ const struct BaseStats gBaseStats[] =
 		.evYield_SpDefense 	= 0,
 		.evYield_Speed 		= 0,
 		.item1 = ITEM_BLACK_SLUDGE,
-		.item2 = ITEM_NONE,
+		.item2 = ITEM_TOXIC_ORB,
 		.genderRatio = PERCENT_FEMALE(50),
 		.eggCycles = 20,
 		.friendship = 50,
@@ -7528,7 +7528,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_SLOW,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_MOXIE,
+		.ability1 = ABILITY_EARLYBIRD,
 		.ability2 = ABILITY_FLASHFIRE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_UNNERVE,
@@ -7561,7 +7561,7 @@ const struct BaseStats gBaseStats[] =
 		.growthRate = GROWTH_SLOW,
 		.eggGroup1 = EGG_GROUP_FIELD,
 		.eggGroup2 = EGG_GROUP_FIELD,
-		.ability1 = ABILITY_MOXIE,
+		.ability1 = ABILITY_EARLYBIRD,
 		.ability2 = ABILITY_FLASHFIRE,
 		.safariZoneFleeRate = 0,
 		.hiddenAbility = ABILITY_UNNERVE,
diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c
index 2e25b7d..ddbddbc 100644
--- a/src/Egg_Moves.c
+++ b/src/Egg_Moves.c
@@ -988,6 +988,7 @@ const u16 gEggMoves[] =
 		MOVE_TICKLE,
 		MOVE_MISTYTERRAIN,
 		MOVE_HEALPULSE,
+		MOVE_COSMICPOWER,
 		MOVE_TELEPORT,
 		MOVE_SOFTBOILED),
 
@@ -2571,7 +2572,7 @@ const u16 gEggMoves[] =
 		MOVE_CRUNCH,
 		MOVE_SCARYFACE,
 		MOVE_ASTONISH,
-		MOVE_BITE,
+		MOVE_PUNISHMENT,
 		MOVE_HAZE,
 		MOVE_IRONTAIL,
 		MOVE_FOULPLAY,
@@ -3339,9 +3340,10 @@ const u16 gEggMoves[] =
 		MOVE_FEINTATTACK,
 		MOVE_CAMOUFLAGE,
 		MOVE_LUNGE,
-		MOVE_STRUGGLEBUG,
+		MOVE_BUGBITE,
 		MOVE_DOUBLETEAM,
-		MOVE_INFESTATION),
+		MOVE_INFESTATION,
+		MOVE_FURYCUTTER),
 
 	egg_moves(FERROSEED,
 		MOVE_BULLETSEED,
diff --git a/src/Learnsets.c b/src/Learnsets.c
index f162360..7de3c86 100644
--- a/src/Learnsets.c
+++ b/src/Learnsets.c
@@ -690,6 +690,11 @@ static const struct LevelUpMove sNidokingLevelUpLearnset[] = {
 
 static const struct LevelUpMove sClefairyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_SPOTLIGHT),
+	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
+	LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
+	LEVEL_UP_MOVE( 1, MOVE_SWEETKISS),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
+	LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF),
 	LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
@@ -704,41 +709,46 @@ static const struct LevelUpMove sClefairyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(25, MOVE_MINIMIZE),
 	LEVEL_UP_MOVE(28, MOVE_STOREDPOWER),
 	LEVEL_UP_MOVE(31, MOVE_METRONOME),
-	LEVEL_UP_MOVE(34, MOVE_COSMICPOWER),
-	LEVEL_UP_MOVE(37, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(40, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(43, MOVE_MOONLIGHT),
-	LEVEL_UP_MOVE(46, MOVE_MOONBLAST),
-	LEVEL_UP_MOVE(49, MOVE_GRAVITY),
-	LEVEL_UP_MOVE(50, MOVE_METEORMASH),
-	LEVEL_UP_MOVE(55, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE(58, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE(34, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE(37, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(40, MOVE_MOONLIGHT),
+	LEVEL_UP_MOVE(43, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE(46, MOVE_GRAVITY),
+	LEVEL_UP_MOVE(49, MOVE_METEORMASH),
+	LEVEL_UP_MOVE(50, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE(55, MOVE_AFTERYOU),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sClefableLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_SING),
-	LEVEL_UP_MOVE( 1, MOVE_SWEETKISS),
-	LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE),
-	LEVEL_UP_MOVE( 1, MOVE_ENCORE),
-	LEVEL_UP_MOVE( 1, MOVE_CHARM),
-	LEVEL_UP_MOVE( 1, MOVE_STOREDPOWER),
-	LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
-	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
-	LEVEL_UP_MOVE( 1, MOVE_LIFEDEW),
-	LEVEL_UP_MOVE( 1, MOVE_METRONOME),
-	LEVEL_UP_MOVE( 1, MOVE_GRAVITY),
-	LEVEL_UP_MOVE( 1, MOVE_FOLLOWME),
-	LEVEL_UP_MOVE( 1, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE( 1, MOVE_SPOTLIGHT),
 	LEVEL_UP_MOVE( 1, MOVE_SPLASH),
-	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_COPYCAT),
+	LEVEL_UP_MOVE( 1, MOVE_SWEETKISS),
+	LEVEL_UP_MOVE( 1, MOVE_CHARM),
+	LEVEL_UP_MOVE( 1, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 1, MOVE_ENCORE),
+	LEVEL_UP_MOVE( 1, MOVE_SING),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
 	LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL),
+	LEVEL_UP_MOVE( 1, MOVE_BESTOW),
+	LEVEL_UP_MOVE( 1, MOVE_LIFEDEW),
+	LEVEL_UP_MOVE( 1, MOVE_WAKEUPSLAP),
+	LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
+	LEVEL_UP_MOVE( 1, MOVE_STOREDPOWER),
+	LEVEL_UP_MOVE( 1, MOVE_METRONOME),
+	LEVEL_UP_MOVE( 1, MOVE_LUCKYCHANT),
+	LEVEL_UP_MOVE( 1, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE( 1, MOVE_GRAVITY),
+	LEVEL_UP_MOVE( 1, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
+	LEVEL_UP_MOVE( 1, MOVE_FOLLOWME),
 	LEVEL_UP_MOVE( 1, MOVE_MOONLIGHT),
-	LEVEL_UP_MOVE( 1, MOVE_COSMICPOWER),
-	LEVEL_UP_MOVE( 1, MOVE_METEORMASH),
 	LEVEL_UP_MOVE( 1, MOVE_MOONBLAST),
+	LEVEL_UP_MOVE( 1, MOVE_METEORMASH),
 	LEVEL_UP_END
 };
 
@@ -6503,11 +6513,11 @@ static const struct LevelUpMove sTorkoalLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(15, MOVE_CLEARSMOG),
 	LEVEL_UP_MOVE(19, MOVE_FLAMEWHEEL),
 	LEVEL_UP_MOVE(23, MOVE_PROTECT),
-	LEVEL_UP_MOVE(26, MOVE_LAVAPLUME),
-	LEVEL_UP_MOVE(30, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(26, MOVE_BODYSLAM),
+	LEVEL_UP_MOVE(30, MOVE_LAVAPLUME),
 	LEVEL_UP_MOVE(34, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(37, MOVE_FLAMETHROWER),
-	LEVEL_UP_MOVE(41, MOVE_FLAIL),
+	LEVEL_UP_MOVE(37, MOVE_FLAIL),
+	LEVEL_UP_MOVE(41, MOVE_FLAMETHROWER),
 	LEVEL_UP_MOVE(45, MOVE_CURSE),
 	LEVEL_UP_MOVE(48, MOVE_SCORCHINGSANDS),
 	LEVEL_UP_MOVE(52, MOVE_HEATWAVE),
@@ -9084,33 +9094,37 @@ static const struct LevelUpMove sCherubiLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 5, MOVE_LEAFAGE),
 	LEVEL_UP_MOVE(10, MOVE_GROWTH),
 	LEVEL_UP_MOVE(13, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(16, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(19, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(16, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(20, MOVE_LUCKYCHANT),
 	LEVEL_UP_MOVE(23, MOVE_LEECHSEED),
-	LEVEL_UP_MOVE(27, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(32, MOVE_PETALBLIZZARD),
-	LEVEL_UP_MOVE(37, MOVE_WORRYSEED),
-	LEVEL_UP_MOVE(41, MOVE_SOLARBEAM),
+	LEVEL_UP_MOVE(26, MOVE_TAKEDOWN),
+	LEVEL_UP_MOVE(30, MOVE_PETALBLIZZARD),
+	LEVEL_UP_MOVE(34, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(38, MOVE_WORRYSEED),
+	LEVEL_UP_MOVE(41, MOVE_DAZZLINGGLEAM),
+	LEVEL_UP_MOVE(45, MOVE_SOLARBEAM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sCherrimLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_SUNNYDAY),
 	LEVEL_UP_MOVE( 1, MOVE_FLOWERSHIELD),
+	LEVEL_UP_MOVE( 1, MOVE_SOLARBLADE),
 	LEVEL_UP_MOVE( 1, MOVE_MORNINGSUN),
 	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
 	LEVEL_UP_MOVE( 1, MOVE_LEAFAGE),
 	LEVEL_UP_MOVE( 1, MOVE_GROWTH),
 	LEVEL_UP_MOVE(13, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(16, MOVE_LUCKYCHANT),
-	LEVEL_UP_MOVE(19, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(16, MOVE_MAGICALLEAF),
+	LEVEL_UP_MOVE(20, MOVE_LUCKYCHANT),
 	LEVEL_UP_MOVE(23, MOVE_LEECHSEED),
-	LEVEL_UP_MOVE(24, MOVE_SUNNYDAY),
 	LEVEL_UP_MOVE(28, MOVE_TAKEDOWN),
-	LEVEL_UP_MOVE(34, MOVE_PETALBLIZZARD),
-	LEVEL_UP_MOVE(40, MOVE_WORRYSEED),
-	LEVEL_UP_MOVE(45, MOVE_SOLARBEAM),
-	LEVEL_UP_MOVE(51, MOVE_PETALDANCE),
+	LEVEL_UP_MOVE(33, MOVE_PETALBLIZZARD),
+	LEVEL_UP_MOVE(38, MOVE_GIGADRAIN),
+	LEVEL_UP_MOVE(43, MOVE_WORRYSEED),
+	LEVEL_UP_MOVE(47, MOVE_DAZZLINGGLEAM),
+	LEVEL_UP_MOVE(52, MOVE_SOLARBEAM),
+	LEVEL_UP_MOVE(57, MOVE_PETALDANCE),
 	LEVEL_UP_END
 };
 
@@ -9388,7 +9402,7 @@ static const struct LevelUpMove sStunkyLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 9, MOVE_ACIDSPRAY),
 	LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
 	LEVEL_UP_MOVE(15, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(18, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE(18, MOVE_BITE),
 	LEVEL_UP_MOVE(21, MOVE_VENOSHOCK),
 	LEVEL_UP_MOVE(24, MOVE_SCREECH),
 	LEVEL_UP_MOVE(25, MOVE_SLASH),
@@ -9412,7 +9426,7 @@ static const struct LevelUpMove sSkuntankLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 9, MOVE_ACIDSPRAY),
 	LEVEL_UP_MOVE(12, MOVE_FURYSWIPES),
 	LEVEL_UP_MOVE(15, MOVE_FOCUSENERGY),
-	LEVEL_UP_MOVE(18, MOVE_PUNISHMENT),
+	LEVEL_UP_MOVE(18, MOVE_BITE),
 	LEVEL_UP_MOVE(21, MOVE_VENOSHOCK),
 	LEVEL_UP_MOVE(24, MOVE_SCREECH),
 	LEVEL_UP_MOVE(25, MOVE_SLASH),
@@ -12431,10 +12445,11 @@ static const struct LevelUpMove sMinccinoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(31, MOVE_TAILSLAP),
 	LEVEL_UP_MOVE(35, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE(38, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE(41, MOVE_TICKLE),
-	LEVEL_UP_MOVE(44, MOVE_SLAM),
+	LEVEL_UP_MOVE(41, MOVE_SLAM),
+	LEVEL_UP_MOVE(45, MOVE_TICKLE),
 	LEVEL_UP_MOVE(48, MOVE_HYPERVOICE),
-	LEVEL_UP_MOVE(52, MOVE_LASTRESORT),
+	LEVEL_UP_MOVE(52, MOVE_PLAYROUGH),
+	LEVEL_UP_MOVE(56, MOVE_LASTRESORT),
 	LEVEL_UP_END
 };
 
@@ -12445,19 +12460,20 @@ static const struct LevelUpMove sCinccinoLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_BABYDOLLEYES),
 	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
 	LEVEL_UP_MOVE( 1, MOVE_ECHOEDVOICE),
-	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
 	LEVEL_UP_MOVE( 1, MOVE_SING),
+	LEVEL_UP_MOVE( 1, MOVE_DOUBLESLAP),
 	LEVEL_UP_MOVE( 1, MOVE_SWIFT),
 	LEVEL_UP_MOVE( 1, MOVE_AFTERYOU),
 	LEVEL_UP_MOVE( 1, MOVE_CAPTIVATE),
-	LEVEL_UP_MOVE( 1, MOVE_TICKLE),
 	LEVEL_UP_MOVE( 1, MOVE_SLAM),
+	LEVEL_UP_MOVE( 1, MOVE_TICKLE),
 	LEVEL_UP_MOVE( 1, MOVE_HYPERVOICE),
+	LEVEL_UP_MOVE( 1, MOVE_PLAYROUGH),
 	LEVEL_UP_MOVE( 1, MOVE_LASTRESORT),
-	LEVEL_UP_MOVE( 1, MOVE_TAILSLAP),
-	LEVEL_UP_MOVE( 1, MOVE_WAKEUPSLAP),
 	LEVEL_UP_MOVE( 1, MOVE_CHARM),
+	LEVEL_UP_MOVE( 1, MOVE_WAKEUPSLAP),
 	LEVEL_UP_MOVE( 1, MOVE_ENCORE),
+	LEVEL_UP_MOVE( 1, MOVE_TAILSLAP),
 	LEVEL_UP_END
 };
 
@@ -12889,71 +12905,64 @@ static const struct LevelUpMove sJellicentLevelUpLearnset[] = {
 
 static const struct LevelUpMove sAlomomolaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 1, MOVE_PLAYNICE),
-	LEVEL_UP_MOVE( 1, MOVE_HYDROPUMP),
-	LEVEL_UP_MOVE( 1, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE( 1, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND),
 	LEVEL_UP_MOVE( 1, MOVE_POUND),
 	LEVEL_UP_MOVE( 1, MOVE_WATERSPORT),
-	LEVEL_UP_MOVE( 5, MOVE_AQUARING),
-	LEVEL_UP_MOVE( 9, MOVE_AQUAJET),
+	LEVEL_UP_MOVE( 5, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE( 9, MOVE_AQUARING),
 	LEVEL_UP_MOVE(13, MOVE_DOUBLESLAP),
-	LEVEL_UP_MOVE(17, MOVE_HEALPULSE),
-	LEVEL_UP_MOVE(21, MOVE_PROTECT),
-	LEVEL_UP_MOVE(25, MOVE_WATERPULSE),
+	LEVEL_UP_MOVE(17, MOVE_AQUAJET),
+	LEVEL_UP_MOVE(21, MOVE_HEALPULSE),
+	LEVEL_UP_MOVE(25, MOVE_BRINE),
 	LEVEL_UP_MOVE(29, MOVE_WAKEUPSLAP),
-	LEVEL_UP_MOVE(33, MOVE_SOAK),
-	LEVEL_UP_MOVE(37, MOVE_WISH),
-	LEVEL_UP_MOVE(41, MOVE_BRINE),
-	LEVEL_UP_MOVE(45, MOVE_SAFEGUARD),
-	LEVEL_UP_MOVE(49, MOVE_WHIRLPOOL),
-	LEVEL_UP_MOVE(53, MOVE_HELPINGHAND),
-	LEVEL_UP_MOVE(57, MOVE_HEALINGWISH),
-	LEVEL_UP_MOVE(61, MOVE_WIDEGUARD),
-	LEVEL_UP_MOVE(65, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(33, MOVE_HELPINGHAND),
+	LEVEL_UP_MOVE(37, MOVE_WHIRLPOOL),
+	LEVEL_UP_MOVE(41, MOVE_SOAK),
+	LEVEL_UP_MOVE(45, MOVE_HEALINGWISH),
+	LEVEL_UP_MOVE(49, MOVE_WIDEGUARD),
+	LEVEL_UP_MOVE(53, MOVE_HYDROPUMP),
+	LEVEL_UP_MOVE(57, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(61, MOVE_PROTECT),
+	LEVEL_UP_MOVE(65, MOVE_WISH),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sJoltikLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
 	LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE),
-	LEVEL_UP_MOVE( 1, MOVE_SPIDERWEB),
-	LEVEL_UP_MOVE( 4, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE( 7, MOVE_SCREECH),
-	LEVEL_UP_MOVE(12, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(15, MOVE_ELECTROWEB),
-	LEVEL_UP_MOVE(18, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(23, MOVE_GASTROACID),
-	LEVEL_UP_MOVE(26, MOVE_SLASH),
-	LEVEL_UP_MOVE(29, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(34, MOVE_SIGNALBEAM),
-	LEVEL_UP_MOVE(37, MOVE_AGILITY),
-	LEVEL_UP_MOVE(40, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(45, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(48, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
+	LEVEL_UP_MOVE( 4, MOVE_ELECTROWEB),
+	LEVEL_UP_MOVE( 8, MOVE_SPIDERWEB),
+	LEVEL_UP_MOVE(12, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE(16, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(20, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(28, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(32, MOVE_SIGNALBEAM),
+	LEVEL_UP_MOVE(37, MOVE_SLASH),
+	LEVEL_UP_MOVE(40, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(44, MOVE_AGILITY),
+	LEVEL_UP_MOVE(48, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(52, MOVE_BUGBUZZ),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sGalvantulaLevelUpLearnset[] = {
 	LEVEL_UP_MOVE( 0, MOVE_STICKYWEB),
-	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
 	LEVEL_UP_MOVE( 1, MOVE_LEECHLIFE),
+	LEVEL_UP_MOVE( 1, MOVE_STRINGSHOT),
+	LEVEL_UP_MOVE( 1, MOVE_ELECTROWEB),
 	LEVEL_UP_MOVE( 1, MOVE_SPIDERWEB),
-	LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE( 4, MOVE_THUNDERWAVE),
-	LEVEL_UP_MOVE( 7, MOVE_SCREECH),
-	LEVEL_UP_MOVE(12, MOVE_FURYCUTTER),
-	LEVEL_UP_MOVE(15, MOVE_ELECTROWEB),
-	LEVEL_UP_MOVE(18, MOVE_BUGBITE),
-	LEVEL_UP_MOVE(23, MOVE_GASTROACID),
-	LEVEL_UP_MOVE(26, MOVE_SLASH),
-	LEVEL_UP_MOVE(29, MOVE_ELECTROBALL),
-	LEVEL_UP_MOVE(34, MOVE_SIGNALBEAM),
+	LEVEL_UP_MOVE(12, MOVE_STRUGGLEBUG),
+	LEVEL_UP_MOVE(16, MOVE_THUNDERWAVE),
+	LEVEL_UP_MOVE(20, MOVE_ELECTROBALL),
+	LEVEL_UP_MOVE(24, MOVE_SCREECH),
+	LEVEL_UP_MOVE(28, MOVE_SUCKERPUNCH),
+	LEVEL_UP_MOVE(32, MOVE_SIGNALBEAM),
 	LEVEL_UP_MOVE(35, MOVE_STICKYWEB),
-	LEVEL_UP_MOVE(40, MOVE_AGILITY),
-	LEVEL_UP_MOVE(46, MOVE_SUCKERPUNCH),
-	LEVEL_UP_MOVE(54, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(60, MOVE_BUGBUZZ),
+	LEVEL_UP_MOVE(39, MOVE_SLASH),
+	LEVEL_UP_MOVE(43, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(48, MOVE_AGILITY),
+	LEVEL_UP_MOVE(53, MOVE_GASTROACID),
+	LEVEL_UP_MOVE(58, MOVE_BUGBUZZ),
 	LEVEL_UP_END
 };
 
@@ -12999,68 +13008,67 @@ static const struct LevelUpMove sFerrothornLevelUpLearnset[] = {
 };
 
 static const struct LevelUpMove sKlinkLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
 	LEVEL_UP_MOVE( 1, MOVE_VICEGRIP),
-	LEVEL_UP_MOVE( 6, MOVE_CHARGE),
-	LEVEL_UP_MOVE(11, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE(16, MOVE_GEARGRIND),
-	LEVEL_UP_MOVE(21, MOVE_BIND),
-	LEVEL_UP_MOVE(26, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE(31, MOVE_AUTOTOMIZE),
-	LEVEL_UP_MOVE(36, MOVE_MIRRORSHOT),
-	LEVEL_UP_MOVE(39, MOVE_SCREECH),
-	LEVEL_UP_MOVE(42, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(45, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(48, MOVE_SHIFTGEAR),
-	LEVEL_UP_MOVE(50, MOVE_LOCKON),
-	LEVEL_UP_MOVE(54, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE(57, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE( 4, MOVE_BIND),
+	LEVEL_UP_MOVE( 8, MOVE_CHARGE),
+	LEVEL_UP_MOVE(12, MOVE_CHARGEBEAM),
+	LEVEL_UP_MOVE(16, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(20, MOVE_MIRRORSHOT),
+	LEVEL_UP_MOVE(24, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(28, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(32, MOVE_GEARGRIND),
+	LEVEL_UP_MOVE(36, MOVE_SCREECH),
+	LEVEL_UP_MOVE(40, MOVE_SHIFTGEAR),
+	LEVEL_UP_MOVE(44, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(48, MOVE_LOCKON),
+	LEVEL_UP_MOVE(52, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(56, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sKlangLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 1, MOVE_VICEGRIP),
-	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 1, MOVE_GEARGRIND),
-	LEVEL_UP_MOVE( 6, MOVE_CHARGE),
-	LEVEL_UP_MOVE(11, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE(16, MOVE_GEARGRIND),
-	LEVEL_UP_MOVE(21, MOVE_BIND),
-	LEVEL_UP_MOVE(26, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE(31, MOVE_AUTOTOMIZE),
-	LEVEL_UP_MOVE(36, MOVE_MIRRORSHOT),
-	LEVEL_UP_MOVE(40, MOVE_SCREECH),
-	LEVEL_UP_MOVE(44, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(48, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(52, MOVE_SHIFTGEAR),
-	LEVEL_UP_MOVE(56, MOVE_LOCKON),
-	LEVEL_UP_MOVE(60, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE(64, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_VICEGRIP),
+	LEVEL_UP_MOVE( 1, MOVE_BIND),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	LEVEL_UP_MOVE(12, MOVE_CHARGEBEAM),
+	LEVEL_UP_MOVE(16, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(20, MOVE_MIRRORSHOT),
+	LEVEL_UP_MOVE(24, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(28, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(32, MOVE_GEARGRIND),
+	LEVEL_UP_MOVE(36, MOVE_SCREECH),
+	LEVEL_UP_MOVE(41, MOVE_SHIFTGEAR),
+	LEVEL_UP_MOVE(46, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(51, MOVE_LOCKON),
+	LEVEL_UP_MOVE(56, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(61, MOVE_HYPERBEAM),
 	LEVEL_UP_END
 };
 
 static const struct LevelUpMove sKlinklangLevelUpLearnset[] = {
-	LEVEL_UP_MOVE( 0, MOVE_MAGNETICFLUX),
+	LEVEL_UP_MOVE( 0, MOVE_ELECTRICTERRAIN),
+	LEVEL_UP_MOVE( 1, MOVE_MAGNETICFLUX),
 	LEVEL_UP_MOVE( 1, MOVE_GEARUP),
-	LEVEL_UP_MOVE( 1, MOVE_VICEGRIP),
-	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	LEVEL_UP_MOVE( 1, MOVE_HYPERBEAM),
 	LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE( 1, MOVE_GEARGRIND),
-	LEVEL_UP_MOVE( 6, MOVE_CHARGE),
-	LEVEL_UP_MOVE(11, MOVE_THUNDERSHOCK),
-	LEVEL_UP_MOVE(16, MOVE_GEARGRIND),
-	LEVEL_UP_MOVE(21, MOVE_BIND),
-	LEVEL_UP_MOVE(25, MOVE_CHARGEBEAM),
-	LEVEL_UP_MOVE(31, MOVE_AUTOTOMIZE),
-	LEVEL_UP_MOVE(36, MOVE_MIRRORSHOT),
-	LEVEL_UP_MOVE(40, MOVE_SCREECH),
-	LEVEL_UP_MOVE(44, MOVE_DISCHARGE),
-	LEVEL_UP_MOVE(48, MOVE_METALSOUND),
-	LEVEL_UP_MOVE(48, MOVE_MAGNETICFLUX),
-	LEVEL_UP_MOVE(54, MOVE_SHIFTGEAR),
-	LEVEL_UP_MOVE(60, MOVE_LOCKON),
-	LEVEL_UP_MOVE(66, MOVE_ZAPCANNON),
-	LEVEL_UP_MOVE(72, MOVE_HYPERBEAM),
+	LEVEL_UP_MOVE( 1, MOVE_VICEGRIP),
+	LEVEL_UP_MOVE( 1, MOVE_BIND),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	LEVEL_UP_MOVE(12, MOVE_CHARGEBEAM),
+	LEVEL_UP_MOVE(16, MOVE_METALSOUND),
+	LEVEL_UP_MOVE(20, MOVE_MIRRORSHOT),
+	LEVEL_UP_MOVE(24, MOVE_AUTOTOMIZE),
+	LEVEL_UP_MOVE(28, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(32, MOVE_GEARGRIND),
+	LEVEL_UP_MOVE(36, MOVE_SCREECH),
+	LEVEL_UP_MOVE(41, MOVE_SHIFTGEAR),
+	LEVEL_UP_MOVE(46, MOVE_FLASHCANNON),
+	LEVEL_UP_MOVE(48, MOVE_ELECTRICTERRAIN),
+	LEVEL_UP_MOVE(53, MOVE_LOCKON),
+	LEVEL_UP_MOVE(59, MOVE_ZAPCANNON),
+	LEVEL_UP_MOVE(65, MOVE_STEELROLLER),
 	LEVEL_UP_END
 };
 
@@ -15572,9 +15580,9 @@ static const struct LevelUpMove sBergmiteLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(27, MOVE_ICEBALL),
 	LEVEL_UP_MOVE(31, MOVE_TAKEDOWN),
 	LEVEL_UP_MOVE(35, MOVE_BLIZZARD),
-	LEVEL_UP_MOVE(39, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(42, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(46, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(39, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(43, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(47, MOVE_IRONDEFENSE),
 	LEVEL_UP_MOVE(50, MOVE_AVALANCHE),
 	LEVEL_UP_MOVE(54, MOVE_CURSE),
 	LEVEL_UP_MOVE(57, MOVE_RECOVER),
@@ -15598,9 +15606,9 @@ static const struct LevelUpMove sAvaluggLevelUpLearnset[] = {
 	LEVEL_UP_MOVE(31, MOVE_TAKEDOWN),
 	LEVEL_UP_MOVE(35, MOVE_BLIZZARD),
 	LEVEL_UP_MOVE(36, MOVE_BODYSLAM),
-	LEVEL_UP_MOVE(41, MOVE_IRONDEFENSE),
-	LEVEL_UP_MOVE(45, MOVE_DOUBLEEDGE),
-	LEVEL_UP_MOVE(50, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(41, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(46, MOVE_DOUBLEEDGE),
+	LEVEL_UP_MOVE(51, MOVE_IRONDEFENSE),
 	LEVEL_UP_MOVE(55, MOVE_AVALANCHE),
 	LEVEL_UP_MOVE(60, MOVE_CURSE),
 	LEVEL_UP_MOVE(64, MOVE_RECOVER),
diff --git a/src/Pokedex_Orders.c b/src/Pokedex_Orders.c
index 14a914b..bf3ef14 100644
--- a/src/Pokedex_Orders.c
+++ b/src/Pokedex_Orders.c
@@ -45,11 +45,8 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_WATCHOG,
 	SPECIES_RATTATA,
 	SPECIES_RATICATE,
-	SPECIES_BUDEW,
-	SPECIES_ROSELIA,
-	SPECIES_ROSERADE,
-	SPECIES_SWABLU,
-	SPECIES_ALTARIA,
+	SPECIES_MINCCINO,
+	SPECIES_CINCCINO,
 	SPECIES_ELECTRIKE,
 	SPECIES_MANECTRIC,
 	SPECIES_AZURILL,
@@ -61,12 +58,12 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_SCRAFTY,
 	SPECIES_RIOLU,
 	SPECIES_LUCARIO,
+	SPECIES_INKAY,
+	SPECIES_MALAMAR,
 	SPECIES_POOCHYENA,
 	SPECIES_MIGHTYENA,
 	SPECIES_WINGULL,
 	SPECIES_PELIPPER,
-	SPECIES_SENTRET,
-	SPECIES_FURRET,
 	SPECIES_BIDOOF,
 	SPECIES_BIBAREL,
 	SPECIES_BUIZEL,
@@ -79,11 +76,12 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_MASQUERAIN,
 	SPECIES_KRABBY,
 	SPECIES_KINGLER,
+	SPECIES_CHERUBI,
+	SPECIES_CHERRIM,
 	SPECIES_SANDYGAST,
 	SPECIES_PALOSSAND,
-	SPECIES_BURMY,
-	SPECIES_WORMADAM,
-	SPECIES_MOTHIM,
+	SPECIES_SENTRET,
+	SPECIES_FURRET,
 	SPECIES_FLABEBE,
 	SPECIES_FLOETTE,
 	SPECIES_FLORGES,
@@ -99,8 +97,6 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_COMBEE,
 	SPECIES_VESPIQUEN,
 	SPECIES_COMFEY,
-	SPECIES_CHERUBI,
-	SPECIES_CHERRIM,
 	SPECIES_CATERPIE,
 	SPECIES_METAPOD,
 	SPECIES_BUTTERFREE,
@@ -122,15 +118,15 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_DUSKNOIR,
 	SPECIES_PHANTUMP,
 	SPECIES_TREVENANT,
-	SPECIES_NINCADA,
-	SPECIES_NINJASK,
-	SPECIES_SHEDINJA,
 	SPECIES_STARLY,
 	SPECIES_STARAVIA,
 	SPECIES_STARAPTOR,
 	SPECIES_LILLIPUP,
 	SPECIES_HERDIER,
 	SPECIES_STOUTLAND,
+	SPECIES_BUDEW,
+	SPECIES_ROSELIA,
+	SPECIES_ROSERADE,
 	SPECIES_EKANS,
 	SPECIES_ARBOK,
 	SPECIES_NUMEL,
@@ -141,8 +137,9 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_KIRLIA,
 	SPECIES_GARDEVOIR,
 	SPECIES_GALLADE,
-	SPECIES_LITLEO,
-	SPECIES_PYROAR,
+	SPECIES_BURMY,
+	SPECIES_WORMADAM,
+	SPECIES_MOTHIM,
 	SPECIES_WOOBAT,
 	SPECIES_SWOOBAT,
 	SPECIES_SLUGMA,
@@ -271,8 +268,8 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_ACCELGOR,
 	SPECIES_EXEGGCUTE,
 	SPECIES_EXEGGUTOR,
-	SPECIES_MINCCINO,
-	SPECIES_CINCCINO,
+	SPECIES_SWABLU,
+	SPECIES_ALTARIA,
 	SPECIES_TOGEDEMARU,
 	SPECIES_SPOINK,
 	SPECIES_GRUMPIG,
@@ -340,8 +337,6 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_TALONFLAME,
 	SPECIES_ROCKRUFF,
 	SPECIES_LYCANROC,
-	SPECIES_INKAY,
-	SPECIES_MALAMAR,
 	SPECIES_PONYTA,
 	SPECIES_RAPIDASH,
 	SPECIES_SNUBBULL,
@@ -349,6 +344,12 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_MIENFOO,
 	SPECIES_MIENSHAO,
 	SPECIES_DEDENNE,
+	SPECIES_GOTHITA,
+	SPECIES_GOTHORITA,
+	SPECIES_GOTHITELLE,
+	SPECIES_SOLOSIS,
+	SPECIES_DUOSION,
+	SPECIES_REUNICLUS,
 	SPECIES_SWIRLIX,
 	SPECIES_SLURPUFF,
 	SPECIES_SPRITZEE,
@@ -459,12 +460,6 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_CHATOT,
 	SPECIES_THROH,
 	SPECIES_SAWK,
-	SPECIES_GOTHITA,
-	SPECIES_GOTHORITA,
-	SPECIES_GOTHITELLE,
-	SPECIES_SOLOSIS,
-	SPECIES_DUOSION,
-	SPECIES_REUNICLUS,
 	SPECIES_GRIMER,
 	SPECIES_MUK,
 	SPECIES_KOFFING,
@@ -473,7 +468,9 @@ const u16 gPokedexOrder_Regional[] =
 	SPECIES_SKIPLOOM,
 	SPECIES_JUMPLUFF,
 	SPECIES_TROPIUS,
-	SPECIES_FARFETCHD,
+	SPECIES_PIDGEY,
+	SPECIES_PIDGEOTTO,
+	SPECIES_PIDGEOT,
 	SPECIES_ZANGOOSE,
 	SPECIES_SEVIPER,
 	SPECIES_BAGON,