diff --git a/data/random-battles/gen3/sets.json b/data/random-battles/gen3/sets.json
index 5a009282a9a1..e89cc57c3bdf 100644
--- a/data/random-battles/gen3/sets.json
+++ b/data/random-battles/gen3/sets.json
@@ -33,7 +33,7 @@
         ]
     },
     "blastoise": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -50,7 +50,7 @@
         ]
     },
     "butterfree": {
-        "level": 95,
+        "level": 96,
         "sets": [
             {
                 "role": "Generalist",
@@ -180,7 +180,7 @@
         ]
     },
     "clefable": {
-        "level": 84,
+        "level": 85,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -238,7 +238,7 @@
         ]
     },
     "venomoth": {
-        "level": 88,
+        "level": 87,
         "sets": [
             {
                 "role": "Generalist",
@@ -358,7 +358,7 @@
         ]
     },
     "victreebel": {
-        "level": 84,
+        "level": 85,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -424,7 +424,7 @@
         ]
     },
     "magneton": {
-        "level": 84,
+        "level": 85,
         "sets": [
             {
                 "role": "Staller",
@@ -561,7 +561,7 @@
         ]
     },
     "marowak": {
-        "level": 82,
+        "level": 83,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -702,7 +702,7 @@
         ]
     },
     "jynx": {
-        "level": 81,
+        "level": 80,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -711,7 +711,7 @@
         ]
     },
     "electabuzz": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -726,7 +726,7 @@
         ]
     },
     "magmar": {
-        "level": 84,
+        "level": 85,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -900,7 +900,7 @@
         ]
     },
     "zapdos": {
-        "level": 75,
+        "level": 74,
         "sets": [
             {
                 "role": "Staller",
@@ -955,7 +955,7 @@
         ]
     },
     "mew": {
-        "level": 73,
+        "level": 72,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1050,7 +1050,7 @@
         ]
     },
     "ariados": {
-        "level": 97,
+        "level": 98,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -1087,7 +1087,7 @@
         ]
     },
     "togetic": {
-        "level": 95,
+        "level": 96,
         "sets": [
             {
                 "role": "Staller",
@@ -1778,7 +1778,7 @@
         ]
     },
     "celebi": {
-        "level": 75,
+        "level": 74,
         "sets": [
             {
                 "role": "Bulky Setup",
@@ -1996,7 +1996,7 @@
         ]
     },
     "shedinja": {
-        "level": 97,
+        "level": 99,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -2032,7 +2032,7 @@
         ]
     },
     "nosepass": {
-        "level": 98,
+        "level": 99,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -2255,7 +2255,7 @@
         ]
     },
     "spinda": {
-        "level": 98,
+        "level": 99,
         "sets": [
             {
                 "role": "Staller",
@@ -2313,7 +2313,7 @@
         ]
     },
     "zangoose": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -2648,7 +2648,7 @@
         ]
     },
     "latios": {
-        "level": 66,
+        "level": 67,
         "sets": [
             {
                 "role": "Bulky Setup",
diff --git a/data/random-battles/gen4/sets.json b/data/random-battles/gen4/sets.json
index 7fc4a7c000e1..6d3b96021dca 100644
--- a/data/random-battles/gen4/sets.json
+++ b/data/random-battles/gen4/sets.json
@@ -903,7 +903,7 @@
         ]
     },
     "crobat": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -944,7 +944,7 @@
         ]
     },
     "bellossom": {
-        "level": 90,
+        "level": 91,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -989,7 +989,7 @@
         ]
     },
     "jumpluff": {
-        "level": 91,
+        "level": 92,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1097,7 +1097,7 @@
         ]
     },
     "dunsparce": {
-        "level": 92,
+        "level": 93,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -1257,7 +1257,7 @@
         ]
     },
     "kingdra": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "Bulky Setup",
@@ -1326,7 +1326,7 @@
         ]
     },
     "miltank": {
-        "level": 82,
+        "level": 83,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1352,7 +1352,7 @@
         ]
     },
     "raikou": {
-        "level": 76,
+        "level": 75,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -1366,7 +1366,7 @@
         ]
     },
     "entei": {
-        "level": 81,
+        "level": 80,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -1550,7 +1550,7 @@
         ]
     },
     "swellow": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -2098,7 +2098,7 @@
         ]
     },
     "absol": {
-        "level": 85,
+        "level": 84,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -2472,7 +2472,7 @@
         ]
     },
     "rampardos": {
-        "level": 89,
+        "level": 88,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -3180,7 +3180,7 @@
         ]
     },
     "giratina": {
-        "level": 69,
+        "level": 68,
         "sets": [
             {
                 "role": "Bulky Setup",
diff --git a/data/random-battles/gen5/sets.json b/data/random-battles/gen5/sets.json
index a8b449878b5f..8166cc447585 100644
--- a/data/random-battles/gen5/sets.json
+++ b/data/random-battles/gen5/sets.json
@@ -13,7 +13,7 @@
         ]
     },
     "charizard": {
-        "level": 85,
+        "level": 84,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -194,7 +194,7 @@
         ]
     },
     "wigglytuff": {
-        "level": 95,
+        "level": 96,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -216,7 +216,7 @@
         ]
     },
     "parasect": {
-        "level": 97,
+        "level": 98,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -234,7 +234,7 @@
         ]
     },
     "venomoth": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Bulky Setup",
