2ship2harkinian/mm/2s2h/Rando/ConvertItem.cpp, branch develop-keiichi

Adjust obtainability for progressive time (#1529)

2026-02-01T14:37:32+00:00

Check/Item Tracker improvements (#1492)

2026-01-22T21:51:14+00:00

Add static trap option (#1489)

2026-01-22T04:55:02+00:00

Shuffle some songs (#1481)

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

UX pass on item tracker overhaul (#1460)

2026-01-16T21:39:27+00:00

Refactor junk cycling and trap models (#1452)

2026-01-16T21:20:27+00:00

[Rando] Shuffle Ocarina Buttons (#1303)

2026-01-09T18:03:58+00:00

* Import Models

* Give and Draw for Models

* Logic updates, need to do Evans Song

* Update OnFileCreate

* Fixes

* clang

* Implement Japas Jam Session

* Update naming uniformity

* Rename Logic

* ugh

* Fixes VB, Logic, and removes magic numbers from Starting Items Macro.

* Adds Item Tracker implementation

* Adds Scarecrow song check and makes feedback changes.

* Stop error chime from starting an EDM album.

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

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

* Update mm/2s2h/Rando/Logic/Logic.h

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

* Update mm/2s2h/Rando/Logic/Logic.h

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

* Update mm/2s2h/Enhancements/Songs/SkipScarecrowSong.cpp

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

* Undo Swim change (no idea why i did this)

* Reworked Hook

* Cleanup

* Clean up

Fix bug with SkipScarecrowSong
Fix Zora Ballad logic
Grant Ocarina buttons when not shuffled
Fix VB_PLAY_OCARINA_NOTE boolean
Re-instantiate starting items RI adjustment
Swap Ocarina right and left

---------

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

[Rando] Enemy Soul Shuffle (#1284)

2026-01-06T14:28:56+00:00

* Add Aliens and initial code moved from old build.

* Update Enemy Souls to latest Develop and fix issues.

* Change Stalchild Animation to Idle

* Fix Stalchild Eyes

* Adds Hiploop to keep in line with Enemy Drops

* correction

* Update Matrix Calls

* Remove comment

* Remove Garo for now

* Add Octorok Soul req for Upper Canyon Access

* Add soul requirement for Red Switch

* Grant Soul INF when the option is off

* Adds Nejiron Soul

* Add Flying Pot Soul

* ew (#14)

* cleanup

* Add Bubble Soul

* Adds Freezard

* Change Soul behaivor to Invincible

* header cleanup and arg consolidation

* Fixes OnFileCreate to actually shuffle Enemy Souls. took this op. to fix up Boss Souls shuffling as it was needed to cleanly shuffle Enemy Souls.

* Naming Updates

* Name Updates pt2

* Add Tracker Icons and adds a Default to avoid erroring

* Fix Iron Knuckle Helmet

* revert item icon default and add soul flame to tatl target for enemies that are invincible.

* Move VBs to GameInteractor_VanillaBehavior.h

* Use VB_PERFORM_AC_COLLISION for enemy souls

* Add enemy souls for closer parity with drops

Stub out enemy draw funcs
Use macros to streamline existing skeleton inits
Logically account for enemy souls in CanKillEnemy
Fix logical quirk with Ikana ice arrows

* Draw everything

* Remove unused INIT arg from SETUP_FLEX_SKEL

* Add Igos, Keeta, Gomess

Make soul RIs contiguous, separate boss and enemy
Ignore target color for EnInvadepoh
Remove Real Bombchus and Flying Pots for now
Require Gekko and Snapper souls for beating both

* Add Enemy Souls to item tracker

* clang format

---------

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

[Rando] Clock Shuffle + Logic (#1275)

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

* 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 

* 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 

---------

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

[Rando] Implement Triforce Hunt (#1071)

2025-10-15T16:48:06+00:00

* Implement Triforce Hunt (needs Glitchless Seed Gen help)

* Fix Credits Warping

* Clean up logging

* Fix Seed Gen

* Remove test code.

* Add Triforce Piece to item tracker

* Allow for multiple models, pushing up because I dislike it and can't figure out a better way.

* Majora Soul for Reward (needs work). Completed Triforce text

* Clang

* clean up comment

* Remove SPDLOG

* Updates based on Feedback

* Cleanup

* Cleanup again

* Fix Ship Utils

* Fix Tracker drawing

* Feedback updates

* clang because why not

* Update to use ENTRANCE mapping. Thanks BalloonDude

* Expand shuffle maximum and handle instances where a seed may not generate.

* Undo menu text.

* Fix Item Tracker... again and feedback changes.

* Update define location to StaticData.h and update majora syntax

* cleanup

* Remove TriforceHunt.cpp again...

* clean up

* FOR REAL THIS TIME

* Update ratio of required/max if the seed needs to adjust how many are in the pool due to generator issues.

* clang