diff options
| author | Eblo <7004497+Eblo@users.noreply.github.com> | 2026-02-01 09:37:32 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-02-01 09:37:32 -0500 |
| commit | 5b93126269f010dfeb2e2e8d247a382b76f4bec2 (patch) | |
| tree | 10670b5692034809c1efa78881ff3a204ee984bf /mm/2s2h/Rando/ConvertItem.cpp | |
| parent | 81833767f7a830d59db4c00f4d4585e98c211801 (diff) | |
Adjust obtainability for progressive time (#1529)
Diffstat (limited to 'mm/2s2h/Rando/ConvertItem.cpp')
| -rw-r--r-- | mm/2s2h/Rando/ConvertItem.cpp | 5 |
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: |