@@ -648,7 +648,7 @@
         ]
     },
     "tauros": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -825,7 +825,7 @@
         ]
     },
     "dragonite": {
-        "level": 75,
+        "level": 74,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -974,7 +974,7 @@
         ]
     },
     "bellossom": {
-        "level": 93,
+        "level": 94,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1020,7 +1020,7 @@
         ]
     },
     "jumpluff": {
-        "level": 86,
+        "level": 85,
         "sets": [
             {
                 "role": "Fast Support",
@@ -1046,7 +1046,7 @@
         ]
     },
     "quagsire": {
-        "level": 85,
+        "level": 86,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -1149,7 +1149,7 @@
         ]
     },
     "gligar": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Staller",
@@ -1428,7 +1428,7 @@
         ]
     },
     "suicune": {
-        "level": 81,
+        "level": 80,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -1668,7 +1668,7 @@
         ]
     },
     "slaking": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -1690,7 +1690,7 @@
         ]
     },
     "shedinja": {
-        "level": 90,
+        "level": 91,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -1699,7 +1699,7 @@
         ]
     },
     "exploud": {
-        "level": 91,
+        "level": 92,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -2406,7 +2406,7 @@
         ]
     },
     "empoleon": {
-        "level": 81,
+        "level": 80,
         "sets": [
             {
                 "role": "Staller",
@@ -2423,7 +2423,7 @@
         ]
     },
     "staraptor": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -2474,7 +2474,7 @@
         ]
     },
     "rampardos": {
-        "level": 89,
+        "level": 88,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -2549,7 +2549,7 @@
         ]
     },
     "pachirisu": {
-        "level": 92,
+        "level": 93,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -2683,7 +2683,7 @@
         ]
     },
     "chatot": {
-        "level": 92,
+        "level": 93,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -2745,7 +2745,7 @@
         ]
     },
     "drapion": {
-        "level": 84,
+        "level": 85,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -2844,7 +2844,7 @@
         ]
     },
     "tangrowth": {
-        "level": 85,
+        "level": 86,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -3064,7 +3064,7 @@
         ]
     },
     "uxie": {
-        "level": 81,
+        "level": 80,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -3147,7 +3147,7 @@
         ]
     },
     "giratina": {
-        "level": 72,
+        "level": 71,
         "sets": [
             {
                 "role": "Fast Support",
@@ -3204,7 +3204,7 @@
         ]
     },
     "darkrai": {
-        "level": 71,
+        "level": 70,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -3867,7 +3867,7 @@
         ]
     },
     "swanna": {
-        "level": 86,
+        "level": 87,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -3949,7 +3949,7 @@
         ]
     },
     "galvantula": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -3959,7 +3959,7 @@
         ]
     },
     "ferrothorn": {
-        "level": 74,
+        "level": 73,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -3995,7 +3995,7 @@
         ]
     },
     "beheeyem": {
-        "level": 89,
+        "level": 90,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -4101,7 +4101,7 @@
         ]
     },
     "bisharp": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -4187,7 +4187,7 @@
         ]
     },
     "cobalion": {
-        "level": 78,
+        "level": 77,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -4233,7 +4233,7 @@
         ]
     },
     "tornadustherian": {
-        "level": 76,
+        "level": 75,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -4327,7 +4327,7 @@
         ]
     },
     "kyuremblack": {
-        "level": 75,
+        "level": 74,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -4375,7 +4375,7 @@
         ]
     },
     "genesect": {
-        "level": 74,
+        "level": 73,
         "sets": [
             {
                 "role": "Setup Sweeper",
diff --git a/data/random-battles/gen6/sets.json b/data/random-battles/gen6/sets.json
index f6b90846063c..86ed60e3cb9b 100644
--- a/data/random-battles/gen6/sets.json
+++ b/data/random-battles/gen6/sets.json
@@ -652,7 +652,7 @@
         ]
     },
     "seaking": {
-        "level": 91,
+        "level": 92,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -662,7 +662,7 @@
         ]
     },
     "starmie": {
-        "level": 81,
+        "level": 82,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -784,7 +784,7 @@
         ]
     },
     "vaporeon": {
-        "level": 83,
+        "level": 84,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -905,7 +905,7 @@
         ]
     },
     "dragonite": {
-        "level": 75,
+        "level": 74,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -959,7 +959,7 @@
         ]
     },
     "meganium": {
-        "level": 91,
+        "level": 92,
         "sets": [
             {
                 "role": "Staller",
@@ -997,7 +997,7 @@
         ]
     },
     "noctowl": {
-        "level": 94,
+        "level": 95,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1075,7 +1075,7 @@
         ]
     },
     "bellossom": {
-        "level": 93,
+        "level": 94,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1370,7 +1370,7 @@
         ]
     },
     "magcargo": {
-        "level": 96,
+        "level": 97,
         "sets": [
             {
                 "role": "Staller",
@@ -1423,7 +1423,7 @@
         ]
     },
     "skarmory": {
-        "level": 79,
+        "level": 78,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1999,7 +1999,7 @@
         ]
     },
     "manectricmega": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -2216,7 +2216,7 @@
         ]
     },
     "lunatone": {
-        "level": 93,
+        "level": 94,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -2393,7 +2393,7 @@
         ]
     },
     "glalie": {
-        "level": 88,
+        "level": 89,
         "sets": [
             {
                 "role": "Fast Support",
@@ -2566,7 +2566,7 @@
         ]
     },
     "latiasmega": {
-        "level": 78,
+        "level": 77,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -2768,7 +2768,7 @@
         ]
     },
     "bibarel": {
-        "level": 93,
+        "level": 94,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -2809,7 +2809,7 @@
         ]
     },
     "rampardos": {
-        "level": 88,
+        "level": 87,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -3138,7 +3138,7 @@
         ]
     },
     "carnivine": {
-        "level": 97,
+        "level": 98,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -3156,7 +3156,7 @@
         ]
     },
     "abomasnow": {
-        "level": 86,
+        "level": 85,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -3299,7 +3299,7 @@
         ]
     },
     "glaceon": {
-        "level": 89,
+        "level": 90,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -3312,7 +3312,7 @@
         ]
     },
     "gliscor": {
-        "level": 78,
+        "level": 77,
         "sets": [
             {
                 "role": "Staller",
@@ -3366,7 +3366,7 @@
         ]
     },
     "probopass": {
-        "level": 90,
+        "level": 91,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -3827,7 +3827,7 @@
         ]
     },
     "victini": {
-        "level": 79,
+        "level": 78,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -4150,7 +4150,7 @@
         ]
     },
     "maractus": {
-        "level": 95,
+        "level": 96,
         "sets": [
             {
                 "role": "Fast Support",
@@ -4173,7 +4173,7 @@
         ]
     },
     "scrafty": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -4249,7 +4249,7 @@
         ]
     },
     "zoroark": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -4268,7 +4268,7 @@
         ]
     },
     "gothitelle": {
-        "level": 86,
+        "level": 87,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -4491,7 +4491,7 @@
         ]
     },
     "mienshao": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -4638,7 +4638,7 @@
         ]
     },
     "virizion": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -4647,7 +4647,7 @@
         ]
     },
     "tornadus": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -4759,7 +4759,7 @@
         ]
     },
     "kyuremblack": {
-        "level": 75,
+        "level": 76,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -4856,7 +4856,7 @@
         ]
     },
     "diggersby": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Setup Sweeper",
