diff --git a/src/Egg_Moves.c b/src/Egg_Moves.c index c378cfb..2e25b7d 100644 --- a/src/Egg_Moves.c +++ b/src/Egg_Moves.c @@ -1944,6 +1944,7 @@ const u16 gEggMoves[] = MOVE_POWERUPPUNCH), egg_moves(SNORUNT, + MOVE_POWDERSNOW, MOVE_BLOCK, MOVE_SPIKES, MOVE_ROLLOUT, @@ -1952,9 +1953,7 @@ const u16 gEggMoves[] = MOVE_WEATHERBALL, MOVE_AVALANCHE, MOVE_HEX, - MOVE_FAKETEARS, - MOVE_SWITCHEROO, - MOVE_ICICLECRASH), + MOVE_SWITCHEROO), egg_moves(AZURILL, MOVE_ENCORE, @@ -3244,9 +3243,9 @@ const u16 gEggMoves[] = egg_moves(DUCKLETT, MOVE_STEELWING, - MOVE_BRINE, + MOVE_BUBBLEBEAM, MOVE_GUST, - MOVE_AIRCUTTER, + MOVE_WINGATTACK, MOVE_MIRRORMOVE, MOVE_MEFIRST, MOVE_LUCKYCHANT, diff --git a/src/Evolution Table.c b/src/Evolution Table.c index 4b6c736..5619ac0 100644 --- a/src/Evolution Table.c +++ b/src/Evolution Table.c @@ -139,7 +139,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_PINSIR] = {{EVO_MEGA, ITEM_PINSIRITE, SPECIES_PINSIR_MEGA, MEGA_VARIANT_STANDARD}}, [SPECIES_MAGIKARP] = {{EVO_LEVEL, 20, SPECIES_GYARADOS, 0}}, [SPECIES_GYARADOS] = {{EVO_MEGA, ITEM_GYARADOSITE, SPECIES_GYARADOS_MEGA, MEGA_VARIANT_STANDARD}}, -// [SPECIES_LAPRAS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}}, + [SPECIES_LAPRAS] = {{EVO_GIGANTAMAX, TRUE, SPECIES_LAPRAS_GIGA, 0}}, [SPECIES_EEVEE] = {{EVO_FRIENDSHIP_DAY, 0, SPECIES_ESPEON, 0}, {EVO_FRIENDSHIP_NIGHT, 0, SPECIES_UMBREON, 0}, {EVO_MOVE_TYPE, TYPE_FAIRY, SPECIES_SYLVEON, TRUE}, //Require high friendship @@ -212,7 +212,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_ELEKID] = {{EVO_LEVEL, 30, SPECIES_ELECTABUZZ, 0}}, [SPECIES_MAGBY] = {{EVO_LEVEL, 30, SPECIES_MAGMAR, 0}}, [SPECIES_LARVITAR] = {{EVO_LEVEL, 30, SPECIES_PUPITAR, 0}}, - [SPECIES_PUPITAR] = {{EVO_LEVEL, 55, SPECIES_TYRANITAR, 0}}, + [SPECIES_PUPITAR] = {{EVO_LEVEL, 48, SPECIES_TYRANITAR, 0}}, [SPECIES_TYRANITAR] = {{EVO_MEGA, ITEM_TYRANITARITE, SPECIES_TYRANITAR_MEGA, MEGA_VARIANT_STANDARD}}, [SPECIES_TREECKO] = {{EVO_LEVEL, 16, SPECIES_GROVYLE, 0}}, [SPECIES_GROVYLE] = {{EVO_LEVEL, 36, SPECIES_SCEPTILE, 0}}, @@ -262,7 +262,7 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_SPHEAL] = {{EVO_LEVEL, 32, SPECIES_SEALEO, 0}}, [SPECIES_SEALEO] = {{EVO_LEVEL, 44, SPECIES_WALREIN, 0}}, [SPECIES_CACNEA] = {{EVO_LEVEL, 32, SPECIES_CACTURNE, 0}}, - [SPECIES_SNORUNT] = {{EVO_LEVEL, 42, SPECIES_GLALIE, 0}, + [SPECIES_SNORUNT] = {{EVO_LEVEL, 30, SPECIES_GLALIE, 0}, {EVO_ITEM, ITEM_DAWN_STONE, SPECIES_FROSLASS, MON_FEMALE}}, [SPECIES_GLALIE] = {{EVO_MEGA, ITEM_GLALITITE, SPECIES_GLALIE_MEGA, MEGA_VARIANT_STANDARD}}, [SPECIES_AZURILL] = {{EVO_FRIENDSHIP, 0, SPECIES_MARILL, 0}}, @@ -404,9 +404,9 @@ const struct Evolution gEvolutionTable[NUM_SPECIES][EVOS_PER_MON] = [SPECIES_GOTHORITA] = {{EVO_LEVEL, 41, SPECIES_GOTHITELLE, 0}}, [SPECIES_SOLOSIS] = {{EVO_LEVEL, 32, SPECIES_DUOSION, 0}}, [SPECIES_DUOSION] = {{EVO_LEVEL, 41, SPECIES_REUNICLUS, 0}}, - [SPECIES_DUCKLETT] = {{EVO_LEVEL, 35, SPECIES_SWANNA, 0}}, - [SPECIES_VANILLITE] = {{EVO_LEVEL, 35, SPECIES_VANILLISH, 0}}, - [SPECIES_VANILLISH] = {{EVO_LEVEL, 47, SPECIES_VANILLUXE, 0}}, + [SPECIES_DUCKLETT] = {{EVO_LEVEL, 30, SPECIES_SWANNA, 0}}, + [SPECIES_VANILLITE] = {{EVO_LEVEL, 24, SPECIES_VANILLISH, 0}}, + [SPECIES_VANILLISH] = {{EVO_LEVEL, 42, SPECIES_VANILLUXE, 0}}, [SPECIES_DEERLING] = {{EVO_LEVEL, 34, SPECIES_SAWSBUCK, 0}}, [SPECIES_KARRABLAST] = {{EVO_ITEM, ITEM_LINK_STONE, SPECIES_ESCAVALIER, 0}, {EVO_TRADE, 0, SPECIES_ESCAVALIER, 0}}, diff --git a/src/Learnsets.c b/src/Learnsets.c index 8297b0a..70a03cd 100644 --- a/src/Learnsets.c +++ b/src/Learnsets.c @@ -5460,9 +5460,9 @@ static const struct LevelUpMove sTyranitarLevelUpLearnset[] = { LEVEL_UP_MOVE(39, MOVE_CRUNCH), LEVEL_UP_MOVE(43, MOVE_THRASH), LEVEL_UP_MOVE(47, MOVE_STONEEDGE), - LEVEL_UP_MOVE(51, MOVE_EARTHQUAKE), - LEVEL_UP_MOVE(58, MOVE_HYPERBEAM), - LEVEL_UP_MOVE(64, MOVE_GIGAIMPACT), + LEVEL_UP_MOVE(53, MOVE_EARTHQUAKE), + LEVEL_UP_MOVE(59, MOVE_HYPERBEAM), + LEVEL_UP_MOVE(65, MOVE_GIGAIMPACT), LEVEL_UP_END }; @@ -7061,18 +7061,19 @@ static const struct LevelUpMove sCacturneLevelUpLearnset[] = { static const struct LevelUpMove sSnoruntLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 5, MOVE_LEER), - LEVEL_UP_MOVE(10, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE(13, MOVE_POWDERSNOW), + LEVEL_UP_MOVE(10, MOVE_ICESHARD), + LEVEL_UP_MOVE(13, MOVE_DOUBLETEAM), LEVEL_UP_MOVE(16, MOVE_BITE), - LEVEL_UP_MOVE(19, MOVE_ICESHARD), + LEVEL_UP_MOVE(19, MOVE_ICYWIND), LEVEL_UP_MOVE(22, MOVE_PROTECT), - LEVEL_UP_MOVE(25, MOVE_ICYWIND), - LEVEL_UP_MOVE(29, MOVE_FROSTBREATH), - LEVEL_UP_MOVE(34, MOVE_ICEFANG), - LEVEL_UP_MOVE(39, MOVE_HAIL), - LEVEL_UP_MOVE(44, MOVE_HEADBUTT), - LEVEL_UP_MOVE(49, MOVE_CRUNCH), - LEVEL_UP_MOVE(54, MOVE_BLIZZARD), + LEVEL_UP_MOVE(25, MOVE_HEADBUTT), + LEVEL_UP_MOVE(28, MOVE_ICEFANG), + LEVEL_UP_MOVE(32, MOVE_CRUNCH), + LEVEL_UP_MOVE(35, MOVE_FAKETEARS), + LEVEL_UP_MOVE(38, MOVE_ICICLECRASH), + LEVEL_UP_MOVE(41, MOVE_FROSTBREATH), + LEVEL_UP_MOVE(44, MOVE_HAIL), + LEVEL_UP_MOVE(47, MOVE_BLIZZARD), LEVEL_UP_END }; @@ -7080,20 +7081,22 @@ static const struct LevelUpMove sGlalieLevelUpLearnset[] = { LEVEL_UP_MOVE( 0, MOVE_FREEZEDRY), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_ICESHARD), LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW), LEVEL_UP_MOVE(16, MOVE_BITE), - LEVEL_UP_MOVE(19, MOVE_ICESHARD), + LEVEL_UP_MOVE(19, MOVE_ICYWIND), LEVEL_UP_MOVE(22, MOVE_PROTECT), - LEVEL_UP_MOVE(25, MOVE_ICYWIND), - LEVEL_UP_MOVE(29, MOVE_FROSTBREATH), - LEVEL_UP_MOVE(34, MOVE_ICEFANG), - LEVEL_UP_MOVE(39, MOVE_HAIL), - LEVEL_UP_MOVE(41, MOVE_FREEZEDRY), - LEVEL_UP_MOVE(47, MOVE_HEADBUTT), - LEVEL_UP_MOVE(53, MOVE_CRUNCH), - LEVEL_UP_MOVE(59, MOVE_BLIZZARD), - LEVEL_UP_MOVE(65, MOVE_SHEERCOLD), + LEVEL_UP_MOVE(25, MOVE_HEADBUTT), + LEVEL_UP_MOVE(28, MOVE_ICEFANG), + LEVEL_UP_MOVE(29, MOVE_FREEZEDRY), + LEVEL_UP_MOVE(33, MOVE_CRUNCH), + LEVEL_UP_MOVE(37, MOVE_FAKETEARS), + LEVEL_UP_MOVE(41, MOVE_ICICLECRASH), + LEVEL_UP_MOVE(45, MOVE_FROSTBREATH), + LEVEL_UP_MOVE(49, MOVE_DARKPULSE), + LEVEL_UP_MOVE(53, MOVE_HAIL), + LEVEL_UP_MOVE(57, MOVE_BLIZZARD), + LEVEL_UP_MOVE(61, MOVE_SHEERCOLD), LEVEL_UP_END }; @@ -10455,29 +10458,29 @@ static const struct LevelUpMove sDusknoirLevelUpLearnset[] = { }; static const struct LevelUpMove sFroslassLevelUpLearnset[] = { - LEVEL_UP_MOVE( 0, MOVE_OMINOUSWIND), - LEVEL_UP_MOVE( 1, MOVE_DESTINYBOND), + LEVEL_UP_MOVE( 0, MOVE_HEX), LEVEL_UP_MOVE( 1, MOVE_BITE), LEVEL_UP_MOVE( 1, MOVE_PROTECT), - LEVEL_UP_MOVE( 1, MOVE_ICEFANG), LEVEL_UP_MOVE( 1, MOVE_HEADBUTT), + LEVEL_UP_MOVE( 1, MOVE_ICEFANG), LEVEL_UP_MOVE( 1, MOVE_CRUNCH), + LEVEL_UP_MOVE( 1, MOVE_ICICLECRASH), LEVEL_UP_MOVE( 1, MOVE_ASTONISH), LEVEL_UP_MOVE( 1, MOVE_LEER), + LEVEL_UP_MOVE( 1, MOVE_ICESHARD), LEVEL_UP_MOVE( 1, MOVE_DOUBLETEAM), - LEVEL_UP_MOVE( 1, MOVE_POWDERSNOW), - LEVEL_UP_MOVE(16, MOVE_HEX), - LEVEL_UP_MOVE(19, MOVE_ICESHARD), + LEVEL_UP_MOVE(16, MOVE_OMINOUSWIND), + LEVEL_UP_MOVE(19, MOVE_ICYWIND), LEVEL_UP_MOVE(22, MOVE_DRAININGKISS), - LEVEL_UP_MOVE(25, MOVE_ICYWIND), - LEVEL_UP_MOVE(29, MOVE_CONFUSERAY), - LEVEL_UP_MOVE(32, MOVE_WAKEUPSLAP), - LEVEL_UP_MOVE(36, MOVE_FROSTBREATH), - LEVEL_UP_MOVE(40, MOVE_WILLOWISP), - LEVEL_UP_MOVE(43, MOVE_HAIL), - LEVEL_UP_MOVE(46, MOVE_AURORAVEIL), - LEVEL_UP_MOVE(49, MOVE_SHADOWBALL), - LEVEL_UP_MOVE(54, MOVE_BLIZZARD), + LEVEL_UP_MOVE(25, MOVE_CONFUSERAY), + LEVEL_UP_MOVE(28, MOVE_WAKEUPSLAP), + LEVEL_UP_MOVE(32, MOVE_WILLOWISP), + LEVEL_UP_MOVE(36, MOVE_FAKETEARS), + LEVEL_UP_MOVE(40, MOVE_FROSTBREATH), + LEVEL_UP_MOVE(45, MOVE_SHADOWBALL), + LEVEL_UP_MOVE(50, MOVE_HAIL), + LEVEL_UP_MOVE(55, MOVE_AURORAVEIL), + LEVEL_UP_MOVE(60, MOVE_BLIZZARD), LEVEL_UP_END }; @@ -12594,19 +12597,20 @@ static const struct LevelUpMove sDucklettLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_WATERGUN), LEVEL_UP_MOVE( 3, MOVE_WATERSPORT), LEVEL_UP_MOVE( 6, MOVE_DEFOG), - LEVEL_UP_MOVE( 9, MOVE_WINGATTACK), - LEVEL_UP_MOVE(13, MOVE_WATERPULSE), + LEVEL_UP_MOVE( 9, MOVE_AIRCUTTER), + LEVEL_UP_MOVE(12, MOVE_WATERPULSE), LEVEL_UP_MOVE(15, MOVE_AERIALACE), - LEVEL_UP_MOVE(19, MOVE_BUBBLEBEAM), - LEVEL_UP_MOVE(21, MOVE_FEATHERDANCE), + LEVEL_UP_MOVE(18, MOVE_FEATHERDANCE), + LEVEL_UP_MOVE(21, MOVE_BRINE), LEVEL_UP_MOVE(24, MOVE_AQUARING), LEVEL_UP_MOVE(27, MOVE_AIRSLASH), LEVEL_UP_MOVE(30, MOVE_ROOST), - LEVEL_UP_MOVE(34, MOVE_RAINDANCE), - LEVEL_UP_MOVE(37, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(33, MOVE_LIQUIDATION), + LEVEL_UP_MOVE(36, MOVE_DUALWINGBEAT), LEVEL_UP_MOVE(39, MOVE_TAILWIND), - LEVEL_UP_MOVE(41, MOVE_BRAVEBIRD), - LEVEL_UP_MOVE(46, MOVE_HURRICANE), + LEVEL_UP_MOVE(42, MOVE_RAINDANCE), + LEVEL_UP_MOVE(45, MOVE_BRAVEBIRD), + LEVEL_UP_MOVE(48, MOVE_HURRICANE), LEVEL_UP_END }; @@ -12614,22 +12618,20 @@ static const struct LevelUpMove sSwannaLevelUpLearnset[] = { LEVEL_UP_MOVE( 1, MOVE_WATERGUN), LEVEL_UP_MOVE( 1, MOVE_WATERSPORT), LEVEL_UP_MOVE( 1, MOVE_DEFOG), - LEVEL_UP_MOVE( 1, MOVE_WINGATTACK), - LEVEL_UP_MOVE( 3, MOVE_WATERSPORT), - LEVEL_UP_MOVE( 6, MOVE_DEFOG), - LEVEL_UP_MOVE( 9, MOVE_WINGATTACK), - LEVEL_UP_MOVE(13, MOVE_WATERPULSE), + LEVEL_UP_MOVE( 1, MOVE_AIRCUTTER), + LEVEL_UP_MOVE(12, MOVE_WATERPULSE), LEVEL_UP_MOVE(15, MOVE_AERIALACE), - LEVEL_UP_MOVE(19, MOVE_BUBBLEBEAM), - LEVEL_UP_MOVE(21, MOVE_FEATHERDANCE), + LEVEL_UP_MOVE(18, MOVE_FEATHERDANCE), + LEVEL_UP_MOVE(21, MOVE_BRINE), LEVEL_UP_MOVE(24, MOVE_AQUARING), LEVEL_UP_MOVE(27, MOVE_AIRSLASH), LEVEL_UP_MOVE(30, MOVE_ROOST), - LEVEL_UP_MOVE(34, MOVE_RAINDANCE), - 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_MOVE(35, MOVE_LIQUIDATION), + LEVEL_UP_MOVE(41, MOVE_DUALWINGBEAT), + LEVEL_UP_MOVE(47, MOVE_TAILWIND), + LEVEL_UP_MOVE(53, MOVE_RAINDANCE), + LEVEL_UP_MOVE(59, MOVE_BRAVEBIRD), + LEVEL_UP_MOVE(65, MOVE_HURRICANE), LEVEL_UP_END }; @@ -12645,10 +12647,11 @@ static const struct LevelUpMove sVanilliteLevelUpLearnset[] = { LEVEL_UP_MOVE(26, MOVE_MIRRORSHOT), LEVEL_UP_MOVE(28, MOVE_UPROAR), LEVEL_UP_MOVE(32, MOVE_ACIDARMOR), - LEVEL_UP_MOVE(36, MOVE_MIRRORCOAT), - LEVEL_UP_MOVE(40, MOVE_ICEBEAM), - LEVEL_UP_MOVE(44, MOVE_BLIZZARD), - LEVEL_UP_MOVE(48, MOVE_SHEERCOLD), + LEVEL_UP_MOVE(36, MOVE_ICEBEAM), + LEVEL_UP_MOVE(40, MOVE_MIRRORCOAT), + LEVEL_UP_MOVE(44, MOVE_FLASHCANNON), + LEVEL_UP_MOVE(48, MOVE_BLIZZARD), + LEVEL_UP_MOVE(52, MOVE_SHEERCOLD), LEVEL_UP_END }; @@ -12661,13 +12664,14 @@ static const struct LevelUpMove sVanillishLevelUpLearnset[] = { LEVEL_UP_MOVE(16, MOVE_AVALANCHE), LEVEL_UP_MOVE(20, MOVE_HAIL), LEVEL_UP_MOVE(24, MOVE_ICICLESPEAR), - LEVEL_UP_MOVE(26, MOVE_MIRRORSHOT), - LEVEL_UP_MOVE(28, MOVE_UPROAR), - LEVEL_UP_MOVE(32, MOVE_ACIDARMOR), - LEVEL_UP_MOVE(38, MOVE_MIRRORCOAT), - LEVEL_UP_MOVE(44, MOVE_ICEBEAM), - LEVEL_UP_MOVE(50, MOVE_BLIZZARD), - LEVEL_UP_MOVE(56, MOVE_SHEERCOLD), + LEVEL_UP_MOVE(27, MOVE_MIRRORSHOT), + LEVEL_UP_MOVE(32, MOVE_UPROAR), + LEVEL_UP_MOVE(37, MOVE_ACIDARMOR), + LEVEL_UP_MOVE(42, MOVE_ICEBEAM), + LEVEL_UP_MOVE(47, MOVE_MIRRORCOAT), + LEVEL_UP_MOVE(52, MOVE_FLASHCANNON), + LEVEL_UP_MOVE(57, MOVE_BLIZZARD), + LEVEL_UP_MOVE(62, MOVE_SHEERCOLD), LEVEL_UP_END }; @@ -12683,13 +12687,14 @@ static const struct LevelUpMove sVanilluxeLevelUpLearnset[] = { LEVEL_UP_MOVE(16, MOVE_AVALANCHE), LEVEL_UP_MOVE(20, MOVE_HAIL), LEVEL_UP_MOVE(24, MOVE_ICICLESPEAR), - LEVEL_UP_MOVE(26, MOVE_MIRRORSHOT), - LEVEL_UP_MOVE(28, MOVE_UPROAR), - LEVEL_UP_MOVE(32, MOVE_ACIDARMOR), - LEVEL_UP_MOVE(38, MOVE_MIRRORCOAT), - LEVEL_UP_MOVE(44, MOVE_ICEBEAM), - LEVEL_UP_MOVE(52, MOVE_BLIZZARD), - LEVEL_UP_MOVE(60, MOVE_SHEERCOLD), + LEVEL_UP_MOVE(27, MOVE_MIRRORSHOT), + LEVEL_UP_MOVE(32, MOVE_UPROAR), + LEVEL_UP_MOVE(37, MOVE_ACIDARMOR), + LEVEL_UP_MOVE(42, MOVE_ICEBEAM), + LEVEL_UP_MOVE(46, MOVE_MIRRORCOAT), + LEVEL_UP_MOVE(54, MOVE_FLASHCANNON), + LEVEL_UP_MOVE(62, MOVE_BLIZZARD), + LEVEL_UP_MOVE(68, MOVE_SHEERCOLD), LEVEL_UP_END };