From 5b93126269f010dfeb2e2e8d247a382b76f4bec2 Mon Sep 17 00:00:00 2001 From: Eblo <7004497+Eblo@users.noreply.github.com> Date: Sun, 1 Feb 2026 09:37:32 -0500 Subject: Adjust obtainability for progressive time (#1529) --- mm/2s2h/Rando/ConvertItem.cpp | 5 +++++ 1 file changed, 5 insertions(+) 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: -- cgit v1.2.3