From 9286b808661d37aad2dbeae8c076b744898798c0 Mon Sep 17 00:00:00 2001 From: Bassoonian Date: Sun, 21 Jan 2024 13:02:45 +0100 Subject: [PATCH] Remove illegal moves from teachable learnsets (#4042) Co-authored-by: Alex <93446519+AlexOn1ine@users.noreply.github.com> --- src/data/pokemon/teachable_learnsets.h | 95 -------------------------- 1 file changed, 95 deletions(-) diff --git a/src/data/pokemon/teachable_learnsets.h b/src/data/pokemon/teachable_learnsets.h index a478c8d179..c4eaf84c9b 100644 --- a/src/data/pokemon/teachable_learnsets.h +++ b/src/data/pokemon/teachable_learnsets.h @@ -710,7 +710,6 @@ static const u16 sRaticateTeachableLearnset[] = { #if P_ALOLAN_FORMS static const u16 sRattataAlolanTeachableLearnset[] = { MOVE_BLIZZARD, - MOVE_CUT, MOVE_DIG, MOVE_FACADE, MOVE_ICE_BEAM, @@ -727,7 +726,6 @@ static const u16 sRattataAlolanTeachableLearnset[] = { static const u16 sRaticateAlolanTeachableLearnset[] = { MOVE_BLIZZARD, MOVE_BULK_UP, - MOVE_CUT, MOVE_DIG, MOVE_FACADE, MOVE_HYPER_BEAM, @@ -1022,7 +1020,6 @@ static const u16 sRaichuAlolanTeachableLearnset[] = { MOVE_CALM_MIND, MOVE_DIG, MOVE_FACADE, - MOVE_FLASH, MOVE_HYPER_BEAM, MOVE_IRON_TAIL, MOVE_LIGHT_SCREEN, @@ -1031,7 +1028,6 @@ static const u16 sRaichuAlolanTeachableLearnset[] = { MOVE_REFLECT, MOVE_REST, MOVE_ROCK_SMASH, - MOVE_STRENGTH, MOVE_THUNDERBOLT, MOVE_THUNDER, MOVE_TOXIC, @@ -1138,7 +1134,6 @@ static const u16 sSandslashTeachableLearnset[] = { static const u16 sSandshrewAlolanTeachableLearnset[] = { MOVE_BLIZZARD, MOVE_BRICK_BREAK, - MOVE_CUT, MOVE_DIG, MOVE_EARTHQUAKE, MOVE_FACADE, @@ -1146,8 +1141,6 @@ static const u16 sSandshrewAlolanTeachableLearnset[] = { MOVE_IRON_TAIL, MOVE_PROTECT, MOVE_REST, - MOVE_ROCK_SMASH, - MOVE_STRENGTH, MOVE_TOXIC, MOVE_UNAVAILABLE, }; @@ -1155,7 +1148,6 @@ static const u16 sSandshrewAlolanTeachableLearnset[] = { static const u16 sSandslashAlolanTeachableLearnset[] = { MOVE_BLIZZARD, MOVE_BRICK_BREAK, - MOVE_CUT, MOVE_DIG, MOVE_EARTHQUAKE, MOVE_FACADE, @@ -1164,8 +1156,6 @@ static const u16 sSandslashAlolanTeachableLearnset[] = { MOVE_IRON_TAIL, MOVE_PROTECT, MOVE_REST, - MOVE_ROCK_SMASH, - MOVE_STRENGTH, MOVE_TOXIC, MOVE_UNAVAILABLE, }; @@ -2379,27 +2369,23 @@ static const u16 sDugtrioTeachableLearnset[] = { #if P_ALOLAN_FORMS static const u16 sDiglettAlolanTeachableLearnset[] = { - MOVE_CUT, MOVE_DIG, MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_PROTECT, MOVE_REST, - MOVE_ROCK_SMASH, MOVE_SLUDGE_BOMB, MOVE_TOXIC, MOVE_UNAVAILABLE, }; static const u16 sDugtrioAlolanTeachableLearnset[] = { - MOVE_CUT, MOVE_DIG, MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_HYPER_BEAM, MOVE_PROTECT, MOVE_REST, - MOVE_ROCK_SMASH, MOVE_SLUDGE_BOMB, MOVE_TOXIC, MOVE_UNAVAILABLE, @@ -2500,9 +2486,7 @@ static const u16 sPersianTeachableLearnset[] = { #if P_ALOLAN_FORMS static const u16 sMeowthAlolanTeachableLearnset[] = { - MOVE_CUT, MOVE_FACADE, - MOVE_FLASH, MOVE_IRON_TAIL, MOVE_PROTECT, MOVE_REST, @@ -2515,9 +2499,7 @@ static const u16 sMeowthAlolanTeachableLearnset[] = { }; static const u16 sPersianAlolanTeachableLearnset[] = { - MOVE_CUT, MOVE_FACADE, - MOVE_FLASH, MOVE_HYPER_BEAM, MOVE_IRON_TAIL, MOVE_PROTECT, @@ -3760,7 +3742,6 @@ static const u16 sGeodudeAlolanTeachableLearnset[] = { MOVE_PROTECT, MOVE_REST, MOVE_ROCK_SMASH, - MOVE_STRENGTH, MOVE_THUNDERBOLT, MOVE_THUNDER, MOVE_TOXIC, @@ -3777,7 +3758,6 @@ static const u16 sGravelerAlolanTeachableLearnset[] = { MOVE_PROTECT, MOVE_REST, MOVE_ROCK_SMASH, - MOVE_STRENGTH, MOVE_THUNDERBOLT, MOVE_THUNDER, MOVE_TOXIC, @@ -3795,7 +3775,6 @@ static const u16 sGolemAlolanTeachableLearnset[] = { MOVE_PROTECT, MOVE_REST, MOVE_ROCK_SMASH, - MOVE_STRENGTH, MOVE_THUNDERBOLT, MOVE_THUNDER, MOVE_TOXIC, @@ -4634,7 +4613,6 @@ static const u16 sGrimerAlolanTeachableLearnset[] = { MOVE_REST, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB, - MOVE_STRENGTH, MOVE_TAUNT, MOVE_TOXIC, MOVE_UNAVAILABLE, @@ -4649,10 +4627,8 @@ static const u16 sMukAlolanTeachableLearnset[] = { MOVE_HYPER_BEAM, MOVE_PROTECT, MOVE_REST, - MOVE_ROCK_SMASH, MOVE_SHADOW_BALL, MOVE_SLUDGE_BOMB, - MOVE_STRENGTH, MOVE_TAUNT, MOVE_TOXIC, MOVE_UNAVAILABLE, @@ -5298,7 +5274,6 @@ static const u16 sExeggutorAlolanTeachableLearnset[] = { MOVE_EARTHQUAKE, MOVE_FACADE, MOVE_FLAMETHROWER, - MOVE_FLASH, MOVE_HYPER_BEAM, MOVE_IRON_TAIL, MOVE_LIGHT_SCREEN, @@ -5308,7 +5283,6 @@ static const u16 sExeggutorAlolanTeachableLearnset[] = { MOVE_REST, MOVE_SOLAR_BEAM, MOVE_SLUDGE_BOMB, - MOVE_STRENGTH, MOVE_TOXIC, MOVE_UNAVAILABLE, }; @@ -5431,9 +5405,7 @@ static const u16 sMarowakAlolanTeachableLearnset[] = { MOVE_IRON_TAIL, MOVE_PROTECT, MOVE_REST, - MOVE_ROCK_SMASH, MOVE_SHADOW_BALL, - MOVE_STRENGTH, MOVE_THUNDERBOLT, MOVE_THUNDER, MOVE_TOXIC, @@ -7312,8 +7284,6 @@ static const u16 sTaurosTeachableLearnset[] = { #if P_PALDEAN_FORMS static const u16 sTaurosPaldeanCombatBreedTeachableLearnset[] = { - MOVE_ATTRACT, - MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_BULLDOZE, MOVE_CLOSE_COMBAT, @@ -7321,31 +7291,20 @@ static const u16 sTaurosPaldeanCombatBreedTeachableLearnset[] = { MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_FACADE, - MOVE_FIRE_BLAST, - MOVE_FLAMETHROWER, - MOVE_FRUSTRATION, MOVE_GIGA_IMPACT, - MOVE_HELPING_HAND, - MOVE_HIDDEN_POWER, MOVE_HYPER_BEAM, - MOVE_ICE_BEAM, - MOVE_ICY_WIND, MOVE_IRON_HEAD, MOVE_OUTRAGE, MOVE_PROTECT, MOVE_RAIN_DANCE, MOVE_REST, - MOVE_RETURN, MOVE_REVERSAL, MOVE_ROCK_SLIDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_SCARY_FACE, - MOVE_SECRET_POWER, - MOVE_SHADOW_BALL, MOVE_SLEEP_TALK, MOVE_SMART_STRIKE, - MOVE_SOLAR_BEAM, MOVE_STOMPING_TANTRUM, MOVE_STONE_EDGE, MOVE_SUBSTITUTE, @@ -7354,9 +7313,6 @@ static const u16 sTaurosPaldeanCombatBreedTeachableLearnset[] = { MOVE_TAKE_DOWN, MOVE_TERA_BLAST, MOVE_THIEF, - MOVE_THUNDER, - MOVE_THUNDERBOLT, - MOVE_TOXIC, MOVE_TRAILBLAZE, MOVE_WILD_CHARGE, MOVE_ZEN_HEADBUTT, @@ -7364,8 +7320,6 @@ static const u16 sTaurosPaldeanCombatBreedTeachableLearnset[] = { }; static const u16 sTaurosPaldeanBlazeBreedTeachableLearnset[] = { - MOVE_ATTRACT, - MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_BULLDOZE, MOVE_CLOSE_COMBAT, @@ -7375,40 +7329,27 @@ static const u16 sTaurosPaldeanBlazeBreedTeachableLearnset[] = { MOVE_FACADE, MOVE_FIRE_BLAST, MOVE_FLAMETHROWER, - MOVE_FRUSTRATION, MOVE_GIGA_IMPACT, - MOVE_HELPING_HAND, - MOVE_HIDDEN_POWER, MOVE_HYPER_BEAM, - MOVE_ICE_BEAM, - MOVE_ICY_WIND, MOVE_IRON_HEAD, MOVE_OUTRAGE, MOVE_PROTECT, MOVE_RAIN_DANCE, MOVE_REST, - MOVE_RETURN, MOVE_REVERSAL, MOVE_ROCK_SLIDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_SCARY_FACE, - MOVE_SECRET_POWER, - MOVE_SHADOW_BALL, MOVE_SLEEP_TALK, MOVE_SMART_STRIKE, - MOVE_SOLAR_BEAM, MOVE_STOMPING_TANTRUM, MOVE_STONE_EDGE, MOVE_SUBSTITUTE, MOVE_SUNNY_DAY, - MOVE_SURF, MOVE_TAKE_DOWN, MOVE_TERA_BLAST, MOVE_THIEF, - MOVE_THUNDER, - MOVE_THUNDERBOLT, - MOVE_TOXIC, MOVE_TRAILBLAZE, MOVE_WILD_CHARGE, MOVE_ZEN_HEADBUTT, @@ -7416,8 +7357,6 @@ static const u16 sTaurosPaldeanBlazeBreedTeachableLearnset[] = { }; static const u16 sTaurosPaldeanAquaBreedTeachableLearnset[] = { - MOVE_ATTRACT, - MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_BULLDOZE, MOVE_CLOSE_COMBAT, @@ -7425,42 +7364,27 @@ static const u16 sTaurosPaldeanAquaBreedTeachableLearnset[] = { MOVE_EARTHQUAKE, MOVE_ENDURE, MOVE_FACADE, - MOVE_FIRE_BLAST, - MOVE_FLAMETHROWER, - MOVE_FRUSTRATION, MOVE_GIGA_IMPACT, - MOVE_HELPING_HAND, - MOVE_HIDDEN_POWER, MOVE_HYPER_BEAM, - MOVE_ICE_BEAM, - MOVE_ICY_WIND, MOVE_IRON_HEAD, MOVE_OUTRAGE, MOVE_PROTECT, MOVE_RAIN_DANCE, MOVE_REST, - MOVE_RETURN, MOVE_REVERSAL, MOVE_ROCK_SLIDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM, MOVE_SCARY_FACE, - MOVE_SECRET_POWER, - MOVE_SHADOW_BALL, MOVE_SLEEP_TALK, MOVE_SMART_STRIKE, - MOVE_SOLAR_BEAM, MOVE_STOMPING_TANTRUM, MOVE_STONE_EDGE, MOVE_SUBSTITUTE, - MOVE_SUNNY_DAY, MOVE_SURF, MOVE_TAKE_DOWN, MOVE_TERA_BLAST, MOVE_THIEF, - MOVE_THUNDER, - MOVE_THUNDERBOLT, - MOVE_TOXIC, MOVE_TRAILBLAZE, MOVE_WILD_CHARGE, MOVE_ZEN_HEADBUTT, @@ -10619,38 +10543,27 @@ static const u16 sQuagsireTeachableLearnset[] = { static const u16 sWooperPaldeanTeachableLearnset[] = { MOVE_ACID_SPRAY, MOVE_AMNESIA, - MOVE_ATTRACT, - MOVE_AVALANCHE, - MOVE_BLIZZARD, MOVE_BODY_SLAM, MOVE_BULLDOZE, MOVE_CHILLING_WATER, MOVE_DIG, MOVE_EARTH_POWER, MOVE_EARTHQUAKE, - MOVE_ENCORE, MOVE_ENDURE, MOVE_FACADE, - MOVE_FRUSTRATION, MOVE_HELPING_HAND, - MOVE_HIDDEN_POWER, MOVE_HYDRO_PUMP, - MOVE_ICE_BEAM, - MOVE_ICY_WIND, MOVE_LIQUIDATION, MOVE_MUD_SHOT, MOVE_MUD_SLAP, MOVE_PROTECT, MOVE_RAIN_DANCE, MOVE_REST, - MOVE_RETURN, MOVE_ROCK_SLIDE, MOVE_ROCK_TOMB, MOVE_SANDSTORM, - MOVE_SECRET_POWER, MOVE_SLEEP_TALK, MOVE_SLUDGE_BOMB, - MOVE_SNOWSCAPE, MOVE_SPIKES, MOVE_STEALTH_ROCK, MOVE_STOMPING_TANTRUM, @@ -19255,17 +19168,11 @@ static const u16 sDeoxysNormalTeachableLearnset[] = { MOVE_TOXIC, MOVE_WATER_PULSE, MOVE_BODY_SLAM, - MOVE_COUNTER, - MOVE_DOUBLE_EDGE, MOVE_DREAM_EATER, - MOVE_DYNAMIC_PUNCH, MOVE_ENDURE, MOVE_FIRE_PUNCH, MOVE_ICE_PUNCH, MOVE_ICY_WIND, - MOVE_MEGA_KICK, - MOVE_MEGA_PUNCH, - MOVE_MIMIC, MOVE_MUD_SLAP, MOVE_PSYCH_UP, MOVE_ROCK_SLIDE, @@ -33081,7 +32988,6 @@ static const u16 sMeltanTeachableLearnset[] = { MOVE_IRON_DEFENSE, MOVE_GYRO_BALL, MOVE_STEEL_BEAM, - MOVE_HIDDEN_POWER, MOVE_UNAVAILABLE, }; @@ -33126,7 +33032,6 @@ static const u16 sMelmetalTeachableLearnset[] = { MOVE_BODY_PRESS, MOVE_STEEL_BEAM, MOVE_STEEL_ROLLER, - MOVE_HIDDEN_POWER, MOVE_UNAVAILABLE, }; #endif //P_FAMILY_MELTAN