diff --git a/data/random-battles/gen7/sets.json b/data/random-battles/gen7/sets.json
index 1a8f1379992c..9edf74fe35fe 100644
--- a/data/random-battles/gen7/sets.json
+++ b/data/random-battles/gen7/sets.json
@@ -22,7 +22,7 @@
         ]
     },
     "charizard": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Z-Move user",
@@ -71,7 +71,7 @@
         ]
     },
     "blastoisemega": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -316,7 +316,7 @@
         ]
     },
     "parasect": {
-        "level": 97,
+        "level": 98,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -437,7 +437,7 @@
         ]
     },
     "alakazam": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -519,7 +519,7 @@
         ]
     },
     "golemalola": {
-        "level": 89,
+        "level": 90,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -792,7 +792,7 @@
         ]
     },
     "kangaskhan": {
-        "level": 88,
+        "level": 87,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -829,7 +829,7 @@
         ]
     },
     "starmie": {
-        "level": 84,
+        "level": 85,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -1115,7 +1115,7 @@
         ]
     },
     "mewtwomegax": {
-        "level": 71,
+        "level": 70,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -1124,7 +1124,7 @@
         ]
     },
     "mewtwomegay": {
-        "level": 71,
+        "level": 70,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -1155,7 +1155,7 @@
         ]
     },
     "typhlosion": {
-        "level": 86,
+        "level": 85,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -1246,7 +1246,7 @@
         ]
     },
     "ampharos": {
-        "level": 88,
+        "level": 87,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -1393,7 +1393,7 @@
         ]
     },
     "wobbuffet": {
-        "level": 87,
+        "level": 88,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1437,7 +1437,7 @@
         ]
     },
     "gligar": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Staller",
