summaryrefslogtreecommitdiff
path: root/mm/src/code
AgeCommit message (Collapse)Author
4 days[Enhancement] Prevent Hot Spring Water from cooling (#1989)HEADdevelopItsHeckinPat
* Prevent Hot Spring Water from cooling * Remove unnecessary arg's * Tweak to VB location --------- Co-authored-by: Garrett <garrettjcox@gmail.com>
4 daysMerge pull request #2020 from 2ship2harkinian/develop-battlerGarrett Cox
develop-battler -> develop
4 days[Enhancement] Trigger active item on B (#1870)lightmanLP
* proto * proto 2 * proto 3 * proto 4 * small fix and cleanup * clang format * ptr fix * possible fix for active item with cycle * strip gfs enhancement * strip redundant horse check * small cleanup * fix button holding * prevent instant putaway * cvar cleanup * B bomb arrow fix * fix hook reset to neutral * config migration * icon for B item * clang fmt * fix third person items stripping on dpad * Apply from review Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * clang fmt * missed one Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Revert "missed one" This reverts commit 1c8312cede581cd1fed68d8d3c703c67d3bcbcde. Because, apparently, I'm not * fix * stricter check * add isDpad to hook * add dpad checks * clang fmt * Update mm/2s2h/config/ConfigUpdaters.cpp * Update mm/2s2h/config/ConfigUpdaters.cpp --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
4 daysReturn success from SDL_main after normal shutdown (#2016)boburning
10 daysAdd OnActorEntryHalfDaysBits hook and refactor TingleAlwaysInClockTown (#2010)Garrett Cox
13 days[Enhancement] Drops Don't Despawn (#1982)Josh Bodner
* despawn * last file * retain vanilla file * retain vanilla behavior * clean up logic * formatting * formatting fix * formatting fix? * final push to fix logic back to intended state after formatting fix
2026-10-14Merge pull request #1504 from Eblo/decomp-cherry-pick-the-squeakuelEblo
Periodic cherry-pick from upstream
2026-10-14Load appropriate scene layers from non-SoT saves (#1952)Eblo
* Load cleared scene layers if applicable * Add Termina Field * This is not unique to pause saves * Introduce as a fix instead --------- Co-authored-by: Garrett <garrettjcox@gmail.com>
2026-10-14fix: avoid integer pointer arithmetic in player animations (#1965)alexbcz
2026-09-08Save Persistent Bunny Hood state in file info (#1933)Jordan Longstaff
* Save Persistent Bunny Hood state in file info * Static methods
2026-09-01gActorSetup{Opa,Xlu}DL docs (#1898)Dragorn421
2026-08-31Moar Cosmetics (#1891)Garrett Cox
2026-08-29Sync port files, clang formatEblo
2026-08-29Merge remote-tracking branch 'upstream/develop' into ↵Eblo
decomp-cherry-pick-the-squeakuel
2026-08-29Documentation pass on WaterBox code (#1860)mzxrules
* Documentation pass on WaterBox code * format * vtx flags, fix comments * format * Add function documentation comment
2026-08-29gSetupActorDLs (#1893)Derek Hensley
* D_801AEFA0 -> gActorEmtpyDL * gActorSetupOpaDL * gActorSetupXluDL
2026-08-17develop-battler -> develop (#1892)Garrett Cox
* Fix tingle map & bombers notebook checks not being re-obtainable (#1886) * fix flags (#1885) * button it up (#1884) * Maybe fix wasapi teardown (#1879) * [Fix] Game crashes when menu engaged when regenerating OTR (#1878) * fix * more reliable target it should just check that process of otr extraction finished and we are in game * properly remove all incompatible o2rs (#1882) * Fix interpolation for archery enemies and bubbles (#1889) --------- Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.com> Co-authored-by: mckinlee <mckinlee@ymail.com> Co-authored-by: lightmanLP <liteman1000@gmail.com>
2026-08-17Fix interpolation for archery enemies and bubbles (#1889)Garrett Cox
2026-08-15Toggle for screen distortion (#1880)Garrett Cox
2026-08-06Bugfix, Deku Hookshot pull out crash (#1849)djevangelia
* Bugfix, Deku Hookshot pull out crash * check * Deku Hookshot, console crash handling * Apply suggestions from code review Co-authored-by: Garrett Cox <garrettjcox@gmail.com> --------- Co-authored-by: djevangelia <djevangelia> Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2026-08-03Fix remaining '2' on file select code (#1843)Garrett Cox
2026-08-01Adjust palette hack for maps (#1835)Garrett Cox
2026-07-27Option to auto advance text to credits (#1821)Garrett Cox
2026-07-25Merge remote-tracking branch 'upstream/develop' into ↵Eblo
decomp-cherry-pick-the-squeakuel
2026-07-25Port LERP interpolation improvements from ship (#1812)Philip Dubé
2026-07-21XML Skeleton Support (#1796)Jameriquiah
* xml skeleton support * new include to please macos build * build xml limbs as lod and force vanilla draw path allows soh skeletons to be loaded in 2ship * disable lod when custom models are used
2026-07-20Document `EnTest3` (#1881)Jordan Longstaff
* Document `EnTest3` * Add comments for enum-type fields * Add scheduled action index comments Co-authored-by: Copilot <copilot@github.com> * Use enums in comparisons * Rename `sp3C` * Rewrite comments on speak data Co-authored-by: Copilot <copilot@github.com> * Reformat * Missed a text comment * Missed another text comment --------- Co-authored-by: Copilot <copilot@github.com>
2026-07-20Bombers Part 3: `EnBombers` (#1849)Jordan Longstaff
* Bombers Part 3: Wandering NPCs and caught players * Rename WEEKEVENTREG flags * Fix missing rename of `unk_2A0`
2026-07-20Merge remote-tracking branch 'upstream/develop' into ↵Eblo
decomp-cherry-pick-the-squeakuel
2026-07-03New Features: No random drops + No heart/healing drops (#1547)anthony-barricelli
* no random drops * no heart/fairy drops * add item spawns to prevent soft locks * remove redundancies, use collectible vb behavior for hearts * feedback -- move vb check
2026-06-11Bombers Part 2: Guard (#1848)Jordan Longstaff
* Bombers Part 2: Guard * Fix errors * Re-rename functions
2026-06-11Document `EnKendoJs` (#1838)Jordan Longstaff
* Document `EnKendoJs` * Fix typedefs * Fix isSlashingLog reference * Found out what that unused animation was * Rename animation constants * Rename WEEKEVENTREG flag * Remove trailing whitespaces * Fix uses of isSlashingLog * Rename Skel object * Deciphered FF part of params * Dismantle message enum * Remove mask message macro * Refactor message start macro * Rename text ID arrays * Use boolean values for isRetracting * Remove statement added by faulty merge * Rename message handler functions * Minigame round union for clarity
2026-06-11Merge remote-tracking branch 'upstream/develop' into ↵Eblo
decomp-cherry-pick-the-squeakuel
2026-05-25[Enhancement] Port Extraction Flow, ImGui scaling, file perm check from SoH ↵Eblo
(#1709) * Port Extraction Flow, ImGui scaling, file perms * Remove obsolete F1 menu message
2026-05-21[Enhancement] Color Pictograph (#1484)balloondude2
* mostly works * mvp * don't think I need the align * clean up * now we have png * whoops * remove unused code Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * Remove unneeded code Co-authored-by: Garrett Cox <garrettjcox@gmail.com> * move buffer off of save context * load png when the camera is used * clean up * clang format * Pass in pointer * Changed to pointer(FIX FOR LINUX) (#8) --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com> Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com>
2026-05-19Merge pull request #1702 from HarbourMasters/develop-keiichiEblo
develop-keiichi->develop
2026-05-18Execute moon crash hooks during edge case (#1691)Jordan Longstaff
2026-05-10[Enhancement] Infinite Epona Carrots (#1675)mckinlee
* vroom vroom * move that...
2026-05-07[Enhancement] Bomb Arrows (#1496)mckinlee
* shoot and go boom * add bomb model to arrow tip * simplify bomb draw and effects * add bomb arrows to arrow cycling * use ObjectExtension and simplify arrow cycle handling * overhaul * feedback/fixes * clean up diff * feedback 2 and a fix --------- Co-authored-by: Jameriquiah <42100286+Jameriquiah@users.noreply.github.com> Co-authored-by: Jameriquiah <jordynhardyman12@gmail.com>
2026-04-26Port SoH Cosmetics Editor UI (#1633)Jameriquiah
* port soh cosmetics editor ui * fix wrong hearts color * fix rainbow * cosmetics editor refactor * formatting
2026-04-11Alt Toggle for Custom animation (#1624)Jameriquiah
* Add explicit alt prefix checking to animation loading Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com> * forgot comment Co-Authored-By: PurpleHato <47987542+PurpleHato@users.noreply.github.com> --------- Co-authored-by: PurpleHato <47987542+PurpleHato@users.noreply.github.com>
2026-03-30Fix Button Env Color (#1603)mckinlee
2026-03-30[Enhancement] Extra Powder Kegs (#1600)mckinlee
* extra powder kegs * feedback * feedback 2 * feedback 3
2026-03-22Sync asset files and clang formatEblo
2026-03-22Rename globals related to textbox and icon scaling (#1846)Jordan Longstaff
2026-03-22Merge remote-tracking branch 'upstream/develop' into ↵Eblo
decomp-cherry-pick-the-squeakuel
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-03-19[Enhancement] Song Items (#1566)mckinlee
* equip songs * feedback
2026-03-10Basic surround sound support. (#1516)tortugaveloz
* Update LUS and add surround sound support. * Fix loading to load surround when configured that way. * Update mm/src/code/z_sram_NES.c Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> * Apply suggestions from code review Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update LUS. --------- Co-authored-by: inspectredc <78732756+inspectredc@users.noreply.github.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2026-03-10prevent ocarina end on sun song if faster playback is on (#1542)anthony-barricelli