Update more bottle conditions.

Update chest conditions to give items back if the user lacks them.

code/include/rnd/savefile.h

@@ -86,10 +86,9 @@ namespace rnd {
       BitField<41, 1, u64> bottleGoldDustGiven;
       BitField<42, 1, u64> bottleSeahorseGiven;
       BitField<43, 1, u64> bottleChateuGiven;
-      BitField<44, 1, u64> bottleMysteryMilkGiven;
-      BitField<45, 1, u64> bottleRedPotionGiven;
-      BitField<46, 2, u64> progressiveSwordUpgrade;
-      BitField<47, 17, u64> unused;
+      BitField<44, 1, u64> bottleRedPotionGiven;
+      BitField<45, 2, u64> progressiveSwordUpgrade;
+      BitField<46, 18, u64> unused;
     };
     GivenItemRegister givenItemChecks;
     union FairyCollectRegister {

code/source/rnd/item_override.cpp

@@ -500,8 +500,6 @@ namespace rnd {
       gExtSaveData.givenItemChecks.bottleChateuGiven = 1;
     } else if (storedGetItemId == GetItemID::GI_BOTTLE_SEAHORSE) {
       gExtSaveData.givenItemChecks.bottleSeahorseGiven = 1;
-    } else if (storedGetItemId == GetItemID::GI_BOTTLE_MYSTERY_MILK) {
-      gExtSaveData.givenItemChecks.bottleMysteryMilkGiven = 1;
     }
   }
 
@@ -611,15 +609,13 @@ namespace rnd {
       if (rActiveItemOverride.key.type == ItemOverride_Type::OVR_CHEST) {
 // Check and see if we have trade items or repeatable bottles and add to the array.
 #if defined ENABLE_DEBUG || defined DEBUG_PRINT
-        rnd::util::Print("%s: Active item row item ID is %#04x\n", __func__, rActiveItemRow->itemId);
+        rnd::util::Print("%s: Active item row item ID is %#04x and key flag is %#04x\n", __func__,
+                         rActiveItemRow->itemId, rActiveItemOverride.key.flag);
 #endif
         // Only set if we're not a trade item or bottled item.
-        /*if ((rActiveItemRow->itemId < 0x12 && rActiveItemRow->itemId > 0x30) && (rActiveItemRow->itemId < 0x9F)) {
-          // XXX: Hacky fix but maybe we need to redo how we track chests. Mark Giant's Mask Chest
-          // to be repeatably obtainable since we're not extending this array to 126 in the second dimension.
-          if (rActiveItemOverride.key.flag < 0x20)
-            gExtSaveData.chestRewarded[rActiveItemOverride.key.scene][rActiveItemOverride.key.flag] = 1;
-        }*/
+        if ((rActiveItemRow->itemId < 0x12 || rActiveItemRow->itemId > 0x30) && (rActiveItemRow->itemId < 0x9F)) {
+          gExtSaveData.chestRewarded[rActiveItemOverride.key.scene][rActiveItemOverride.key.flag] = 1;
+        }
       }
       game::GlobalContext* gctx = GetContext().gctx;
       u16 textId = rActiveItemRow->textId;
@@ -665,17 +661,16 @@ namespace rnd {
       ItemOverride_Clear();
       player->get_item_id = incomingGetItemId;
       return;
-    } else if (override.key.type == ItemOverride_Type::OVR_CHEST /*&&
-               gExtSaveData.chestRewarded[override.key.scene][override.key.flag] == 1*/) {
-      // Override was already given, check to see if we're a refill item now, if not, give a blue rupee instead.
+    } else if (override.key.type == ItemOverride_Type::OVR_CHEST &&
+               gExtSaveData.chestRewarded[override.key.scene][override.key.flag] == 1) {
+      // Override was already given, check to see if the item exists in inventory, if it does
+      // then we give a blue rupee. Only check for inventory items. If an item is a heart piece
+      // do not give multiples.
       // Only do this for items that are not bottle refills.
-      // Bottle logic is taken care of in the ItemUpgrade function.
-      // TODO: Check if we have the item in our inventory. If not, give the item back.
+      // Bottle logic is taken care of in the ItemUpgrade function for each bottle.
       ItemRow* itemToBeGiven = ItemTable_GetItemRow(override.value.getItemId);
-      if (itemToBeGiven->itemId < 0x4A && game::HasItem((game::ItemId)itemToBeGiven->itemId)) {
-        override.value.getItemId = 0x02;
-        override.value.looksLikeItemId = 0x02;
-      } else if (itemToBeGiven->itemId == 0xFF) {
+      if (game::HasMask((game::ItemId)itemToBeGiven->itemId) || game::HasItem((game::ItemId)itemToBeGiven->itemId) ||
+          itemToBeGiven->itemId > 0x49) {
         override.value.getItemId = 0x02;
         override.value.looksLikeItemId = 0x02;
       }

code/source/rnd/item_upgrade.cpp

@@ -88,6 +88,10 @@ namespace rnd {
   }
 
   GetItemID ItemUpgrade_RefillBottle(game::SaveData* saveCtx, GetItemID getItemId) {
+    // As you can see mystery milk avoids this check since it's wiped from your inventory
+    // on cycle reset. It also happens to remove whichever bottle the milk is in,
+    // so we should avoid refills and just give the bottle until a user can get that
+    // side quest fulfilled.
     switch (getItemId) {
     case GetItemID::GI_BOTTLE_POTION_RED:
       if (gExtSaveData.givenItemChecks.bottleRedPotionGiven == 1) {
@@ -117,11 +121,6 @@ namespace rnd {
         return GetItemID::GI_BOTTLE_CHATEAU_ROMANI_REFILL;
       }
       break;
-    case GetItemID::GI_BOTTLE_MYSTERY_MILK:
-      if (gExtSaveData.givenItemChecks.bottleMysteryMilkGiven == 1) {
-        return GetItemID::GI_BOTTLE_MYSTERY_MILK_REFILL;
-      }
-      break;
     default:
       return getItemId;
     }