@@ -1482,7 +1482,7 @@
         ]
     },
     "qwilfish": {
-        "level": 88,
+        "level": 87,
         "sets": [
             {
                 "role": "Fast Support",
@@ -1530,7 +1530,7 @@
         ]
     },
     "heracross": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -1576,7 +1576,7 @@
         ]
     },
     "corsola": {
-        "level": 93,
+        "level": 94,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -1585,7 +1585,7 @@
         ]
     },
     "octillery": {
-        "level": 94,
+        "level": 95,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -1670,7 +1670,7 @@
         ]
     },
     "stantler": {
-        "level": 90,
+        "level": 91,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -1738,7 +1738,7 @@
         ]
     },
     "entei": {
-        "level": 79,
+        "level": 78,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -1781,7 +1781,7 @@
         ]
     },
     "tyranitarmega": {
-        "level": 78,
+        "level": 77,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -1925,7 +1925,7 @@
         ]
     },
     "dustox": {
-        "level": 94,
+        "level": 95,
         "sets": [
             {
                 "role": "Bulky Setup",
@@ -2070,7 +2070,7 @@
         ]
     },
     "shedinja": {
-        "level": 92,
+        "level": 93,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -2536,7 +2536,7 @@
         ]
     },
     "banette": {
-        "level": 92,
+        "level": 93,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -2820,7 +2820,7 @@
         ]
     },
     "kyogre": {
-        "level": 70,
+        "level": 69,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -2868,7 +2868,7 @@
         ]
     },
     "rayquaza": {
-        "level": 72,
+        "level": 71,
         "sets": [
             {
                 "role": "Z-Move user",
@@ -3100,7 +3100,7 @@
         ]
     },
     "mothim": {
-        "level": 95,
+        "level": 94,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -3123,7 +3123,7 @@
         ]
     },
     "pachirisu": {
-        "level": 94,
+        "level": 95,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -3242,7 +3242,7 @@
         ]
     },
     "purugly": {
-        "level": 89,
+        "level": 90,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -3347,7 +3347,7 @@
         ]
     },
     "lucariomega": {
-        "level": 76,
+        "level": 75,
         "sets": [
             {
                 "role": "Bulky Setup",
@@ -3439,7 +3439,7 @@
         ]
     },
     "magnezone": {
-        "level": 83,
+        "level": 84,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -4174,7 +4174,7 @@
         ]
     },
     "watchog": {
-        "level": 94,
+        "level": 95,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -4221,7 +4221,7 @@
         ]
     },
     "simisear": {
-        "level": 89,
+        "level": 90,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -4741,7 +4741,7 @@
         ]
     },
     "chandelure": {
-        "level": 83,
+        "level": 84,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -4870,7 +4870,7 @@
         ]
     },
     "braviary": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -5169,7 +5169,7 @@
         ]
     },
     "genesect": {
-        "level": 75,
+        "level": 74,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -5350,7 +5350,7 @@
         ]
     },
     "meowsticf": {
-        "level": 89,
+        "level": 90,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -5414,7 +5414,7 @@
         ]
     },
     "barbaracle": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -5530,7 +5530,7 @@
         ]
     },
     "goodra": {
-        "level": 84,
+        "level": 85,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -5610,7 +5610,7 @@
         ]
     },
     "noivern": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "Fast Attacker",
@@ -5754,7 +5754,7 @@
         ]
     },
     "toucannon": {
-        "level": 87,
+        "level": 88,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -5918,7 +5918,7 @@
         ]
     },
     "mudsdale": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -6313,7 +6313,7 @@
         ]
     },
     "mimikyu": {
-        "level": 74,
+        "level": 73,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -6494,7 +6494,7 @@
         ]
     },
     "celesteela": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "AV Pivot",
