From 90c3feab92387390b9f0add2ca7204b8f2d33b18 Mon Sep 17 00:00:00 2001 From: Skeli Date: Mon, 20 Dec 2021 03:09:18 +0200 Subject: [PATCH] More Moveset Updates --- src/Egg_Moves.c | 21 +++++--- src/Learnsets.c | 133 ++++++++++++++++++++++++++++-------------------- 2 files changed, 94 insertions(+), 60 deletions(-) diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c index 502f025..d4af0ed 100644 --- a/src/Egg_Moves.c +++ b/src/Egg_Moves.c @@ -83,6 +83,7 @@ const u16 gEggMoves[] = MOVE_UPROAR, MOVE_MEFIRST, MOVE_REVENGE, + MOVE_TAKEDOWN, MOVE_FINALGAMBIT), egg_moves(SPEAROW, @@ -296,6 +297,8 @@ const u16 gEggMoves[] = MOVE_SLEEPTALK, MOVE_NIGHTSLASH, MOVE_POWERTRIP, + MOVE_SKULLBASH, + MOVE_RETALIATE, MOVE_THUNDEROUSKICK), egg_moves(GROWLITHE, @@ -309,7 +312,8 @@ const u16 gEggMoves[] = MOVE_DOUBLEKICK, MOVE_CLOSECOMBAT, MOVE_BURNUP, - MOVE_FLAMEBURST), + MOVE_FLAMEBURST, + MOVE_TELEPORT), egg_moves(POLIWAG, MOVE_MIST, @@ -550,7 +554,8 @@ const u16 gEggMoves[] = MOVE_SKILLSWAP, MOVE_POWERSPLIT, MOVE_PSYCHICTERRAIN, - MOVE_TELEPORT), + MOVE_TELEPORT, + MOVE_MINDREADER), egg_moves(KRABBY, MOVE_HAZE, @@ -1162,7 +1167,8 @@ const u16 gEggMoves[] = MOVE_FEINT, MOVE_FEINTATTACK, MOVE_DOUBLEEDGE, - MOVE_SECRETPOWER), + MOVE_SECRETPOWER, + MOVE_STRINGSHOT), egg_moves(WOOPER, MOVE_BODYSLAM, @@ -1195,7 +1201,8 @@ const u16 gEggMoves[] = MOVE_BRAVEBIRD, MOVE_ROOST, MOVE_FLATTER, - MOVE_PUNISHMENT), + MOVE_PUNISHMENT, + MOVE_AIRCUTTER), egg_moves(MISDREAVUS, MOVE_SCREECH, @@ -1492,7 +1499,8 @@ const u16 gEggMoves[] = MOVE_DOUBLEKICK, MOVE_MUDSPORT, MOVE_RAGE, - MOVE_CAPTIVATE), + MOVE_CAPTIVATE, + MOVE_LUNGE), egg_moves(TYROGUE, MOVE_RAPIDSPIN, @@ -2378,7 +2386,8 @@ const u16 gEggMoves[] = MOVE_EARTHPOWER, MOVE_WIDEGUARD, MOVE_GRASSYTERRAIN, - MOVE_HEAVYSLAM), + MOVE_HEAVYSLAM, + MOVE_LEAFAGE), egg_moves(CHIMCHAR, MOVE_FIREPUNCH, diff --git a/src/Learnsets.c b/src/Learnsets.c index 163c5f0..4bdd1e7 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -386,9 +386,10 @@ static const struct LevelUpMove sSpearowLevelUpLearnset[] = { LEVEL_UP_MOVE(18, MOVE_MIRRORMOVE), LEVEL_UP_MOVE(22, MOVE_ASSURANCE), LEVEL_UP_MOVE(24, MOVE_AGILITY), - LEVEL_UP_MOVE(27, MOVE_FOCUSENERGY), - LEVEL_UP_MOVE(30, MOVE_ROOST), - LEVEL_UP_MOVE(34, MOVE_DRILLPECK), + LEVEL_UP_MOVE(27, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(30, MOVE_FOCUSENERGY), + LEVEL_UP_MOVE(34, MOVE_ROOST), + LEVEL_UP_MOVE(37, MOVE_DRILLPECK), LEVEL_UP_END }; @@ -403,10 +404,11 @@ static const struct LevelUpMove sFearowLevelUpLearnset[] = { LEVEL_UP_MOVE(18, MOVE_MIRRORMOVE), LEVEL_UP_MOVE(23, MOVE_ASSURANCE), LEVEL_UP_MOVE(26, MOVE_AGILITY), - LEVEL_UP_MOVE(30, MOVE_FOCUSENERGY), - LEVEL_UP_MOVE(34, MOVE_ROOST), - LEVEL_UP_MOVE(39, MOVE_DRILLPECK), - LEVEL_UP_MOVE(44, MOVE_DRILLRUN), + LEVEL_UP_MOVE(30, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(34, MOVE_FOCUSENERGY), + LEVEL_UP_MOVE(38, MOVE_ROOST), + LEVEL_UP_MOVE(42, MOVE_DRILLPECK), + LEVEL_UP_MOVE(46, MOVE_DRILLRUN), LEVEL_UP_MOVE(50, MOVE_BEAKBLAST), LEVEL_UP_END }; @@ -537,7 +539,7 @@ static const struct LevelUpMove sSandshrewLevelUpLearnset[] = { static const struct LevelUpMove sSandslashLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CRUSHCLAW), - LEVEL_UP_MOVE( 1, MOVE_CRUSHCLAW), + LEVEL_UP_MOVE( 1, MOVE_AGILITY), LEVEL_UP_MOVE( 1, MOVE_SCRATCH), LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), LEVEL_UP_MOVE( 1, MOVE_POISONSTING), @@ -547,6 +549,7 @@ static const struct LevelUpMove sSandslashLevelUpLearnset[] = { LEVEL_UP_MOVE(15, MOVE_RAPIDSPIN), LEVEL_UP_MOVE(18, MOVE_BULLDOZE), LEVEL_UP_MOVE(21, MOVE_SWIFT), + LEVEL_UP_MOVE(21, MOVE_CRUSHCLAW), LEVEL_UP_MOVE(26, MOVE_FURYSWIPES), LEVEL_UP_MOVE(31, MOVE_SANDTOMB), LEVEL_UP_MOVE(33, MOVE_MAGNITUDE), @@ -1046,6 +1049,7 @@ static const struct LevelUpMove sVenonatLevelUpLearnset[] = { static const struct LevelUpMove sVenomothLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_GUST), + LEVEL_UP_MOVE( 1, MOVE_WHIRLWIND), LEVEL_UP_MOVE( 1, MOVE_BUGBITE), LEVEL_UP_MOVE( 1, MOVE_POISONFANG), LEVEL_UP_MOVE( 1, MOVE_TACKLE), @@ -3197,8 +3201,8 @@ static const struct LevelUpMove sArticunoLevelUpLearnset[] = { 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(20, MOVE_AGILITY), + LEVEL_UP_MOVE(15, MOVE_AGILITY), + LEVEL_UP_MOVE(20, MOVE_ICESHARD), LEVEL_UP_MOVE(25, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE(30, MOVE_TAILWIND), LEVEL_UP_MOVE(35, MOVE_FREEZEDRY), @@ -3218,13 +3222,13 @@ static const struct LevelUpMove sZapdosLevelUpLearnset[] = { 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(15, MOVE_AGILITY), + LEVEL_UP_MOVE(20, MOVE_PLUCK), LEVEL_UP_MOVE(25, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE(30, MOVE_CHARGE), - LEVEL_UP_MOVE(35, MOVE_DRILLPECK), + LEVEL_UP_MOVE(35, MOVE_DISCHARGE), LEVEL_UP_MOVE(40, MOVE_ROOST), - LEVEL_UP_MOVE(45, MOVE_DISCHARGE), + LEVEL_UP_MOVE(45, MOVE_DRILLPECK), LEVEL_UP_MOVE(50, MOVE_RAINDANCE), LEVEL_UP_MOVE(55, MOVE_THUNDER), LEVEL_UP_MOVE(60, MOVE_DETECT), @@ -3240,8 +3244,8 @@ static const struct LevelUpMove sMoltresLevelUpLearnset[] = { 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(15, MOVE_AGILITY), + LEVEL_UP_MOVE(20, MOVE_WINGATTACK), LEVEL_UP_MOVE(25, MOVE_ANCIENTPOWER), LEVEL_UP_MOVE(30, MOVE_INCINERATE), LEVEL_UP_MOVE(35, MOVE_AIRSLASH), @@ -3950,11 +3954,13 @@ static const struct LevelUpMove sMareepLevelUpLearnset[] = { }; static const struct LevelUpMove sFlaaffyLevelUpLearnset[] = { + LEVEL_UP_MOVE( 0, MOVE_CHARGEBEAM), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE), LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK), LEVEL_UP_MOVE(12, MOVE_COTTONSPORE), + LEVEL_UP_MOVE(14, MOVE_CHARGEBEAM), LEVEL_UP_MOVE(15, MOVE_CHARGE), LEVEL_UP_MOVE(19, MOVE_TAKEDOWN), LEVEL_UP_MOVE(24, MOVE_ELECTROBALL), @@ -3980,6 +3986,7 @@ static const struct LevelUpMove sAmpharosLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_THUNDERWAVE), LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK), LEVEL_UP_MOVE(12, MOVE_COTTONSPORE), + LEVEL_UP_MOVE(14, MOVE_CHARGEBEAM), LEVEL_UP_MOVE(15, MOVE_CHARGE), LEVEL_UP_MOVE(19, MOVE_TAKEDOWN), LEVEL_UP_MOVE(24, MOVE_ELECTROBALL), @@ -4019,12 +4026,16 @@ static const struct LevelUpMove sBellossomLevelUpLearnset[] = { }; static const struct LevelUpMove sMarillLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_SPLASH), + LEVEL_UP_MOVE( 1, MOVE_BUBBLE), + LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 3, MOVE_HELPINGHAND), + LEVEL_UP_MOVE( 1, MOVE_SPLASH), + LEVEL_UP_MOVE( 1, MOVE_BUBBLE), + LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), LEVEL_UP_MOVE( 1, MOVE_TACKLE), - LEVEL_UP_MOVE( 1, MOVE_BUBBLE), - LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), - LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), LEVEL_UP_MOVE( 3, MOVE_WATERSPORT), LEVEL_UP_MOVE( 6, MOVE_WATERGUN), LEVEL_UP_MOVE( 9, MOVE_CHARM), @@ -4042,15 +4053,19 @@ static const struct LevelUpMove sMarillLevelUpLearnset[] = { }; static const struct LevelUpMove sAzumarillLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), - LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), - LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_SPLASH), LEVEL_UP_MOVE( 1, MOVE_BUBBLE), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), - LEVEL_UP_MOVE( 3, MOVE_WATERSPORT), - LEVEL_UP_MOVE( 6, MOVE_WATERGUN), - LEVEL_UP_MOVE( 9, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_SPLASH), + LEVEL_UP_MOVE( 1, MOVE_BUBBLE), + LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_ROLLOUT), + LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_WATERSPORT), + LEVEL_UP_MOVE( 1, MOVE_WATERGUN), + LEVEL_UP_MOVE( 1, MOVE_CHARM), LEVEL_UP_MOVE(12, MOVE_SLAM), LEVEL_UP_MOVE(14, MOVE_BUBBLEBEAM), LEVEL_UP_MOVE(16, MOVE_BOUNCE), @@ -4344,6 +4359,7 @@ static const struct LevelUpMove sEspeonLevelUpLearnset[] = { static const struct LevelUpMove sUmbreonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PURSUIT), + LEVEL_UP_MOVE( 1, MOVE_DARKPULSE), LEVEL_UP_MOVE( 1, MOVE_COVET), LEVEL_UP_MOVE( 1, MOVE_SWIFT), LEVEL_UP_MOVE( 1, MOVE_BITE), @@ -5097,13 +5113,15 @@ static const struct LevelUpMove sPhanpyLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), LEVEL_UP_MOVE( 6, MOVE_FLAIL), LEVEL_UP_MOVE(10, MOVE_ROLLOUT), - LEVEL_UP_MOVE(15, MOVE_NATURALGIFT), - LEVEL_UP_MOVE(19, MOVE_ENDURE), - LEVEL_UP_MOVE(24, MOVE_SLAM), - LEVEL_UP_MOVE(28, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(33, MOVE_CHARM), - LEVEL_UP_MOVE(37, MOVE_LASTRESORT), + LEVEL_UP_MOVE(14, MOVE_SLAM), + LEVEL_UP_MOVE(18, MOVE_CHARM), + LEVEL_UP_MOVE(22, MOVE_BULLDOZE), + LEVEL_UP_MOVE(26, MOVE_NATURALGIFT), + LEVEL_UP_MOVE(30, MOVE_ENDURE), + LEVEL_UP_MOVE(34, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(38, MOVE_LASTRESORT), LEVEL_UP_MOVE(42, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE), LEVEL_UP_END }; @@ -5111,29 +5129,30 @@ static const struct LevelUpMove sDonphanLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_FURYATTACK), LEVEL_UP_MOVE( 1, MOVE_FIREFANG), LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG), - LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_FLAIL), - LEVEL_UP_MOVE( 1, MOVE_NATURALGIFT), - LEVEL_UP_MOVE( 1, MOVE_ENDURE), - LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_NATURALGIFT), + LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), + LEVEL_UP_MOVE( 1, MOVE_ENDURE), LEVEL_UP_MOVE( 1, MOVE_LASTRESORT), LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_ODORSLEUTH), LEVEL_UP_MOVE( 1, MOVE_HORNATTACK), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), - LEVEL_UP_MOVE( 1, MOVE_RAPIDSPIN), + LEVEL_UP_MOVE( 6, MOVE_RAPIDSPIN), LEVEL_UP_MOVE(10, MOVE_ROLLOUT), - LEVEL_UP_MOVE(15, MOVE_ASSURANCE), - LEVEL_UP_MOVE(19, MOVE_KNOCKOFF), - LEVEL_UP_MOVE(24, MOVE_SLAM), + LEVEL_UP_MOVE(14, MOVE_SLAM), + LEVEL_UP_MOVE(18, MOVE_SCARYFACE), + LEVEL_UP_MOVE(22, MOVE_BULLDOZE), LEVEL_UP_MOVE(24, MOVE_FURYATTACK), - LEVEL_UP_MOVE(26, MOVE_BULLDOZE), - LEVEL_UP_MOVE(30, MOVE_MAGNITUDE), - LEVEL_UP_MOVE(37, MOVE_SCARYFACE), - LEVEL_UP_MOVE(43, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(50, MOVE_GIGAIMPACT), + LEVEL_UP_MOVE(27, MOVE_ASSURANCE), + LEVEL_UP_MOVE(32, MOVE_ENDURE), + LEVEL_UP_MOVE(36, MOVE_KNOCKOFF), + LEVEL_UP_MOVE(41, MOVE_MAGNITUDE), + LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(51, MOVE_GIGAIMPACT), LEVEL_UP_END }; @@ -5664,6 +5683,7 @@ static const struct LevelUpMove sCombuskenLevelUpLearnset[] = { static const struct LevelUpMove sBlazikenLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_FIREPUNCH), LEVEL_UP_MOVE( 1, MOVE_HIGHJUMPKICK), + LEVEL_UP_MOVE( 1, MOVE_CLOSECOMBAT), LEVEL_UP_MOVE( 1, MOVE_FLAMETHROWER), LEVEL_UP_MOVE( 1, MOVE_FEATHERDANCE), LEVEL_UP_MOVE( 1, MOVE_MIRRORMOVE), @@ -6194,6 +6214,7 @@ static const struct LevelUpMove sShroomishLevelUpLearnset[] = { static const struct LevelUpMove sBreloomLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_MACHPUNCH), + LEVEL_UP_MOVE( 1, MOVE_DRAINPUNCH), LEVEL_UP_MOVE( 1, MOVE_POISONPOWDER), LEVEL_UP_MOVE( 1, MOVE_WORRYSEED), LEVEL_UP_MOVE( 1, MOVE_GIGADRAIN), @@ -6805,6 +6826,7 @@ static const struct LevelUpMove sVibravaLevelUpLearnset[] = { static const struct LevelUpMove sFlygonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGONCLAW), + LEVEL_UP_MOVE( 1, MOVE_OUTRAGE), LEVEL_UP_MOVE( 1, MOVE_DRAGONRUSH), LEVEL_UP_MOVE( 1, MOVE_DRAGONDANCE), LEVEL_UP_MOVE( 1, MOVE_LASERFOCUS), @@ -7059,6 +7081,7 @@ static const struct LevelUpMove sCacneaLevelUpLearnset[] = { static const struct LevelUpMove sCacturneLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SPIKYSHIELD), + LEVEL_UP_MOVE( 1, MOVE_POISONJAB), LEVEL_UP_MOVE( 1, MOVE_REVENGE), LEVEL_UP_MOVE( 1, MOVE_POISONSTING), LEVEL_UP_MOVE( 1, MOVE_LEER), @@ -7180,7 +7203,7 @@ static const struct LevelUpMove sAzurillLevelUpLearnset[] = { LEVEL_UP_MOVE( 8, MOVE_CHARM), LEVEL_UP_MOVE(10, MOVE_BUBBLEBEAM), LEVEL_UP_MOVE(12, MOVE_SLAM), - LEVEL_UP_MOVE(15, MOVE_BOUNCE), + LEVEL_UP_MOVE(15, MOVE_BOUNCE), LEVEL_UP_END }; @@ -7368,6 +7391,7 @@ static const struct LevelUpMove sSwabluLevelUpLearnset[] = { static const struct LevelUpMove sAltariaLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DRAGONPULSE), + LEVEL_UP_MOVE( 1, MOVE_HURRICANE), LEVEL_UP_MOVE( 1, MOVE_PLUCK), LEVEL_UP_MOVE( 1, MOVE_MIRRORMOVE), LEVEL_UP_MOVE( 1, MOVE_PECK), @@ -9613,10 +9637,10 @@ static const struct LevelUpMove sSpiritombLevelUpLearnset[] = { static const struct LevelUpMove sGibleLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 3, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 7, MOVE_FIREFANG), + LEVEL_UP_MOVE( 7, MOVE_METALCLAW), LEVEL_UP_MOVE(13, MOVE_SANDSTORM), - LEVEL_UP_MOVE(15, MOVE_SANDTOMB), - LEVEL_UP_MOVE(18, MOVE_METALCLAW), + LEVEL_UP_MOVE(15, MOVE_FIREFANG), + LEVEL_UP_MOVE(18, MOVE_SANDTOMB), LEVEL_UP_MOVE(21, MOVE_BITE), LEVEL_UP_MOVE(24, MOVE_BULLDOZE), LEVEL_UP_MOVE(27, MOVE_SLASH), @@ -9635,10 +9659,10 @@ static const struct LevelUpMove sGabiteLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DUALCHOP), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 1, MOVE_FIREFANG), + LEVEL_UP_MOVE( 1, MOVE_METALCLAW), LEVEL_UP_MOVE( 1, MOVE_SANDSTORM), - LEVEL_UP_MOVE(15, MOVE_SANDTOMB), - LEVEL_UP_MOVE(18, MOVE_METALCLAW), + LEVEL_UP_MOVE(15, MOVE_FIREFANG), + LEVEL_UP_MOVE(18, MOVE_SANDTOMB), LEVEL_UP_MOVE(21, MOVE_BITE), LEVEL_UP_MOVE(23, MOVE_DUALCHOP), LEVEL_UP_MOVE(24, MOVE_BULLDOZE), @@ -9658,10 +9682,10 @@ static const struct LevelUpMove sGarchompLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CRUNCH), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 1, MOVE_FIREFANG), + LEVEL_UP_MOVE( 1, MOVE_METALCLAW), LEVEL_UP_MOVE( 1, MOVE_SANDSTORM), - LEVEL_UP_MOVE(15, MOVE_SANDTOMB), - LEVEL_UP_MOVE(18, MOVE_METALCLAW), + LEVEL_UP_MOVE(15, MOVE_FIREFANG), + LEVEL_UP_MOVE(18, MOVE_SANDTOMB), LEVEL_UP_MOVE(21, MOVE_BITE), LEVEL_UP_MOVE(23, MOVE_DUALCHOP), LEVEL_UP_MOVE(24, MOVE_BULLDOZE), @@ -10748,6 +10772,7 @@ static const struct LevelUpMove sManaphyLevelUpLearnset[] = { static const struct LevelUpMove sDarkraiLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ROAROFTIME), LEVEL_UP_MOVE( 1, MOVE_SPACIALREND), + LEVEL_UP_MOVE( 1, MOVE_SUCKERPUNCH), LEVEL_UP_MOVE( 1, MOVE_NIGHTSHADE), LEVEL_UP_MOVE( 1, MOVE_OMINOUSWIND), LEVEL_UP_MOVE( 1, MOVE_PURSUIT),