diff --git a/linker.ld b/linker.ld index 400384d..3bb25b5 100644 --- a/linker.ld +++ b/linker.ld @@ -1,7 +1,7 @@ OUTPUT_ARCH(arm) MEMORY { - rom : ORIGIN = (0x08000000 + 0x16cdc00), LENGTH = 32M + rom : ORIGIN = (0x08000000 + 0x16cdd20), LENGTH = 32M ewram : ORIGIN = 0x02000000, LENGTH = 4M - 4k } diff --git a/routinepointers b/routinepointers index 1b6ba71..ed97a6e 100644 --- a/routinepointers +++ b/routinepointers @@ -1 +1,2 @@ -## \ No newline at end of file +## +sp1B9_SeenAllRegionalMons 8160444 diff --git a/scripts/insert.py b/scripts/insert.py index 4416ee7..27099fc 100644 --- a/scripts/insert.py +++ b/scripts/insert.py @@ -7,7 +7,7 @@ import sys from datetime import datetime import _io -OFFSET_TO_PUT = 0x16cdc00 +OFFSET_TO_PUT = 0x16cdd20 SOURCE_ROM = "Pokemon Unbound.gba" ROM_NAME = "test.gba" diff --git a/scripts/make.py b/scripts/make.py index 4cad15a..9f95a48 100644 --- a/scripts/make.py +++ b/scripts/make.py @@ -9,7 +9,7 @@ import sys ############ ROM_NAME = "Pokemon Unbound.gba" # The name of your rom -OFFSET_TO_PUT = 0x16cdc00 +OFFSET_TO_PUT = 0x16cdd20 SEARCH_FREE_SPACE = False # Set to True if you want the script to search for free space # Set to False if you don't want to search for free space as you update the engine diff --git a/src/Evolution Table.c b/src/Evolution Table.c index 206b70e..ac3d98d 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -45,8 +45,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_ZUBAT] = {{EVO_LEVEL, 22, SPECIES_GOLBAT, 0}}, [SPECIES_GOLBAT] = {{EVO_FRIENDSHIP, 0, SPECIES_CROBAT, 0}}, [SPECIES_ODDISH] = {{EVO_LEVEL, 21, SPECIES_GLOOM, 0}}, - [SPECIES_GLOOM] = {{EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM, 0}, - {EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME, 0}}, + [SPECIES_GLOOM] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_VILEPLUME, 0}, + {EVO_ITEM, ITEM_SUN_STONE, SPECIES_BELLOSSOM, 0}}, [SPECIES_PARAS] = {{EVO_LEVEL, 24, SPECIES_PARASECT, 0}}, [SPECIES_VENONAT] = {{EVO_LEVEL, 31, SPECIES_VENOMOTH, 0}}, [SPECIES_DIGLETT] = {{EVO_LEVEL, 26, SPECIES_DUGTRIO, 0}}, @@ -92,7 +92,8 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_KRABBY] = {{EVO_LEVEL, 28, SPECIES_KINGLER, 0}}, [SPECIES_VOLTORB] = {{EVO_LEVEL, 30, SPECIES_ELECTRODE, 0}}, [SPECIES_EXEGGCUTE] = {{EVO_ITEM, ITEM_LEAF_STONE, SPECIES_EXEGGUTOR, 0}}, - [SPECIES_CUBONE] = {{EVO_LEVEL, 28, SPECIES_MAROWAK, 0}}, + [SPECIES_CUBONE] = {{EVO_LEVEL_DAY, 28, SPECIES_MAROWAK, 0}, + {EVO_LEVEL_NIGHT, 28, SPECIES_MAROWAK_A, 0}}, [SPECIES_LICKITUNG] = {{EVO_MOVE, MOVE_ROLLOUT, SPECIES_LICKILICKY, 0}}, [SPECIES_KOFFING] = {{EVO_LEVEL, 35, SPECIES_WEEZING, 0}}, [SPECIES_RHYHORN] = {{EVO_LEVEL, 42, SPECIES_RHYDON, 0}}, diff --git a/src/Learnsets.c b/src/Learnsets.c index 06d6d62..078287a 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -55,8 +55,8 @@ static const struct LevelUpMove sIvysaurLevelUpLearnset[] = { }; static const struct LevelUpMove sVenusaurLevelUpLearnset[] = { - LEVEL_UP_MOVE( 0, MOVE_PETALDANCE), LEVEL_UP_MOVE( 0, MOVE_PETALBLIZZARD), + LEVEL_UP_MOVE( 0, MOVE_PETALDANCE), LEVEL_UP_MOVE( 1, MOVE_PETALDANCE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), @@ -69,7 +69,7 @@ static const struct LevelUpMove sVenusaurLevelUpLearnset[] = { LEVEL_UP_MOVE(20, MOVE_TAKEDOWN), LEVEL_UP_MOVE(25, MOVE_SWEETSCENT), LEVEL_UP_MOVE(30, MOVE_SEEDBOMB), - LEVEL_UP_MOVE(35, MOVE_PETALBLIZZARD), + LEVEL_UP_MOVE(31, MOVE_PETALBLIZZARD), LEVEL_UP_MOVE(37, MOVE_SYNTHESIS), LEVEL_UP_MOVE(44, MOVE_WORRYSEED), LEVEL_UP_MOVE(51, MOVE_DOUBLEEDGE), @@ -276,6 +276,7 @@ static const struct LevelUpMove sPidgeyLevelUpLearnset[] = { LEVEL_UP_MOVE(29, MOVE_AGILITY), LEVEL_UP_MOVE(33, MOVE_WINGATTACK), LEVEL_UP_MOVE(37, MOVE_ROOST), + LEVEL_UP_MOVE(39, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(41, MOVE_TAILWIND), LEVEL_UP_MOVE(45, MOVE_MIRRORMOVE), LEVEL_UP_MOVE(49, MOVE_AIRSLASH), @@ -296,6 +297,7 @@ static const struct LevelUpMove sPidgeottoLevelUpLearnset[] = { LEVEL_UP_MOVE(32, MOVE_AGILITY), LEVEL_UP_MOVE(37, MOVE_WINGATTACK), LEVEL_UP_MOVE(42, MOVE_ROOST), + LEVEL_UP_MOVE(45, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(47, MOVE_TAILWIND), LEVEL_UP_MOVE(52, MOVE_MIRRORMOVE), LEVEL_UP_MOVE(57, MOVE_AIRSLASH), @@ -318,6 +320,7 @@ static const struct LevelUpMove sPidgeotLevelUpLearnset[] = { LEVEL_UP_MOVE(32, MOVE_AGILITY), LEVEL_UP_MOVE(38, MOVE_WINGATTACK), LEVEL_UP_MOVE(44, MOVE_ROOST), + LEVEL_UP_MOVE(47, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(50, MOVE_TAILWIND), LEVEL_UP_MOVE(56, MOVE_MIRRORMOVE), LEVEL_UP_MOVE(62, MOVE_AIRSLASH), @@ -374,6 +377,7 @@ static const struct LevelUpMove sSpearowLevelUpLearnset[] = { LEVEL_UP_MOVE(18, MOVE_MIRRORMOVE), LEVEL_UP_MOVE(22, MOVE_ASSURANCE), LEVEL_UP_MOVE(25, MOVE_AGILITY), + LEVEL_UP_MOVE(27, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(29, MOVE_FOCUSENERGY), LEVEL_UP_MOVE(32, MOVE_ROOST), LEVEL_UP_MOVE(36, MOVE_DRILLPECK), @@ -394,7 +398,8 @@ static const struct LevelUpMove sFearowLevelUpLearnset[] = { LEVEL_UP_MOVE(18, MOVE_MIRRORMOVE), LEVEL_UP_MOVE(23, MOVE_ASSURANCE), LEVEL_UP_MOVE(27, MOVE_AGILITY), - LEVEL_UP_MOVE(32, MOVE_FOCUSENERGY), + LEVEL_UP_MOVE(30, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(33, MOVE_FOCUSENERGY), LEVEL_UP_MOVE(36, MOVE_ROOST), LEVEL_UP_MOVE(41, MOVE_DRILLPECK), LEVEL_UP_MOVE(45, MOVE_DRILLRUN), @@ -754,6 +759,7 @@ static const struct LevelUpMove sZubatLevelUpLearnset[] = { LEVEL_UP_MOVE(25, MOVE_POISONFANG), LEVEL_UP_MOVE(29, MOVE_MEANLOOK), LEVEL_UP_MOVE(31, MOVE_LEECHFANG), + LEVEL_UP_MOVE(33, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(35, MOVE_HAZE), LEVEL_UP_MOVE(37, MOVE_VENOSHOCK), LEVEL_UP_MOVE(41, MOVE_AIRSLASH), @@ -778,6 +784,7 @@ static const struct LevelUpMove sGolbatLevelUpLearnset[] = { LEVEL_UP_MOVE(27, MOVE_POISONFANG), LEVEL_UP_MOVE(32, MOVE_MEANLOOK), LEVEL_UP_MOVE(35, MOVE_LEECHFANG), + LEVEL_UP_MOVE(37, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(40, MOVE_HAZE), LEVEL_UP_MOVE(43, MOVE_VENOSHOCK), LEVEL_UP_MOVE(48, MOVE_AIRSLASH), @@ -2667,100 +2674,132 @@ static const struct LevelUpMove sDittoLevelUpLearnset[] = { static const struct LevelUpMove sEeveeLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_COVET), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), - LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(13, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(17, MOVE_BITE), - LEVEL_UP_MOVE(17, MOVE_SWIFT), - LEVEL_UP_MOVE(20, MOVE_REFRESH), - LEVEL_UP_MOVE(25, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(29, MOVE_CHARM), - LEVEL_UP_MOVE(33, MOVE_BATONPASS), - LEVEL_UP_MOVE(37, MOVE_DOUBLEEDGE), - LEVEL_UP_MOVE(41, MOVE_LASTRESORT), - LEVEL_UP_MOVE(45, MOVE_TRUMPCARD), + LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), + LEVEL_UP_MOVE(20, MOVE_SWIFT), + LEVEL_UP_MOVE(23, MOVE_REFRESH), + LEVEL_UP_MOVE(25, MOVE_BITE), + LEVEL_UP_MOVE(30, MOVE_COPYCAT), + LEVEL_UP_MOVE(35, MOVE_BATONPASS), + LEVEL_UP_MOVE(40, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(45, MOVE_CHARM), + LEVEL_UP_MOVE(50, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE(55, MOVE_LASTRESORT), + LEVEL_UP_MOVE(60, MOVE_TRUMPCARD), LEVEL_UP_END }; static const struct LevelUpMove sVaporeonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_WATERGUN), - LEVEL_UP_MOVE( 1, MOVE_WATERGUN), + LEVEL_UP_MOVE( 1, MOVE_COVET), + LEVEL_UP_MOVE( 1, MOVE_SWIFT), + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_COPYCAT), + LEVEL_UP_MOVE( 1, MOVE_BATONPASS), + LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), + LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_TRUMPCARD), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_WATERGUN), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(13, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(17, MOVE_WATERPULSE), - LEVEL_UP_MOVE(20, MOVE_AURORABEAM), - LEVEL_UP_MOVE(25, MOVE_AQUARING), - LEVEL_UP_MOVE(29, MOVE_ACIDARMOR), - LEVEL_UP_MOVE(33, MOVE_HAZE), - LEVEL_UP_MOVE(37, MOVE_MUDDYWATER), - LEVEL_UP_MOVE(41, MOVE_LASTRESORT), - LEVEL_UP_MOVE(45, MOVE_HYDROPUMP), + LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), + LEVEL_UP_MOVE(20, MOVE_HAZE), + LEVEL_UP_MOVE(25, MOVE_WATERPULSE), + LEVEL_UP_MOVE(30, MOVE_AURORABEAM), + LEVEL_UP_MOVE(35, MOVE_AQUARING), + LEVEL_UP_MOVE(40, MOVE_MUDDYWATER), + LEVEL_UP_MOVE(45, MOVE_ACIDARMOR), + LEVEL_UP_MOVE(50, MOVE_HYDROPUMP), + LEVEL_UP_MOVE(55, MOVE_LASTRESORT), LEVEL_UP_END }; static const struct LevelUpMove sJolteonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_THUNDERSHOCK), - LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK), + LEVEL_UP_MOVE( 1, MOVE_COVET), + LEVEL_UP_MOVE( 1, MOVE_SWIFT), + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_COPYCAT), + LEVEL_UP_MOVE( 1, MOVE_BATONPASS), + LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), + LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_TRUMPCARD), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_THUNDERSHOCK), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(13, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(17, MOVE_DOUBLEKICK), - LEVEL_UP_MOVE(20, MOVE_THUNDERFANG), - LEVEL_UP_MOVE(25, MOVE_PINMISSILE), - LEVEL_UP_MOVE(29, MOVE_AGILITY), - LEVEL_UP_MOVE(33, MOVE_THUNDERWAVE), - LEVEL_UP_MOVE(37, MOVE_DISCHARGE), - LEVEL_UP_MOVE(41, MOVE_LASTRESORT), - LEVEL_UP_MOVE(45, MOVE_THUNDER), + LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), + LEVEL_UP_MOVE(20, MOVE_THUNDERWAVE), + LEVEL_UP_MOVE(25, MOVE_DOUBLEKICK), + LEVEL_UP_MOVE(30, MOVE_THUNDERFANG), + LEVEL_UP_MOVE(35, MOVE_PINMISSILE), + LEVEL_UP_MOVE(40, MOVE_DISCHARGE), + LEVEL_UP_MOVE(45, MOVE_AGILITY), + LEVEL_UP_MOVE(50, MOVE_THUNDER), + LEVEL_UP_MOVE(55, MOVE_LASTRESORT), LEVEL_UP_END }; static const struct LevelUpMove sFlareonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_EMBER), - LEVEL_UP_MOVE( 1, MOVE_EMBER), + LEVEL_UP_MOVE( 1, MOVE_COVET), + LEVEL_UP_MOVE( 1, MOVE_SWIFT), + LEVEL_UP_MOVE( 1, MOVE_COPYCAT), + LEVEL_UP_MOVE( 1, MOVE_BATONPASS), + LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), + LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_TRUMPCARD), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_EMBER), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(13, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(17, MOVE_BITE), - LEVEL_UP_MOVE(20, MOVE_FIREFANG), - LEVEL_UP_MOVE(25, MOVE_FIRESPIN), - LEVEL_UP_MOVE(29, MOVE_SCARYFACE), - LEVEL_UP_MOVE(33, MOVE_SMOG), - LEVEL_UP_MOVE(37, MOVE_LAVAPLUME), - LEVEL_UP_MOVE(41, MOVE_LASTRESORT), - LEVEL_UP_MOVE(45, MOVE_FLAREBLITZ), + LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), + LEVEL_UP_MOVE(20, MOVE_SMOG), + LEVEL_UP_MOVE(25, MOVE_BITE), + LEVEL_UP_MOVE(30, MOVE_FIREFANG), + LEVEL_UP_MOVE(35, MOVE_FIRESPIN), + LEVEL_UP_MOVE(40, MOVE_LAVAPLUME), + LEVEL_UP_MOVE(45, MOVE_SCARYFACE), + LEVEL_UP_MOVE(50, MOVE_FLAREBLITZ), + LEVEL_UP_MOVE(55, MOVE_LASTRESORT), LEVEL_UP_END }; static const struct LevelUpMove sPorygonLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_CONVERSION2), + LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), + LEVEL_UP_MOVE( 1, MOVE_SHARPEN), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CONVERSION), - LEVEL_UP_MOVE( 1, MOVE_SHARPEN), - LEVEL_UP_MOVE( 7, MOVE_PSYBEAM), - LEVEL_UP_MOVE(12, MOVE_AGILITY), - LEVEL_UP_MOVE(18, MOVE_RECOVER), - LEVEL_UP_MOVE(23, MOVE_MAGNETRISE), + LEVEL_UP_MOVE( 5, MOVE_RECYCLE), + LEVEL_UP_MOVE(10, MOVE_MAGNETRISE), + LEVEL_UP_MOVE(15, MOVE_THUNDERSHOCK), + LEVEL_UP_MOVE(20, MOVE_PSYBEAM), + LEVEL_UP_MOVE(25, MOVE_CONVERSION2), LEVEL_UP_MOVE(29, MOVE_SIGNALBEAM), - LEVEL_UP_MOVE(34, MOVE_RECYCLE), + LEVEL_UP_MOVE(32, MOVE_AGILITY), + LEVEL_UP_MOVE(35, MOVE_RECOVER), LEVEL_UP_MOVE(40, MOVE_DISCHARGE), - LEVEL_UP_MOVE(45, MOVE_LOCKON), - LEVEL_UP_MOVE(50, MOVE_TRIATTACK), - LEVEL_UP_MOVE(56, MOVE_MAGICCOAT), - LEVEL_UP_MOVE(62, MOVE_ZAPCANNON), + LEVEL_UP_MOVE(45, MOVE_TRIATTACK), + LEVEL_UP_MOVE(50, MOVE_MAGICCOAT), + LEVEL_UP_MOVE(55, MOVE_LOCKON), + LEVEL_UP_MOVE(60, MOVE_ZAPCANNON), LEVEL_UP_END }; @@ -3443,6 +3482,7 @@ static const struct LevelUpMove sCrobatLevelUpLearnset[] = { LEVEL_UP_MOVE(27, MOVE_POISONFANG), LEVEL_UP_MOVE(32, MOVE_MEANLOOK), LEVEL_UP_MOVE(35, MOVE_LEECHFANG), + LEVEL_UP_MOVE(37, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(40, MOVE_HAZE), LEVEL_UP_MOVE(43, MOVE_VENOSHOCK), LEVEL_UP_MOVE(48, MOVE_AIRSLASH), @@ -3984,41 +4024,61 @@ static const struct LevelUpMove sQuagsireLevelUpLearnset[] = { static const struct LevelUpMove sEspeonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_CONFUSION), - LEVEL_UP_MOVE( 1, MOVE_CONFUSION), + LEVEL_UP_MOVE( 1, MOVE_COVET), + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_COPYCAT), + LEVEL_UP_MOVE( 1, MOVE_BATONPASS), + LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), + LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_TRUMPCARD), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_CONFUSION), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(13, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(17, MOVE_SWIFT), - LEVEL_UP_MOVE(20, MOVE_PSYBEAM), - LEVEL_UP_MOVE(25, MOVE_FUTURESIGHT), - LEVEL_UP_MOVE(29, MOVE_PSYCHUP), - LEVEL_UP_MOVE(33, MOVE_MORNINGSUN), - LEVEL_UP_MOVE(37, MOVE_PSYCHIC), - LEVEL_UP_MOVE(41, MOVE_LASTRESORT), - LEVEL_UP_MOVE(45, MOVE_POWERSWAP), + LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), + LEVEL_UP_MOVE(20, MOVE_SWIFT), + LEVEL_UP_MOVE(25, MOVE_PSYBEAM), + LEVEL_UP_MOVE(30, MOVE_MORNINGSUN), + LEVEL_UP_MOVE(35, MOVE_POWERSWAP), + LEVEL_UP_MOVE(40, MOVE_PSYCHIC), + LEVEL_UP_MOVE(45, MOVE_PSYCHUP), + LEVEL_UP_MOVE(50, MOVE_FUTURESIGHT), + LEVEL_UP_MOVE(55, MOVE_LASTRESORT), LEVEL_UP_END }; static const struct LevelUpMove sUmbreonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_PURSUIT), - LEVEL_UP_MOVE( 1, MOVE_PURSUIT), + LEVEL_UP_MOVE( 1, MOVE_COVET), + LEVEL_UP_MOVE( 1, MOVE_SWIFT), + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_COPYCAT), + LEVEL_UP_MOVE( 1, MOVE_BATONPASS), + LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), + LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_TRUMPCARD), + LEVEL_UP_MOVE( 1, MOVE_FEINTATTACK), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_PURSUIT), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(13, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(17, MOVE_CONFUSERAY), - LEVEL_UP_MOVE(20, MOVE_FEINTATTACK), + LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), + LEVEL_UP_MOVE(20, MOVE_CONFUSERAY), LEVEL_UP_MOVE(25, MOVE_ASSURANCE), - LEVEL_UP_MOVE(29, MOVE_SCREECH), - LEVEL_UP_MOVE(33, MOVE_MOONLIGHT), - LEVEL_UP_MOVE(37, MOVE_MEANLOOK), - LEVEL_UP_MOVE(41, MOVE_LASTRESORT), - LEVEL_UP_MOVE(45, MOVE_GUARDSWAP), + LEVEL_UP_MOVE(30, MOVE_MOONLIGHT), + LEVEL_UP_MOVE(35, MOVE_GUARDSWAP), + LEVEL_UP_MOVE(40, MOVE_DARKPULSE), + LEVEL_UP_MOVE(45, MOVE_SCREECH), + LEVEL_UP_MOVE(50, MOVE_MEANLOOK), + LEVEL_UP_MOVE(55, MOVE_LASTRESORT), LEVEL_UP_END }; @@ -4031,7 +4091,8 @@ static const struct LevelUpMove sMurkrowLevelUpLearnset[] = { LEVEL_UP_MOVE(21, MOVE_NIGHTSHADE), LEVEL_UP_MOVE(25, MOVE_ASSURANCE), LEVEL_UP_MOVE(31, MOVE_TAUNT), - LEVEL_UP_MOVE(35, MOVE_FEINTATTACK), + LEVEL_UP_MOVE(33, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(36, MOVE_FEINTATTACK), LEVEL_UP_MOVE(41, MOVE_MEANLOOK), LEVEL_UP_MOVE(45, MOVE_FOULPLAY), LEVEL_UP_MOVE(50, MOVE_TAILWIND), @@ -4444,8 +4505,9 @@ static const struct LevelUpMove sSlugmaLevelUpLearnset[] = { LEVEL_UP_MOVE(15, MOVE_INCINERATE), LEVEL_UP_MOVE(20, MOVE_CLEARSMOG), LEVEL_UP_MOVE(22, MOVE_ANCIENTPOWER), - LEVEL_UP_MOVE(27, MOVE_FLAMEBURST), - LEVEL_UP_MOVE(29, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(25, MOVE_FLAMEBURST), + LEVEL_UP_MOVE(28, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(31, MOVE_SCORCHINGSANDS), LEVEL_UP_MOVE(34, MOVE_LAVAPLUME), LEVEL_UP_MOVE(36, MOVE_AMNESIA), LEVEL_UP_MOVE(41, MOVE_BODYSLAM), @@ -4457,7 +4519,6 @@ static const struct LevelUpMove sSlugmaLevelUpLearnset[] = { static const struct LevelUpMove sMagcargoLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_SHELLSMASH), - LEVEL_UP_MOVE( 1, MOVE_EARTHPOWER), LEVEL_UP_MOVE( 1, MOVE_YAWN), LEVEL_UP_MOVE( 1, MOVE_SMOG), LEVEL_UP_MOVE( 1, MOVE_EMBER), @@ -4468,8 +4529,9 @@ static const struct LevelUpMove sMagcargoLevelUpLearnset[] = { LEVEL_UP_MOVE(15, MOVE_INCINERATE), LEVEL_UP_MOVE(20, MOVE_CLEARSMOG), LEVEL_UP_MOVE(22, MOVE_ANCIENTPOWER), - LEVEL_UP_MOVE(27, MOVE_FLAMEBURST), - LEVEL_UP_MOVE(29, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(25, MOVE_FLAMEBURST), + LEVEL_UP_MOVE(28, MOVE_ROCKSLIDE), + LEVEL_UP_MOVE(31, MOVE_SCORCHINGSANDS), LEVEL_UP_MOVE(34, MOVE_LAVAPLUME), LEVEL_UP_MOVE(36, MOVE_AMNESIA), LEVEL_UP_MOVE(37, MOVE_SHELLSMASH), @@ -4655,12 +4717,12 @@ static const struct LevelUpMove sHoundourLevelUpLearnset[] = { LEVEL_UP_MOVE(44, MOVE_FLAMETHROWER), LEVEL_UP_MOVE(49, MOVE_CRUNCH), LEVEL_UP_MOVE(52, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(56, MOVE_INFERNO), + LEVEL_UP_MOVE(56, MOVE_DARKPULSE), + LEVEL_UP_MOVE(62, MOVE_INFERNO), LEVEL_UP_END }; static const struct LevelUpMove sHoundoomLevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_INFERNO), LEVEL_UP_MOVE( 1, MOVE_NASTYPLOT), LEVEL_UP_MOVE( 1, MOVE_THUNDERFANG), LEVEL_UP_MOVE( 1, MOVE_LEER), @@ -4680,7 +4742,8 @@ static const struct LevelUpMove sHoundoomLevelUpLearnset[] = { LEVEL_UP_MOVE(50, MOVE_FLAMETHROWER), LEVEL_UP_MOVE(56, MOVE_CRUNCH), LEVEL_UP_MOVE(60, MOVE_NASTYPLOT), - LEVEL_UP_MOVE(65, MOVE_INFERNO), + LEVEL_UP_MOVE(65, MOVE_DARKPULSE), + LEVEL_UP_MOVE(70, MOVE_INFERNO), LEVEL_UP_END }; @@ -4744,24 +4807,24 @@ static const struct LevelUpMove sDonphanLevelUpLearnset[] = { }; static const struct LevelUpMove sPorygon2LevelUpLearnset[] = { - LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON), - LEVEL_UP_MOVE( 1, MOVE_MAGICCOAT), - LEVEL_UP_MOVE( 1, MOVE_CONVERSION2), + LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), + LEVEL_UP_MOVE( 1, MOVE_SHARPEN), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CONVERSION), - LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), - LEVEL_UP_MOVE( 7, MOVE_PSYBEAM), - LEVEL_UP_MOVE(12, MOVE_AGILITY), - LEVEL_UP_MOVE(18, MOVE_RECOVER), - LEVEL_UP_MOVE(23, MOVE_MAGNETRISE), + LEVEL_UP_MOVE( 1, MOVE_RECYCLE), + LEVEL_UP_MOVE( 1, MOVE_MAGNETRISE), + LEVEL_UP_MOVE(15, MOVE_THUNDERSHOCK), + LEVEL_UP_MOVE(20, MOVE_PSYBEAM), + LEVEL_UP_MOVE(25, MOVE_CONVERSION2), LEVEL_UP_MOVE(29, MOVE_SIGNALBEAM), - LEVEL_UP_MOVE(34, MOVE_RECYCLE), + LEVEL_UP_MOVE(32, MOVE_AGILITY), + LEVEL_UP_MOVE(35, MOVE_RECOVER), LEVEL_UP_MOVE(40, MOVE_DISCHARGE), - LEVEL_UP_MOVE(45, MOVE_LOCKON), - LEVEL_UP_MOVE(50, MOVE_TRIATTACK), - LEVEL_UP_MOVE(56, MOVE_MAGICCOAT), - LEVEL_UP_MOVE(62, MOVE_ZAPCANNON), - LEVEL_UP_MOVE(67, MOVE_HYPERBEAM), + LEVEL_UP_MOVE(45, MOVE_TRIATTACK), + LEVEL_UP_MOVE(50, MOVE_MAGICCOAT), + LEVEL_UP_MOVE(55, MOVE_LOCKON), + LEVEL_UP_MOVE(60, MOVE_ZAPCANNON), + LEVEL_UP_MOVE(65, MOVE_HYPERBEAM), LEVEL_UP_END }; @@ -5004,10 +5067,10 @@ static const struct LevelUpMove sLarvitarLevelUpLearnset[] = { LEVEL_UP_MOVE(21, MOVE_DARKPULSE), LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE), LEVEL_UP_MOVE(27, MOVE_CRUNCH), - LEVEL_UP_MOVE(31, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(33, MOVE_STONEEDGE), - LEVEL_UP_MOVE(36, MOVE_CHIPAWAY), - LEVEL_UP_MOVE(39, MOVE_THRASH), + LEVEL_UP_MOVE(31, MOVE_CHIPAWAY), + LEVEL_UP_MOVE(33, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(36, MOVE_THRASH), + LEVEL_UP_MOVE(39, MOVE_STONEEDGE), LEVEL_UP_MOVE(42, MOVE_HYPERBEAM), LEVEL_UP_END }; @@ -5028,10 +5091,10 @@ static const struct LevelUpMove sPupitarLevelUpLearnset[] = { LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE), LEVEL_UP_MOVE(27, MOVE_CRUNCH), LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(33, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(37, MOVE_STONEEDGE), - LEVEL_UP_MOVE(42, MOVE_CHIPAWAY), - LEVEL_UP_MOVE(47, MOVE_THRASH), + LEVEL_UP_MOVE(33, MOVE_CHIPAWAY), + LEVEL_UP_MOVE(37, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(42, MOVE_THRASH), + LEVEL_UP_MOVE(47, MOVE_STONEEDGE), LEVEL_UP_MOVE(52, MOVE_HYPERBEAM), LEVEL_UP_END }; @@ -5054,10 +5117,10 @@ static const struct LevelUpMove sTyranitarLevelUpLearnset[] = { LEVEL_UP_MOVE(24, MOVE_ROCKSLIDE), LEVEL_UP_MOVE(27, MOVE_CRUNCH), LEVEL_UP_MOVE(29, MOVE_IRONDEFENSE), - LEVEL_UP_MOVE(33, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(37, MOVE_STONEEDGE), - LEVEL_UP_MOVE(42, MOVE_CHIPAWAY), - LEVEL_UP_MOVE(47, MOVE_THRASH), + LEVEL_UP_MOVE(33, MOVE_CHIPAWAY), + LEVEL_UP_MOVE(37, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(42, MOVE_THRASH), + LEVEL_UP_MOVE(47, MOVE_STONEEDGE), LEVEL_UP_MOVE(52, MOVE_HYPERBEAM), LEVEL_UP_MOVE(59, MOVE_GIGAIMPACT), LEVEL_UP_END @@ -5651,6 +5714,7 @@ static const struct LevelUpMove sTaillowLevelUpLearnset[] = { LEVEL_UP_MOVE(17, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(21, MOVE_AERIALACE), LEVEL_UP_MOVE(25, MOVE_QUICKGUARD), + LEVEL_UP_MOVE(27, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(29, MOVE_AGILITY), LEVEL_UP_MOVE(33, MOVE_AIRSLASH), LEVEL_UP_MOVE(37, MOVE_ENDEAVOR), @@ -5673,7 +5737,8 @@ static const struct LevelUpMove sSwellowLevelUpLearnset[] = { LEVEL_UP_MOVE(17, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(21, MOVE_AERIALACE), LEVEL_UP_MOVE(27, MOVE_QUICKGUARD), - LEVEL_UP_MOVE(33, MOVE_AGILITY), + LEVEL_UP_MOVE(31, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(34, MOVE_AGILITY), LEVEL_UP_MOVE(39, MOVE_AIRSLASH), LEVEL_UP_MOVE(45, MOVE_ENDEAVOR), LEVEL_UP_MOVE(51, MOVE_BRAVEBIRD), @@ -6005,7 +6070,8 @@ static const struct LevelUpMove sTorkoalLevelUpLearnset[] = { LEVEL_UP_MOVE(40, MOVE_FLAMETHROWER), LEVEL_UP_MOVE(42, MOVE_FLAIL), LEVEL_UP_MOVE(44, MOVE_CURSE), - LEVEL_UP_MOVE(48, MOVE_HEATWAVE), + LEVEL_UP_MOVE(47, MOVE_SCORCHINGSANDS), + LEVEL_UP_MOVE(49, MOVE_HEATWAVE), LEVEL_UP_MOVE(52, MOVE_AMNESIA), LEVEL_UP_MOVE(56, MOVE_INFERNO), LEVEL_UP_MOVE(60, MOVE_SHELLSMASH), @@ -6391,10 +6457,11 @@ static const struct LevelUpMove sNumelLevelUpLearnset[] = { LEVEL_UP_MOVE(15, MOVE_FLAMEBURST), LEVEL_UP_MOVE(19, MOVE_MAGNITUDE), LEVEL_UP_MOVE(22, MOVE_LAVAPLUME), - LEVEL_UP_MOVE(26, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(26, MOVE_SCORCHINGSANDS), LEVEL_UP_MOVE(29, MOVE_CURSE), LEVEL_UP_MOVE(31, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(36, MOVE_YAWN), + LEVEL_UP_MOVE(35, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(37, MOVE_YAWN), LEVEL_UP_MOVE(40, MOVE_EARTHQUAKE), LEVEL_UP_MOVE(43, MOVE_FLAMETHROWER), LEVEL_UP_MOVE(47, MOVE_DOUBLEEDGE), @@ -6411,11 +6478,12 @@ static const struct LevelUpMove sCameruptLevelUpLearnset[] = { LEVEL_UP_MOVE(15, MOVE_FLAMEBURST), LEVEL_UP_MOVE(19, MOVE_MAGNITUDE), LEVEL_UP_MOVE(22, MOVE_LAVAPLUME), - LEVEL_UP_MOVE(26, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(26, MOVE_SCORCHINGSANDS), LEVEL_UP_MOVE(29, MOVE_CURSE), LEVEL_UP_MOVE(31, MOVE_TAKEDOWN), LEVEL_UP_MOVE(32, MOVE_ROCKSLIDE), - LEVEL_UP_MOVE(39, MOVE_YAWN), + LEVEL_UP_MOVE(39, MOVE_EARTHPOWER), + LEVEL_UP_MOVE(42, MOVE_YAWN), LEVEL_UP_MOVE(46, MOVE_EARTHQUAKE), LEVEL_UP_MOVE(52, MOVE_ERUPTION), LEVEL_UP_MOVE(59, MOVE_FISSURE), @@ -8119,6 +8187,7 @@ static const struct LevelUpMove sStarlyLevelUpLearnset[] = { LEVEL_UP_MOVE(25, MOVE_AERIALACE), LEVEL_UP_MOVE(29, MOVE_TAKEDOWN), LEVEL_UP_MOVE(33, MOVE_AGILITY), + LEVEL_UP_MOVE(35, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(37, MOVE_BRAVEBIRD), LEVEL_UP_MOVE(41, MOVE_FINALGAMBIT), LEVEL_UP_END @@ -8135,6 +8204,7 @@ static const struct LevelUpMove sStaraviaLevelUpLearnset[] = { LEVEL_UP_MOVE(23, MOVE_WHIRLWIND), LEVEL_UP_MOVE(28, MOVE_AERIALACE), LEVEL_UP_MOVE(33, MOVE_TAKEDOWN), + LEVEL_UP_MOVE(35, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(38, MOVE_AGILITY), LEVEL_UP_MOVE(43, MOVE_BRAVEBIRD), LEVEL_UP_MOVE(48, MOVE_FINALGAMBIT), @@ -8155,6 +8225,7 @@ static const struct LevelUpMove sStaraptorLevelUpLearnset[] = { LEVEL_UP_MOVE(28, MOVE_AERIALACE), LEVEL_UP_MOVE(33, MOVE_TAKEDOWN), LEVEL_UP_MOVE(33, MOVE_CLOSECOMBAT), + LEVEL_UP_MOVE(38, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(41, MOVE_AGILITY), LEVEL_UP_MOVE(49, MOVE_BRAVEBIRD), LEVEL_UP_MOVE(57, MOVE_FINALGAMBIT), @@ -8754,6 +8825,7 @@ static const struct LevelUpMove sHonchkrowLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_WINGATTACK), LEVEL_UP_MOVE(25, MOVE_SWAGGER), LEVEL_UP_MOVE(35, MOVE_NASTYPLOT), + LEVEL_UP_MOVE(40, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(45, MOVE_FOULPLAY), LEVEL_UP_MOVE(55, MOVE_NIGHTSLASH), LEVEL_UP_MOVE(65, MOVE_QUASH), @@ -8832,7 +8904,8 @@ static const struct LevelUpMove sStunkyLevelUpLearnset[] = { LEVEL_UP_MOVE(36, MOVE_NIGHTSLASH), LEVEL_UP_MOVE(39, MOVE_BELCH), LEVEL_UP_MOVE(42, MOVE_VENOMDRENCH), - LEVEL_UP_MOVE(45, MOVE_EXPLOSION), + LEVEL_UP_MOVE(45, MOVE_SLUDGEBOMB), + LEVEL_UP_MOVE(48, MOVE_EXPLOSION), LEVEL_UP_END }; @@ -8856,7 +8929,9 @@ static const struct LevelUpMove sSkuntankLevelUpLearnset[] = { LEVEL_UP_MOVE(38, MOVE_NIGHTSLASH), LEVEL_UP_MOVE(43, MOVE_BELCH), LEVEL_UP_MOVE(48, MOVE_VENOMDRENCH), - LEVEL_UP_MOVE(53, MOVE_EXPLOSION), + LEVEL_UP_MOVE(53, MOVE_SLUDGEBOMB), + LEVEL_UP_MOVE(59, MOVE_EXPLOSION), + LEVEL_UP_MOVE(66, MOVE_POISONJAB), }; static const struct LevelUpMove sBronzorLevelUpLearnset[] = { @@ -9001,10 +9076,11 @@ static const struct LevelUpMove sGibleLevelUpLearnset[] = { LEVEL_UP_MOVE( 7, MOVE_FIREFANG), LEVEL_UP_MOVE(13, MOVE_SANDSTORM), LEVEL_UP_MOVE(15, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(17, MOVE_DRAGONRAGE), - LEVEL_UP_MOVE(19, MOVE_SANDTOMB), + LEVEL_UP_MOVE(17, MOVE_SANDTOMB), + LEVEL_UP_MOVE(20, MOVE_METALCLAW), LEVEL_UP_MOVE(25, MOVE_SLASH), LEVEL_UP_MOVE(27, MOVE_DRAGONCLAW), + LEVEL_UP_MOVE(29, MOVE_DRAGONRAGE), LEVEL_UP_MOVE(31, MOVE_DIG), LEVEL_UP_MOVE(37, MOVE_DRAGONRUSH), LEVEL_UP_END @@ -9019,11 +9095,12 @@ static const struct LevelUpMove sGabiteLevelUpLearnset[] = { LEVEL_UP_MOVE( 7, MOVE_FIREFANG), LEVEL_UP_MOVE(13, MOVE_SANDSTORM), LEVEL_UP_MOVE(15, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(17, MOVE_DRAGONRAGE), - LEVEL_UP_MOVE(19, MOVE_SANDTOMB), + LEVEL_UP_MOVE(17, MOVE_SANDTOMB), + LEVEL_UP_MOVE(20, MOVE_METALCLAW), LEVEL_UP_MOVE(23, MOVE_DUALCHOP), LEVEL_UP_MOVE(28, MOVE_SLASH), LEVEL_UP_MOVE(33, MOVE_DRAGONCLAW), + LEVEL_UP_MOVE(37, MOVE_DRAGONRAGE), LEVEL_UP_MOVE(40, MOVE_DIG), LEVEL_UP_MOVE(49, MOVE_DRAGONRUSH), LEVEL_UP_END @@ -9041,11 +9118,12 @@ static const struct LevelUpMove sGarchompLevelUpLearnset[] = { LEVEL_UP_MOVE( 7, MOVE_FIREFANG), LEVEL_UP_MOVE(13, MOVE_SANDSTORM), LEVEL_UP_MOVE(15, MOVE_TAKEDOWN), - LEVEL_UP_MOVE(17, MOVE_DRAGONRAGE), - LEVEL_UP_MOVE(19, MOVE_SANDTOMB), + LEVEL_UP_MOVE(17, MOVE_SANDTOMB), + LEVEL_UP_MOVE(20, MOVE_METALCLAW), LEVEL_UP_MOVE(23, MOVE_DUALCHOP), LEVEL_UP_MOVE(28, MOVE_SLASH), LEVEL_UP_MOVE(33, MOVE_DRAGONCLAW), + LEVEL_UP_MOVE(37, MOVE_DRAGONRAGE), LEVEL_UP_MOVE(40, MOVE_DIG), LEVEL_UP_MOVE(47, MOVE_CRUNCH), LEVEL_UP_MOVE(55, MOVE_DRAGONRUSH), @@ -9596,41 +9674,62 @@ static const struct LevelUpMove sYanmegaLevelUpLearnset[] = { static const struct LevelUpMove sLeafeonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_RAZORLEAF), - LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), + LEVEL_UP_MOVE( 1, MOVE_COVET), + LEVEL_UP_MOVE( 1, MOVE_SWIFT), + LEVEL_UP_MOVE( 1, MOVE_BITE), + LEVEL_UP_MOVE( 1, MOVE_COPYCAT), + LEVEL_UP_MOVE( 1, MOVE_BATONPASS), + LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), + LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), + LEVEL_UP_MOVE( 1, MOVE_TRUMPCARD), + LEVEL_UP_MOVE( 1, MOVE_GRASSWHISTLE), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_RAZORLEAF), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(13, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(17, MOVE_GRASSWHISTLE), - LEVEL_UP_MOVE(20, MOVE_MAGICALLEAF), - LEVEL_UP_MOVE(25, MOVE_GIGADRAIN), - LEVEL_UP_MOVE(29, MOVE_SWORDSDANCE), - LEVEL_UP_MOVE(33, MOVE_SYNTHESIS), - LEVEL_UP_MOVE(37, MOVE_SUNNYDAY), - LEVEL_UP_MOVE(41, MOVE_LASTRESORT), - LEVEL_UP_MOVE(45, MOVE_LEAFBLADE), + LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), + LEVEL_UP_MOVE(20, MOVE_LEECHSEED), + LEVEL_UP_MOVE(25, MOVE_MAGICALLEAF), + LEVEL_UP_MOVE(30, MOVE_SYNTHESIS), + LEVEL_UP_MOVE(35, MOVE_SUNNYDAY), + LEVEL_UP_MOVE(40, MOVE_GIGADRAIN), + LEVEL_UP_MOVE(45, MOVE_SWORDSDANCE), + LEVEL_UP_MOVE(50, MOVE_LEAFBLADE), + LEVEL_UP_MOVE(55, MOVE_LASTRESORT), LEVEL_UP_END }; static const struct LevelUpMove sGlaceonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_ICYWIND), - LEVEL_UP_MOVE( 1, MOVE_ICYWIND), + LEVEL_UP_MOVE( 1, MOVE_COVET), + LEVEL_UP_MOVE( 1, MOVE_SWIFT), + LEVEL_UP_MOVE( 1, MOVE_COPYCAT), + LEVEL_UP_MOVE( 1, MOVE_BATONPASS), + LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), + LEVEL_UP_MOVE( 1, MOVE_CHARM), + LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_TRUMPCARD), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), + LEVEL_UP_MOVE( 1, MOVE_BARRIER), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_ICYWIND), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), - LEVEL_UP_MOVE( 9, MOVE_BABYDOLLEYES), - LEVEL_UP_MOVE(13, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(17, MOVE_BITE), - LEVEL_UP_MOVE(20, MOVE_ICEFANG), - LEVEL_UP_MOVE(25, MOVE_ICESHARD), - LEVEL_UP_MOVE(29, MOVE_BARRIER), - LEVEL_UP_MOVE(33, MOVE_MIRRORCOAT), - LEVEL_UP_MOVE(37, MOVE_HAIL), - LEVEL_UP_MOVE(41, MOVE_LASTRESORT), - LEVEL_UP_MOVE(45, MOVE_BLIZZARD), + LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), + LEVEL_UP_MOVE(20, MOVE_ICESHARD), + LEVEL_UP_MOVE(25, MOVE_BITE), + LEVEL_UP_MOVE(30, MOVE_ICEFANG), + LEVEL_UP_MOVE(35, MOVE_HAIL), + LEVEL_UP_MOVE(40, MOVE_FREEZEDRY), + LEVEL_UP_MOVE(45, MOVE_MIRRORCOAT), + LEVEL_UP_MOVE(50, MOVE_BLIZZARD), + LEVEL_UP_MOVE(55, MOVE_LASTRESORT), LEVEL_UP_END }; @@ -9687,24 +9786,26 @@ static const struct LevelUpMove sMamoswineLevelUpLearnset[] = { static const struct LevelUpMove sPorygonZLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TRICKROOM), - LEVEL_UP_MOVE( 1, MOVE_ZAPCANNON), - LEVEL_UP_MOVE( 1, MOVE_MAGICCOAT), - LEVEL_UP_MOVE( 1, MOVE_CONVERSION2), + LEVEL_UP_MOVE( 1, MOVE_NASTYPLOT), + LEVEL_UP_MOVE( 1, MOVE_DEFENSECURL), + LEVEL_UP_MOVE( 1, MOVE_SHARPEN), + LEVEL_UP_MOVE( 1, MOVE_EMBARGO), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_CONVERSION), - LEVEL_UP_MOVE( 1, MOVE_NASTYPLOT), - LEVEL_UP_MOVE( 7, MOVE_PSYBEAM), - LEVEL_UP_MOVE(12, MOVE_AGILITY), - LEVEL_UP_MOVE(18, MOVE_RECOVER), - LEVEL_UP_MOVE(23, MOVE_MAGNETRISE), + LEVEL_UP_MOVE( 1, MOVE_RECYCLE), + LEVEL_UP_MOVE( 1, MOVE_MAGNETRISE), + LEVEL_UP_MOVE(15, MOVE_THUNDERSHOCK), + LEVEL_UP_MOVE(20, MOVE_PSYBEAM), + LEVEL_UP_MOVE(25, MOVE_CONVERSION2), LEVEL_UP_MOVE(29, MOVE_SIGNALBEAM), - LEVEL_UP_MOVE(34, MOVE_EMBARGO), + LEVEL_UP_MOVE(32, MOVE_AGILITY), + LEVEL_UP_MOVE(35, MOVE_RECOVER), LEVEL_UP_MOVE(40, MOVE_DISCHARGE), - LEVEL_UP_MOVE(45, MOVE_LOCKON), - LEVEL_UP_MOVE(50, MOVE_TRIATTACK), - LEVEL_UP_MOVE(56, MOVE_MAGICCOAT), - LEVEL_UP_MOVE(62, MOVE_ZAPCANNON), - LEVEL_UP_MOVE(67, MOVE_HYPERBEAM), + LEVEL_UP_MOVE(45, MOVE_TRIATTACK), + LEVEL_UP_MOVE(50, MOVE_MAGICCOAT), + LEVEL_UP_MOVE(55, MOVE_LOCKON), + LEVEL_UP_MOVE(60, MOVE_ZAPCANNON), + LEVEL_UP_MOVE(65, MOVE_HYPERBEAM), LEVEL_UP_END }; @@ -10592,20 +10693,21 @@ static const struct LevelUpMove sMusharnaLevelUpLearnset[] = { static const struct LevelUpMove sPidoveLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GUST), - LEVEL_UP_MOVE( 4, MOVE_GROWL), - LEVEL_UP_MOVE( 8, MOVE_LEER), - LEVEL_UP_MOVE(11, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(15, MOVE_AIRCUTTER), - LEVEL_UP_MOVE(18, MOVE_ROOST), - LEVEL_UP_MOVE(22, MOVE_DETECT), - LEVEL_UP_MOVE(25, MOVE_TAUNT), - LEVEL_UP_MOVE(29, MOVE_AIRSLASH), - LEVEL_UP_MOVE(32, MOVE_RAZORWIND), - LEVEL_UP_MOVE(36, MOVE_FEATHERDANCE), - LEVEL_UP_MOVE(39, MOVE_SWAGGER), - LEVEL_UP_MOVE(43, MOVE_FACADE), - LEVEL_UP_MOVE(46, MOVE_TAILWIND), - LEVEL_UP_MOVE(50, MOVE_SKYATTACK), + LEVEL_UP_MOVE( 1, MOVE_GROWL), + LEVEL_UP_MOVE( 4, MOVE_LEER), + LEVEL_UP_MOVE( 8, MOVE_QUICKATTACK), + LEVEL_UP_MOVE(12, MOVE_TAUNT), + LEVEL_UP_MOVE(16, MOVE_AIRCUTTER), + LEVEL_UP_MOVE(20, MOVE_SWAGGER), + LEVEL_UP_MOVE(24, MOVE_FEATHERDANCE), + LEVEL_UP_MOVE(26, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(28, MOVE_DETECT), + LEVEL_UP_MOVE(32, MOVE_AIRSLASH), + LEVEL_UP_MOVE(34, MOVE_RAZORWIND), + LEVEL_UP_MOVE(36, MOVE_ROOST), + LEVEL_UP_MOVE(40, MOVE_TAILWIND), + LEVEL_UP_MOVE(42, MOVE_FACADE), + LEVEL_UP_MOVE(44, MOVE_SKYATTACK), LEVEL_UP_END }; @@ -10614,20 +10716,18 @@ static const struct LevelUpMove sTranquillLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), - LEVEL_UP_MOVE( 4, MOVE_GROWL), - LEVEL_UP_MOVE( 8, MOVE_LEER), - LEVEL_UP_MOVE(11, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(15, MOVE_AIRCUTTER), - LEVEL_UP_MOVE(18, MOVE_ROOST), - LEVEL_UP_MOVE(23, MOVE_DETECT), - LEVEL_UP_MOVE(27, MOVE_TAUNT), - LEVEL_UP_MOVE(32, MOVE_AIRSLASH), - LEVEL_UP_MOVE(36, MOVE_RAZORWIND), - LEVEL_UP_MOVE(41, MOVE_FEATHERDANCE), - LEVEL_UP_MOVE(45, MOVE_SWAGGER), - LEVEL_UP_MOVE(50, MOVE_FACADE), - LEVEL_UP_MOVE(54, MOVE_TAILWIND), - LEVEL_UP_MOVE(59, MOVE_SKYATTACK), + LEVEL_UP_MOVE(12, MOVE_TAUNT), + LEVEL_UP_MOVE(16, MOVE_AIRCUTTER), + LEVEL_UP_MOVE(20, MOVE_SWAGGER), + LEVEL_UP_MOVE(26, MOVE_FEATHERDANCE), + LEVEL_UP_MOVE(30, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(34, MOVE_DETECT), + LEVEL_UP_MOVE(38, MOVE_AIRSLASH), + LEVEL_UP_MOVE(41, MOVE_RAZORWIND), + LEVEL_UP_MOVE(44, MOVE_ROOST), + LEVEL_UP_MOVE(50, MOVE_TAILWIND), + LEVEL_UP_MOVE(53, MOVE_FACADE), + LEVEL_UP_MOVE(56, MOVE_SKYATTACK), LEVEL_UP_END }; @@ -10636,19 +10736,17 @@ static const struct LevelUpMove sUnfezantLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_LEER), LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), - LEVEL_UP_MOVE( 4, MOVE_GROWL), - LEVEL_UP_MOVE( 8, MOVE_LEER), - LEVEL_UP_MOVE(11, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(15, MOVE_AIRCUTTER), - LEVEL_UP_MOVE(18, MOVE_ROOST), - LEVEL_UP_MOVE(23, MOVE_DETECT), - LEVEL_UP_MOVE(27, MOVE_TAUNT), - LEVEL_UP_MOVE(33, MOVE_AIRSLASH), - LEVEL_UP_MOVE(38, MOVE_RAZORWIND), - LEVEL_UP_MOVE(44, MOVE_FEATHERDANCE), - LEVEL_UP_MOVE(49, MOVE_SWAGGER), - LEVEL_UP_MOVE(55, MOVE_FACADE), - LEVEL_UP_MOVE(60, MOVE_TAILWIND), + LEVEL_UP_MOVE(12, MOVE_TAUNT), + LEVEL_UP_MOVE(16, MOVE_AIRCUTTER), + LEVEL_UP_MOVE(20, MOVE_SWAGGER), + LEVEL_UP_MOVE(26, MOVE_FEATHERDANCE), + LEVEL_UP_MOVE(30, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(36, MOVE_DETECT), + LEVEL_UP_MOVE(42, MOVE_AIRSLASH), + LEVEL_UP_MOVE(46, MOVE_RAZORWIND), + LEVEL_UP_MOVE(50, MOVE_ROOST), + LEVEL_UP_MOVE(58, MOVE_TAILWIND), + LEVEL_UP_MOVE(62, MOVE_FACADE), LEVEL_UP_MOVE(66, MOVE_SKYATTACK), LEVEL_UP_END }; @@ -11871,7 +11969,8 @@ static const struct LevelUpMove sDucklettLevelUpLearnset[] = { LEVEL_UP_MOVE(27, MOVE_AIRSLASH), LEVEL_UP_MOVE(30, MOVE_ROOST), LEVEL_UP_MOVE(34, MOVE_RAINDANCE), - LEVEL_UP_MOVE(37, MOVE_TAILWIND), + LEVEL_UP_MOVE(37, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(39, MOVE_TAILWIND), LEVEL_UP_MOVE(41, MOVE_BRAVEBIRD), LEVEL_UP_MOVE(46, MOVE_HURRICANE), LEVEL_UP_END @@ -11893,7 +11992,8 @@ static const struct LevelUpMove sSwannaLevelUpLearnset[] = { LEVEL_UP_MOVE(27, MOVE_AIRSLASH), LEVEL_UP_MOVE(30, MOVE_ROOST), LEVEL_UP_MOVE(34, MOVE_RAINDANCE), - LEVEL_UP_MOVE(40, MOVE_TAILWIND), + LEVEL_UP_MOVE(39, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(42, MOVE_TAILWIND), LEVEL_UP_MOVE(47, MOVE_BRAVEBIRD), LEVEL_UP_MOVE(55, MOVE_HURRICANE), LEVEL_UP_END @@ -12864,6 +12964,7 @@ static const struct LevelUpMove sRuffletLevelUpLearnset[] = { LEVEL_UP_MOVE(23, MOVE_AERIALACE), LEVEL_UP_MOVE(28, MOVE_SLASH), LEVEL_UP_MOVE(32, MOVE_DEFOG), + LEVEL_UP_MOVE(34, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(37, MOVE_TAILWIND), LEVEL_UP_MOVE(41, MOVE_AIRSLASH), LEVEL_UP_MOVE(46, MOVE_CRUSHCLAW), @@ -12890,6 +12991,7 @@ static const struct LevelUpMove sBraviaryLevelUpLearnset[] = { LEVEL_UP_MOVE(23, MOVE_AERIALACE), LEVEL_UP_MOVE(28, MOVE_SLASH), LEVEL_UP_MOVE(32, MOVE_DEFOG), + LEVEL_UP_MOVE(34, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(37, MOVE_TAILWIND), LEVEL_UP_MOVE(41, MOVE_AIRSLASH), LEVEL_UP_MOVE(46, MOVE_CRUSHCLAW), @@ -13735,67 +13837,73 @@ static const struct LevelUpMove sDiggersbyLevelUpLearnset[] = { static const struct LevelUpMove sFletchlingLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_GROWL), - LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(10, MOVE_PECK), - LEVEL_UP_MOVE(13, MOVE_AGILITY), - LEVEL_UP_MOVE(16, MOVE_FLAIL), - LEVEL_UP_MOVE(21, MOVE_ROOST), - LEVEL_UP_MOVE(25, MOVE_RAZORWIND), - LEVEL_UP_MOVE(29, MOVE_NATURALGIFT), - LEVEL_UP_MOVE(34, MOVE_FLAMECHARGE), - LEVEL_UP_MOVE(39, MOVE_ACROBATICS), - LEVEL_UP_MOVE(41, MOVE_MEFIRST), - LEVEL_UP_MOVE(45, MOVE_TAILWIND), - LEVEL_UP_MOVE(48, MOVE_STEELWING), + LEVEL_UP_MOVE( 4, MOVE_QUICKATTACK), + LEVEL_UP_MOVE( 8, MOVE_EMBER), + LEVEL_UP_MOVE(12, MOVE_FLAIL), + LEVEL_UP_MOVE(16, MOVE_ACROBATICS), + LEVEL_UP_MOVE(20, MOVE_AGILITY), + LEVEL_UP_MOVE(24, MOVE_AERIALACE), + LEVEL_UP_MOVE(26, MOVE_RAZORWIND), + LEVEL_UP_MOVE(28, MOVE_TAILWIND), + LEVEL_UP_MOVE(30, MOVE_NATURALGIFT), + LEVEL_UP_MOVE(32, MOVE_STEELWING), + LEVEL_UP_MOVE(34, MOVE_ROOST), + LEVEL_UP_MOVE(37, MOVE_MEFIRST), + LEVEL_UP_MOVE(40, MOVE_FLY), LEVEL_UP_END }; static const struct LevelUpMove sFletchinderLevelUpLearnset[] = { - LEVEL_UP_MOVE( 0, MOVE_EMBER), + LEVEL_UP_MOVE( 0, MOVE_FLAMECHARGE), + LEVEL_UP_MOVE( 1, MOVE_FEINT), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), - LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(10, MOVE_PECK), - LEVEL_UP_MOVE(13, MOVE_AGILITY), - LEVEL_UP_MOVE(16, MOVE_FLAIL), - LEVEL_UP_MOVE(16, MOVE_EMBER), - LEVEL_UP_MOVE(25, MOVE_ROOST), - LEVEL_UP_MOVE(27, MOVE_RAZORWIND), - LEVEL_UP_MOVE(31, MOVE_NATURALGIFT), - LEVEL_UP_MOVE(38, MOVE_FLAMECHARGE), - LEVEL_UP_MOVE(42, MOVE_ACROBATICS), + LEVEL_UP_MOVE( 1, MOVE_EMBER), + LEVEL_UP_MOVE(12, MOVE_FLAIL), + LEVEL_UP_MOVE(16, MOVE_ACROBATICS), + LEVEL_UP_MOVE(16, MOVE_FLAMECHARGE), + LEVEL_UP_MOVE(22, MOVE_AGILITY), + LEVEL_UP_MOVE(27, MOVE_AERIALACE), + LEVEL_UP_MOVE(30, MOVE_RAZORWIND), + LEVEL_UP_MOVE(32, MOVE_TAILWIND), + LEVEL_UP_MOVE(34, MOVE_NATURALGIFT), + LEVEL_UP_MOVE(37, MOVE_STEELWING), + LEVEL_UP_MOVE(42, MOVE_ROOST), LEVEL_UP_MOVE(46, MOVE_MEFIRST), - LEVEL_UP_MOVE(51, MOVE_TAILWIND), - LEVEL_UP_MOVE(55, MOVE_STEELWING), + LEVEL_UP_MOVE(50, MOVE_FLY), LEVEL_UP_END }; static const struct LevelUpMove sTalonflameLevelUpLearnset[] = { - LEVEL_UP_MOVE( 0, MOVE_FLAMECHARGE), - LEVEL_UP_MOVE( 1, MOVE_EMBER), + LEVEL_UP_MOVE( 0, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE( 1, MOVE_FLAMECHARGE), LEVEL_UP_MOVE( 1, MOVE_BRAVEBIRD), LEVEL_UP_MOVE( 1, MOVE_FLAREBLITZ), + LEVEL_UP_MOVE( 1, MOVE_FEINT), LEVEL_UP_MOVE( 1, MOVE_TACKLE), + LEVEL_UP_MOVE( 1, MOVE_PECK), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_QUICKATTACK), - LEVEL_UP_MOVE( 1, MOVE_PECK), - LEVEL_UP_MOVE( 6, MOVE_QUICKATTACK), - LEVEL_UP_MOVE(10, MOVE_PECK), - LEVEL_UP_MOVE(13, MOVE_AGILITY), - LEVEL_UP_MOVE(16, MOVE_FLAIL), - LEVEL_UP_MOVE(16, MOVE_EMBER), - LEVEL_UP_MOVE(25, MOVE_ROOST), - LEVEL_UP_MOVE(27, MOVE_RAZORWIND), - LEVEL_UP_MOVE(31, MOVE_NATURALGIFT), - LEVEL_UP_MOVE(34, MOVE_FLAMECHARGE), - LEVEL_UP_MOVE(44, MOVE_ACROBATICS), - LEVEL_UP_MOVE(49, MOVE_MEFIRST), - LEVEL_UP_MOVE(55, MOVE_TAILWIND), - LEVEL_UP_MOVE(60, MOVE_STEELWING), - LEVEL_UP_MOVE(64, MOVE_BRAVEBIRD), - LEVEL_UP_END + LEVEL_UP_MOVE( 1, MOVE_EMBER), + LEVEL_UP_MOVE(12, MOVE_FLAIL), + LEVEL_UP_MOVE(16, MOVE_ACROBATICS), + LEVEL_UP_MOVE(16, MOVE_FLAMECHARGE), + LEVEL_UP_MOVE(22, MOVE_AGILITY), + LEVEL_UP_MOVE(27, MOVE_AERIALACE), + LEVEL_UP_MOVE(30, MOVE_RAZORWIND), + LEVEL_UP_MOVE(32, MOVE_TAILWIND), + LEVEL_UP_MOVE(34, MOVE_NATURALGIFT), + LEVEL_UP_MOVE(34, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(42, MOVE_STEELWING), + LEVEL_UP_MOVE(48, MOVE_ROOST), + LEVEL_UP_MOVE(52, MOVE_MEFIRST), + LEVEL_UP_MOVE(56, MOVE_FLY), + LEVEL_UP_MOVE(62, MOVE_BRAVEBIRD), + LEVEL_UP_MOVE(68, MOVE_FLAREBLITZ), }; static const struct LevelUpMove sScatterbugLevelUpLearnset[] = { @@ -13868,7 +13976,8 @@ static const struct LevelUpMove sPyroarLevelUpLearnset[] = { LEVEL_UP_MOVE(28, MOVE_ENDEAVOR), LEVEL_UP_MOVE(33, MOVE_ECHOEDVOICE), LEVEL_UP_MOVE(38, MOVE_FLAMETHROWER), - LEVEL_UP_MOVE(42, MOVE_CRUNCH), + LEVEL_UP_MOVE(42, MOVE_SCORCHINGSANDS), + LEVEL_UP_MOVE(45, MOVE_CRUNCH), LEVEL_UP_MOVE(48, MOVE_HYPERVOICE), LEVEL_UP_MOVE(51, MOVE_INCINERATE), LEVEL_UP_MOVE(57, MOVE_OVERHEAT), @@ -14524,7 +14633,6 @@ static const struct LevelUpMove sAurorusLevelUpLearnset[] = { static const struct LevelUpMove sSylveonLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_DISARMINGVOICE), - LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE), LEVEL_UP_MOVE( 1, MOVE_COVET), LEVEL_UP_MOVE( 1, MOVE_BITE), LEVEL_UP_MOVE( 1, MOVE_COPYCAT), @@ -14532,10 +14640,12 @@ static const struct LevelUpMove sSylveonLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_TAKEDOWN), LEVEL_UP_MOVE( 1, MOVE_CHARM), LEVEL_UP_MOVE( 1, MOVE_DOUBLEEDGE), + LEVEL_UP_MOVE( 1, MOVE_TRUMPCARD), LEVEL_UP_MOVE( 1, MOVE_HELPINGHAND), LEVEL_UP_MOVE( 1, MOVE_TACKLE), LEVEL_UP_MOVE( 1, MOVE_GROWL), LEVEL_UP_MOVE( 1, MOVE_TAILWHIP), + LEVEL_UP_MOVE( 1, MOVE_DISARMINGVOICE), LEVEL_UP_MOVE( 5, MOVE_SANDATTACK), LEVEL_UP_MOVE(10, MOVE_QUICKATTACK), LEVEL_UP_MOVE(15, MOVE_BABYDOLLEYES), @@ -16034,6 +16144,7 @@ static const struct LevelUpMove sSandygastLevelUpLearnset[] = { LEVEL_UP_MOVE(25, MOVE_BULLDOZE), LEVEL_UP_MOVE(30, MOVE_HYPNOSIS), LEVEL_UP_MOVE(35, MOVE_GIGADRAIN), + LEVEL_UP_MOVE(38, MOVE_SCORCHINGSANDS), LEVEL_UP_MOVE(40, MOVE_IRONDEFENSE), LEVEL_UP_MOVE(45, MOVE_SHADOWBALL), LEVEL_UP_MOVE(50, MOVE_EARTHPOWER), @@ -16052,6 +16163,7 @@ static const struct LevelUpMove sPalossandLevelUpLearnset[] = { LEVEL_UP_MOVE(25, MOVE_BULLDOZE), LEVEL_UP_MOVE(30, MOVE_HYPNOSIS), LEVEL_UP_MOVE(35, MOVE_GIGADRAIN), + LEVEL_UP_MOVE(38, MOVE_SCORCHINGSANDS), LEVEL_UP_MOVE(40, MOVE_IRONDEFENSE), LEVEL_UP_MOVE(47, MOVE_SHADOWBALL), LEVEL_UP_MOVE(54, MOVE_EARTHPOWER),