@@ -6552,7 +6552,7 @@
         ]
     },
     "necrozmaduskmane": {
-        "level": 68,
+        "level": 69,
         "sets": [
             {
                 "role": "Bulky Setup",
diff --git a/data/random-battles/gen8/data.json b/data/random-battles/gen8/data.json
index c3ab34d4fb8a..7b1861069fc2 100644
--- a/data/random-battles/gen8/data.json
+++ b/data/random-battles/gen8/data.json
@@ -275,7 +275,7 @@
         "doublesMoves": ["coaching", "drainpunch", "feint", "firepunch", "icepunch", "machpunch"]
     },
     "weezing": {
-        "level": 86,
+        "level": 87,
         "moves": ["fireblast", "painsplit", "sludgebomb", "toxicspikes", "willowisp"],
         "doublesLevel": 88,
         "doublesMoves": ["fireblast", "painsplit", "sludgebomb", "toxicspikes", "willowisp"]
@@ -301,7 +301,7 @@
         "doublesMoves": ["doubleedge", "drainpunch", "fakeout", "protect", "rockslide", "suckerpunch"]
     },
     "seaking": {
-        "level": 89,
+        "level": 90,
         "moves": ["drillrun", "knockoff", "megahorn", "swordsdance", "waterfall"],
         "doublesLevel": 88,
         "doublesMoves": ["drillrun", "knockoff", "megahorn", "protect", "scaleshot", "swordsdance", "waterfall"]
@@ -319,11 +319,11 @@
         "doublesMoves": ["dazzlinggleam", "fakeout", "icywind", "lightscreen", "psychic", "reflect"]
     },
     "mrmimegalar": {
-        "level": 85,
+        "level": 84,
         "moves": ["focusblast", "freezedry", "nastyplot", "psychic", "rapidspin"]
     },
     "scyther": {
-        "level": 81,
+        "level": 82,
         "moves": ["brickbreak", "dualwingbeat", "knockoff", "roost", "swordsdance", "uturn"],
         "doublesLevel": 84,
         "doublesMoves": ["brickbreak", "bugbite", "dualwingbeat", "uturn"]
@@ -377,7 +377,7 @@
         "doublesMoves": ["faketears", "helpinghand", "shadowball", "thunderbolt", "thunderwave"]
     },
     "flareon": {
-        "level": 86,
+        "level": 87,
         "moves": ["facade", "flamecharge", "flareblitz", "quickattack", "superpower"],
         "doublesLevel": 88,
         "doublesMoves": ["facade", "flamecharge", "flareblitz", "protect", "quickattack", "superpower"]
@@ -830,7 +830,7 @@
         "doublesMoves": ["earthpower", "icebeam", "meteorbeam", "protect", "psychic", "trickroom"]
     },
     "solrock": {
-        "level": 89,
+        "level": 90,
         "moves": ["earthquake", "explosion", "morningsun", "rockslide", "stealthrock", "willowisp"],
         "doublesLevel": 88,
         "doublesMoves": ["flareblitz", "helpinghand", "rockslide", "stoneedge", "willowisp"]
@@ -867,7 +867,7 @@
         "noDynamaxMoves": ["earthquake", "knockoff", "rapidspin", "stealthrock", "stoneedge", "swordsdance"]
     },
     "milotic": {
-        "level": 82,
+        "level": 81,
         "moves": ["haze", "icebeam", "recover", "scald", "toxic"],
         "doublesLevel": 80,
         "doublesMoves": ["coil", "hypnosis", "muddywater", "recover"]
@@ -903,7 +903,7 @@
         "doublesMoves": ["dragonclaw", "fireblast", "hurricane", "protect", "tailwind"]
     },
     "metagross": {
-        "level": 78,
+        "level": 79,
         "moves": ["agility", "bulletpunch", "earthquake", "explosion", "meteormash", "stealthrock", "thunderpunch"],
         "doublesLevel": 82,
         "doublesMoves": ["agility", "bulletpunch", "icepunch", "meteormash", "stompingtantrum", "trick", "zenheadbutt"]
@@ -1053,7 +1053,7 @@
         "doublesMoves": ["knockoff", "poisonjab", "protect", "swordsdance", "taunt"]
     },
     "toxicroak": {
-        "level": 84,
+        "level": 85,
         "moves": ["drainpunch", "gunkshot", "icepunch", "knockoff", "substitute", "suckerpunch", "swordsdance"],
         "doublesLevel": 86,
         "doublesMoves": ["drainpunch", "fakeout", "gunkshot", "protect", "suckerpunch", "swordsdance", "taunt"]
@@ -1144,7 +1144,7 @@
         "doublesMoves": ["closecombat", "feint", "knockoff", "protect", "swordsdance", "tripleaxel", "zenheadbutt"]
     },
     "dusknoir": {
-        "level": 87,
+        "level": 88,
         "moves": ["earthquake", "icepunch", "painsplit", "poltergeist", "shadowsneak", "trick", "willowisp"],
         "doublesLevel": 86,
         "doublesMoves": ["earthquake", "haze", "icepunch", "poltergeist", "shadowsneak", "trickroom", "willowisp"]
@@ -1394,7 +1394,7 @@
         "doublesMoves": ["knockoff", "protect", "rockslide", "shellsmash", "xscissor"]
     },
     "scrafty": {
-        "level": 83,
+        "level": 82,
         "moves": ["closecombat", "dragondance", "icepunch", "knockoff", "poisonjab"],
         "doublesLevel": 84,
         "doublesMoves": ["closecombat", "coaching", "drainpunch", "fakeout", "icepunch", "knockoff"]
@@ -1430,7 +1430,7 @@
         "doublesMoves": ["drainpunch", "explosion", "gunkshot", "protect", "toxicspikes"]
     },
     "zoroark": {
-        "level": 84,
+        "level": 83,
         "moves": ["darkpulse", "flamethrower", "nastyplot", "sludgebomb", "trick"],
         "doublesLevel": 84,
         "doublesMoves": ["darkpulse", "flamethrower", "focusblast", "nastyplot", "protect", "sludgebomb"]
@@ -1496,7 +1496,7 @@
         "doublesMoves": ["bodypress", "gyroball", "leechseed", "powerwhip", "protect", "toxic"]
     },
     "klinklang": {
-        "level": 84,
+        "level": 83,
         "moves": ["geargrind", "shiftgear", "substitute", "wildcharge"],
         "doublesLevel": 88,
         "doublesMoves": ["geargrind", "protect", "shiftgear", "wildcharge"]
@@ -1581,7 +1581,7 @@
         "doublesMoves": ["closecombat", "headcharge", "lashout", "protect", "wildcharge"]
     },
     "braviary": {
-        "level": 81,
+        "level": 80,
         "moves": ["bravebird", "bulkup", "closecombat", "roost"],
         "doublesLevel": 82,
         "doublesMoves": ["bravebird", "bulkup", "closecombat", "roost", "tailwind"]
@@ -1879,7 +1879,7 @@
         "doublesMoves": ["poltergeist", "powerwhip", "protect", "shadowsneak", "trickroom"]
     },
     "gourgeistsuper": {
-        "level": 85,
+        "level": 84,
         "moves": ["poltergeist", "powerwhip", "rockslide", "shadowsneak", "trickroom"],
         "doublesLevel": 88,
         "doublesMoves": ["poltergeist", "powerwhip", "protect", "shadowsneak", "trickroom"]
@@ -1988,7 +1988,7 @@
         "doublesMoves": ["earthquake", "helpinghand", "hydropump", "icebeam", "muddywater", "protect"]
     },
     "toxapex": {
-        "level": 80,
+        "level": 79,
         "moves": ["banefulbunker", "haze", "recover", "scald", "toxic", "toxicspikes"],
         "doublesLevel": 90,
         "doublesMoves": ["banefulbunker", "haze", "recover", "scald", "toxic", "toxicspikes"]
@@ -2054,7 +2054,7 @@
         "doublesMoves": ["closecombat", "gunkshot", "knockoff", "rockslide", "uturn"]
     },
     "golisopod": {
-        "level": 84,
+        "level": 85,
         "moves": ["firstimpression", "knockoff", "leechlife", "liquidation", "spikes"],
         "doublesLevel": 88,
         "doublesMoves": ["aquajet", "firstimpression", "knockoff", "leechlife", "liquidation", "protect", "wideguard"]
@@ -2244,7 +2244,7 @@
         "doublesMoves": ["haze", "healpulse", "moonblast", "muddywater", "naturesmadness", "protect", "taunt"]
     },
     "solgaleo": {
-        "level": 71,
+        "level": 72,
         "moves": ["closecombat", "flamecharge", "flareblitz", "knockoff", "psychicfangs", "sunsteelstrike"],
         "doublesLevel": 76,
         "doublesMoves": ["closecombat", "flareblitz", "morningsun", "protect", "psychicfangs", "stoneedge", "sunsteelstrike"]
@@ -2355,7 +2355,7 @@
         "doublesMoves": ["closecombat", "fakeout", "grassknot", "knockoff", "plasmafists", "snarl"]
     },
     "melmetal": {
-        "level": 74,
+        "level": 73,
         "moves": ["doubleironbash", "earthquake", "superpower", "thunderpunch", "thunderwave"],
         "doublesLevel": 76,
         "doublesMoves": ["acidarmor", "bodypress", "doubleironbash", "protect", "thunderpunch", "thunderwave"]
@@ -2456,13 +2456,13 @@
         "doublesMoves": ["acrobatics", "dragondance", "dragonrush", "gravapple", "protect"]
     },
     "appletun": {
-        "level": 90,
+        "level": 91,
         "moves": ["appleacid", "dragonpulse", "leechseed", "recover"],
         "doublesLevel": 90,
         "doublesMoves": ["appleacid", "dragonpulse", "leechseed", "protect", "recover"]
     },
     "appletungmax": {
-        "level": 90,
+        "level": 91,
         "moves": ["appleacid", "dracometeor", "leechseed", "recover"]
     },
     "sandaconda": {
@@ -2672,7 +2672,7 @@
         "doublesMoves": ["bodypress", "dracometeor", "dragonpulse", "flashcannon", "protect", "snarl", "thunderbolt"]
     },
     "dragapult": {
-        "level": 77,
+        "level": 76,
         "moves": ["dracometeor", "fireblast", "shadowball", "thunderbolt", "uturn"],
         "doublesLevel": 80,
         "doublesMoves": ["dragondarts", "fireblast", "protect", "shadowball", "thunderbolt", "thunderwave"]
@@ -2696,7 +2696,7 @@
         "doublesMoves": ["closecombat", "crunch", "playrough", "protect", "psychicfangs"]
     },
     "zamazentacrowned": {
-        "level": 71,
+        "level": 70,
         "moves": ["behemothbash", "closecombat", "crunch", "howl", "psychicfangs"],
         "doublesLevel": 72,
         "doublesMoves": ["behemothbash", "closecombat", "crunch", "howl", "protect"]
diff --git a/data/random-battles/gen9/doubles-sets.json b/data/random-battles/gen9/doubles-sets.json
index 9eb433cd5ca8..03c452515dd9 100644
--- a/data/random-battles/gen9/doubles-sets.json
+++ b/data/random-battles/gen9/doubles-sets.json
@@ -10,7 +10,7 @@
         ]
     },
     "charizard": {
-        "level": 83,
+        "level": 82,
         "sets": [
             {
                 "role": "Offensive Protect",
@@ -120,7 +120,7 @@
         ]
     },
     "clefairy": {
-        "level": 96,
+        "level": 97,
         "sets": [
             {
                 "role": "Doubles Support",
@@ -510,7 +510,7 @@
         ]
     },
     "hitmonchan": {
-        "level": 89,
+        "level": 90,
         "sets": [
             {
                 "role": "Doubles Bulky Attacker",
@@ -530,7 +530,7 @@
         ]
     },
     "weezinggalar": {
-        "level": 87,
+        "level": 88,
         "sets": [
             {
                 "role": "Doubles Bulky Attacker",
@@ -665,7 +665,7 @@
         ]
     },
     "ditto": {
-        "level": 96,
+        "level": 97,
         "sets": [
             {
                 "role": "Choice Item user",
@@ -765,7 +765,7 @@
         ]
     },
     "zapdosgalar": {
-        "level": 78,
+        "level": 77,
         "sets": [
             {
                 "role": "Doubles Fast Attacker",
@@ -1215,7 +1215,7 @@
         ]
     },
     "houndoom": {
-        "level": 87,
+        "level": 86,
         "sets": [
             {
                 "role": "Doubles Fast Attacker",
@@ -1295,7 +1295,7 @@
         ]
     },
     "blissey": {
-        "level": 95,
+        "level": 96,
         "sets": [
             {
                 "role": "Doubles Support",
@@ -1305,7 +1305,7 @@
         ]
     },
     "raikou": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Offensive Protect",
@@ -1480,7 +1480,7 @@
         ]
     },
     "masquerain": {
-        "level": 88,
+        "level": 89,
         "sets": [
             {
                 "role": "Doubles Setup Sweeper",
@@ -1750,7 +1750,7 @@
         ]
     },
     "tropius": {
-        "level": 93,
+        "level": 94,
         "sets": [
             {
                 "role": "Doubles Support",
@@ -1815,7 +1815,7 @@
         ]
     },
     "regirock": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "Doubles Bulky Setup",
@@ -1840,7 +1840,7 @@
         ]
     },
     "registeel": {
-        "level": 79,
+        "level": 78,
         "sets": [
             {
                 "role": "Doubles Bulky Setup",
@@ -1965,7 +1965,7 @@
         ]
     },
     "deoxysspeed": {
-        "level": 83,
+        "level": 84,
         "sets": [
             {
                 "role": "Doubles Support",
@@ -2930,7 +2930,7 @@
         ]
     },
     "serperior": {
-        "level": 82,
+        "level": 81,
         "sets": [
             {
                 "role": "Offensive Protect",
@@ -3470,7 +3470,7 @@
         ]
     },
     "tornadustherian": {
-        "level": 78,
+        "level": 77,
         "sets": [
             {
                 "role": "Doubles Setup Sweeper",
@@ -3485,7 +3485,7 @@
         ]
     },
     "thundurus": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "Doubles Setup Sweeper",
@@ -3505,7 +3505,7 @@
         ]
     },
     "thundurustherian": {
-        "level": 79,
+        "level": 78,
         "sets": [
             {
                 "role": "Doubles Fast Attacker",
@@ -3810,7 +3810,7 @@
         ]
     },
     "dedenne": {
-        "level": 87,
+        "level": 86,
         "sets": [
             {
                 "role": "Doubles Support",
@@ -3820,7 +3820,7 @@
         ]
     },
     "carbink": {
-        "level": 89,
+        "level": 88,
         "sets": [
             {
                 "role": "Doubles Bulky Setup",
@@ -4060,7 +4060,7 @@
         ]
     },
     "oricoriopau": {
-        "level": 88,
+        "level": 89,
         "sets": [
             {
                 "role": "Bulky Protect",
@@ -4350,7 +4350,7 @@
         ]
     },
     "necrozmadawnwings": {
-        "level": 73,
+        "level": 74,
         "sets": [
             {
                 "role": "Doubles Wallbreaker",
@@ -4420,7 +4420,7 @@
         ]
     },
     "inteleon": {
-        "level": 81,
+        "level": 80,
         "sets": [
             {
                 "role": "Choice Item user",
@@ -4470,7 +4470,7 @@
         ]
     },
     "flapple": {
-        "level": 93,
+        "level": 94,
         "sets": [
             {
                 "role": "Doubles Bulky Attacker",
@@ -4520,7 +4520,7 @@
         ]
     },
     "barraskewda": {
-        "level": 83,
+        "level": 84,
         "sets": [
             {
                 "role": "Doubles Wallbreaker",
@@ -4655,7 +4655,7 @@
         ]
     },
     "stonjourner": {
-        "level": 89,
+        "level": 88,
         "sets": [
             {
                 "role": "Doubles Fast Attacker",
@@ -5595,7 +5595,7 @@
         ]
     },
     "brutebonnet": {
-        "level": 79,
+        "level": 80,
         "sets": [
             {
                 "role": "Doubles Bulky Attacker",
@@ -5605,7 +5605,7 @@
         ]
     },
     "sandyshocks": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "Doubles Fast Attacker",
@@ -5835,7 +5835,7 @@
         ]
     },
     "koraidon": {
-        "level": 67,
+        "level": 66,
         "sets": [
             {
                 "role": "Choice Item user",
@@ -5885,7 +5885,7 @@
         ]
     },
     "dipplin": {
-        "level": 90,
+        "level": 91,
         "sets": [
             {
                 "role": "Doubles Bulky Attacker",
@@ -6030,7 +6030,7 @@
         ]
     },
     "hydrapple": {
-        "level": 84,
+        "level": 85,
         "sets": [
             {
                 "role": "Doubles Wallbreaker",
@@ -6050,7 +6050,7 @@
         ]
     },
     "ragingbolt": {
-        "level": 78,
+        "level": 77,
         "sets": [
             {
                 "role": "Doubles Wallbreaker",
diff --git a/data/random-battles/gen9/sets.json b/data/random-battles/gen9/sets.json
index bfd24dc64ae6..afbcffa60e97 100644
--- a/data/random-battles/gen9/sets.json
+++ b/data/random-battles/gen9/sets.json
@@ -825,7 +825,7 @@
         ]
     },
     "articunogalar": {
-        "level": 83,
+        "level": 84,
         "sets": [
             {
                 "role": "Fast Bulky Setup",
@@ -970,7 +970,7 @@
         ]
     },
     "feraligatr": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "Fast Bulky Setup",
@@ -1010,7 +1010,7 @@
         ]
     },
     "ariados": {
-        "level": 94,
+        "level": 95,
         "sets": [
             {
                 "role": "Fast Support",
@@ -1080,7 +1080,7 @@
         ]
     },
     "sudowoodo": {
-        "level": 93,
+        "level": 94,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -2080,7 +2080,7 @@
         ]
     },
     "regirock": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -2850,7 +2850,7 @@
         ]
     },
     "rotomheat": {
-        "level": 82,
+        "level": 83,
         "sets": [
             {
                 "role": "Bulky Attacker",
@@ -3195,7 +3195,7 @@
         ]
     },
     "arceusfighting": {
-        "level": 69,
+        "level": 70,
         "sets": [
             {
                 "role": "Fast Bulky Setup",
@@ -3240,7 +3240,7 @@
         ]
     },
     "arceusghost": {
-        "level": 70,
+        "level": 69,
         "sets": [
             {
                 "role": "Bulky Support",
@@ -3300,7 +3300,7 @@
         ]
     },
     "arceuspoison": {
-        "level": 72,
+        "level": 71,
         "sets": [
             {
                 "role": "Setup Sweeper",
@@ -3365,7 +3365,7 @@
         ]
     },
     "serperior": {
-        "level": 80,
+        "level": 79,
         "sets": [
             {
                 "role": "Tera Blast user",
@@ -4150,7 +4150,7 @@
         ]
     },
     "vivillon": {
-        "level": 85,
+        "level": 84,
         "sets": [
             {
                 "role": "Fast Bulky Setup",
@@ -4460,7 +4460,7 @@
         ]
     },
     "incineroar": {
-        "level": 84,
+        "level": 83,
         "sets": [
             {
                 "role": "AV Pivot",
@@ -5730,7 +5730,7 @@
         ]
     },
     "armarouge": {
-        "level": 81,
+        "level": 80,
         "sets": [
             {
                 "role": "Wallbreaker",
@@ -5970,7 +5970,7 @@
         ]
     },
     "glimmora": {
-        "level": 76,
+        "level": 75,
         "sets": [
             {
                 "role": "Fast Support",