From d86a14ec6d035b6434558a17d04dd2d890316504 Mon Sep 17 00:00:00 2001 From: Skeli Date: Thu, 15 Oct 2020 16:14:04 -0400 Subject: [PATCH] Minor Learnset Updates --- src/Learnsets.c | 171 +++++++++++++++-------------- src/tm_compatibility/122 - Fly.txt | 1 + 2 files changed, 89 insertions(+), 83 deletions(-) diff --git a/src/Learnsets.c b/src/Learnsets.c index 8c6da05..32d764f 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -3266,16 +3266,17 @@ static const struct LevelUpMove sChikoritaLevelUpLearnset[] = { LEVEL_UP_MOVE( 6, MOVE_RAZORLEAF), LEVEL_UP_MOVE( 9, MOVE_POISONPOWDER), LEVEL_UP_MOVE(12, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(17, MOVE_REFLECT), - LEVEL_UP_MOVE(20, MOVE_MAGICALLEAF), - LEVEL_UP_MOVE(23, MOVE_NATURALGIFT), - LEVEL_UP_MOVE(28, MOVE_SWEETSCENT), - LEVEL_UP_MOVE(31, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(34, MOVE_BODYSLAM), - LEVEL_UP_MOVE(39, MOVE_SAFEGUARD), - LEVEL_UP_MOVE(42, MOVE_AROMATHERAPY), - LEVEL_UP_MOVE(45, MOVE_SOLARBEAM), - LEVEL_UP_MOVE(48, MOVE_LEAFSTORM), + LEVEL_UP_MOVE(15, MOVE_REFLECT), + LEVEL_UP_MOVE(18, MOVE_MAGICALLEAF), + LEVEL_UP_MOVE(22, MOVE_NATURALGIFT), + LEVEL_UP_MOVE(26, MOVE_GRASSYGLIDE), + LEVEL_UP_MOVE(30, MOVE_SWEETSCENT), + LEVEL_UP_MOVE(33, MOVE_BODYSLAM), + LEVEL_UP_MOVE(37, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(40, MOVE_SAFEGUARD), + LEVEL_UP_MOVE(43, MOVE_AROMATHERAPY), + LEVEL_UP_MOVE(46, MOVE_SOLARBEAM), + LEVEL_UP_MOVE(50, MOVE_LEAFSTORM), LEVEL_UP_END }; @@ -3285,16 +3286,17 @@ static const struct LevelUpMove sBayleefLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER), LEVEL_UP_MOVE(12, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(18, MOVE_REFLECT), - LEVEL_UP_MOVE(22, MOVE_MAGICALLEAF), - LEVEL_UP_MOVE(26, MOVE_NATURALGIFT), - LEVEL_UP_MOVE(32, MOVE_SWEETSCENT), - LEVEL_UP_MOVE(36, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(40, MOVE_BODYSLAM), - LEVEL_UP_MOVE(46, MOVE_SAFEGUARD), - LEVEL_UP_MOVE(50, MOVE_AROMATHERAPY), - LEVEL_UP_MOVE(54, MOVE_SOLARBEAM), - LEVEL_UP_MOVE(58, MOVE_LEAFSTORM), + LEVEL_UP_MOVE(15, MOVE_REFLECT), + LEVEL_UP_MOVE(19, MOVE_MAGICALLEAF), + LEVEL_UP_MOVE(24, MOVE_NATURALGIFT), + LEVEL_UP_MOVE(29, MOVE_GRASSYGLIDE), + LEVEL_UP_MOVE(34, MOVE_SWEETSCENT), + LEVEL_UP_MOVE(38, MOVE_BODYSLAM), + LEVEL_UP_MOVE(43, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(47, MOVE_SAFEGUARD), + LEVEL_UP_MOVE(51, MOVE_AROMATHERAPY), + LEVEL_UP_MOVE(55, MOVE_SOLARBEAM), + LEVEL_UP_MOVE(60, MOVE_LEAFSTORM), LEVEL_UP_END }; @@ -3306,17 +3308,17 @@ static const struct LevelUpMove sMeganiumLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER), LEVEL_UP_MOVE(12, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(18, MOVE_REFLECT), - LEVEL_UP_MOVE(22, MOVE_MAGICALLEAF), - LEVEL_UP_MOVE(26, MOVE_NATURALGIFT), - LEVEL_UP_MOVE(31, MOVE_PETALDANCE), - LEVEL_UP_MOVE(34, MOVE_SWEETSCENT), - LEVEL_UP_MOVE(40, MOVE_LIGHTSCREEN), - LEVEL_UP_MOVE(46, MOVE_BODYSLAM), - LEVEL_UP_MOVE(54, MOVE_SAFEGUARD), - LEVEL_UP_MOVE(60, MOVE_AROMATHERAPY), - LEVEL_UP_MOVE(66, MOVE_SOLARBEAM), - LEVEL_UP_MOVE(70, MOVE_LEAFSTORM), + LEVEL_UP_MOVE(15, MOVE_REFLECT), + LEVEL_UP_MOVE(19, MOVE_MAGICALLEAF), + LEVEL_UP_MOVE(24, MOVE_NATURALGIFT), + LEVEL_UP_MOVE(29, MOVE_GRASSYGLIDE), + LEVEL_UP_MOVE(36, MOVE_SWEETSCENT), + LEVEL_UP_MOVE(41, MOVE_BODYSLAM), + LEVEL_UP_MOVE(47, MOVE_LIGHTSCREEN), + LEVEL_UP_MOVE(52, MOVE_SAFEGUARD), + LEVEL_UP_MOVE(57, MOVE_AROMATHERAPY), + LEVEL_UP_MOVE(62, MOVE_SOLARBEAM), + LEVEL_UP_MOVE(68, MOVE_LEAFSTORM), LEVEL_UP_END }; @@ -8320,13 +8322,14 @@ static const struct LevelUpMove sTurtwigLevelUpLearnset[] = { LEVEL_UP_MOVE( 9, MOVE_ABSORB), LEVEL_UP_MOVE(13, MOVE_RAZORLEAF), LEVEL_UP_MOVE(17, MOVE_LEECHSEED), - LEVEL_UP_MOVE(21, MOVE_BITE), - LEVEL_UP_MOVE(25, MOVE_MEGADRAIN), - LEVEL_UP_MOVE(29, MOVE_CURSE), - LEVEL_UP_MOVE(33, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(37, MOVE_GIGADRAIN), - LEVEL_UP_MOVE(41, MOVE_CRUNCH), - LEVEL_UP_MOVE(45, MOVE_LEAFSTORM), + LEVEL_UP_MOVE(20, MOVE_BITE), + LEVEL_UP_MOVE(24, MOVE_MEGADRAIN), + LEVEL_UP_MOVE(28, MOVE_GRASSYGLIDE), + LEVEL_UP_MOVE(32, MOVE_CURSE), + LEVEL_UP_MOVE(35, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(38, MOVE_GIGADRAIN), + LEVEL_UP_MOVE(42, MOVE_CRUNCH), + LEVEL_UP_MOVE(46, MOVE_LEAFSTORM), LEVEL_UP_END }; @@ -8335,14 +8338,15 @@ static const struct LevelUpMove sGrotleLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE(13, MOVE_RAZORLEAF), - LEVEL_UP_MOVE(17, MOVE_LEECHSEED), + LEVEL_UP_MOVE(18, MOVE_LEECHSEED), LEVEL_UP_MOVE(22, MOVE_BITE), LEVEL_UP_MOVE(27, MOVE_MEGADRAIN), - LEVEL_UP_MOVE(32, MOVE_CURSE), - LEVEL_UP_MOVE(37, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(42, MOVE_GIGADRAIN), - LEVEL_UP_MOVE(47, MOVE_CRUNCH), - LEVEL_UP_MOVE(52, MOVE_LEAFSTORM), + LEVEL_UP_MOVE(32, MOVE_GRASSYGLIDE), + LEVEL_UP_MOVE(37, MOVE_CURSE), + LEVEL_UP_MOVE(41, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(45, MOVE_GIGADRAIN), + LEVEL_UP_MOVE(50, MOVE_CRUNCH), + LEVEL_UP_MOVE(55, MOVE_LEAFSTORM), LEVEL_UP_END }; @@ -8352,16 +8356,17 @@ static const struct LevelUpMove sTorterraLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_WITHDRAW), LEVEL_UP_MOVE( 1, MOVE_ABSORB), LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), - LEVEL_UP_MOVE(17, MOVE_LEECHSEED), + LEVEL_UP_MOVE(18, MOVE_LEECHSEED), LEVEL_UP_MOVE(22, MOVE_BITE), LEVEL_UP_MOVE(27, MOVE_MEGADRAIN), LEVEL_UP_MOVE(31, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(33, MOVE_CURSE), - LEVEL_UP_MOVE(39, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(45, MOVE_GIGADRAIN), - LEVEL_UP_MOVE(51, MOVE_CRUNCH), - LEVEL_UP_MOVE(57, MOVE_LEAFSTORM), - LEVEL_UP_MOVE(63, MOVE_WOODHAMMER), + LEVEL_UP_MOVE(32, MOVE_GRASSYGLIDE), + LEVEL_UP_MOVE(38, MOVE_CURSE), + LEVEL_UP_MOVE(43, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(48, MOVE_GIGADRAIN), + LEVEL_UP_MOVE(54, MOVE_CRUNCH), + LEVEL_UP_MOVE(60, MOVE_LEAFSTORM), + LEVEL_UP_MOVE(66, MOVE_WOODHAMMER), LEVEL_UP_END }; @@ -9529,8 +9534,7 @@ static const struct LevelUpMove sRioluLevelUpLearnset[] = { }; static const struct LevelUpMove sLucarioLevelUpLearnset[] = { - LEVEL_UP_MOVE( 0, MOVE_AURASPHERE), - LEVEL_UP_MOVE( 1, MOVE_AURASPHERE), + LEVEL_UP_MOVE( 0, MOVE_POWERUPPUNCH), LEVEL_UP_MOVE( 1, MOVE_FORESIGHT), LEVEL_UP_MOVE( 1, MOVE_LIFEDEW), LEVEL_UP_MOVE( 1, MOVE_WORKUP), @@ -9548,17 +9552,18 @@ static const struct LevelUpMove sLucarioLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_METALCLAW), LEVEL_UP_MOVE(12, MOVE_COUNTER), LEVEL_UP_MOVE(16, MOVE_LASERFOCUS), - LEVEL_UP_MOVE(20, MOVE_POWERUPPUNCH), + LEVEL_UP_MOVE(20, MOVE_LOWSWEEP), LEVEL_UP_MOVE(24, MOVE_CALMMIND), LEVEL_UP_MOVE(28, MOVE_METALSOUND), LEVEL_UP_MOVE(32, MOVE_QUICKGUARD), LEVEL_UP_MOVE(36, MOVE_BONERUSH), LEVEL_UP_MOVE(40, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(44, MOVE_HEALPULSE), - LEVEL_UP_MOVE(48, MOVE_METEORMASH), - LEVEL_UP_MOVE(52, MOVE_DRAGONPULSE), - LEVEL_UP_MOVE(56, MOVE_EXTREMESPEED), - LEVEL_UP_MOVE(60, MOVE_CLOSECOMBAT), + LEVEL_UP_MOVE(44, MOVE_AURASPHERE), + LEVEL_UP_MOVE(48, MOVE_HEALPULSE), + LEVEL_UP_MOVE(52, MOVE_METEORMASH), + LEVEL_UP_MOVE(56, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE(60, MOVE_EXTREMESPEED), + LEVEL_UP_MOVE(64, MOVE_CLOSECOMBAT), LEVEL_UP_END }; @@ -14471,19 +14476,20 @@ static const struct LevelUpMove sSkiddoLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWTH), LEVEL_UP_MOVE( 7, MOVE_VINEWHIP), - LEVEL_UP_MOVE( 9, MOVE_TAILWHIP), + LEVEL_UP_MOVE(10, MOVE_TAILWHIP), LEVEL_UP_MOVE(12, MOVE_LEECHSEED), - LEVEL_UP_MOVE(13, MOVE_RAZORLEAF), - LEVEL_UP_MOVE(16, MOVE_WORRYSEED), - LEVEL_UP_MOVE(20, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(22, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(26, MOVE_BULLDOZE), - LEVEL_UP_MOVE(30, MOVE_SEEDBOMB), - LEVEL_UP_MOVE(34, MOVE_BULKUP), + LEVEL_UP_MOVE(14, MOVE_RAZORLEAF), + LEVEL_UP_MOVE(17, MOVE_WORRYSEED), + LEVEL_UP_MOVE(19, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(21, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(24, MOVE_GRASSYGLIDE), + LEVEL_UP_MOVE(27, MOVE_BULLDOZE), + LEVEL_UP_MOVE(31, MOVE_SEEDBOMB), + LEVEL_UP_MOVE(35, MOVE_BULKUP), LEVEL_UP_MOVE(38, MOVE_DOUBLEEDGE), LEVEL_UP_MOVE(42, MOVE_HORNLEECH), - LEVEL_UP_MOVE(45, MOVE_LEAFBLADE), - LEVEL_UP_MOVE(50, MOVE_MILKDRINK), + LEVEL_UP_MOVE(46, MOVE_MILKDRINK), + LEVEL_UP_MOVE(50, MOVE_LEAFBLADE), LEVEL_UP_END }; @@ -14492,23 +14498,22 @@ static const struct LevelUpMove sGogoatLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_EARTHQUAKE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWTH), - LEVEL_UP_MOVE( 1, MOVE_VINEWHIP), - LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), LEVEL_UP_MOVE( 7, MOVE_VINEWHIP), - LEVEL_UP_MOVE( 9, MOVE_TAILWHIP), + LEVEL_UP_MOVE(10, MOVE_TAILWHIP), LEVEL_UP_MOVE(12, MOVE_LEECHSEED), - LEVEL_UP_MOVE(13, MOVE_RAZORLEAF), - LEVEL_UP_MOVE(16, MOVE_WORRYSEED), - LEVEL_UP_MOVE(20, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(22, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(26, MOVE_BULLDOZE), - LEVEL_UP_MOVE(30, MOVE_SEEDBOMB), + LEVEL_UP_MOVE(14, MOVE_RAZORLEAF), + LEVEL_UP_MOVE(17, MOVE_WORRYSEED), + LEVEL_UP_MOVE(19, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(21, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(24, MOVE_GRASSYGLIDE), + LEVEL_UP_MOVE(27, MOVE_BULLDOZE), + LEVEL_UP_MOVE(31, MOVE_SEEDBOMB), LEVEL_UP_MOVE(31, MOVE_AERIALACE), - LEVEL_UP_MOVE(34, MOVE_BULKUP), - LEVEL_UP_MOVE(40, MOVE_DOUBLEEDGE), - LEVEL_UP_MOVE(47, MOVE_HORNLEECH), - LEVEL_UP_MOVE(55, MOVE_LEAFBLADE), - LEVEL_UP_MOVE(58, MOVE_MILKDRINK), + LEVEL_UP_MOVE(35, MOVE_BULKUP), + LEVEL_UP_MOVE(39, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(44, MOVE_HORNLEECH), + LEVEL_UP_MOVE(49, MOVE_MILKDRINK), + LEVEL_UP_MOVE(54, MOVE_LEAFBLADE), LEVEL_UP_END }; diff --git a/src/tm_compatibility/122 - Fly.txt b/src/tm_compatibility/122 - Fly.txt index 1c565a0..e5e4cad 100644 --- a/src/tm_compatibility/122 - Fly.txt +++ b/src/tm_compatibility/122 - Fly.txt @@ -46,6 +46,7 @@ STARAPTOR DRIFBLIM HONCHKROW CHATOT +GARCHOMP TOGEKISS GIRATINA GIRATINA_ORIGIN