From 24be2c8c3958a964cd1d251e7c9438340a90dc06 Mon Sep 17 00:00:00 2001
From: amiosi <44352097+amiosi@users.noreply.github.com>
Date: Mon, 4 Jan 2021 22:04:51 -0500
Subject: [PATCH] fix alolan form movesets

---
 src/data/pokemon/level_up_learnsets.h | 545 +++++++++++++++-----------
 1 file changed, 320 insertions(+), 225 deletions(-)

diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h
index 0ebae3256..2402f591e 100644
--- a/src/data/pokemon/level_up_learnsets.h
+++ b/src/data/pokemon/level_up_learnsets.h
@@ -18088,267 +18088,362 @@ static const struct LevelUpMove sCalyrexLevelUpLearnset[] = {
     LEVEL_UP_END
 };
 
-static const struct LevelUpMove sRattataAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-    LEVEL_UP_MOVE( 3, MOVE_TAIL_WHIP),
-    LEVEL_UP_MOVE( 6, MOVE_QUICK_ATTACK),
-    LEVEL_UP_MOVE( 9, MOVE_FOCUS_ENERGY),
-    LEVEL_UP_MOVE(12, MOVE_BITE),
-    LEVEL_UP_MOVE(15, MOVE_SUPER_FANG),
-    LEVEL_UP_MOVE(18, MOVE_CRUNCH),
-    LEVEL_UP_MOVE(21, MOVE_HYPER_FANG),
-    //LEVEL_UP_MOVE(24, MOVE_SUCKER_PUNCH),
-    LEVEL_UP_MOVE(27, MOVE_DOUBLE_EDGE),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanRattataLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
+	LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK),
+	LEVEL_UP_MOVE( 7, MOVE_FOCUS_ENERGY),
+	LEVEL_UP_MOVE(10, MOVE_BITE),
+	LEVEL_UP_MOVE(13, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(16, MOVE_HYPER_FANG),
+	//LEVEL_UP_MOVE(19, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(22, MOVE_CRUNCH),
+	//LEVEL_UP_MOVE(25, MOVE_SUCKER_PUNCH),
+	LEVEL_UP_MOVE(28, MOVE_SUPER_FANG),
+	LEVEL_UP_MOVE(31, MOVE_DOUBLE_EDGE),
+	LEVEL_UP_MOVE(34, MOVE_ENDEAVOR),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sRaticateAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE),
-    LEVEL_UP_MOVE( 1, MOVE_COUNTER),
-    LEVEL_UP_MOVE( 1, MOVE_FURY_SWIPES),
-    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-    LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
-    LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
-    LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY),
-    LEVEL_UP_MOVE(12, MOVE_BITE),
-    LEVEL_UP_MOVE(15, MOVE_SUPER_FANG),
-    LEVEL_UP_MOVE(18, MOVE_CRUNCH),
-    LEVEL_UP_MOVE(26, MOVE_HYPER_FANG),
-    //LEVEL_UP_MOVE(34, MOVE_SUCKER_PUNCH),
-    LEVEL_UP_MOVE(42, MOVE_DOUBLE_EDGE),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanRaticateLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_SCARY_FACE),
+	LEVEL_UP_MOVE( 1, MOVE_SCARY_FACE),
+	LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
+	LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_FOCUS_ENERGY),
+	LEVEL_UP_MOVE( 4, MOVE_QUICK_ATTACK),
+	LEVEL_UP_MOVE( 7, MOVE_FOCUS_ENERGY),
+	LEVEL_UP_MOVE(10, MOVE_BITE),
+	LEVEL_UP_MOVE(13, MOVE_PURSUIT),
+	LEVEL_UP_MOVE(16, MOVE_HYPER_FANG),
+	//LEVEL_UP_MOVE(19, MOVE_ASSURANCE),
+	LEVEL_UP_MOVE(24, MOVE_CRUNCH),
+	//LEVEL_UP_MOVE(29, MOVE_SUCKER_PUNCH),
+	LEVEL_UP_MOVE(34, MOVE_SUPER_FANG),
+	LEVEL_UP_MOVE(39, MOVE_DOUBLE_EDGE),
+	LEVEL_UP_MOVE(44, MOVE_ENDEAVOR),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sRaichuAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_PSYCHIC),
-    LEVEL_UP_MOVE( 1, MOVE_ENCORE),
-    LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT),
-    LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK),
-    LEVEL_UP_MOVE( 1, MOVE_GROWL),
-    LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
-    LEVEL_UP_MOVE( 1, MOVE_DOUBLE_TEAM),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanRaichuLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_PSYCHIC),
+	LEVEL_UP_MOVE( 1, MOVE_PSYCHIC),
+	//LEVEL_UP_MOVE( 1, MOVE_SPEED_SWAP),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK),
+	LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
+	LEVEL_UP_MOVE( 1, MOVE_QUICK_ATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_THUNDERBOLT),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sSandshrewAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-    LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
-    LEVEL_UP_MOVE( 4, MOVE_BIDE),
-    //LEVEL_UP_MOVE( 8, MOVE_ICE_SHARD),
-    LEVEL_UP_MOVE(12, MOVE_SWIFT),
-    LEVEL_UP_MOVE(16, MOVE_MIRROR_COAT),
-    LEVEL_UP_MOVE(20, MOVE_FURY_SWIPES),
-    LEVEL_UP_MOVE(24, MOVE_ICE_PUNCH),
-    LEVEL_UP_MOVE(28, MOVE_SWORDS_DANCE),
-    LEVEL_UP_MOVE(32, MOVE_SLASH),
-    LEVEL_UP_MOVE(36, MOVE_BLIZZARD),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanSandshrewLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
+	LEVEL_UP_MOVE( 3, MOVE_BIDE),
+	LEVEL_UP_MOVE( 5, MOVE_POWDER_SNOW),
+	LEVEL_UP_MOVE( 7, MOVE_ICE_BALL),
+	LEVEL_UP_MOVE( 9, MOVE_RAPID_SPIN),
+	LEVEL_UP_MOVE(11, MOVE_FURY_CUTTER),
+	LEVEL_UP_MOVE(14, MOVE_METAL_CLAW),
+	LEVEL_UP_MOVE(17, MOVE_SWIFT),
+	LEVEL_UP_MOVE(20, MOVE_FURY_SWIPES),
+	LEVEL_UP_MOVE(23, MOVE_IRON_DEFENSE),
+	LEVEL_UP_MOVE(26, MOVE_SLASH),
+	//LEVEL_UP_MOVE(30, MOVE_IRON_HEAD),
+	//LEVEL_UP_MOVE(34, MOVE_GYRO_BALL),
+	LEVEL_UP_MOVE(38, MOVE_SWORDS_DANCE),
+	LEVEL_UP_MOVE(42, MOVE_HAIL),
+	LEVEL_UP_MOVE(46, MOVE_BLIZZARD),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sSandslashAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_COUNTER),
-    LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-    LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
-    LEVEL_UP_MOVE( 1, MOVE_BIDE),
-    //LEVEL_UP_MOVE( 1, MOVE_ICE_SHARD),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanSandslashLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_ICICLE_SPEAR),
+	LEVEL_UP_MOVE( 1, MOVE_ICICLE_SPEAR),
+	//LEVEL_UP_MOVE( 1, MOVE_METAL_BURST),
+	//LEVEL_UP_MOVE( 1, MOVE_ICICLE_CRASH),
+	LEVEL_UP_MOVE( 1, MOVE_SLASH),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
+	LEVEL_UP_MOVE( 1, MOVE_ICE_BALL),
+	LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sVulpixAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-    LEVEL_UP_MOVE( 3, MOVE_TAIL_WHIP),
-    LEVEL_UP_MOVE( 7, MOVE_MIST),
-    //LEVEL_UP_MOVE(10, MOVE_ICE_SHARD),
-    LEVEL_UP_MOVE(14, MOVE_CONFUSE_RAY),
-    LEVEL_UP_MOVE(17, MOVE_AURORA_BEAM),
-    //LEVEL_UP_MOVE(21, MOVE_DAZZLING_GLEAM),
-    LEVEL_UP_MOVE(24, MOVE_ICE_BEAM),
-    LEVEL_UP_MOVE(28, MOVE_ROAR),
-    LEVEL_UP_MOVE(31, MOVE_BLIZZARD),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanVulpixLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_POWDER_SNOW),
+	LEVEL_UP_MOVE( 4, MOVE_TAIL_WHIP),
+	LEVEL_UP_MOVE( 7, MOVE_ROAR),
+	//LEVEL_UP_MOVE( 9, MOVE_BABY_DOLL_EYES),
+	//LEVEL_UP_MOVE(10, MOVE_ICE_SHARD),
+	LEVEL_UP_MOVE(12, MOVE_CONFUSE_RAY),
+	LEVEL_UP_MOVE(15, MOVE_ICY_WIND),
+	//LEVEL_UP_MOVE(18, MOVE_PAYBACK),
+	LEVEL_UP_MOVE(20, MOVE_MIST),
+	LEVEL_UP_MOVE(23, MOVE_FAINT_ATTACK),
+	//LEVEL_UP_MOVE(26, MOVE_HEX),
+	LEVEL_UP_MOVE(28, MOVE_AURORA_BEAM),
+	LEVEL_UP_MOVE(31, MOVE_EXTRASENSORY),
+	LEVEL_UP_MOVE(34, MOVE_SAFEGUARD),
+	LEVEL_UP_MOVE(36, MOVE_ICE_BEAM),
+	LEVEL_UP_MOVE(39, MOVE_IMPRISON),
+	LEVEL_UP_MOVE(42, MOVE_BLIZZARD),
+	LEVEL_UP_MOVE(44, MOVE_GRUDGE),
+	//LEVEL_UP_MOVE(47, MOVE_CAPTIVATE),
+	LEVEL_UP_MOVE(50, MOVE_SHEER_COLD),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sNinetalesAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS),
-    //LEVEL_UP_MOVE( 1, MOVE_NASTY_PLOT),
-    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-    LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
-    LEVEL_UP_MOVE( 1, MOVE_MIST),
-    //LEVEL_UP_MOVE( 1, MOVE_ICE_SHARD),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanNinetalesLevelUpLearnset[] = {
+	//LEVEL_UP_MOVE( 0, MOVE_DAZZLING_GLEAM),
+	//LEVEL_UP_MOVE( 1, MOVE_DAZZLING_GLEAM),
+	LEVEL_UP_MOVE( 1, MOVE_IMPRISON),
+	//LEVEL_UP_MOVE( 1, MOVE_NASTY_PLOT),
+	LEVEL_UP_MOVE( 1, MOVE_ICE_BEAM),
+	//LEVEL_UP_MOVE( 1, MOVE_ICE_SHARD),
+	LEVEL_UP_MOVE( 1, MOVE_CONFUSE_RAY),
+	LEVEL_UP_MOVE( 1, MOVE_SAFEGUARD),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sDiglettAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-    LEVEL_UP_MOVE( 4, MOVE_SAND_ATTACK),
-    LEVEL_UP_MOVE( 8, MOVE_GROWL),
-    LEVEL_UP_MOVE(12, MOVE_AGILITY),
-    LEVEL_UP_MOVE(15, MOVE_FURY_SWIPES),
-    LEVEL_UP_MOVE(18, MOVE_DIG),
-    LEVEL_UP_MOVE(21, MOVE_SLASH),
-    //LEVEL_UP_MOVE(25, MOVE_SUCKER_PUNCH),
-    LEVEL_UP_MOVE(29, MOVE_EARTHQUAKE),
-    LEVEL_UP_MOVE(33, MOVE_FISSURE),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanDiglettLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW),
+	LEVEL_UP_MOVE( 4, MOVE_GROWL),
+	LEVEL_UP_MOVE( 7, MOVE_ASTONISH),
+	LEVEL_UP_MOVE(10, MOVE_MUD_SLAP),
+	LEVEL_UP_MOVE(14, MOVE_MAGNITUDE),
+	//LEVEL_UP_MOVE(18, MOVE_BULLDOZE),
+	//LEVEL_UP_MOVE(22, MOVE_SUCKER_PUNCH),
+	//LEVEL_UP_MOVE(25, MOVE_MUD_BOMB),
+	//LEVEL_UP_MOVE(28, MOVE_EARTH_POWER),
+	LEVEL_UP_MOVE(31, MOVE_DIG),
+	//LEVEL_UP_MOVE(35, MOVE_IRON_HEAD),
+	LEVEL_UP_MOVE(39, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(43, MOVE_FISSURE),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sDugtrioAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_TRI_ATTACK),
-    LEVEL_UP_MOVE( 1, MOVE_SCREECH),
-    LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-    LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK),
-    LEVEL_UP_MOVE( 1, MOVE_GROWL),
-    LEVEL_UP_MOVE( 1, MOVE_AGILITY),
-    LEVEL_UP_MOVE(15, MOVE_FURY_SWIPES),
-    LEVEL_UP_MOVE(18, MOVE_DIG),
-    LEVEL_UP_MOVE(21, MOVE_SLASH),
-    //LEVEL_UP_MOVE(25, MOVE_SUCKER_PUNCH),
-    LEVEL_UP_MOVE(35, MOVE_EARTHQUAKE),
-    LEVEL_UP_MOVE(45, MOVE_FISSURE),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanDugtrioLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_SAND_TOMB),
+	LEVEL_UP_MOVE( 1, MOVE_SAND_TOMB),
+	//LEVEL_UP_MOVE( 1, MOVE_ROTOTILLER),
+	//LEVEL_UP_MOVE( 1, MOVE_NIGHT_SLASH),
+	LEVEL_UP_MOVE( 1, MOVE_TRI_ATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_SAND_ATTACK),
+	LEVEL_UP_MOVE( 1, MOVE_METAL_CLAW),
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 4, MOVE_GROWL),
+	LEVEL_UP_MOVE( 7, MOVE_ASTONISH),
+	LEVEL_UP_MOVE(10, MOVE_MUD_SLAP),
+	LEVEL_UP_MOVE(14, MOVE_MAGNITUDE),
+	//LEVEL_UP_MOVE(18, MOVE_BULLDOZE),
+	//LEVEL_UP_MOVE(22, MOVE_SUCKER_PUNCH),
+	//LEVEL_UP_MOVE(25, MOVE_MUD_BOMB),
+	//LEVEL_UP_MOVE(30, MOVE_EARTH_POWER),
+	LEVEL_UP_MOVE(35, MOVE_DIG),
+	//LEVEL_UP_MOVE(41, MOVE_IRON_HEAD),
+	LEVEL_UP_MOVE(47, MOVE_EARTHQUAKE),
+	LEVEL_UP_MOVE(53, MOVE_FISSURE),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sMeowthAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-    LEVEL_UP_MOVE( 1, MOVE_GROWL),
-    LEVEL_UP_MOVE( 1, MOVE_BITE),
-    LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT),
-    LEVEL_UP_MOVE( 9, MOVE_TAUNT),
-    LEVEL_UP_MOVE(12, MOVE_PAY_DAY),
-    //LEVEL_UP_MOVE(15, MOVE_FEINT),
-    LEVEL_UP_MOVE(19, MOVE_FURY_SWIPES),
-    LEVEL_UP_MOVE(23, MOVE_SCREECH),
-    LEVEL_UP_MOVE(27, MOVE_SLASH),
-    //LEVEL_UP_MOVE(31, MOVE_NASTY_PLOT),
-    //LEVEL_UP_MOVE(35, MOVE_PLAY_ROUGH),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanMeowthLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 6, MOVE_BITE),
+	LEVEL_UP_MOVE( 9, MOVE_FAKE_OUT),
+	LEVEL_UP_MOVE(14, MOVE_FURY_SWIPES),
+	LEVEL_UP_MOVE(17, MOVE_SCREECH),
+	LEVEL_UP_MOVE(22, MOVE_FAINT_ATTACK),
+	LEVEL_UP_MOVE(25, MOVE_TAUNT),
+	LEVEL_UP_MOVE(30, MOVE_PAY_DAY),
+	LEVEL_UP_MOVE(33, MOVE_SLASH),
+	//LEVEL_UP_MOVE(38, MOVE_NASTY_PLOT),
+	//LEVEL_UP_MOVE(41, MOVE_ASSURANCE),
+	//LEVEL_UP_MOVE(46, MOVE_CAPTIVATE),
+	//LEVEL_UP_MOVE(49, MOVE_NIGHT_SLASH),
+	//LEVEL_UP_MOVE(50, MOVE_FEINT),
+	//LEVEL_UP_MOVE(55, MOVE_DARK_PULSE),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sPersianAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_SWIFT),
-    LEVEL_UP_MOVE( 1, MOVE_AMNESIA),
-    LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS),
-    LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
-    LEVEL_UP_MOVE( 1, MOVE_GROWL),
-    LEVEL_UP_MOVE( 1, MOVE_BITE),
-    LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT),
-    LEVEL_UP_MOVE( 9, MOVE_TAUNT),
-    LEVEL_UP_MOVE(12, MOVE_PAY_DAY),
-    //LEVEL_UP_MOVE(16, MOVE_FEINT),
-    LEVEL_UP_MOVE(19, MOVE_FURY_SWIPES),
-    LEVEL_UP_MOVE(23, MOVE_SCREECH),
-    LEVEL_UP_MOVE(27, MOVE_SLASH),
-    //LEVEL_UP_MOVE(37, MOVE_NASTY_PLOT),
-    //LEVEL_UP_MOVE(47, MOVE_PLAY_ROUGH),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanPersianLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 0, MOVE_SWIFT),
+	LEVEL_UP_MOVE( 1, MOVE_SWIFT),
+	//LEVEL_UP_MOVE( 1, MOVE_QUASH),
+	//LEVEL_UP_MOVE( 1, MOVE_PLAY_ROUGH),
+	//LEVEL_UP_MOVE( 1, MOVE_SWITCHEROO),
+	LEVEL_UP_MOVE( 1, MOVE_SCRATCH),
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT),
+	LEVEL_UP_MOVE( 6, MOVE_BITE),
+	LEVEL_UP_MOVE( 9, MOVE_FAKE_OUT),
+	LEVEL_UP_MOVE(14, MOVE_FURY_SWIPES),
+	LEVEL_UP_MOVE(17, MOVE_SCREECH),
+	LEVEL_UP_MOVE(22, MOVE_FAINT_ATTACK),
+	LEVEL_UP_MOVE(25, MOVE_TAUNT),
+	//LEVEL_UP_MOVE(32, MOVE_POWER_GEM),
+	LEVEL_UP_MOVE(37, MOVE_SLASH),
+	//LEVEL_UP_MOVE(44, MOVE_NASTY_PLOT),
+	//LEVEL_UP_MOVE(49, MOVE_ASSURANCE),
+	//LEVEL_UP_MOVE(56, MOVE_CAPTIVATE),
+	//LEVEL_UP_MOVE(61, MOVE_NIGHT_SLASH),
+	//LEVEL_UP_MOVE(65, MOVE_FEINT),
+	//LEVEL_UP_MOVE(69, MOVE_DARK_PULSE),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sGeodudeAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-    LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
-    LEVEL_UP_MOVE( 3, MOVE_THUNDER_SHOCK),
-    LEVEL_UP_MOVE( 6, MOVE_BIDE),
-    LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW),
-    //LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK),
-    LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN),
-    LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT),
-    LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE),
-    LEVEL_UP_MOVE(27, MOVE_THUNDER_PUNCH),
-    LEVEL_UP_MOVE(31, MOVE_DOUBLE_EDGE),
-    LEVEL_UP_MOVE(35, MOVE_EXPLOSION),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanGeodudeLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
+	LEVEL_UP_MOVE( 4, MOVE_CHARGE),
+	//LEVEL_UP_MOVE( 6, MOVE_ROCK_POLISH),
+	LEVEL_UP_MOVE(10, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE(12, MOVE_SPARK),
+	LEVEL_UP_MOVE(16, MOVE_ROCK_THROW),
+	//LEVEL_UP_MOVE(18, MOVE_SMACK_DOWN),
+	LEVEL_UP_MOVE(22, MOVE_THUNDER_PUNCH),
+	LEVEL_UP_MOVE(24, MOVE_SELF_DESTRUCT),
+	//LEVEL_UP_MOVE(28, MOVE_STEALTH_ROCK),
+	LEVEL_UP_MOVE(30, MOVE_ROCK_BLAST),
+	//LEVEL_UP_MOVE(34, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(36, MOVE_EXPLOSION),
+	LEVEL_UP_MOVE(40, MOVE_DOUBLE_EDGE),
+	//LEVEL_UP_MOVE(42, MOVE_STONE_EDGE),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sGravelerAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-    LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
-    LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK),
-    LEVEL_UP_MOVE( 1, MOVE_BIDE),
-    LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW),
-    //LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK),
-    LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN),
-    LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT),
-    LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE),
-    LEVEL_UP_MOVE(31, MOVE_THUNDER_PUNCH),
-    LEVEL_UP_MOVE(39, MOVE_DOUBLE_EDGE),
-    LEVEL_UP_MOVE(47, MOVE_EXPLOSION),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanGravelerLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	//LEVEL_UP_MOVE( 1, MOVE_ROCK_POLISH),
+	LEVEL_UP_MOVE( 4, MOVE_CHARGE),
+	//LEVEL_UP_MOVE( 6, MOVE_ROCK_POLISH),
+	LEVEL_UP_MOVE(10, MOVE_ROLLOUT),
+	LEVEL_UP_MOVE(12, MOVE_SPARK),
+	LEVEL_UP_MOVE(16, MOVE_ROCK_THROW),
+	//LEVEL_UP_MOVE(18, MOVE_SMACK_DOWN),
+	LEVEL_UP_MOVE(22, MOVE_THUNDER_PUNCH),
+	LEVEL_UP_MOVE(24, MOVE_SELF_DESTRUCT),
+	//LEVEL_UP_MOVE(30, MOVE_STEALTH_ROCK),
+	LEVEL_UP_MOVE(34, MOVE_ROCK_BLAST),
+	//LEVEL_UP_MOVE(40, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(44, MOVE_EXPLOSION),
+	LEVEL_UP_MOVE(50, MOVE_DOUBLE_EDGE),
+	//LEVEL_UP_MOVE(54, MOVE_STONE_EDGE),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sGolemAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_MEGA_PUNCH),
-    LEVEL_UP_MOVE( 1, MOVE_TACKLE),
-    LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
-    LEVEL_UP_MOVE( 1, MOVE_THUNDER_SHOCK),
-    LEVEL_UP_MOVE( 1, MOVE_BIDE),
-    LEVEL_UP_MOVE( 9, MOVE_ROCK_THROW),
-    //LEVEL_UP_MOVE(12, MOVE_STEALTH_ROCK),
-    LEVEL_UP_MOVE(15, MOVE_TAKE_DOWN),
-    LEVEL_UP_MOVE(19, MOVE_SELF_DESTRUCT),
-    LEVEL_UP_MOVE(23, MOVE_ROCK_SLIDE),
-    LEVEL_UP_MOVE(31, MOVE_THUNDER_PUNCH),
-    LEVEL_UP_MOVE(39, MOVE_DOUBLE_EDGE),
-    LEVEL_UP_MOVE(47, MOVE_EXPLOSION),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanGolemLevelUpLearnset[] = {
+	//LEVEL_UP_MOVE( 1, MOVE_HEAVY_SLAM),
+	LEVEL_UP_MOVE( 1, MOVE_TACKLE),
+	LEVEL_UP_MOVE( 1, MOVE_DEFENSE_CURL),
+	LEVEL_UP_MOVE( 1, MOVE_CHARGE),
+	//LEVEL_UP_MOVE( 1, MOVE_ROCK_POLISH),
+	LEVEL_UP_MOVE( 4, MOVE_CHARGE),
+	//LEVEL_UP_MOVE( 6, MOVE_ROCK_POLISH),
+	//LEVEL_UP_MOVE(10, MOVE_STEAMROLLER),
+	LEVEL_UP_MOVE(12, MOVE_SPARK),
+	LEVEL_UP_MOVE(16, MOVE_ROCK_THROW),
+	//LEVEL_UP_MOVE(18, MOVE_SMACK_DOWN),
+	LEVEL_UP_MOVE(22, MOVE_THUNDER_PUNCH),
+	LEVEL_UP_MOVE(24, MOVE_SELF_DESTRUCT),
+	//LEVEL_UP_MOVE(30, MOVE_STEALTH_ROCK),
+	LEVEL_UP_MOVE(34, MOVE_ROCK_BLAST),
+	//LEVEL_UP_MOVE(40, MOVE_DISCHARGE),
+	LEVEL_UP_MOVE(44, MOVE_EXPLOSION),
+	LEVEL_UP_MOVE(50, MOVE_DOUBLE_EDGE),
+	//LEVEL_UP_MOVE(54, MOVE_STONE_EDGE),
+	//LEVEL_UP_MOVE(60, MOVE_HEAVY_SLAM),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sGrimerAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_POUND),
-    LEVEL_UP_MOVE( 1, MOVE_POISON_GAS),
-    LEVEL_UP_MOVE( 6, MOVE_HARDEN),
-    LEVEL_UP_MOVE(12, MOVE_MINIMIZE),
-    LEVEL_UP_MOVE(18, MOVE_DISABLE),
-    LEVEL_UP_MOVE(24, MOVE_BITE),
-    LEVEL_UP_MOVE(30, MOVE_SCREECH),
-    LEVEL_UP_MOVE(36, MOVE_CRUNCH),
-    LEVEL_UP_MOVE(42, MOVE_ACID_ARMOR),
-    LEVEL_UP_MOVE(48, MOVE_SLUDGE_BOMB),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanGrimerLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
+	LEVEL_UP_MOVE( 1, MOVE_POISON_GAS),
+	LEVEL_UP_MOVE( 4, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 7, MOVE_BITE),
+	LEVEL_UP_MOVE(12, MOVE_DISABLE),
+	//LEVEL_UP_MOVE(15, MOVE_ACID_SPRAY),
+	LEVEL_UP_MOVE(18, MOVE_POISON_FANG),
+	LEVEL_UP_MOVE(21, MOVE_MINIMIZE),
+	//LEVEL_UP_MOVE(26, MOVE_FLING),
+	LEVEL_UP_MOVE(29, MOVE_KNOCK_OFF),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(37, MOVE_SCREECH),
+	//LEVEL_UP_MOVE(40, MOVE_GUNK_SHOT),
+	LEVEL_UP_MOVE(43, MOVE_ACID_ARMOR),
+	//LEVEL_UP_MOVE(46, MOVE_BELCH),
+	LEVEL_UP_MOVE(48, MOVE_MEMENTO),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sMukAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_HAZE),
-    //LEVEL_UP_MOVE( 1, MOVE_MOONBLAST),
-    LEVEL_UP_MOVE( 1, MOVE_POUND),
-    LEVEL_UP_MOVE( 1, MOVE_POISON_GAS),
-    LEVEL_UP_MOVE( 1, MOVE_HARDEN),
-    LEVEL_UP_MOVE( 1, MOVE_MINIMIZE),
-    LEVEL_UP_MOVE(18, MOVE_DISABLE),
-    LEVEL_UP_MOVE(24, MOVE_BITE),
-    LEVEL_UP_MOVE(30, MOVE_SCREECH),
-    LEVEL_UP_MOVE(36, MOVE_CRUNCH),
-    LEVEL_UP_MOVE(48, MOVE_ACID_ARMOR),
-    LEVEL_UP_MOVE(60, MOVE_SLUDGE_BOMB),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanMukLevelUpLearnset[] = {
+	//LEVEL_UP_MOVE( 0, MOVE_VENOM_DRENCH),
+	//LEVEL_UP_MOVE( 1, MOVE_VENOM_DRENCH),
+	LEVEL_UP_MOVE( 1, MOVE_POUND),
+	LEVEL_UP_MOVE( 1, MOVE_POISON_GAS),
+	LEVEL_UP_MOVE( 1, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 1, MOVE_BITE),
+	LEVEL_UP_MOVE( 4, MOVE_HARDEN),
+	LEVEL_UP_MOVE( 7, MOVE_BITE),
+	LEVEL_UP_MOVE(12, MOVE_DISABLE),
+	//LEVEL_UP_MOVE(15, MOVE_ACID_SPRAY),
+	LEVEL_UP_MOVE(18, MOVE_POISON_FANG),
+	LEVEL_UP_MOVE(21, MOVE_MINIMIZE),
+	//LEVEL_UP_MOVE(26, MOVE_FLING),
+	LEVEL_UP_MOVE(29, MOVE_KNOCK_OFF),
+	LEVEL_UP_MOVE(32, MOVE_CRUNCH),
+	LEVEL_UP_MOVE(37, MOVE_SCREECH),
+	//LEVEL_UP_MOVE(40, MOVE_GUNK_SHOT),
+	LEVEL_UP_MOVE(46, MOVE_ACID_ARMOR),
+	//LEVEL_UP_MOVE(52, MOVE_BELCH),
+	LEVEL_UP_MOVE(57, MOVE_MEMENTO),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sExeggutorAlolanLevelUpLearnset[] = {
-    //LEVEL_UP_MOVE( 1, MOVE_DRAGON_PULSE),
-    //LEVEL_UP_MOVE( 1, MOVE_POWER_WHIP),
-    LEVEL_UP_MOVE( 1, MOVE_EGG_BOMB),
-    LEVEL_UP_MOVE( 1, MOVE_BARRAGE),
-    LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS),
-    LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
-    LEVEL_UP_MOVE( 1, MOVE_STUN_SPORE),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanExeggutorLevelUpLearnset[] = {
+	//LEVEL_UP_MOVE( 0, MOVE_DRAGON_HAMMER),
+	//LEVEL_UP_MOVE( 1, MOVE_DRAGON_HAMMER),
+	//LEVEL_UP_MOVE( 1, MOVE_SEED_BOMB),
+	LEVEL_UP_MOVE( 1, MOVE_BARRAGE),
+	LEVEL_UP_MOVE( 1, MOVE_HYPNOSIS),
+	LEVEL_UP_MOVE( 1, MOVE_CONFUSION),
+	//LEVEL_UP_MOVE(17, MOVE_PSYSHOCK),
+	LEVEL_UP_MOVE(27, MOVE_EGG_BOMB),
+	//LEVEL_UP_MOVE(37, MOVE_WOOD_HAMMER),
+	//LEVEL_UP_MOVE(47, MOVE_LEAF_STORM),
+	LEVEL_UP_END
 };
 
-static const struct LevelUpMove sMarowakAlolanLevelUpLearnset[] = {
-    LEVEL_UP_MOVE( 1, MOVE_SWORDS_DANCE),
-    LEVEL_UP_MOVE( 1, MOVE_SCREECH),
-    LEVEL_UP_MOVE( 1, MOVE_GROWL),
-    LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
-    LEVEL_UP_MOVE( 1, MOVE_LEER),
-    LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB),
-    LEVEL_UP_MOVE(14, MOVE_FIRE_SPIN),
-    LEVEL_UP_MOVE(18, MOVE_RAGE),
-    LEVEL_UP_MOVE(24, MOVE_WILL_O_WISP),
-    LEVEL_UP_MOVE(26, MOVE_BONEMERANG),
-    LEVEL_UP_MOVE(36, MOVE_THRASH),
-    //LEVEL_UP_MOVE(48, MOVE_FLARE_BLITZ),
-    LEVEL_UP_END
+static const struct LevelUpMove sAlolanMarowakLevelUpLearnset[] = {
+	LEVEL_UP_MOVE( 1, MOVE_GROWL),
+	LEVEL_UP_MOVE( 1, MOVE_TAIL_WHIP),
+	LEVEL_UP_MOVE( 1, MOVE_BONE_CLUB),
+	LEVEL_UP_MOVE( 1, MOVE_FLAME_WHEEL),
+	LEVEL_UP_MOVE( 3, MOVE_TAIL_WHIP),
+	LEVEL_UP_MOVE( 7, MOVE_BONE_CLUB),
+	LEVEL_UP_MOVE(11, MOVE_FLAME_WHEEL),
+	LEVEL_UP_MOVE(13, MOVE_LEER),
+	//LEVEL_UP_MOVE(17, MOVE_HEX),
+	LEVEL_UP_MOVE(21, MOVE_BONEMERANG),
+	LEVEL_UP_MOVE(23, MOVE_WILL_O_WISP),
+	//LEVEL_UP_MOVE(27, MOVE_SHADOW_BONE),
+	LEVEL_UP_MOVE(33, MOVE_THRASH),
+	//LEVEL_UP_MOVE(37, MOVE_FLING),
+	//LEVEL_UP_MOVE(43, MOVE_STOMPING_TANTRUM),
+	LEVEL_UP_MOVE(49, MOVE_ENDEAVOR),
+	//LEVEL_UP_MOVE(53, MOVE_FLARE_BLITZ),
+	//LEVEL_UP_MOVE(59, MOVE_RETALIATE),
+	LEVEL_UP_MOVE(65, MOVE_BONE_RUSH),
+	LEVEL_UP_END
 };
 
+
 static const struct LevelUpMove sMeowthGalarianLevelUpLearnset[] = {
     LEVEL_UP_MOVE( 1, MOVE_FAKE_OUT),
     LEVEL_UP_MOVE( 1, MOVE_GROWL),