summaryrefslogtreecommitdiff
path: root/mm/2s2h/Rando/RemoveItem.cpp
AgeCommit message (Collapse)Author
2026-07-11Tweaks to sarias song behavior (#1780)Garrett Cox
2026-03-19[Rando] Tycoon's Wallet (#1597)mckinlee
* big boy wallet * cleaner 4 digit support * feedback * #1605 explains this change --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2026-02-26Clean up ClockShuffle.cpp (#1546)mckinlee
* 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>
2026-01-20Shuffle some songs (#1481)Garrett Cox
2026-01-09[Rando] Shuffle Ocarina Buttons (#1303)Caladius
* 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>
2026-01-06[Rando] Enemy Soul Shuffle (#1284)Caladius
* 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 <mckinlee@ymail.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2026-01-05[Rando] Clock Shuffle + Logic (#1275)mckinlee
* 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>
2025-09-14Use DungeonSceneIndex in port filesEblo
2025-09-14Update weekevent flags in enhancementsEblo
2025-08-20[Rando] Add Frog Shuffle (#1115)balloondude2
* Draw a frog * wip * builds and doesn't crash * add to regions and fix flag stuff * notes * add menu option * progress * mostly works * format * fix postLimbCrash * fix logic * formatting * cleanup * move to DrawFuncs * rearrange includes to satisfy clang format * Make frogs give check when wearing Don Gero's Mask (#5) * add second text variation * fix init issue --------- Co-authored-by: Caladius <clatini88@gmail.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-04-06Cleanup includes (#1072)louist103
* Cleanup * Format * Fixes * Update macports-deps.txt * Fix mac * Update macports-deps.txt Co-authored-by: Archez <Archez@users.noreply.github.com> * Move includes around --------- Co-authored-by: Archez <Archez@users.noreply.github.com>
2025-02-14Boss Souls initial implementationGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2025-01-31Fix issue with small keys not being removed in logic calculationsGarrett Cox
2025-01-23Fix logic issues with skulltula tokens and red potion refillGarrett Cox
2025-01-18Adds some more missing items to RemoveItem so that logic works correctlyGarrett Cox
2025-01-12Add some more missing RemoveItemsGarrett Cox
2025-01-12Create new glitchless logic variant, and move old one to 'French Vanilla'Garrett Cox
2024-12-31Add CSMC for pots, fix some seed generation issuesGarrett Cox
2024-12-14Revert change to temple map namesGarrett Cox
2024-12-14Tingle checksGarrett Cox
Co-authored-by: Caladius <Caladius@users.noreply.github.com>
2024-11-03PoC glitchless playthrough implementationGarrett Cox