diff --git a/index.html b/index.html
index ea5bc87..31e3834 100644
--- a/index.html
+++ b/index.html
@@ -387,10 +387,7 @@ <h4 class="panel-title">宝可梦#1</h4>
                         <option value="4">4次命中</option>
                         <option value="5">5次命中</option>
                     </select>
-                    <select class="move-double calc-trigger hide">
-                        <option value="0">正常威力</option>
-                        <option value="1">2倍威力</option>
-                    </select>
+                    <input class="move-double calc-trigger btn-input hide" type="checkbox" id="doubleL1"/><label class="double-btn btn x-btn" for="doubleL1" title="计算时取2倍威力?">翻倍</label>
                     <select class="move-hits2 calc-trigger hide">
                         <option value="1">1次命中</option>
                         <option value="2">2次命中</option>
@@ -444,10 +441,7 @@ <h4 class="panel-title">宝可梦#1</h4>
                         <option value="4">4次命中</option>
                         <option value="5">5次命中</option>
                     </select>
-                    <select class="move-double calc-trigger hide">
-                        <option value="0">正常威力</option>
-                        <option value="1">2倍威力</option>
-                    </select>
+                    <input class="move-double calc-trigger btn-input hide" type="checkbox" id="doubleL2"/><label class="double-btn btn x-btn" for="doubleL2" title="计算时取2倍威力?">翻倍</label>
                     <select class="move-hits2 calc-trigger hide">
                         <option value="1">1次命中</option>
                         <option value="2">2次命中</option>
@@ -501,10 +495,7 @@ <h4 class="panel-title">宝可梦#1</h4>
                         <option value="4">4次命中</option>
                         <option value="5">5次命中</option>
                     </select>
-                    <select class="move-double calc-trigger hide">
-                        <option value="0">正常威力</option>
-                        <option value="1">2倍威力</option>
-                    </select>
+                    <input class="move-double calc-trigger btn-input hide" type="checkbox" id="doubleL3"/><label class="double-btn btn x-btn" for="doubleL3" title="计算时取2倍威力?">翻倍</label>
                     <select class="move-hits2 calc-trigger hide">
                         <option value="1">1次命中</option>
                         <option value="2">2次命中</option>
@@ -558,10 +549,7 @@ <h4 class="panel-title">宝可梦#1</h4>
                         <option value="4">4次命中</option>
                         <option value="5">5次命中</option>
                     </select>
-                    <select class="move-double calc-trigger hide">
-                        <option value="0">正常威力</option>
-                        <option value="1">2倍威力</option>
-                    </select>
+                    <input class="move-double calc-trigger btn-input hide" type="checkbox" id="doubleL4"/><label class="double-btn btn x-btn" for="doubleL4" title="计算时取2倍威力?">翻倍</label>
                     <select class="move-hits2 calc-trigger hide">
                         <option value="1">1次命中</option>
                         <option value="2">2次命中</option>
@@ -681,7 +669,7 @@ <h4 class="panel-title">
                 <!-- Note: I know the html is clunky but it does make it look nicer so idk probably worth
                 I have the original code commented out anyways if I change my mind -->
                 <hr class="gen-specific g2 g3 g4 g5 g6 g7 g8 g9" />
-                <div class="btn-group gen-specific g7 g8">
+                <div class="btn-group gen-specific g7 g8" id="protect-field">
                     <div class="left" title="此宝可梦是否守住?">
                         <input class="btn-input calc-trigger" type="checkbox" id="protectL" /><label class="btn btn-xwide" for="protectL">守住</label>
                     </div>
@@ -769,7 +757,7 @@ <h4 class="panel-title">
                         <input class="btn-input calc-trigger" type="radio" name="spikesR" value="3" id="spikesR3" /><label class="btn btn-wide btn-right" for="spikesR3">3 撒菱</label>
                     </div>
                 </div>
-                <div class="btn-group gen-specific g4 g5 g6 g7 g8">
+                <div class="btn-group gen-specific g4 g5 g6 g7 g8" id="flower-gift">
                     <div class="left" title="是否受友方花之礼加成?">
                         <input class="btn-input calc-trigger" type="checkbox" id="flowerGiftL" /><label class="btn btn-xxwide" for="flowerGiftL">花之礼</label>
                     </div>
@@ -1166,10 +1154,7 @@ <h4 class="panel-title">宝可梦#2</h4>
                         <option value="4">4次命中</option>
                         <option value="5">5次命中</option>
                     </select>
-                    <select class="move-double calc-trigger hide">
-                        <option value="0">正常威力</option>
-                        <option value="1">2倍威力</option>
-                    </select>
+                    <input class="move-double calc-trigger btn-input hide" type="checkbox" id="doubleR1"/><label class="double-btn btn x-btn" for="doubleR1" title="计算时取2倍威力?">翻倍</label>
                     <select class="move-hits2 calc-trigger hide">
                         <option value="1">1次命中</option>
                         <option value="2">2次命中</option>
