summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mm/2s2h/Rando/ConvertItem.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/2s2h/Rando/ConvertItem.cpp b/mm/2s2h/Rando/ConvertItem.cpp
index 5e11a7204..4506f6140 100644
--- a/mm/2s2h/Rando/ConvertItem.cpp
+++ b/mm/2s2h/Rando/ConvertItem.cpp
@@ -590,6 +590,11 @@ bool Rando::IsItemObtainable(RandoItemId randoItemId, RandoCheckId randoCheckId)
return !Flags_GetRandoInf(RANDO_INF_OBTAINED_CLOCK_DAY_1 +
Rando::ClockItems::GetHalfDayIndexFromClockItem(randoItemId));
case RI_TIME_PROGRESSIVE:
+ if (hasObtainedCheck) {
+ return false;
+ } else if (Rando::ClockItems::GetAllOwnedHalfDaysMask() == 0x3F) { // Have all 6 half days
+ return false;
+ }
return true;
case RI_OCARINA_BUTTON_A:
case RI_OCARINA_BUTTON_C_DOWN: