Fix accounts for Deku Nut slot initialization

JordanLongstaff · Jan 2, 2025 · 3f6df82 · 3f6df82
1 parent 7acc02a
commit 3f6df82
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/soh/soh/SohMenuBar.cpp b/soh/soh/SohMenuBar.cpp
@@ -1473,9 +1473,10 @@ void DrawEnhancementsMenu() {
             UIWidgets::Tooltip("Fixes a bug where the Gravedigging Tour Heart Piece disappears if the area reloads");
             if (UIWidgets::PaddedEnhancementCheckbox("Fix Deku Nut upgrade", CVAR_ENHANCEMENT("DekuNutUpgradeFix"),
                                                      true, false)) {
-                s32 expectedNutUpgrades = CUR_UPG_VALUE(UPG_NUTS) - 1;
-                s32 actualNutUpgrades = (Flags_GetInfTable(INFTABLE_193) ? 1 : 0) +
-                                        (Flags_GetItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE) ? 1 : 0);
+                s32 expectedNutUpgrades = (INV_CONTENT(ITEM_NUT) == ITEM_NUT ? 1 : 0) +
+                                          (Flags_GetInfTable(INFTABLE_193) ? 1 : 0) +
+                                          (Flags_GetItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE) ? 1 : 0);
+                s32 actualNutUpgrades = CUR_UPG_VALUE(UPG_NUTS);
                 if (expectedNutUpgrades != actualNutUpgrades) {
                     Flags_UnsetItemGetInf(ITEMGETINF_OBTAINED_NUT_UPGRADE_FROM_STAGE);
                 }