@@ -1223,10 +1208,7 @@ <h4 class="panel-title">宝可梦#2</h4>
                         <option value="4">4次命中</option>
                         <option value="5">5次命中</option>
                     </select>
-                    <select class="move-double calc-trigger hide">
-                        <option value="0">正常威力</option>
-                        <option value="1">2倍威力</option>
-                    </select>
+                    <input class="move-double calc-trigger btn-input hide" type="checkbox" id="doubleR2"/><label class="double-btn btn x-btn" for="doubleR2" title="计算时取2倍威力?">翻倍</label>
                     <select class="move-hits2 calc-trigger hide">
                         <option value="1">1次命中</option>
                         <option value="2">2次命中</option>
@@ -1280,10 +1262,7 @@ <h4 class="panel-title">宝可梦#2</h4>
                         <option value="4">4次命中</option>
                         <option value="5">5次命中</option>
                     </select>
-                    <select class="move-double calc-trigger hide">
-                        <option value="0">正常威力</option>
-                        <option value="1">2倍威力</option>
-                    </select>
+                    <input class="move-double calc-trigger btn-input hide" type="checkbox" id="doubleR3"/><label class="double-btn btn x-btn" for="doubleR3" title="计算时取2倍威力?">翻倍</label>
                     <select class="move-hits2 calc-trigger hide">
                         <option value="1">1次命中</option>
                         <option value="2">2次命中</option>
@@ -1337,10 +1316,7 @@ <h4 class="panel-title">宝可梦#2</h4>
                         <option value="4">4次命中</option>
                         <option value="5">5次命中</option>
                     </select>
-                    <select class="move-double calc-trigger hide">
-                        <option value="0">正常威力</option>
-                        <option value="1">2倍威力</option>
-                    </select>
+                    <input class="move-double calc-trigger btn-input hide" type="checkbox" id="doubleR4"/><label class="double-btn btn x-btn" for="doubleR4" title="计算时取2倍威力?">翻倍</label>
                     <select class="move-hits2 calc-trigger hide">
                         <option value="1">1次命中</option>
                         <option value="2">2次命中</option>
diff --git a/script_res/ability_data.js b/script_res/ability_data.js
index 43361f9..f832290 100644
--- a/script_res/ability_data.js
+++ b/script_res/ability_data.js
@@ -329,7 +329,7 @@ var ABILITIES_SV = ABILITIES_SS.concat([
     //Teal Mask DLC new additions
     "Mind's Eye",   //Ignores evasion/accuracy and is Scrappy w/o Intimidate immunity
     'Supersweet Syrup', //Intimidate but with evasion and only once
-    'Hospitality',  //Heals HP, needs more info but probably has no calc functionality
+    'Hospitality',  //Heals ally's HP, no calc functionality
     'Toxic Chain',  //Poison Touch but with badly poisoned instead, no calc functionality
     'Embody Aspect', //Boosts Ogerpon's stats based on mask, needs for info for what kind of boost and how much
 ]);
