diff --git a/src/data/pokemon/level_up_learnset_pointers.h b/src/data/pokemon/level_up_learnset_pointers.h index 7bd64a9a46..a3b66208e2 100644 --- a/src/data/pokemon/level_up_learnset_pointers.h +++ b/src/data/pokemon/level_up_learnset_pointers.h @@ -413,7 +413,11 @@ const u16 *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_SHIELDON] = sShieldonLevelUpLearnset, [SPECIES_BASTIODON] = sBastiodonLevelUpLearnset, [SPECIES_BURMY] = sBurmyLevelUpLearnset, - [SPECIES_WORMADAM] = sWormadamLevelUpLearnset, + [SPECIES_BURMY_SANDY] = sBurmyLevelUpLearnset, + [SPECIES_BURMY_TRASH] = sBurmyLevelUpLearnset, + [SPECIES_WORMADAM] = sWormadamPlantLevelUpLearnset, + [SPECIES_WORMADAM_SANDY] = sWormadamSandyLevelUpLearnset, + [SPECIES_WORMADAM_TRASH] = sWormadamTrashLevelUpLearnset, [SPECIES_MOTHIM] = sMothimLevelUpLearnset, [SPECIES_COMBEE] = sCombeeLevelUpLearnset, [SPECIES_VESPIQUEN] = sVespiquenLevelUpLearnset, @@ -480,6 +484,11 @@ const u16 *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_DUSKNOIR] = sDusknoirLevelUpLearnset, [SPECIES_FROSLASS] = sFroslassLevelUpLearnset, [SPECIES_ROTOM] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_FAN] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_FROST] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_HEAT] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_MOW] = sRotomLevelUpLearnset, + [SPECIES_ROTOM_WASH] = sRotomLevelUpLearnset, [SPECIES_UXIE] = sUxieLevelUpLearnset, [SPECIES_MESPRIT] = sMespritLevelUpLearnset, [SPECIES_AZELF] = sAzelfLevelUpLearnset, @@ -647,6 +656,8 @@ const u16 *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_ZEKROM] = sZekromLevelUpLearnset, [SPECIES_LANDORUS] = sLandorusLevelUpLearnset, [SPECIES_KYUREM] = sKyuremLevelUpLearnset, + [SPECIES_KYUREM_BLACK] = sKyuremBlackLevelUpLearnset, + [SPECIES_KYUREM_WHITE] = sKyuremWhiteLevelUpLearnset, [SPECIES_KELDEO] = sKeldeoLevelUpLearnset, [SPECIES_MELOETTA] = sMeloettaLevelUpLearnset, [SPECIES_GENESECT] = sGenesectLevelUpLearnset, @@ -678,7 +689,8 @@ const u16 *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_PANGORO] = sPangoroLevelUpLearnset, [SPECIES_FURFROU] = sFurfrouLevelUpLearnset, [SPECIES_ESPURR] = sEspurrLevelUpLearnset, - [SPECIES_MEOWSTIC] = sMeowsticLevelUpLearnset, + [SPECIES_MEOWSTIC] = sMeowsticMaleLevelUpLearnset, + [SPECIES_MEOWSTIC_F] = sMeowsticFemaleLevelUpLearnset, [SPECIES_HONEDGE] = sHonedgeLevelUpLearnset, [SPECIES_DOUBLADE] = sDoubladeLevelUpLearnset, [SPECIES_AEGISLASH] = sAegislashLevelUpLearnset, @@ -808,4 +820,55 @@ const u16 *const gLevelUpLearnsets[NUM_SPECIES] = [SPECIES_STAKATAKA] = sStakatakaLevelUpLearnset, [SPECIES_BLACEPHALON] = sBlacephalonLevelUpLearnset, [SPECIES_ZERAORA] = sZeraoraLevelUpLearnset, + // Megas have the same learnsets + [SPECIES_MEGA_VENUSAUR] = sVenusaurLevelUpLearnset, + [SPECIES_MEGA_CHARIZARD_X] = sCharizardLevelUpLearnset, + [SPECIES_MEGA_CHARIZARD_Y] = sCharizardLevelUpLearnset, + [SPECIES_MEGA_BLASTOISE] = sBlastoiseLevelUpLearnset, + [SPECIES_MEGA_BEEDRILL] = sBeedrillLevelUpLearnset, + [SPECIES_MEGA_PIDGEOT] = sPidgeotLevelUpLearnset, + [SPECIES_MEGA_ALAKAZAM] = sAlakazamLevelUpLearnset, + [SPECIES_MEGA_SLOWBRO] = sSlowbroLevelUpLearnset, + [SPECIES_MEGA_GENGAR] = sGengarLevelUpLearnset, + [SPECIES_MEGA_KANGASKHAN] = sKangaskhanLevelUpLearnset, + [SPECIES_MEGA_PINSIR] = sPinsirLevelUpLearnset, + [SPECIES_MEGA_GYARADOS] = sGyaradosLevelUpLearnset, + [SPECIES_MEGA_AERODACTYL] = sAerodactylLevelUpLearnset, + [SPECIES_MEGA_MEWTWO_X] = sMewtwoLevelUpLearnset, + [SPECIES_MEGA_MEWTWO_Y] = sMewtwoLevelUpLearnset, + [SPECIES_MEGA_AMPHAROS] = sAmpharosLevelUpLearnset, + [SPECIES_MEGA_STEELIX] = sSteelixLevelUpLearnset, + [SPECIES_MEGA_SCIZOR] = sScizorLevelUpLearnset, + [SPECIES_MEGA_HERACROSS] = sHeracrossLevelUpLearnset, + [SPECIES_MEGA_HOUNDOOM] = sHoundoomLevelUpLearnset, + [SPECIES_MEGA_TYRANITAR] = sTyranitarLevelUpLearnset, + [SPECIES_MEGA_SCEPTILE] = sSceptileLevelUpLearnset, + [SPECIES_MEGA_BLAZIKEN] = sBlazikenLevelUpLearnset, + [SPECIES_MEGA_SWAMPERT] = sSwampertLevelUpLearnset, + [SPECIES_MEGA_GARDEVOIR] = sGardevoirLevelUpLearnset, + [SPECIES_MEGA_SABLEYE] = sSableyeLevelUpLearnset, + [SPECIES_MEGA_MAWILE] = sMawileLevelUpLearnset, + [SPECIES_MEGA_AGGRON] = sAggronLevelUpLearnset, + [SPECIES_MEGA_MEDICHAM] = sMedichamLevelUpLearnset, + [SPECIES_MEGA_MANECTRIC] = sManectricLevelUpLearnset, + [SPECIES_MEGA_SHARPEDO] = sSharpedoLevelUpLearnset, + [SPECIES_MEGA_CAMERUPT] = sCameruptLevelUpLearnset, + [SPECIES_MEGA_ALTARIA] = sAltariaLevelUpLearnset, + [SPECIES_MEGA_BANETTE] = sBanetteLevelUpLearnset, + [SPECIES_MEGA_ABSOL] = sAbsolLevelUpLearnset, + [SPECIES_MEGA_GLALIE] = sGlalieLevelUpLearnset, + [SPECIES_MEGA_SALAMENCE] = sSalamenceLevelUpLearnset, + [SPECIES_MEGA_METAGROSS] = sMetagrossLevelUpLearnset, + [SPECIES_MEGA_LATIAS] = sLatiasLevelUpLearnset, + [SPECIES_MEGA_LATIOS] = sLatiosLevelUpLearnset, + [SPECIES_PRIMAL_KYOGRE] = sKyogreLevelUpLearnset, + [SPECIES_PRIMAL_GROUDON] = sGroudonLevelUpLearnset, + [SPECIES_MEGA_RAYQUAZA] = sRayquazaLevelUpLearnset, + [SPECIES_MEGA_LOPUNNY] = sLopunnyLevelUpLearnset, + [SPECIES_MEGA_GARCHOMP] = sGarchompLevelUpLearnset, + [SPECIES_MEGA_LUCARIO] = sLucarioLevelUpLearnset, + [SPECIES_MEGA_ABOMASNOW] = sAbomasnowLevelUpLearnset, + [SPECIES_MEGA_GALLADE] = sGalladeLevelUpLearnset, + [SPECIES_MEGA_AUDINO] = sAudinoLevelUpLearnset, + [SPECIES_MEGA_DIANCIE] = sDiancieLevelUpLearnset, }; diff --git a/src/data/pokemon/level_up_learnsets.h b/src/data/pokemon/level_up_learnsets.h index 2699ca26a3..fadc8c9f54 100644 --- a/src/data/pokemon/level_up_learnsets.h +++ b/src/data/pokemon/level_up_learnsets.h @@ -5622,7 +5622,17 @@ static const u16 sBurmyLevelUpLearnset[] = { LEVEL_UP_END }; -static const u16 sWormadamLevelUpLearnset[] = { +static const u16 sWormadamPlantLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const u16 sWormadamSandyLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const u16 sWormadamTrashLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END }; @@ -6792,6 +6802,16 @@ static const u16 sKyuremLevelUpLearnset[] = { LEVEL_UP_END }; +static const u16 sKyuremBlackLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const u16 sKyuremWhiteLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + static const u16 sKeldeoLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END @@ -6947,7 +6967,12 @@ static const u16 sEspurrLevelUpLearnset[] = { LEVEL_UP_END }; -static const u16 sMeowsticLevelUpLearnset[] = { +static const u16 sMeowsticMaleLevelUpLearnset[] = { + LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_END +}; + +static const u16 sMeowsticFemaleLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_END };