diff --git a/src/poke_env/data/static/learnset.json b/src/poke_env/data/static/learnset.json
index b203eda1..aa812b80 100644
--- a/src/poke_env/data/static/learnset.json
+++ b/src/poke_env/data/static/learnset.json
@@ -93726,7 +93726,7 @@
    "sheercold": ["9L67", "8L67", "5L59", "4L60"],
    "signalbeam": ["7T"],
    "silverwind": ["4M"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "slash": ["9L39", "8L39", "7L28", "4L14"],
    "sleeptalk": ["9M", "8M", "7M", "4M"],
    "snore": ["8M", "4T"],
@@ -93745,7 +93745,7 @@
    "terablast": ["9M"],
    "toxic": ["7M", "4M"],
    "trailblaze": ["9M"],
-   "tripleaxel": ["8T"],
+   "tripleaxel": ["9M", "8T"],
    "uturn": ["9M", "8M", "7M", "4M"],
    "waterpulse": ["9M", "6T", "4M"],
    "xscissor": ["9M", "9L46", "8M", "8L46", "7M", "7L32", "4M", "4L27"]
@@ -93814,7 +93814,7 @@
    "payback": ["8M", "7M", "6M", "5M", "4M"],
    "phantomforce": ["9M"],
    "poisonjab": ["9M", "8M", "7M", "6M", "5M", "4M"],
-   "poltergeist": ["8T"],
+   "poltergeist": ["9M", "8T"],
    "poweruppunch": ["6M"],
    "powerwhip": ["9L52", "8L56", "7L60", "6L60", "5L60", "4L55"],
    "protect": ["9M", "8M", "7M", "6M", "5M", "4M"],
@@ -93864,6 +93864,7 @@
    "toxic": ["7M", "6M", "5M", "4M"],
    "trick": ["9M", "8M", "7T", "6T", "5T", "4T"],
    "trickroom": ["9M", "8M", "7M", "6M", "5M", "4M"],
+   "upperhand": ["9M"],
    "vacuumwave": ["9M", "4T"],
    "willowisp": ["9M", "8M", "7M"],
    "wonderroom": ["8M", "7T", "6T", "5T"],
@@ -94067,6 +94068,7 @@
    "counter": ["4T"],
    "doubleedge": ["9L1", "8L1", "4T"],
    "doubleteam": ["7M", "4M"],
+   "dragoncheer": ["9M"],
    "dragondance": ["9M", "8M"],
    "dragonpulse": ["9M", "8M", "7T"],
    "dragontail": ["9M", "7M"],
@@ -94127,7 +94129,7 @@
    "round": ["8M", "7M"],
    "safeguard": ["8M", "7M", "4M"],
    "sandtomb": ["9M", "8M"],
-   "scorchingsands": ["8T"],
+   "scorchingsands": ["9M", "8T"],
    "secretpower": ["7M", "4M"],
    "seedbomb": ["9M", "9L32", "8M", "8L32", "7L23", "4T"],
    "sleeptalk": ["9M", "8M", "7M", "4M"],
@@ -94144,6 +94146,7 @@
    "swordsdance": ["9M", "8M", "7M", "4M"],
    "synthesis": ["9L27", "8L27", "7L14", "4T", "4L48"],
    "takedown": ["9M"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
    "terrainpulse": ["8T"],
    "toxic": ["7M", "4M"],
@@ -94292,7 +94295,7 @@
    "poisonjab": ["9M", "8M", "7M", "4M"],
    "pounce": ["9M"],
    "protect": ["9M", "8M", "7M", "4M"],
-   "psychup": ["7M", "4M"],
+   "psychup": ["9M", "7M", "4M"],
    "raindance": ["9M", "8M", "7M", "4M"],
    "rapidspin": ["9L16", "8L16", "7L9", "4L9"],
    "reflect": ["9M", "8M", "7M", "4M"],
@@ -94308,15 +94311,15 @@
    "safeguard": ["9L1", "8M", "8L1", "7M", "4M"],
    "sandstorm": ["9M", "8M", "7M", "4M"],
    "sandtomb": ["9M", "8M"],
-   "scorchingsands": ["8T"],
+   "scorchingsands": ["9M", "8T"],
    "secretpower": ["7M", "4M"],
    "selfdestruct": ["8M"],
    "shadowball": ["9M", "8M", "7M", "4M"],
    "skillswap": ["9M", "8M", "7M", "4M"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "sleeptalk": ["9M", "8M", "7M", "4M"],
    "sludgebomb": ["9M", "9L38", "8M", "8L38", "7M", "7L35", "4M", "4L35"],
-   "sludgewave": ["8M", "7M"],
+   "sludgewave": ["9M", "8M", "7M"],
    "smartstrike": ["9M", "8M"],
    "snatch": ["7M", "4M"],
    "snore": ["8M", "7T", "4T"],
@@ -94338,6 +94341,7 @@
    "toxicspikes": ["9M", "9L20", "8M", "8L20", "7L41", "4L41"],
    "trickroom": ["9M", "8M", "7M", "4M"],
    "twister": ["4T"],
+   "upperhand": ["9M"],
    "uturn": ["9M", "8M", "7M", "4M"],
    "venoshock": ["9M", "8M", "7M"],
    "whirlwind": ["9L32", "8L32", "7L25", "4L25"],
@@ -94695,7 +94699,7 @@
    "chipaway": ["7L30"],
    "circlethrow": ["9L1", "8L1", "7L1"],
    "closecombat": ["9M", "8M"],
-   "coaching": ["8T"],
+   "coaching": ["9M", "8T"],
    "confide": ["7M"],
    "crosschop": ["7M"],
    "crosspoison": ["8M"],
@@ -94716,6 +94720,7 @@
    "gigaimpact": ["9M", "8M", "7M", "4M"],
    "gunkshot": ["9M", "8M", "7T", "4T"],
    "hail": ["8M", "7M", "4M"],
+   "hardpress": ["9M"],
    "headbutt": ["9L36", "8L36", "4T"],
    "hiddenpower": ["7M", "4M"],
    "hydropump": ["9M", "8M"],
@@ -94730,7 +94735,7 @@
    "lowsweep": ["9M", "8M", "7M"],
    "machpunch": ["9L16", "8L16", "7L35", "4L32"],
    "megapunch": ["8M"],
-   "muddywater": ["8M"],
+   "muddywater": ["9M", "8M"],
    "mudslap": ["9M", "4T"],
    "naturalgift": ["4M"],
    "poisonjab": ["9M", "8M", "7M"],
@@ -94752,7 +94757,7 @@
    "scald": ["8M", "8L42", "7M", "7L40"],
    "scaryface": ["9M", "8M"],
    "secretpower": ["7M", "4M"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "sleeptalk": ["9M", "8M", "7M", "4M"],
    "sludgebomb": ["9M", "8M", "7M", "4M"],
    "smokescreen": ["9L12", "8L12", "7L7", "4L7"],
@@ -94771,7 +94776,7 @@
    "taunt": ["9M", "9L32", "8M", "8L32", "7M", "7L24", "4M", "4L36"],
    "terablast": ["9M"],
    "thief": ["9M", "9L1", "8M", "8L1", "7M", "7L51", "4M", "4L47"],
-   "throatchop": ["8M"],
+   "throatchop": ["9M", "8M"],
    "thunderpunch": ["9M", "8M", "7T", "4T"],
    "torment": ["7M", "4M"],
    "toxic": ["7M", "4M"],
@@ -94779,7 +94784,7 @@
    "waterfall": ["9M", "8M", "7M", "4M"],
    "watergun": ["9L1", "8L1"],
    "waterpulse": ["9M", "7T", "4M"],
-   "whirlpool": ["8M", "4M"],
+   "whirlpool": ["9M", "8M", "4M"],
    "wideguard": ["9L54", "8L54", "7L62"],
    "workup": ["8M", "7M"],
    "wrap": ["9L1", "8L1", "7L1", "4L1"],
@@ -94899,7 +94904,7 @@
    "dreameater": ["7M", "4M"],
    "earthquake": ["9M", "8M", "7M", "4M"],
    "embargo": ["7M", "4M"],
-   "endeavor": ["7T", "4T"],
+   "endeavor": ["9M", "7T", "4T"],
    "facade": ["9M", "8M", "7M", "4M"],
    "fakeout": ["9L1", "8L1", "7L27", "4L35"],
    "falseswipe": ["9M", "8M", "7M", "4M"],
@@ -94939,7 +94944,7 @@
    "playrough": ["9M", "8M", "7E"],
    "poltergeist": ["9M", "8T"],
    "protect": ["9M", "8M", "7M", "4M"],
-   "psychup": ["7M", "4M"],
+   "psychup": ["9M", "7M", "4M"],
    "raindance": ["9M", "8M", "7M", "4M"],
    "rest": ["9M", "8M", "7M", "4M"],
    "retaliate": ["8M", "7M"],
@@ -94954,7 +94959,7 @@
    "shadowclaw": ["9M", "9L32", "8M", "8L32", "7M", "7L35", "4M", "4L40"],
    "shadowsneak": ["9L16", "8L16", "7L18", "4L18"],
    "shadowstrike": ["9L44", "8L44", "7L48", "4L49"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "sleeptalk": ["9M", "8M", "7M", "4M"],
    "snatch": ["7M", "4M"],
    "snore": ["8M", "7T", "4T"],
@@ -95186,6 +95191,7 @@
    "doubleteam": ["7M", "4M"],
    "dracometeor": ["9M", "8T", "7T", "4T"],
    "dragonbreath": ["9L20", "8L20", "7L29"],
+   "dragoncheer": ["9M"],
    "dragonclaw": ["9M", "8M", "7M", "4M"],
    "dragonpulse": ["9M", "8M", "7T", "4M"],
    "dragonrage": ["7L24", "4L7"],
@@ -95194,7 +95200,7 @@
    "eerieimpulse": ["9M", "8M"],
    "electricterrain": ["9M", "9L1", "8M", "8L1", "7L1"],
    "electroball": ["9M", "8M"],
-   "electroweb": ["8M", "7T"],
+   "electroweb": ["9M", "8M", "7T"],
    "endure": ["9M", "8M", "4M"],
    "facade": ["9M", "8M", "7M", "4M"],
    "fireblast": ["9M", "8M", "7M", "4M"],
@@ -95219,7 +95225,7 @@
    "irontail": ["8M", "7T"],
    "lightscreen": ["9M", "8M", "7M", "4M"],
    "lockon": ["9L56", "8L56"],
-   "muddywater": ["8M"],
+   "muddywater": ["9M", "8M"],
    "mudslap": ["9M", "4T"],
    "naturalgift": ["4M"],
    "naturepower": ["7M"],
@@ -95244,6 +95250,7 @@
    "strength": ["4M"],
    "substitute": ["9M", "8M", "7M", "4M"],
    "sunnyday": ["9M", "8M", "7M", "4M"],
+   "supercellslam": ["9M"],
    "surf": ["9M", "8M", "7M", "4M"],
    "swagger": ["7M"],
    "swift": ["9M", "8M", "4T"],
@@ -95425,7 +95432,7 @@
    "round": ["8M", "7M"],
    "sandstorm": ["9M", "8M", "7M", "4M"],
    "sandtomb": ["9M", "9L1", "8M", "8L1"],
-   "scorchingsands": ["8T"],
+   "scorchingsands": ["9M", "8T"],
    "screech": ["8M"],
    "secretpower": ["7M", "4M"],
    "sleeptalk": ["9M", "8M", "7M", "4M"],
@@ -95441,11 +95448,13 @@
    "substitute": ["9M", "8M", "7M", "4M"],
    "suckerpunch": ["4T"],
    "sunnyday": ["9M", "8M", "7M", "4M"],
+   "supercellslam": ["9M"],
    "superpower": ["8M", "7T", "6T", "5T", "4T"],
    "swagger": ["7M", "4M"],
    "swallow": ["9L42", "8L42", "7L53", "4L48"],
    "takedown": ["9M"],
    "taunt": ["9M", "8M", "7M", "4M"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
    "thunderfang": ["9M", "8M"],
    "torment": ["7M"],
@@ -95496,7 +95505,7 @@
    "eerieimpulse": ["9M", "8M"],
    "electricterrain": ["9M", "8M"],
    "electroball": ["9M", "8M"],
-   "electroweb": ["8M", "7T"],
+   "electroweb": ["9M", "8M", "7T"],
    "endure": ["9M", "8M", "4M"],
    "facade": ["9M", "8M", "7M", "4M"],
    "flash": ["4M"],
@@ -95672,7 +95681,7 @@
    "captivate": ["4M"],
    "charge": ["9M", "9L20", "8L20", "7L19", "4L19"],
    "closecombat": ["9M", "9L64", "8M", "8L64", "7L35", "4L35"],
-   "coaching": ["8T"],
+   "coaching": ["9M", "8T"],
    "confide": ["7M"],
    "copycat": ["9L1", "8L1", "7L1", "4L1"],
    "counter": ["4T"],
@@ -95743,6 +95752,7 @@
    "swagger": ["7M", "4M"],
    "taunt": ["9M", "8M", "7M", "4M"],
    "tearfullook": ["9L24", "8L24", "7L22"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
    "thief": ["9M", "8M", "7M", "4M"],
    "throatchop": ["9L1", "8M", "8L1"],
@@ -95851,7 +95861,7 @@
    "bulkup": ["9M", "9L1", "8M", "8L1", "7M", "5M"],
    "bulldoze": ["9M", "8M", "7M", "5M"],
    "closecombat": ["9M", "8M"],
-   "coaching": ["8T"],
+   "coaching": ["9M", "8T"],
    "confide": ["7M"],
    "confuseray": ["9M", "7M"],
    "doubleteam": ["7M", "5M"],
@@ -95920,7 +95930,7 @@
    "taunt": ["9M", "9L1", "8M", "8L1", "7M", "5M"],
    "terablast": ["9M"],
    "thief": ["9M", "8M", "7M", "5M"],
-   "throatchop": ["8M"],
+   "throatchop": ["9M", "8M"],
    "toxic": ["7M", "5M"],
    "trailblaze": ["9M"],
    "whirlwind": ["9L18", "8L18", "7L23", "5L23"],
@@ -96014,7 +96024,7 @@
    "facade": ["9M", "8M", "7M", "5M"],
    "flash": ["6M", "5M"],
    "frustration": ["7M", "5M"],
-   "futuresight": ["8M"],
+   "futuresight": ["9M", "8M"],
    "gigadrain": ["8M", "6T"],
    "gigaimpact": ["9M", "8M", "7M", "5M"],
    "grassknot": ["9M", "8M", "7M", "5M"],
@@ -96040,7 +96050,8 @@
    "powerwhip": ["9L52", "8M", "8L52", "7L56", "5L60"],
    "protect": ["9M", "8M", "7M", "5M"],
    "psychic": ["9M", "8M", "7M", "5M"],
-   "psychup": ["7M", "5M"],
+   "psychicnoise": ["9M"],
+   "psychup": ["9M", "7M", "5M"],
    "rest": ["9M", "8M", "7M", "5M"],
    "return": ["7M", "5M"],
    "round": ["8M", "7M", "5M"],
@@ -96049,7 +96060,7 @@
    "shadowball": ["9M", "9L40", "8M", "8L40", "7M", "7L50", "5M", "5L50"],
    "shadowclaw": ["9M", "8M", "7M", "5M"],
    "shadowsneak": ["9L1", "8L1", "7L6", "5L13"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "sleeptalk": ["9M", "8M", "7M"],
    "snore": ["8M", "7T"],
    "solarbeam": ["9M", "8M", "7M", "5M"],
@@ -96129,7 +96140,7 @@
    "secretpower": ["7M"],
    "selfdestruct": ["8M"],
    "shockwave": ["7T"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "sleeptalk": ["9M", "8M", "7M", "7E", "5E"],
    "sludgebomb": ["9M", "8M", "7M", "5M"],
    "sludgewave": ["9L36", "8M", "8L36", "7M", "5M"],
@@ -96330,12 +96341,13 @@
    "confide": ["7M"],
    "cut": ["6M", "5M"],
    "doubleteam": ["9L9", "8L9", "7M", "5M"],
+   "dragoncheer": ["9M"],
    "dragondance": ["9M", "9L1", "8M", "8L1", "7L1", "5L1"],
    "dreameater": ["7M", "5M"],
    "dualwingbeat": ["9M", "8T"],
    "echoedvoice": ["7M", "5M"],
-   "electroweb": ["8M", "7T", "5T"],
-   "expandingforce": ["8T"],
+   "electroweb": ["9M", "8M", "7T", "5T"],
+   "expandingforce": ["9M", "8T"],
    "facade": ["9M", "8M", "7M", "5M"],
    "finalgambit": ["9L61", "8L61", "5L41"],
    "flash": ["6M", "5M"],
@@ -96364,6 +96376,7 @@
    "pounce": ["9M"],
    "protect": ["9M", "8M", "7M", "5M"],
    "psychic": ["9M", "9L47", "8M", "8L47", "7M", "5M"],
+   "psychicnoise": ["9M"],
    "psychicterrain": ["9M", "9L0", "8M", "8L0", "7L1"],
    "psychup": ["7M", "5M"],
    "psyshock": ["9M", "8M", "7M", "5M"],
@@ -96382,7 +96395,7 @@
    "signalbeam": ["7T"],
    "silverwind": ["7L1", "5L1"],
    "skillswap": ["9M", "8M", "7T", "5T"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "sleeptalk": ["9M", "8M", "7M"],
    "snore": ["8M", "7T"],
    "snowscape": ["9M"],
@@ -96503,13 +96516,14 @@
    "attract": ["8M", "7M", "5M"],
    "beatup": ["8M"],
    "bind": ["7T", "5T"],
-   "breakingswipe": ["8M"],
+   "breakingswipe": ["9M", "8M"],
    "brutalswing": ["8M", "7M"],
    "confide": ["7M"],
    "crunch": ["9M", "9L28", "8M", "8L28", "7L43", "5L42"],
    "cut": ["6M", "5M"],
    "darkpulse": ["9M", "8M", "7M", "5T"],
    "doubleteam": ["7M", "5M"],
+   "dragoncheer": ["9M"],
    "dragontail": ["9M", "7M", "5M"],
    "endure": ["9M", "8M"],
    "energyball": ["9M", "8M", "7M", "5M"],
@@ -96554,7 +96568,7 @@
    "screech": ["8M"],
    "secretpower": ["7M"],
    "seedbomb": ["9M", "8M", "7T", "5T"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "slam": ["9L24", "8L24", "7L29", "5L30"],
    "sleeptalk": ["9M", "8M", "7M", "5T"],
    "snarl": ["9M", "8M", "7M", "5M"],
@@ -96570,9 +96584,10 @@
    "swagger": ["7M", "5M"],
    "synthesis": ["7T", "6T", "5T"],
    "taunt": ["9M", "8M", "7M", "5M"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
    "thief": ["9M", "8M", "7M", "5M"],
-   "throatchop": ["8M"],
+   "throatchop": ["9M", "8M"],
    "thunderfang": ["9M", "8M"],
    "toxic": ["7M", "6M", "5M"],
    "trailblaze": ["9M"],
@@ -96690,6 +96705,7 @@
    "frustration": ["7M", "5M"],
    "gigaimpact": ["9M", "8M", "7M", "5M"],
    "growl": ["9L1", "8L1", "7L5", "5L5"],
+   "hardpress": ["9M"],
    "hiddenpower": ["7M", "5M"],
    "hurricane": ["9M", "9L62", "8M", "8L62", "7L64", "5L58"],
    "hyperbeam": ["9M", "8M", "7M", "5M"],
@@ -96730,10 +96746,11 @@
    "tailwind": ["9M", "9L44", "8L44", "5T", "5L48"],
    "takedown": ["9M"],
    "terablast": ["9M"],
-   "throatchop": ["8M"],
+   "throatchop": ["9M", "8M"],
    "toxic": ["7M", "5M"],
+   "upperhand": ["9M"],
    "waterpulse": ["9M", "7T"],
-   "whirlpool": ["8M"],
+   "whirlpool": ["9M", "8M"],
    "wingattack": ["9L24", "8L24", "7L22", "5L22"]
   }
  },
@@ -96850,7 +96867,7 @@
    "leechlife": ["9M", "8M", "7M", "6L1"],
    "liquidation": ["9M", "8M"],
    "memento": ["9L68", "8L68", "7L66", "6L66"],
-   "muddywater": ["8M"],
+   "muddywater": ["9M", "8M"],
    "overheat": ["9M", "8M", "7M", "6M"],
    "payback": ["8M", "7M", "6M"],
    "pounce": ["9M"],
@@ -96864,7 +96881,7 @@
    "round": ["8M", "7M", "6M"],
    "scald": ["9M", "9L0", "8M", "8L0", "7M", "7L28", "6M", "6L28"],
    "scaryface": ["9M", "8M"],
-   "scorchingsands": ["8T"],
+   "scorchingsands": ["9M", "8T"],
    "secretpower": ["7M"],
    "skittersmack": ["8T"],
    "sleeptalk": ["9M", "8M", "7M", "6M"],
@@ -96980,7 +96997,7 @@
    "electricterrain": ["9M", "9L1", "8M", "8L1", "7L1"],
    "electrify": ["9L46", "8L46"],
    "electroball": ["9M", "8M"],
-   "electroweb": ["8M", "7T"],
+   "electroweb": ["9M", "8M", "7T"],
    "encore": ["9M", "9L12", "8M", "8L12", "7L16", "6L16"],
    "endure": ["9M", "8M"],
    "facade": ["9M", "8M", "7M", "6M"],
@@ -97014,6 +97031,7 @@
    "sludgewave": ["9L52", "8M", "8L52", "7M", "6M"],
    "snore": ["8M", "7T"],
    "substitute": ["9M", "8M", "7M", "6M"],
+   "supercellslam": ["9M"],
    "supersonic": ["9L1", "8L1", "7L1", "6L1"],
    "surf": ["9M"],
    "swagger": ["9L58", "8L58", "7M", "7L56", "6M", "6L56"],
@@ -97195,7 +97213,7 @@
    "blizzard": ["9M", "8M", "7M", "6M"],
    "bodypress": ["9M", "8M"],
    "bodyslam": ["9M", "8M"],
-   "breakingswipe": ["8M"],
+   "breakingswipe": ["9M", "8M"],
    "brine": ["9L28", "8M", "8L28", "7L45", "6L45"],
    "brutalswing": ["8M", "7M"],
    "bubblebeam": ["9L24", "8L24", "7L25", "6L25"],
@@ -97219,6 +97237,7 @@
    "gigaimpact": ["9M", "8M", "7M", "6M"],
    "gust": ["9L1", "8L1", "7L1", "6L1"],
    "hail": ["8M", "7M", "6M"],
+   "hardpress": ["9M"],
    "haze": ["9M"],
    "heavyslam": ["9M", "9L66", "8M", "8L66", "7L1"],
    "hiddenpower": ["7M", "6M"],
@@ -97314,7 +97333,7 @@
    "knockoff": ["9E"],
    "lightscreen": ["9M", "8M"],
    "magicroom": ["8M", "6T"],
-   "meteorbeam": ["8T"],
+   "meteorbeam": ["9M", "8T"],
    "metronome": ["9M", "8M"],
    "payback": ["8M", "7M", "6M"],
    "pinmissile": ["8M"],
@@ -97343,7 +97362,7 @@
    "sleeptalk": ["9M", "8M", "7M", "6M"],
    "sludge": ["9L44", "8L44", "7L28", "6L28"],
    "sludgebomb": ["9M", "8M", "7M", "6M"],
-   "sludgewave": ["8M", "8L60", "7M", "6M"],
+   "sludgewave": ["9M", "8M", "8L60", "7M", "6M"],
    "smackdown": ["9M", "9L24", "8L24", "7M", "7L23", "6M", "6L23"],
    "snatch": ["6T"],
    "snore": ["8M", "6T"],
@@ -97443,7 +97462,7 @@
    "celebrate": ["6S0"],
    "charm": ["9M", "9L9", "8M", "8L1"],
    "closecombat": ["9M", "9L42", "8M", "8L42", "7L53", "6L53"],
-   "coaching": ["8T"],
+   "coaching": ["9M", "8T"],
    "confide": ["7L25", "6L25"],
    "crushclaw": ["9L0", "8L0", "7M", "6M"],
    "dazzlinggleam": ["9M", "8M", "7M", "6M"],
@@ -97484,7 +97503,8 @@
    "poweruppunch": ["8L9", "7M", "6M"],
    "protect": ["9M", "8M", "7M", "6M"],
    "psychic": ["9M"],
-   "psychup": ["7M", "6M"],
+   "psychicnoise": ["9M"],
+   "psychup": ["9M", "7M", "6M"],
    "rest": ["9M", "9L27", "8M", "8L27", "7M", "7L41", "6M", "6L41"],
    "retaliate": ["8M", "7M", "6M"],
    "return": ["7M", "6M"],
@@ -97496,7 +97516,7 @@
    "secretpower": ["7M"],
    "sleeptalk": ["9M", "8M", "7M", "6M"],
    "sludgebomb": ["9M", "8M", "7M", "6M"],
-   "sludgewave": ["8M", "7M", "6M"],
+   "sludgewave": ["9M", "8M", "7M", "6M"],
    "snarl": ["9M", "8M", "7M", "6M"],
    "snore": ["9L27", "8M", "8L27", "6T"],
    "speedswap": ["8M"],
@@ -97511,6 +97531,7 @@
    "terablast": ["9M"],
    "torment": ["9L36", "8L36", "7M", "6M"],
    "toxic": ["7M", "6M"],
+   "upperhand": ["9M"],
    "uproar": ["9M", "8M"],
    "vacuumwave": ["9M"],
    "wakeupslap": ["7L13", "6L13"],
@@ -97538,6 +97559,7 @@
    "doubleteam": ["9L25", "8L25", "7M"],
    "dracometeor": ["9M", "8T", "7T"],
    "dragonbreath": ["9L20", "8L20", "7L19"],
+   "dragoncheer": ["9M"],
    "dragonclaw": ["9M", "9L35", "8M", "8L35", "7M", "7L23"],
    "dragonpulse": ["9M", "8M", "7T"],
    "dragonrage": ["7L12"],
@@ -97578,7 +97600,8 @@
    "protect": ["9M", "8M", "7M"],
    "psychic": ["9M", "8M", "7M"],
    "psychicfangs": ["9M", "9L50", "8M", "8L50", "7L32"],
-   "psychup": ["7M"],
+   "psychicnoise": ["9M"],
+   "psychup": ["9M", "7M"],
    "raindance": ["9M", "8M", "7M"],
    "rest": ["9M", "8M", "7M"],
    "return": ["7M"],
@@ -97600,13 +97623,14 @@
    "takedown": ["9M"],
    "taunt": ["9M"],
    "telekinesis": ["7T"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
-   "throatchop": ["8M", "7T"],
+   "throatchop": ["9M", "8M", "7T"],
    "toxic": ["9M", "7M"],
    "toxicspikes": ["9M", "8M", "7L28"],
    "trickroom": ["9M", "8M", "7M"],
    "venoshock": ["9M", "8M", "7M"],
-   "whirlpool": ["8M", "7E"],
+   "whirlpool": ["9M", "8M", "7E"],
    "wrap": ["9L1", "8L1", "7L1"],
    "zenheadbutt": ["9M", "8M", "7T"]
   }
@@ -97929,7 +97953,7 @@
    "echoedvoice": ["7M"],
    "eerieimpulse": ["9M", "8M"],
    "electricterrain": ["9M", "9L1", "8M", "8L1", "7L1"],
-   "electroweb": ["8M", "7T"],
+   "electroweb": ["9M", "8M", "7T"],
    "endeavor": ["7T"],
    "endure": ["9M", "8M"],
    "energyball": ["9M", "9L1", "8M", "8L1", "7M"],
@@ -97976,6 +98000,7 @@
    "spark": ["9L30", "8L30", "7L24"],
    "substitute": ["9M", "8M", "7M"],
    "sunnyday": ["9M", "8M", "7M"],
+   "supercellslam": ["9M"],
    "swagger": ["7M"],
    "swift": ["9M", "8M"],
    "swordsdance": ["9M", "8M", "7M"],
@@ -97984,7 +98009,7 @@
    "takedown": ["9M"],
    "terablast": ["9M"],
    "terrainpulse": ["8T"],
-   "throatchop": ["8M"],
+   "throatchop": ["9M", "8M"],
    "thunder": ["9M", "8M", "7M"],
    "thunderbolt": ["9M", "8M", "7M"],
    "thundershock": ["9L1", "8L1", "7L1"],
@@ -98171,6 +98196,7 @@
    "defog": ["7T"],
    "dig": ["9M", "9L1", "8M", "8L1"],
    "doubleteam": ["7M"],
+   "dragoncheer": ["9M"],
    "earthpower": ["9M", "8M", "7T"],
    "earthquake": ["9M", "9L56", "8M", "8L56", "7M", "7L54"],
    "ember": ["9L1", "8L1", "7L1"],
@@ -98217,7 +98243,7 @@
    "round": ["8M", "7M"],
    "sandtomb": ["9M", "8M"],
    "scaleshot": ["9M", "8T"],
-   "scorchingsands": ["8T"],
+   "scorchingsands": ["9M", "8T"],
    "scratch": ["9L1", "8L1", "7L1"],
    "screech": ["9L49", "8M", "8L49", "7L49"],
    "sleeptalk": ["9M", "8M", "7M"],
@@ -98235,6 +98261,7 @@
    "swagger": ["7M"],
    "tailwhip": ["9L1", "8L1", "7L1"],
    "taunt": ["9M", "8M", "7M"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
    "toxic": ["9M", "9L63", "8L63", "7M"],
    "trailblaze": ["9M"],
@@ -98419,6 +98446,7 @@
  },
  "snaelstrom": {
   "learnset": {
+   "alluringvoice": ["9M"],
    "allyswitch": ["8M"],
    "aquajet": ["9L12", "8L12", "7L17"],
    "aquaring": ["9L1", "8L1", "7L1"],
@@ -98444,7 +98472,7 @@
    "endure": ["9M", "8M"],
    "facade": ["9M", "8M", "7M"],
    "frustration": ["7M"],
-   "futuresight": ["8M"],
+   "futuresight": ["9M", "8M"],
    "gigaimpact": ["9M", "8M", "7M"],
    "growl": ["9L1", "8L1", "7L1"],
    "guardswap": ["8M"],
@@ -98481,7 +98509,7 @@
    "scald": ["8M", "7M"],
    "signalbeam": ["7T"],
    "skillswap": ["9M", "8M"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "sleeptalk": ["9M", "8M", "7M"],
    "snore": ["8M", "7T"],
    "snowscape": ["9M"],
@@ -98601,6 +98629,7 @@
    "gravity": ["9M", "9L24", "7T"],
    "guardsplit": ["9L16", "8L16", "7L25"],
    "gyroball": ["9M", "9L12", "8M", "8L12", "7M", "7L20"],
+   "hardpress": ["9M"],
    "healingwish": ["9L46", "8L46", "7L50"],
    "heavyslam": ["9M"],
    "helpinghand": ["9M", "8M", "7T"],
@@ -98623,7 +98652,7 @@
    "pound": ["9L1", "8L1", "7L1"],
    "powersplit": ["9L16", "8L16", "7L25"],
    "protect": ["9M", "8M", "7M"],
-   "psychup": ["7M"],
+   "psychup": ["9M", "7M"],
    "quash": ["9L20", "8L20", "7M"],
    "rapidspin": ["9L1", "9S0", "8L1", "7L1"],
    "recycle": ["7T"],
@@ -98721,16 +98750,18 @@
   "learnset": {
    "acrobatics": ["9M", "8M"],
    "agility": ["9M", "8M"],
+   "alluringvoice": ["9M"],
    "allyswitch": ["8M"],
    "attract": ["8M"],
    "batonpass": ["9M", "9L1", "8M", "8L1"],
-   "breakingswipe": ["8M"],
+   "breakingswipe": ["9M", "8M"],
    "bulldoze": ["9M", "8M"],
    "charm": ["9M", "9L20", "8M", "8L20"],
    "cosmicpower": ["9L28", "8M", "8L28"],
    "dazzlinggleam": ["9M", "8M"],
    "dracometeor": ["8T"],
    "dragonbreath": ["9L1", "8L1"],
+   "dragoncheer": ["9M"],
    "dragonclaw": ["9M", "8M"],
    "dragonpulse": ["9M", "9L44", "8M", "8L44"],
    "dragonrush": ["9L56", "8L56"],
@@ -98757,7 +98788,7 @@
    "lightscreen": ["9M", "8M"],
    "magicalleaf": ["9M", "8M"],
    "magiccoat": ["8L1"],
-   "meteorbeam": ["8T"],
+   "meteorbeam": ["9M", "8T"],
    "metronome": ["9M", "8M"],
    "mysticalfire": ["9L0", "8M", "8L0"],
    "outrage": ["9M", "8M"],
@@ -98768,7 +98799,7 @@
    "rest": ["9M", "8M"],
    "round": ["8M"],
    "safeguard": ["9L32", "8M"],
-   "scorchingsands": ["8T"],
+   "scorchingsands": ["9M", "8T"],
    "sleeptalk": ["9M", "8M"],
    "snore": ["8M"],
    "solarbeam": ["9M", "8M"],
@@ -98858,7 +98889,7 @@
    "attract": ["8M"],
    "bite": ["9L1", "8L1"],
    "bodyslam": ["9M", "8M"],
-   "breakingswipe": ["8M"],
+   "breakingswipe": ["9M", "8M"],
    "brutalswing": ["8M"],
    "bugbite": ["9M", "9L16", "8L16"],
    "bugbuzz": ["9M", "9L24", "8M", "8L24"],
@@ -98869,8 +98900,9 @@
    "darkpulse": ["9M", "8M"],
    "dracometeor": ["9M", "8T"],
    "dragonbreath": ["9L1", "8L1"],
+   "dragoncheer": ["9M"],
    "dragonclaw": ["9M", "8M"],
-   "dragonhammer": ["8L0"],
+   "dragonhammer": ["9M", "8L0"],
    "dragonpulse": ["9M", "9L46", "8M", "8L46"],
    "dragontail": ["9M"],
    "dualwingbeat": ["9M", "8T"],
@@ -98905,7 +98937,7 @@
    "scaleshot": ["9M", "9L0"],
    "scaryface": ["9M", "8M"],
    "screech": ["8M"],
-   "skittersmack": ["8T"],
+   "skittersmack": ["9M", "8T"],
    "sleeptalk": ["9M", "8M"],
    "sludgebomb": ["9M", "8M"],
    "smog": ["9L12", "8L12"],
@@ -98933,6 +98965,7 @@
   "learnset": {
    "acidspray": ["9M", "9L1", "8L1"],
    "aerialace": ["9M", "9L10", "8L10"],
+   "alluringvoice": ["9M"],
    "aromatherapy": ["8L60"],
    "assurance": ["8M"],
    "attract": ["8M"],
@@ -98974,6 +99007,7 @@
    "payday": ["8M"],
    "playrough": ["9M", "9L65", "8M"],
    "protect": ["9M", "8M"],
+   "psychicnoise": ["9M"],
    "recover": ["9L1", "8L1", "8S0"],
    "reflect": ["9M", "8M"],
    "rest": ["9M", "8M"],
@@ -98985,7 +99019,7 @@
    "shadowball": ["9M", "8M"],
    "sleeptalk": ["9M", "8M"],
    "sludgebomb": ["9M", "8M"],
-   "sludgewave": ["8M"],
+   "sludgewave": ["9M", "8M"],
    "snarl": ["9M", "8M"],
    "snore": ["8M"],
    "spite": ["9M", "9L15", "8L15"],
@@ -99065,7 +99099,7 @@
    "skillswap": ["9M", "8M"],
    "sleeptalk": ["9M", "8M"],
    "sludgebomb": ["9M", "8M"],
-   "sludgewave": ["8M"],
+   "sludgewave": ["9M", "8M"],
    "snore": ["8M"],
    "stealthrock": ["9M", "8M"],
    "steelwing": ["8M"],
@@ -99073,6 +99107,7 @@
    "swift": ["9M", "8M"],
    "tailwind": ["9M"],
    "takedown": ["9M"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
    "thunderwave": ["9M", "8M"],
    "toxic": ["9L30", "8L30"],
@@ -99166,7 +99201,7 @@
    "sandattack": ["9L1", "8L1"],
    "sandstorm": ["9M", "9L1", "8M", "8L1"],
    "sandtomb": ["9M", "9L1", "8M", "8L1"],
-   "scorchingsands": ["8T"],
+   "scorchingsands": ["9M", "8T"],
    "sleeptalk": ["9M", "8M"],
    "snore": ["8M"],
    "spitup": ["9L1", "8L1"],
@@ -99180,6 +99215,7 @@
    "swordsdance": ["9M", "8M"],
    "tackle": ["9L1", "8L1"],
    "taunt": ["9M", "9L1", "8M", "8L1"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
    "thief": ["9M", "9L1", "8M", "8L1"],
    "watergun": ["9L1", "8L1"],
@@ -99308,7 +99344,6 @@
  "hemogoblin": {
   "learnset": {
    "batonpass": ["9M"],
-   "bitterblade": ["9L0"],
    "bodyslam": ["9M"],
    "brutalswing": ["9L1"],
    "bulkup": ["9M"],
@@ -99326,7 +99361,6 @@
    "energyball": ["9M"],
    "facade": ["9M"],
    "fireblast": ["9M"],
-   "firelash": ["9L1"],
    "flamethrower": ["9M"],
    "flareblitz": ["9M"],
    "fling": ["9M"],
@@ -99367,6 +99401,7 @@
    "tailwhip": ["9L1"],
    "takedown": ["9M"],
    "taunt": ["9M"],
+   "temperflare": ["9M"],
    "terablast": ["9M"],
    "thunder": ["9M"],
    "thunderbolt": ["9M"],
diff --git a/src/poke_env/data/static/pokedex/gen6pokedex.json b/src/poke_env/data/static/pokedex/gen6pokedex.json
index 439feca7..a0268a53 100644
--- a/src/poke_env/data/static/pokedex/gen6pokedex.json
+++ b/src/poke_env/data/static/pokedex/gen6pokedex.json
@@ -11011,6 +11011,7 @@
         "eggGroups": [
             "Dragon"
         ],
+        "evoCondition": "during rain",
         "evoLevel": 50,
         "formeOrder": [
             "Goodra",
@@ -11047,6 +11048,7 @@
         "eggGroups": [
             "Dragon"
         ],
+        "evoCondition": "during rain",
         "evoLevel": 50,
         "forme": "Hisui",
         "heightm": 1.7,
diff --git a/src/poke_env/data/static/pokedex/gen7pokedex.json b/src/poke_env/data/static/pokedex/gen7pokedex.json
index 30e9d9d8..6ca09d63 100644
--- a/src/poke_env/data/static/pokedex/gen7pokedex.json
+++ b/src/poke_env/data/static/pokedex/gen7pokedex.json
@@ -11772,6 +11772,7 @@
         "eggGroups": [
             "Dragon"
         ],
+        "evoCondition": "during rain",
         "evoLevel": 50,
         "formeOrder": [
             "Goodra",
@@ -11808,6 +11809,7 @@
         "eggGroups": [
             "Dragon"
         ],
+        "evoCondition": "during rain",
         "evoLevel": 50,
         "forme": "Hisui",
         "heightm": 1.7,
diff --git a/src/poke_env/data/static/pokedex/gen8pokedex.json b/src/poke_env/data/static/pokedex/gen8pokedex.json
index 2aabd6cd..6e2d4cb9 100644
--- a/src/poke_env/data/static/pokedex/gen8pokedex.json
+++ b/src/poke_env/data/static/pokedex/gen8pokedex.json
@@ -13494,6 +13494,7 @@
         "eggGroups": [
             "Dragon"
         ],
+        "evoCondition": "during rain",
         "evoLevel": 50,
         "formeOrder": [
             "Goodra",
@@ -13530,6 +13531,7 @@
         "eggGroups": [
             "Dragon"
         ],
+        "evoCondition": "during rain",
         "evoLevel": 50,
         "forme": "Hisui",
         "heightm": 1.7,
diff --git a/src/poke_env/data/static/pokedex/gen9pokedex.json b/src/poke_env/data/static/pokedex/gen9pokedex.json
index 468b6111..db1c2a8a 100644
--- a/src/poke_env/data/static/pokedex/gen9pokedex.json
+++ b/src/poke_env/data/static/pokedex/gen9pokedex.json
@@ -14920,6 +14920,7 @@
         "eggGroups": [
             "Dragon"
         ],
+        "evoCondition": "during rain",
         "evoLevel": 50,
         "formeOrder": [
             "Goodra",
@@ -14956,6 +14957,7 @@
         "eggGroups": [
             "Dragon"
         ],
+        "evoCondition": "during rain",
         "evoLevel": 50,
         "forme": "Hisui",
         "heightm": 1.7,
@@ -19113,7 +19115,7 @@
             "Bug"
         ],
         "evoCondition": "Black Augurite",
-        "evoType": "other",
+        "evoType": "useItem",
         "heightm": 1.8,
         "name": "Kleavor",
         "num": 900,