diff --git a/script_res/ap_calc.js b/script_res/ap_calc.js
index 40df5a0..b0869fb 100644
--- a/script_res/ap_calc.js
+++ b/script_res/ap_calc.js
@@ -489,8 +489,8 @@ $(".move-selector").change(function() {
         moveGroupObj.children(".move-10hits").hide();
     }
 
-    if (move.canDouble) moveGroupObj.children(".move-double").show();
-    else moveGroupObj.children(".move-double").hide();
+    if (move.canDouble) moveGroupObj.children(".double-btn").show();
+    else moveGroupObj.children(".double-btn").hide();
 
     if (move.oneTwoHit) moveGroupObj.children(".move-hits2").show();
     else moveGroupObj.children(".move-hits2").hide();
@@ -1031,7 +1031,7 @@ function getMoveDetails(moveInfo, maxMon) {
                         : (defaultDetails.isThreeHit && !moveInfo.find(".move-z").prop("checked") && !maxMon) ? 3
                             : (moveName == "Beat Up" && !moveInfo.find(".move-z").prop("checked") && !maxMon) ? 4
                             : 1,
-        isDouble: (defaultDetails.canDouble && !moveInfo.find(".move-z").prop("checked") && !maxMon) ? ~~moveInfo.find(".move-double").val() : 0,
+        isDouble: (defaultDetails.canDouble && !moveInfo.find(".move-z").prop("checked") && !maxMon && moveInfo.find(".move-double").prop("checked")) ? 1 : 0,
         tripleHits: (defaultDetails.isTripleHit && !moveInfo.find(".move-z").prop("checked") && !maxMon) ? ~~moveInfo.find(".move-hits3").val() : 0,
         combinePledge: (moveName.includes(" Pledge") && !moveInfo.find(".move-z").prop("checked") && !maxMon) ? moveInfo.find(".move-pledge").val() : 0,
         timesAffected: (defaultDetails.linearAddBP && !moveInfo.find(".move-z").prop("checked") && !maxMon) ? ~~moveInfo.find(".move-linearAddedBP").val() : 0,
@@ -1120,6 +1120,7 @@ var gen, pokedex, setdex, setdexCustom, typeChart, moves, abilities, items, STAT
 
 $(".gen").change(function () {
     gen = ~~$(this).val();
+    localStorage.setItem("gen", gen);
 
     loadSVColors(document.getElementById('switchTheme').value);     //
 
@@ -1180,7 +1181,7 @@ $(".gen").change(function () {
             pokedex = POKEDEX_BW;
             setdex = SETDEX_BW;
             setdexCustom = SETDEX_CUSTOM_BW;
-            typeChart = TYPE_CHART_GSC;
+            typeChart = TYPE_CHART_BW;
             moves = MOVES_BW;
             items = ITEMS_BW;
             abilities = ABILITIES_BW;
@@ -1252,17 +1253,42 @@ $(".gen").change(function () {
                 $('label[for="zL' + i + '"]').show();
                 $('label[for="zR' + i + '"]').show();
             }
+            $('div #primal-weather').show();
         }
         else {
             for (i = 1; i <= 4; i++) {
                 $('label[for="zL' + i + '"]').hide();
                 $('label[for="zR' + i + '"]').hide();
             }
+            $('div #primal-weather').hide();
         }
     }
     $("select.type1, select.move-type, select.tera-type").find("option").remove().end().append(typeOptions);
     $("select.type2").find("option").remove().end().append("<option value=\"\">(无)</option>" + typeOptions);
     var moveOptions = getSelectOptions(Object.keys(moves), true, undefined, translate_move);
+
+    if (gen >= 9) {
+        if (localStorage.getItem("dex") == "natdex") {
+            $('div #auras').show();
+            $('div #protect-field').show();
+            $('div #flower-gift').show();
+        }
+        else {
+            $('div #auras').hide();
+            $('div #protect-field').hide();
+            $('div #flower-gift').hide();
+        }
+    }
+    var types = Object.keys(typeChart);
+    types.splice(types.indexOf('Typeless'), 1);
+    var teraTypes = $.extend(true, [], types);
+    if (gen >= 2) types.push('Typeless');
+    var typeOptions = getSelectOptions(types, undefined, undefined, translate_type);
+    var teraTypeOptions = getSelectOptions(teraTypes, undefined, undefined, translate_type);
+    $("select.type1, select.move-type").find("option").remove().end().append(typeOptions);
+    $("select.type2").find("option").remove().end().append("<option value=\"\">(无)</option>" + typeOptions);
+    $("select.tera-type").find("option").remove().end().append(teraTypeOptions);
+    var moveOptions = getSelectOptions(Object.keys(moves), true, undefined, translate_move);
     $("select.move-selector").find("option").remove().end().append(moveOptions);
     var abilityOptions = getSelectOptions(abilities, true, undefined, translate_ability);
     $("select.ability").find("option").remove().end().append("<option value=\"\">(其他)</option>" + abilityOptions);
@@ -1386,9 +1412,20 @@ function getSelectOptions(arr, sort, defaultIdx, transFunc) {
     return r;
 }
 
+function getGen() {
+    var genLocalStor = localStorage.getItem("gen");
+    if (genLocalStor) {
+        $("#gen" + genLocalStor).prop("checked", true);
+        $("#gen" + genLocalStor).change();
+    }
+    else {
+        $("#gen9").prop("checked", true);
+        $("#gen9").change();
+    }
+}
+
 $(document).ready(function() {
-    $("#gen9").prop("checked", true);
-    $("#gen9").change();
+    getGen();
     $(".terrain-trigger").bind("change keyup", getTerrainEffects);
     $(".calc-trigger").bind("change keyup", calculate);
     $(".set-selector").select2({
diff --git a/script_res/damage_MASTER.js b/script_res/damage_MASTER.js
index 5800c3d..049843d 100644
--- a/script_res/damage_MASTER.js
+++ b/script_res/damage_MASTER.js
@@ -413,6 +413,20 @@ function checkSeeds(pokemon, terrain) {
     }
 }
 
+//function checkConsumedItem(pokemon, terrain) {
+//    if (pokemon.item === terrain + ' Seed') {
+//        if (['Electric', 'Grassy'].indexOf(terrain) !== -1)
+//            pokemon.boosts[DF] = Math.min(6, pokemon.boosts[DF] + 1);
+//        else
+//            pokemon.boosts[SD] = Math.min(6, pokemon.boosts[SD] + 1);
+//        pokemon.item = '';
+//    }
+//    else if (pokemon.item === 'Booster Energy'
+//        && (pokemon.ability === 'Protosynthesis' && weather !== 'Sun') || (pokemon.ability === 'Quark Drive' && terrain !== 'Electric')) {
+//        pokemon.item = '';
+//    }
+//}
+
 function checkSupersweetSyrup(source, target) {
     if (source.ability === 'Supersweet Syrup' && source.abilityOn) {
         if (target.ability === "Defiant") {
@@ -600,11 +614,15 @@ function checkMoveTypeChange(move, field, attacker) {
             'Typeless';
     } else if (move.name.includes(" Pledge") && move.name !== move.combinePledge) {
         var bothPledgeNames = move.name + " " + move.combinePledge;
-        move.type = bothPledgeNames.includes("Grass") && bothPledgeNames.includes("Fire") ? 'Fire' :
-            bothPledgeNames.includes("Grass") && bothPledgeNames.includes("Water") ? 'Grass' :
-            bothPledgeNames.includes("Water") && bothPledgeNames.includes("Fire") ? 'Water' :
-            'Typeless'; //last case should never happen, just there to help with debugging
-    } else if (move.name === "Tera Blast" && attacker.isTerastalize) {
+        move.type = bothPledgeNames.includes("Grass") && bothPledgeNames.includes("Fire") ? 'Fire'
+            : bothPledgeNames.includes("Grass") && bothPledgeNames.includes("Water") ? 'Grass'
+                : bothPledgeNames.includes("Water") && bothPledgeNames.includes("Fire") ? 'Water'
+                    : 'Typeless';   //last case should never happen, just there to help with debugging
+    }
+    else if (move.name === 'Aura Wheel' && attacker.name === 'Morpeko-Hangry') {
+        move.type = 'Dark';
+    }
+    else if (move.name === "Tera Blast" && attacker.isTerastalize) {
         move.type = attacker.tera_type;
     } else if (move.name === "Raging Bull") {
         switch (attacker.name) {
@@ -800,12 +818,13 @@ function abilityIgnore(attacker, move, defAbility, description, defItem = "") {
     if (['Shadow Shield', 'Full Metal Body', 'Prism Armor', 'As One',
         'Tablets of Ruin', 'Vessel of Ruin', 'Sword of Ruin', 'Beads of Ruin'].indexOf(defAbility) == -1 && defItem !== "Ability Shield") {
         if (["Mold Breaker", "Teravolt", "Turboblaze"].indexOf(attacker.ability) !== -1) {
-            defAbility = "";
+            defAbility = "[ignored]";   //'[ignored]' is used as a check for ally abilities as well
             description.attackerAbility = attacker.ability;
-        } else if (["Moongeist Beam", "Sunsteel Strike", "Photon Geyser", "Searing Sunraze Smash", "Menacing Moonraze Maelstrom",
-                "Light That Burns the Sky", 'G-Max Drum Solo', 'G-Max Fireball', 'G-Max Hydrosnipe'
-            ].indexOf(move.name) !== -1)
-            defAbility = ""; //works as a mold breaker
+        }
+        else if (["Moongeist Beam", "Sunsteel Strike", "Photon Geyser", "Searing Sunraze Smash", "Menacing Moonraze Maelstrom",
+            "Light That Burns the Sky", 'G-Max Drum Solo', 'G-Max Fireball', 'G-Max Hydrosnipe'].indexOf(move.name) !== -1) {
+            defAbility = "[ignored]"; //works as a mold breaker
+        }
     }
 
     return [defAbility, description];
@@ -869,7 +888,7 @@ function immunityChecks(move, attacker, defender, field, description, defAbility
             "description": buildDescription(description)
         };
     }
-    if ((defAbility === "Wonder Guard" && typeEffectiveness <= 1) ||
+    if ((defAbility === "Wonder Guard" && typeEffectiveness <= 1 && move.name !== 'Struggle') ||
         (move.type === "Grass" && defAbility === "Sap Sipper") ||
         (move.type === "Fire" && ["Flash Fire", "Well-Baked Body"].indexOf(defAbility) !== -1) ||
         (move.type === "Water" && ["Dry Skin", "Storm Drain", "Water Absorb"].indexOf(defAbility) !== -1) ||
@@ -1072,9 +1091,9 @@ function setDamage(move, attacker, defender, description, isQuarteredByProtect,
     //f. OHKO moves
     if (move.isMLG) {
         if (move.name == 'Sheer Cold' && [defender.type1, defender.type2].indexOf('Ice') !== -1)
-            return { "damage": [defender.curHP], "description": buildDescription(description) };
-        else
             return { "damage": [0], "description": buildDescription(description) };
+        else
+            return { "damage": [defender.curHP], "description": buildDescription(description) };
     }
     //g. Psywave
 
@@ -1302,7 +1321,7 @@ function calcBPMods(attacker, defender, field, move, description, ateIzeBoosted,
     var auraBreak = ($("input:checkbox[id='aura-break']:checked").val() != undefined);
 
     //a. Aura Break
-    if (auraActive && auraBreak && !field.isNeutralizingGas && ["Mold Breaker", "Teravolt", "Turboblaze"].indexOf(attacker.ability) == -1) {
+    if (auraActive && auraBreak && !field.isNeutralizingGas && defAbility !== '[ignored]') {
         bpMods.push(0x0C00);
         if (isAttackerAura || attacker.ability == "Aura Break") {
             description.attackerAbility = attacker.ability;
@@ -1372,7 +1391,7 @@ function calcBPMods(attacker, defender, field, move, description, ateIzeBoosted,
     }
 
     //f. Fairy Aura, Dark Aura
-    if (auraActive && !auraBreak && !field.isNeutralizingGas && (gen > 7 || ["Mold Breaker", "Teravolt", "Turboblaze"].indexOf(attacker.ability) == -1)) {
+    if (auraActive && !auraBreak && !field.isNeutralizingGas && (gen > 7 || defAbility !== '[ignored]')) {
         bpMods.push(0x1548);
         if (isAttackerAura) {
             description.attackerAbility = attacker.ability;
@@ -1832,16 +1851,19 @@ function calcGeneralMods(baseDamage, move, attacker, defender, defAbility, field
     var childMod = gen >= 7 ? 0x0400 : 0x0800;
     baseDamage = attacker.isChild ? pokeRound(baseDamage * childMod / 0x1000) : baseDamage;    //should be accurate based on implementation
     //c. Weather mod, Hydro Steam
-    if (((field.weather.indexOf("Sun") > -1 && (move.type === "Fire" || move.name === "Hydro Steam")) || (field.weather.indexOf("Rain") > -1 && move.type === "Water")) && defender.item !== 'Utility Umbrella') {
+    if ((((field.weather.indexOf("Sun") > -1 && move.type === "Fire") || (field.weather.indexOf("Rain") > -1 && move.type === "Water")) && defender.item !== 'Utility Umbrella')
+        || (field.weather.indexOf("Sun") > -1 && move.name === "Hydro Steam" && attacker.item !== 'Utility Umbrella')) {
         baseDamage = pokeRound(baseDamage * 0x1800 / 0x1000);
         description.weather = field.weather;
-    } else if ((field.weather === "Strong Winds" && (defender.type1 === "Flying" || defender.type2 === "Flying") &&
-            typeChart[move.type]["Flying"] > 1)) {
-        description.weather = field.weather; //not actually a mod, just adding the description here
-    } else if (((field.weather === "Sun" && move.type === "Water" && move.name !== "Hydro Steam") || (field.weather === "Rain" && move.type === "Fire")) && defender.item !== 'Utility Umbrella') {
+    }
+    else if (((field.weather === "Sun" && move.type === "Water") || (field.weather === "Rain" && move.type === "Fire")) && defender.item !== 'Utility Umbrella') {
         baseDamage = pokeRound(baseDamage * 0x800 / 0x1000);
         description.weather = field.weather;
     }
+    else if ((field.weather === "Strong Winds" && (defender.type1 === "Flying" || defender.type2 === "Flying") &&
+        typeChart[move.type]["Flying"] > 1)) {
+        description.weather = field.weather;        //not actually a mod, just adding the description here
+    }
     //d. Glaive Rush 2x mod
     if (defender.glaiveRushMod) {
         baseDamage = pokeRound(baseDamage * 0x2000 / 0x1000);
@@ -1921,7 +1943,7 @@ function calcGeneralMods(baseDamage, move, attacker, defender, defAbility, field
             child.isChild = true;
             childMove = move;
             if (move.name === 'Power-Up Punch') {
-                child.boosts[AT]++;
+                child.boosts[AT] = Math.min(6, child.boosts[AT] + 1);
                 child.stats[AT] = getModifiedStat(child.rawStats[AT], child.boosts[AT]);
             } else if (move.name === 'Assurance') {
                 childMove.isDouble = 1;
@@ -2057,7 +2079,7 @@ function calcFinalMods(move, attacker, defender, field, description, isCritical,
         description.defenderAbility = defAbility;
     }
     //k. Friend Guard
-    if (field.isFriendGuard && ["Mold Breaker", "Teravolt", "Turboblaze"].indexOf(attacker.ability) === -1) {
+    if (field.isFriendGuard && defAbility !== '[ignored]') {
         finalMods.push(0xC00);
         description.isFriendGuard = true;
     }
@@ -2092,7 +2114,7 @@ function calcFinalMods(move, attacker, defender, field, description, isCritical,
         }
         description.defenderItem = defender.item;
     }
-    //r. Doubled damage
+    //r. Doubled damage (These likely won't be added since Minimize/Dig/Dive are hardly ever used)
     //r.i. Body Slam, Stomp, Dragon Rush, Steamroller, Heat Crash, Heavy Slam, Flying Press, Malicious Moonsault
     //r.ii. Earthquake
     //r.iii. Surf, Whirlpool
diff --git a/script_res/damage_SV.js b/script_res/damage_SV.js
index 55fc596..16f6e84 100644
--- a/script_res/damage_SV.js
+++ b/script_res/damage_SV.js
@@ -108,10 +108,6 @@ function GET_DAMAGE_SV(attacker, defender, move, field) {
 
     var isCritical = critMove(move, defAbility);
 
-    if (move.name == "Aura Wheel" && attacker.name == "Morpeko-Hangry") {
-        move.type = "Dark";
-    }
-
     var ateIzeAbility = ATE_IZE_ABILITIES.indexOf(attacker.ability);    //Confirms abilities like Normalize and Pixilate but not Liquid Voice
     var ateIzeBoosted;
     if (!move.isZ && (ateIzeAbility !== -1 || attacker.ability == "Liquid Voice")
diff --git a/script_res/move_data.js b/script_res/move_data.js
index 14e263b..3cd9163 100644
--- a/script_res/move_data.js
+++ b/script_res/move_data.js
@@ -1243,7 +1243,7 @@ var MOVES_GSC = $.extend(true, {}, MOVES_RBY, {
     },
     'Curse': {
 
-        type: 'Ghost',
+        type: '???',
         category: 'Status'
     },
     'Cotton Spore': {
@@ -3488,6 +3488,9 @@ var MOVES_BW = $.extend(true, {}, MOVES_DPP, {
     'Covet': {
         bp: 60,
     },
+    'Curse': {
+        type: 'Ghost',
+    },
 });
 
 var MOVES_XY = $.extend(true, {}, MOVES_BW, {
diff --git a/script_res/pokedex.js b/script_res/pokedex.js
index 52586eb..4efa63f 100644
--- a/script_res/pokedex.js
+++ b/script_res/pokedex.js
@@ -5636,6 +5636,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 31
     },
       "w": 20.0,
+      "ab": "Unaware",
       "canEvolve": true,
   },
   "Bonsly": {
@@ -5677,6 +5678,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 23
     },
       "w": 60.5,
+      "ab": "Levitate",
       "canEvolve": true,
   },
   "Budew": {
@@ -5691,6 +5693,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 55
     },
       "w": 1.2,
+      "ab": "Natural Cure",
       "canEvolve": true,
   },
   "Buizel": {
@@ -5718,6 +5721,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 85
     },
       "w": 5.5,
+      "ab": "Klutz",
       "canEvolve": true,
   },
   "Burmy": {
@@ -5731,6 +5735,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 36
     },
       "w": 3.4,
+      "ab": "Shed Skin",
       "canEvolve": true,
   },
   "Carnivine": {
@@ -5757,7 +5762,8 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sd": 42,
       "sp": 91
     },
-    "w": 1.9
+      "w": 1.9,
+      "ab": "Tangled Feet",
   },
   "Cherrim": {
     "t1": "Grass",
@@ -5826,6 +5832,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 70
     },
       "w": 5.5,
+      "ab": "Honey Gather",
       "canEvolve": true,
   },
   "Cranidos": {
@@ -5839,6 +5846,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 58
     },
       "w": 31.5,
+      "ab": "Mold Breaker",
       "canEvolve": true,
   },
   "Cresselia": {
@@ -5866,6 +5874,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 50
     },
       "w": 23.0,
+      "ab": "Dry Skin",
       "canEvolve": true,
   },
   "Darkrai": {
@@ -5935,6 +5944,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 70
     },
       "w": 1.2,
+      "ab": "Unburden",
       "canEvolve": true,
   },
   "Dusknoir": {
@@ -5988,6 +5998,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 66
     },
       "w": 7.0,
+      "ab": "Swift Swim",
       "canEvolve": true,
   },
   "Floatzel": {
@@ -6141,6 +6152,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 85
     },
       "w": 3.9,
+      "ab": "Own Tempo",
       "canEvolve": true,
   },
   "Gliscor": {
@@ -6182,6 +6194,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 30
     },
       "w": 24.4,
+      "ab": "Natural Cure",
       "canEvolve": true,
   },
   "Heatran": {
@@ -6264,6 +6277,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 25
     },
       "w": 2.2,
+      "ab": "Shed Skin",
       "canEvolve": true,
   },
   "Kricketune": {
@@ -6289,7 +6303,8 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sd": 65,
       "sp": 95
     },
-    "w": 25.5
+      "w": 25.5,
+      "ab": "Leaf Guard",
   },
   "Lickilicky": {
     "t1": "Normal",
@@ -6355,6 +6370,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 60
     },
       "w": 30.5,
+      "ab": "Intimidate",
       "canEvolve": true,
   },
   "Luxray": {
@@ -6463,6 +6479,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 60
     },
       "w": 13.0,
+      "ab": "Filter",
       "canEvolve": true,
   },
   "Mismagius": {
@@ -6518,6 +6535,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 5
     },
       "w": 105.0,
+      "ab": "Thick Fat",
       "canEvolve": true,
   },
   "Pachirisu": {
@@ -6530,7 +6548,8 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sd": 90,
       "sp": 95
     },
-    "w": 3.9
+      "w": 3.9,
+      "ab": "Volt Absorb",
   },
   "Palkia": {
     "t1": "Water",
@@ -6678,6 +6697,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 60
     },
       "w": 20.2,
+      "ab": "Steadfast",
       "canEvolve": true,
   },
   "Roserade": {
@@ -6816,6 +6836,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 34
     },
       "w": 6.3,
+      "ab": "Storm Drain",
       "canEvolve": true,
   },
   "Shieldon": {
@@ -6830,6 +6851,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 30
     },
       "w": 57.0,
+      "ab": "Sturdy",
       "canEvolve": true,
   },
   "Shinx": {
@@ -6843,6 +6865,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 45
     },
       "w": 9.5,
+      "ab": "Intimidate",
       "canEvolve": true,
   },
   "Skorupi": {
@@ -6857,6 +6880,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 65
     },
       "w": 12.0,
+      "ab": "Sniper",
       "canEvolve": true,
   },
   "Skuntank": {
@@ -6943,6 +6967,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 60
     },
       "w": 2.0,
+      "ab": "Intimidate",
       "canEvolve": true,
   },
   "Stunky": {
@@ -6957,6 +6982,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sp": 74
     },
       "w": 19.2,
+      "ab": "Aftermath",
       "canEvolve": true,
   },
   "Tangrowth": {
@@ -7052,7 +7078,8 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sd": 102,
       "sp": 40
     },
-    "w": 38.5
+      "w": 38.5,
+      "ab": "Pressure",
   },
   "Weavile": {
     "t1": "Dark",
@@ -7079,7 +7106,8 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sd": 105,
       "sp": 36
     },
-    "w": 6.5
+      "w": 6.5,
+      "ab": "Anticipation",
   },
   "Wormadam-Sandy": {
     "t1": "Bug",
@@ -7092,7 +7120,8 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sd": 85,
       "sp": 36
     },
-    "w": 6.5
+      "w": 6.5,
+      "ab": "Anticipation",
   },
   "Wormadam-Trash": {
     "t1": "Bug",
@@ -7105,7 +7134,8 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
       "sd": 95,
       "sp": 36
     },
-    "w": 6.5
+      "w": 6.5,
+      "ab": "Anticipation",
   },
   "Yanmega": {
     "t1": "Bug",
@@ -7129,6 +7159,7 @@ var POKEDEX_DPP = $.extend(true, {}, POKEDEX_ADV, {
     "Hitmonlee": { "ab": "Reckless" },
     "Hitmonchan": { "ab": "Iron Fist" },
     "Kangaskhan": { "ab": "Scrappy" },
+    "Scyther": { "ab": "Technician" },
     "Scizor": { "ab": "Technician" },
     "Sunflora": { "ab": "Solar Power" },
     "Miltank": { "ab": "Scrappy" },
diff --git a/script_res/setdex_custom.js b/script_res/setdex_custom.js
index 7cdbf57..58adf72 100644
--- a/script_res/setdex_custom.js
+++ b/script_res/setdex_custom.js
@@ -34,6 +34,7 @@ var showdownToCalcFormes = [
     ["Toxtricity-Low-Key-Gmax", "Toxtricity-Gmax"],
     ["Sinistea-Antique", "Sinistea"],
     ["Polteageist-Antique", "Polteageist"],
+    ["Indeedee", "Indeedee-M"],
     ["Zarude-Dada", "Zarude"],
     ["Dudunsparce-Three-Segment", "Dudunsparce-Big"],
     ["Tatsugiri-Droopy", "Tatsugiri"],
@@ -52,6 +53,7 @@ var calcToShowdownFormes = [
     ["Shellos-East", "Shellos"],
     ["Gastrodon-East", "Gastrodon"],
     ["Dudunsparce-Three-Segment", "Dudunsparce-Big"],
+    ["Indeedee", "Indeedee-M"],
 ];
 
 var saveToCalcFormes = [
diff --git a/script_res/setdex_ncp-g9.js b/script_res/setdex_ncp-g9.js
index 5005822..4706b95 100644
--- a/script_res/setdex_ncp-g9.js
+++ b/script_res/setdex_ncp-g9.js
@@ -7132,7 +7132,7 @@ var SETDEX_VGC2023 = {
             "moves": [
                 "Sucker Punch",
                 "Icicle Crash",
-                "Crunch",
+                "Lash Out",
                 "Sacred Sword"
             ]
         },
diff --git a/script_res/switch_mode.js b/script_res/switch_mode.js
index c7410de..f24e2c8 100644
--- a/script_res/switch_mode.js
+++ b/script_res/switch_mode.js
@@ -19,6 +19,16 @@ if (localStorage.getItem("dex") == "natdex") {
 	//loadDex("vgcdex");	Don't load when starting, it'll be easier if ap_calc handles it by itself
 }
 
+//LEVEL TOGGLING
+//Load the leveling system according to localStorage
+if (localStorage.getItem("level") == true) {
+	$("#douswitch").prop("checked", false);
+}
+
+//GEN TOGGLING
+//Load the generation according to localStorage
+//see function getGen() in ap_calc.js
+
 $(function(){
 
 	$("#switchTheme").on("click", function(){
@@ -51,7 +61,17 @@ $(function(){
 			localStorage.setItem("dex", "vgcdex");
 		}
 	});
-	
+
+	$("#douswitch").on("click", function () {
+		if (!$(this).is(":checked")) {
+			localStorage.setItem("level", true);
+		}
+		else {
+			localStorage.setItem("level", false);
+        }
+	});
+
+	//see $(".gen").change(function ()) in ap_calc.js for changing gen value in localStorage
 })
 
 function loadTheme(color){
@@ -121,19 +141,39 @@ function loadDex(dexMode) {
 				$('label[for="zL' + i + '"]').show();
 				$('label[for="zR' + i + '"]').show();
 			}
+			$('div #primal-weather').show();
 		}
 		else {
 			for (i = 1; i <= 4; i++) {
 				$('label[for="zL' + i + '"]').hide();
 				$('label[for="zR' + i + '"]').hide();
 			}
+			$('div #primal-weather').hide();
+		}
+	}
+	if (gen >= 9) {
+		if (localStorage.getItem("dex") == "vgcdex") {
+			$('div #auras').show();
+			$('div #protect-field').show();
+			$('div #flower-gift').show();
+		}
+		else {
+			$('div #auras').hide();
+			$('div #protect-field').hide();
+			$('div #flower-gift').hide();
 		}
 	}
 	if (typeChart !== undefined) {
-		var typeOptions = getSelectOptions(Object.keys(typeChart));
+		var types = Object.keys(typeChart);
+		types.splice(types.indexOf('Typeless'), 1);
+		var teraTypes = $.extend(true, [], types);
+		if (gen >= 2) types.push('Typeless');
+		var typeOptions = getSelectOptions(types);
+		var teraTypeOptions = getSelectOptions(teraTypes);
     }
-	$("select.type1, select.move-type, select.tera-type").find("option").remove().end().append(typeOptions);
+	$("select.type1, select.move-type").find("option").remove().end().append(typeOptions);
 	$("select.type2").find("option").remove().end().append("<option value=\"\">(none)</option>" + typeOptions);
+	$("select.tera-type").find("option").remove().end().append(teraTypeOptions);
 	var moveOptions = getSelectOptions(Object.keys(moves), true);
 	$("select.move-selector").find("option").remove().end().append(moveOptions);
 	var abilityOptions = getSelectOptions(abilities, true);
diff --git a/script_res/type_data.js b/script_res/type_data.js
index a76efd2..3d4afb8 100644
--- a/script_res/type_data.js
+++ b/script_res/type_data.js
@@ -275,80 +275,96 @@ var TYPE_CHART_GSC = $.extend(true, {}, TYPE_CHART_RBY, {
     Normal: {
         Dark: 1,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Grass: {
         Dark: 1,
         Steel: 0.5,
+        Typeless: 1,
+        '???': 1
     },
     Fire: {
         Dark: 1,
         Steel: 2,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Water: {
         Dark: 1,
         Steel: 1,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Electric: {
         Dark: 1,
         Steel: 1,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Ice: {
         Fire: 0.5,
         Dark: 1,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Flying: {
         Dark: 1,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Bug: {
         Poison: 0.5,
         Dark: 2,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Poison: {
         Bug: 1,
         Dark: 1,
         Steel: 0,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Ground: {
         Dark: 1,
         Steel: 2,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Rock: {
         Dark: 1,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Fighting: {
         Dark: 2,
         Steel: 2,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Psychic: {
         Dark: 0,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Ghost: {
         Psychic: 2,
         Dark: 0.5,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Dragon: {
         Dark: 1,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Dark: {
         category: 'Special',
@@ -369,7 +385,8 @@ var TYPE_CHART_GSC = $.extend(true, {}, TYPE_CHART_RBY, {
         Dragon: 1,
         Dark: 0.5,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
     },
     Steel: {
         category: 'Physical',
@@ -390,9 +407,31 @@ var TYPE_CHART_GSC = $.extend(true, {}, TYPE_CHART_RBY, {
         Dragon: 1,
         Dark: 1,
         Steel: 0.5,
-        Typeless: 1
+        Typeless: 1,
+        '???': 1
+    },
+    '???': {
+        category: 'Physical',
+        Normal: 1,
+        Grass: 1,
+        Fire: 1,
+        Water: 1,
+        Electric: 1,
+        Ice: 1,
+        Flying: 1,
+        Bug: 1,
+        Poison: 1,
+        Ground: 1,
+        Rock: 1,
+        Fighting: 1,
+        Psychic: 1,
+        Ghost: 1,
+        Dragon: 1,
+        Dark: 1,
+        Steel: 1,
+        Typeless: 1,
+        '???': 1
     },
-
     Typeless: {
         category: 'Physical',
         Normal: 1,
@@ -412,11 +451,15 @@ var TYPE_CHART_GSC = $.extend(true, {}, TYPE_CHART_RBY, {
         Dragon: 1,
         Dark: 1,
         Steel: 1,
-        Typeless: 1
-    }
+        Typeless: 1,
+        '???': 1
+    },
 });
 
-var TYPE_CHART_XY = $.extend(true, {}, TYPE_CHART_GSC, {
+var TYPE_CHART_BW = $.extend(true, {}, TYPE_CHART_GSC, {});
+delete TYPE_CHART_BW['???'];
+
+var TYPE_CHART_XY = $.extend(true, {}, TYPE_CHART_BW, {
     Normal: {
         Fairy: 1
     },
@@ -494,4 +537,4 @@ var TYPE_CHART_XY = $.extend(true, {}, TYPE_CHART_GSC, {
     Typeless: {
         Fairy: 1
     }
-});
+});
\ No newline at end of file