2ship2harkinian/mm/2s2h/Rando/MiscBehavior/ClockShuffle.cpp, branch develop 2Ship2Harkinian: Majora’s Mask PC port more fixes (#1584) 2026-03-02T01:51:33+00:00 mckinlee mckinlee@ymail.com 2026-03-02T01:51:33+00:00 786202eaa8596e0337573de60a947af682a3c845 






Clean up ClockShuffle.cpp (#1546)
2026-02-26T23:29:28+00:00

mckinlee
mckinlee@ymail.com

2026-02-26T23:29:28+00:00

c7a49c89b1af7c9fcca92725688f3477f67376cf

* add .idea to gitignore (#1543)

* tlc

* use save editor methods instead

* more cleanup, document some things

* Update mm/2s2h/Rando/MiscBehavior/ClockShuffle.cpp

Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>

* add .idea to gitignore (#1543)

* tlc

* use save editor methods instead

* more cleanup, document some things

* Update mm/2s2h/Rando/MiscBehavior/ClockShuffle.cpp

Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>

* Revert "add .idea to gitignore (#1543)"

This reverts commit 0dd52ebfda9822da02aead98d978d85546f162e6.

* Revert "add .idea to gitignore (#1543)"

This reverts commit 0dd52ebfda9822da02aead98d978d85546f162e6.

* feedback

* fix

---------

Co-authored-by: anthony-barricelli <104381450+anthony-barricelli@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>




* add .idea to gitignore (#1543)

* tlc

* use save editor methods instead

* more cleanup, document some things

* Update mm/2s2h/Rando/MiscBehavior/ClockShuffle.cpp

Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>

* add .idea to gitignore (#1543)

* tlc

* use save editor methods instead

* more cleanup, document some things

* Update mm/2s2h/Rando/MiscBehavior/ClockShuffle.cpp

Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>

* Revert "add .idea to gitignore (#1543)"

This reverts commit 0dd52ebfda9822da02aead98d978d85546f162e6.

* Revert "add .idea to gitignore (#1543)"

This reverts commit 0dd52ebfda9822da02aead98d978d85546f162e6.

* feedback

* fix

---------

Co-authored-by: anthony-barricelli <104381450+anthony-barricelli@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>






Fixes for suns song usage in time shuffle (#1488)
2026-01-22T15:41:56+00:00

Garrett Cox
garrettjcox@gmail.com

2026-01-22T15:41:56+00:00

99204fb69c923cba79299675c2ce21bb4f8ee587












fix soft lock (#1479)
2026-01-21T01:02:14+00:00

mckinlee
mckinlee@ymail.com

2026-01-21T01:02:14+00:00

c2f50b3cc3e623dd34a092f5fdac3d7c829851ca












Tweaks to how starting items works and is stored and interacted with (#1448)
2026-01-11T00:44:17+00:00

Garrett Cox
garrettjcox@gmail.com

2026-01-11T00:44:17+00:00

458faa34e497d558761594177db2ac952bb20a19

* Tweaks to how starting items works and is stored and interacted with

* More tweaks to clock shuffle initialization




* Tweaks to how starting items works and is stored and interacted with

* More tweaks to clock shuffle initialization






Refactor InitializeFileClocks (#1441)
2026-01-07T17:58:57+00:00

mckinlee
mckinlee@ymail.com

2026-01-07T17:58:57+00:00

7835c952b5c4da8cfbec47532853be74b39cc541

* refactor

* feedback




* refactor

* feedback






[Rando] Clock Shuffle + Logic (#1275)
2026-01-06T01:52:39+00:00

mckinlee
mckinlee@ymail.com

2026-01-06T01:52:39+00:00

2b139c215f478ef5deca007dfa6f9b6052db3d1d

* Add Clocks as Items feature

* refactor

* some clean up

* forgot to clangify

* use proper randoinf flags and some fixes

* proper skipsotcutscene fix

* Animated Clock Item (Thank you Caladius!)

* Close attempt at animating the clock, not perfect but a good start.

* Git gud Clock

* fix clock item get crash

Co-Authored-By: Caladius <Caladius@users.noreply.github.com>

* some enhancements

* logic refactor, minor changes, and new enhancements

* huge rework

* clang

* fix a oops; any day, not current day

* housekeeping and starting items menu support

* splits up some milkroad regions and fixes a audio bug

* i suck at merging

* feedback update

* scarecrow dance fix

* add clocks to new item tracker

* day 2 bean patches

* add time logic to enemy drops and simplify day 2 bean macro

* rebrand to "Shuffle Time"

* more eblo feedback

* some more feedback

* rename feedback

* pauseSaveEntrance fix

* fix take 2

* Time Shuffle cleanup

Fix pause save Time Shuffle bug
Fix event queue daytelop bug
Finish merge commit header include
Clean up with shouldRegister

Co-authored-by: mckinlee <mckinlee@ymail.com>

---------

Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>




* Add Clocks as Items feature

* refactor

* some clean up

* forgot to clangify

* use proper randoinf flags and some fixes

* proper skipsotcutscene fix

* Animated Clock Item (Thank you Caladius!)

* Close attempt at animating the clock, not perfect but a good start.

* Git gud Clock

* fix clock item get crash

Co-Authored-By: Caladius <Caladius@users.noreply.github.com>

* some enhancements

* logic refactor, minor changes, and new enhancements

* huge rework

* clang

* fix a oops; any day, not current day

* housekeeping and starting items menu support

* splits up some milkroad regions and fixes a audio bug

* i suck at merging

* feedback update

* scarecrow dance fix

* add clocks to new item tracker

* day 2 bean patches

* add time logic to enemy drops and simplify day 2 bean macro

* rebrand to "Shuffle Time"

* more eblo feedback

* some more feedback

* rename feedback

* pauseSaveEntrance fix

* fix take 2

* Time Shuffle cleanup

Fix pause save Time Shuffle bug
Fix event queue daytelop bug
Finish merge commit header include
Clean up with shouldRegister

Co-authored-by: mckinlee <mckinlee@ymail.com>

---------

Co-authored-by: Caladius <Caladius@users.noreply.github.com>
Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>