summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/ConvertItem.cpp
diff options
context:
space:
mode:
authorEblo <7004497+Eblo@users.noreply.github.com>2025-09-10 12:32:40 -0400
committerGitHub <noreply@github.com>2025-09-10 12:32:40 -0400
commitdf18c6deffd68663a11c84d437da419e6433d679 (patch)
tree9b6d7aa3d136a60f6d610a746b8546c541c751e9 /mm/2s2h/Rando/ConvertItem.cpp
parent72b48cdae019d149899862d8927a5fc755bed9ea (diff)
Revert "Merge develop-rena -> develop (#1258)" (#1269)
This reverts commit 47771de011abced823d9b699fffc8832fedff1b7.
Diffstat (limited to 'mm/2s2h/Rando/ConvertItem.cpp')
-rw-r--r--mm/2s2h/Rando/ConvertItem.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/mm/2s2h/Rando/ConvertItem.cpp b/mm/2s2h/Rando/ConvertItem.cpp
index 771878052..6cb753b94 100644
--- a/mm/2s2h/Rando/ConvertItem.cpp
+++ b/mm/2s2h/Rando/ConvertItem.cpp
@@ -547,13 +547,9 @@ RandoItemId Rando::ConvertItem(RandoItemId randoItemId, RandoCheckId randoCheckI
}
break;
case RI_BOTTLE_MILK:
- if (Inventory_HasEmptyBottle()) {
- return RI_MILK_REFILL;
- }
- break;
case RI_BOTTLE_CHATEAU_ROMANI:
if (Inventory_HasEmptyBottle()) {
- return RI_CHATEAU_ROMANI_REFILL;
+ return RI_MILK_REFILL;
}
break;
case RI_BOTTLE_RED_POTION: