summaryrefslogtreecommitdiff
path: root/mm/src
AgeCommit message (Collapse)Author
2026-01-16Add EnOt reset function (#1457)develop-mionEblo
2025-12-30Only apply fast push to skateblock, not pull (#1418)Eblo
2025-12-18Fix OOB in AudioSeq_ResetReverb (#1397)Eblo
2025-11-30Implement Dinolfos, Boss03 reset funcs (#1371)Eblo
Re-implement Boss07 reset func
2025-11-20Reset Invadepoh state (#1350)Eblo
* Reset sInvasionState in z_en_invadepoh.c * Reset reward state as well * Reset more static variables * oh clang * oh clang again
2025-11-03Fix UB in Item_DropCollectible hook usage (#1314)Eblo
* Fix UB in Item_DropCollectible hook usage * Clang format * Again
2025-11-03Fix lens actors not showing (#1315)Eblo
2025-10-30[Rando] Implement Traps (#1287)Caladius
* Initial Trap Implementation with 1 Trap Example. * New TrapTypes and Per Trap Custom Messages * Spruce up Menu and add placeholders for toggling traps * Reordering and clean up * Seeded Trap Models * Trap Type Opt-in * Add Jinx Trap * Add Enemy (Like Like) Trap * Fix Shop Item draws and convert for Progressive * Placeholder for Custom Model * Implemented time trap[Please Squash this] (#13) * Implemented time trap * Finished comment because im braindead today * Forgot to fix indentation(whoops) * Changed things not mess with the games code, added some more Time Trap messages * Removed a include I forgot to yoink from the base code. * Removed header define for VerifyTimeSkip * Clangit * Missed some leftovers from a merge conflict. * Clang format throwing a fit over a empty line * Added Timeskip CVar placeholder * Fixed issue where game crashes past midnight * Added Moonfall skipping prevention messures. * Added fallback loop to handle the remaining cycles in the event of a overflow. * Cleaner implementation * Keep it simple stupid * changed function name to be more accurate * Removed outdated comment, used TimeSkipInc for moonfall skip prevention * Reverted max trap(accidentally pushed it while testing) * Removed old unused value * Reduced the iteration by 1 to be closer to where it was at before. * Will this fix Windows? * Added TRAP_TIME to trapToCvarMap * Corrected typo on comment * Clangit...again * Added calls to load environment values and adjust the weather. * Update Time Trap and clean up code * Add Flash effect to Time Trap * Added a few more timeTrapMessages * I hate you clang format * Fix Trading Post Kick Out Time * Added map for all locations I can think of that close. * Clangit yet again * Removed Inn handling because the edge case related to it closing cannot happen * Corrected a whoopie I made when I was dealing with a conflict * Removed pointless condition check that is always true * Removed duped variable * Removed unnecessary data from SCENE_8ITEMSHO kickout entry * Removed now used TRADING_POS_ACTOR_PARAM --------- Co-authored-by: Caladius <clatini88@gmail.com> * Comment out Kick Out code for later TODO * Clean out commented code * Adds Wallet Trap and updates some tooltips * More Trap Messages * Even more trap messages * moooooore messages * update for clang * Feedback changes for Time Trap * Update Trap functions * Fix Matrix call * Trap Model Import (Thanks Zrc) * rename * Adjust size * update name for uniformity * Update mm/2s2h/Rando/MiscBehavior/Traps.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/MiscBehavior/Traps.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * feedback updates * Update notifications to remove color codes from trap messages when item skip is on * VBify Object Dependency * Fix comma * fix headers * Refactor ObjectDependency hook * Check if item get cutscenes are being skipped * Use brackets for LUS include * Header update --------- Co-authored-by: sitton76 <58642183+sitton76@users.noreply.github.com> Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-10-29Cleanup heap (#1305)louist103
* Small cleanup to heaps.c * Remove stdio.h * _aligned_free * Fix mac * Format
2025-10-29[Rando] Enemy Drop Shuffle (#1282)Caladius
* Implement most of the Enemy Drops * Fix Glitchless Generation * Fix duplicate Logic Checks * Add Slime Items and fix Linux Floating Point. * Add Comment for Enemy Drops RC Sets * Adds Leever and fixes Position Check issue. * Adds GBC for Logic check * Add Hiploop * Adds Skullfish (Enemy only drops items inside GBT) * Feedback Updates * Updates * Update to Switch for Actor Selection * More Enemy Locations * Fix Mini Baba and remove actors that dont drop items * Update mm/2s2h/Rando/Logic/Logic.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Add case for ACTOR_BOSS_05 in Logic.h * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Clang format actor position * Need swim for Bio Deku Baba * Define RC_ENEMY_DROP_BIO_DEKU_BABA in checks * GitHub spacing how dare you * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/ActorBehavior/EnemyDrops.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Logic/Regions/Miscellaneous.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/StaticData/Checks.cpp Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Update mm/2s2h/Rando/Types.h Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com> * Apply suggestion from @Eblo --------- Co-authored-by: Eblo <7004497+Eblo@users.noreply.github.com>
2025-10-29Bump LUS and OTRExporter, add null audio backend (#1289)Eblo
* Bump LUS and OTRExporter, add null audio backend * Missed an include change * And again * Thanks macOS * Another one * Bump LUS again, fixing SDL audio backend bug * Sync LUS bump changes to merged PRs * Bump LUS again * Update CMakeLists.txt includes
2025-10-27Port fix for soil patch Skulltula sounds (#1280)Eblo
* Port fix for soil patch Skulltula sounds * Apply Skulltula sounds fix to Skull Kid paintings
2025-10-26Fix errant merge conflict resolution (#1306)Eblo
2025-10-26[Enhancement] Right Stick Ocarina (#1293)mckinlee
* right stick ocarina playback option * fix: formatting * long live GameInteractor_RightStickOcarina --------- Co-authored-by: Felix Dietrich <felixdietrich@gmail.com>
2025-10-15[Enhancement] Time Splits (#1266)Caladius
* Adds support for Timesplits * clanged * Fix Popout Crash * wip file saving; fixes Bow and Red Potion splits * Add Active Row Highlighting * Fix D-Pad Bottle Collection * Cleanup and Add Boss Splits. * Add names to Boss Icons * clang v2 * Linker fix * Move time formatting to ShipUtils (this also cleaned up DisplayOverlay). * clang v3 * Adds Saving/Loading splits from file. * Update inventory range to exclude heart piece. * Update column name to not be abbreviated * Adds Magic Meters and Double Defense * clang cuz ya boi alwayz fogetz * Fix Fairy Splits with CS Skip Enabled * Move songColorMap to ShipUtils along with the function to get the color. Fixed Song Icon sizing. * Adds default Window size and allows resizing. * Allow scrolling of splits list * Adds Entrance Splits and cleans up the UI. Adds new splitType to the object so I added a small solution to handle older files that may not have it for testing. * UI Update and Entrance Filters. * Adds split list to the options window to fill out the space. * Fix ID mismatching. * Add Split Comparing Functionality * clang * Compare Split text display corrections * Adds auto scrolling to follow Active Splt if list is bigger than the window. Also locks the Header Row when visible to always be visible at the top instead of scrolling with the list. * Adds Tooltips for options * Fix time coloring for splits with no previous data. * Fix crash and ID mismatch * Feedback Updates * Extern is needed since my definition is in the cpp file it seems.
2025-10-15Fix softlock when talking to Toto as FD (#1277)Eblo
2025-10-15Mask disable adjustments (#1268)Eblo
2025-09-17clang formatEblo
2025-09-17Re-include z64malloc.h in z_parameter.cEblo
2025-09-17Include functions.h in z_fcurve_data_skelanime.cEblo
2025-09-16Port cleanup passEblo
2025-09-16Fix ActorProfile initializersEblo
2025-09-16Replace erroneous CsCmdStartSeq with CsCmdStopSeq (#1812)Eblo
2025-09-16Document Player's Face and z_actor FaceChange functions (#1777)engineer124
* player face docs * more docs * cleanup * toto * more comments * fix bss, names * better comment * PR, fix comment * fix bss * sEyeTextures comment * FaceChange_UpdateBlinkingNonHuman --------- Co-authored-by: Anghelo Carvajal <angheloalf95@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2025-09-16Misc Fixes (#1809)Derek Hensley
* EnAn MsgScriptCallback * Version check * Write .extracted-assets.json to outputDir * Fix m2ctx * Fix boot_functions.csv
2025-09-16Document inconsistent empty C-button disabling bug (#1810)tomtee
* Document inconsistent empty C-button disabling bug * Fixed formatting
2025-09-16Fix OOB in bom bowl man (#1808)louist103
* Fix OOB access * Remove rej * Remove comment * Forgot headers don't auto build * Use 4 elements * rename CSID3
2025-09-16Apply MATRIX_FINALIZE_AND_LOAD to port filesEblo
2025-09-16func_80183070 to Sys_Freeze (#1686)Ozero4
2025-09-16Document credits dog OOB access (#1796)Derek Hensley
* Document credits dog OOB access * PR review * Add speculation why dog is drawn upside down * typo
2025-09-16EffectSs Sync (#1799)Derek Hensley
* gEffectSsOverlayTable * Sync with OoT docs
2025-09-16`En_Kaizoku` and `object_kz` documented: the pirate fighter miniboss (#1788)Isghj
* Kaizoku: some docs * Kaizoku: more docs * Kaizoku: more docs * Kaizoku: all object labeled * Kaizoku: more docs * More docs * Kaizoku: more docs * Kaizoku: more docs * Kaizoku: more docs * Kaizoku: first pass complete * format * Kaizoku: minor tweaks * Kaizoku: Anghelos requested changes pass1 * Kaizoku: minor docs * Kaizoku: get'n't * Kaizoku: format * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Kaizoku: back to OK * Kaizoku: more requested changes * Kaizoku: outfit and lipstick color enums * Kaizoku: rename object assets from gKaizoku to gFighterPirate * Kaizoku: LIMB_FULL * Kaizoku: some requested changes * Kaizoku: more requested changes * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Kaizoku: back to matching * Kaizoku: requested changes * Kaizoku: missed change * Apply suggestions from code review Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com> * Kaizoku: back to matching and more requested changes --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: Tom Overton <tom-overton@users.noreply.github.com>
2025-09-16Small Misc fix cleanups (#1797)Derek Hensley
* MapDisp_AllocDungeonMap * func_80B833C4 * func_80ABD92C * EnFirefly comment offsets
2025-09-16`EnIshi` documentation pass, and `gameplay_field_keep` assets labeled (#1794)Isghj
* Ishi: some docs * Ishi: more docs * Ishi: more docs * Ishi: field_keep assets labeled * Ishi: format * Ishi: minor docs/fixes * Ishi: requested changes * Spawn and Dust Funcs * Ishi: only us version * Ishi/Bombiwa: more requested changes * Ishi: format * Apply suggestions from code review Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> * Ishi: back to matching * Ishi: a value got inverted somehow --------- Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2025-09-16Misc FAKE fixes (#1783)Derek Hensley
* CutsceneCamera_UpdateSplines fake match * CutsceneCamera_Init -1 splineIndex * Eye Point comment * func_80B781DC better fake * func_80B32F04 * ObjSwitch_Update * ObjSwitch_InitTrisCollider * ObjAqua_Init * EnTrt_ItemGiven * func_80C10E98 partly * EnTest7_WarpCsWarp this to 1 * EnTest6_InvertedSoTCutscene better fake * EnTest6_DrawAmmoDropRupee * EnPoSisters_MatchPlayerY * func_8095B76C * EnMinifrog_Init * func_80A5C0B8 * EnKnight_UpdateEffects * EnKnight_FlyingHeadAttack * EnKakasi_Init * EnInvadepoh_ModelInfo_GetNextFaceAnim * BgAstrBombwall_InitCollider like func_809CE068 * Player_UpdateInterface * Player_CsAction_TranslateReverse * DynaPoly_AddBgActorToLookup better fake * CutsceneManager_FindEntranceCsId * func_800AE930 better fake * Math3D_CylVsLineSeg better fake * MapDisp_InitBossRoomStorey * Play_Init * EnTimeTag_Diary_Wait better fake * Remove fake label from Player_SwordFromIA * Player_PostLimbDrawGameplay partly * EffectBlure_AddVertex prev temp * Player_PostLimbDrawGameplay attempt 2 * AudioMgr_StopAllSfxExceptSystem * Camera_Normal0 * Camera_Jump2 * Camera_Normal3 * PR review
2025-09-16GCC Testing Vanilla bugs (#1789)Derek Hensley
* doc desbreko draw damage effect bug * doc like like sfx bug * doc shellblade incorrect sfx id * document powder keg text incorrect sfx * Doc more sfx bugs with shellblade
2025-09-16Torch: arrow lit type enum (#1792)Isghj
2025-09-16Move D_80097508 out of system_heap.c (#1779)Derek Hensley
2025-09-16Misc Fixes (#1778)Derek Hensley
* kaleido_map double parens * ObjUm PostLimbDraw fake match * z_parameter double parens * voice_internal func_801A541C return type * audio load missing return comments * EnTest7_DrawFeathers * EnTest7_UpdateFeathers * format
2025-09-16Standardize "ActorMovement" over "ActorMove" (#1773)engineer124
* actor movement * cleanup * missed one
2025-09-16Fix return type of EnDeath_UpdateCoreVelocityAndRotation (#1769)Tharo
2025-09-16Document Update Actor Flags (#1762)engineer124
* name flags, TODO: comments * comments * improve comments * small cleanup * cleanup comment
2025-09-16Add original asset names to all `object_y*` and `object_z*` files (#1765)Tom Overton
2025-09-16Document Culling (#1759)engineer124
* culling docs * cleanup * PR suggestions
2025-09-16Remove THIS macro (#1756)Tom Overton
* Remove THIS macro * Revert changes to the documentation * Undo revert to STYLE.md
2025-09-16Boss07 (Majora) OK and documented [mm-n64-us.z64 OK] (#1753)Tom Overton
* more matches * more functions * merge, I hope * wrath done-ish * 5 nonmatchings * more matchings * more improvements * more stuff * stuff * docs part 1 / infinity * more docs * . * more adjustments * linked assets * Document object_boss07 and match Boss07_Incarnation_Intro (thanks Synray!) * more stuff * play part 2 * lol merge * update * unk types * SWEET GOOGLY MOOGLY IT MATCHES * cam fixes * adjust damage stuff * if? * stuff * signs * macro stuff. clean up later * names * Some small cleanup * cleanup and docs * more cleanup * Wrath shadow docs * Use `EVENTINF_INTRO_CS_WATCHED_MAJORA` after merging * Update functions.txt * Types cleanup * Some low hanging fruit * Undefined_syms.txt * More static -> battle handler * Lots of naming cleanup * Remove z_boss_07_dmgtbl.inc The reasoning behind removing this file is simple; it wasn't all that long, so extracting it out to an included file didn't really add much, and it made refactoring and/or things much harder, since you needed to check in multiple places to change things. * Get most of the limb stuff named (and actually update the spec) * Some minor cleanup * Updating the repo with what we talked about in discord * Some syncing with Odolwa and other misc name stuff * Some Odolwa/Bio Baba sync * Another bit of Odolwa/Bio Baba sync * Name a lot of incarnation limb variables * Finalize the incarnation intro variable stuff * Fix a goof * `incarnationWrathTransition` variables * `generalCollider` and always use "tentacle" * Completely remove "shot," always use "projectile" * Clean up `Boss07_Mask_Draw` * Name `maskShakeTimer` * Give better names to a few more things * Some beam-related struct vars * undefined_syms * More beam names * More beam stuff * Beam, pt 100000 * Some intro struct members * Some timers * More non-beam stuff, back to beam * Done with beam finally * All but one of the subcam variables, some other stuff * Some variable names and cleanup * More cleanup * jumpSfxTimer -> landSfxTimer * actionState -> subAction and a little bit of syncing with Odolwa * A couple more variables sync * Buncha variables * Lots of non-whip variables * Commit what I have before starting on some of the grab stuff * All but one struct var done * Lots of header cleanup * Finish the header file * Fix build after merging main * Damage effect enums * Update damage effect enums for Incarnation and Wrath * Update damage effect enums for Mask and Remains * First pass at top damage effects * Do a few sub action enums so I have something to show * Fix the damage effect enums, clean up a lot of subaction enums * All remaining sub action enums, cleanup damage effect enums, other misc cleanup * Finish enums * Finish data * Push up what I have * Consistency * scroll -> texScroll * low hanging fruit * PR + small fix * Happy with >20% of functions * Happy with >40% of functions * Happy with >60% of functions * Happy with >75% of functions * Happy with >90% of functions * Happy with >95% of functions * Happy with `Boss07_Wrath_DeathCutscene` * Happy with `Boss07_Mask_FireBeam` * Happy with `Boss07_Wrath_CheckWhipCollisions` * Happy with everything but `Boss07_Mask_Draw` * Happy with all functions I think? * Clean up forward declarations * Write a half-decent file header * Fix after merging * Fix some minor stuff here and there * Minor fix in the file header because I forgot I renamed this * Respond to engineer's review * Respond to Anghelo's review * Replace as many actor lookups with for-loops as I can in Odolwa/Majora * Change the comment about the hookshot from a `@note` to a `@bug` * `drag` -> `deceleration` * Extra scopes for the matrix stuff in `Boss07_Mask_DrawBeam` * Use decimal numbers in the various `FillShadowTex` functions --------- Co-authored-by: petrie911 <pmontag@DESKTOP-LG8A167.localdomain> Co-authored-by: petrie911 <pmontag@Monday.localdomain> Co-authored-by: petrie911 <69443847+petrie911@users.noreply.github.com> Co-authored-by: petrie911 <pmontag@PHYS-S129.iowa.uiowa.edu> Co-authored-by: petrie911 <petrie911@users.noreply.github.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com> Co-authored-by: engineer124 <engineer124engineer124@gmail.com>
2025-09-16Document Light-Based Actor Flags (#1754)engineer124
* light flags template * first attempt * typo * improve names * improve comments
2025-09-16Player Docs: Slide on Slope (#1752)engineer124
* slide on slope * cleanup
2025-09-16Apply cleanup to z_boss_07Eblo
2025-09-16Small Misc Clean (#1751)Derek Hensley
* Fix z64item comment * titleCtxt -> titleCtx * combine gfx buffers bss into 1 file
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 10:14:31 +0000