summaryrefslogtreecommitdiff
path: root/mm/src/audio
AgeCommit message (Collapse)Author
2026-07-07Merge pull request #1779 from HarbourMasters/develop-keiichiGarrett Cox
keiichi -> develop
2026-06-25wiiu: Fix audioGaryOderNichts
2026-05-19Merge pull request #1702 from HarbourMasters/develop-keiichiEblo
develop-keiichi->develop
2026-05-19Disable SFX replacement (#1679)Eblo
* Disable SFX replacement * Comment out dead code instead
2026-03-19[Enhancement] Custom Ocarina Controls (#1598)OtherBlue
* custom ocarina controls implemented * clang format * added blocking for vanilla inputs I forgot
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-01-14tlc (#1446)mckinlee
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>
2025-12-30Merge remote-tracking branch 'upstream/develop-mion' into ↵Eblo
merge-develop-mion-into-develop
2025-12-18Fix OOB in AudioSeq_ResetReverb (#1397)Eblo
2025-11-20[Audio Editor] Port Audio Options from SoH Audio Editor (#1325)Glought
* Ported Audio Options from SoH Audio Editor *Moved "Mute Low HP Alarm" to Audio Editor -> Audio Options Changed Cvar From: "gEnhancements.Sfx.LowHpAlarm" To: "gAudioEditor.LowHpAlarm" *Moved "Mute Carpenter Sounds" to Audio Editor -> Audio Options Changed Cvar From: "gEnhancements.Sfx.MuteCarpenterSfx" To: "gAudioEditor.MuteCarpenterSfx" *Moved "Mute Crying Goron Child" to Audio Editor -> Audio Options Changed Cvar From: "gEnhancements.Sfx.ChildGoronCry" To: "gAudioEditor.ChildGoronCry" *Added "Disable Tatle Call Audio" *Added "Disable Enemy Proximity Music" *Added "Randomize All Music and Sound Effects on New Scene" *Added "Randomize All Music and Sound Effects on Randomizer Generation" *Added "Display Sequence Name on Overlay" and "Overlay Duration" Slider *Added "Link's Voice Pitch Multiplier" Slider * *Ported "AddSearchWidget" Functionally Enabled for Audio Editor -> Audio Options * Cleaned up some code I missed and ran clang format. * Renamed "OnScene" Hook to "OnSceneChange" * Made it so "Link's Voice Pitch Multiplier" slider only effects Link's voice. * Forgot the "AudioHook.cpp" file its needed for the "Display Sequence Name on Overlay" option. * Moved the "Sfx" folder to the "Audio" folder. * Removed extra line breaks between sections in "RegisterAudioWidgets()". * Renamed "OnGenerationCompletion" hook to "OnRandoSeedGeneration" * Changed "gAudioEditor.*" to use "CVAR_AUDIO("*") in "AudioEditor.cpp" * Added "AddAudioSearchWidget" function Changed all "BenGui::mBenMenu->AddSearchWidget lines to use "AddAudioSearchWidget". * Changed the "OnSeqPlayerInit" hook parameters type to use the "s32" Macro. * Update BenMenu/BenGui include paths: Replaced "../../" with "2s2h/". * Ran Clang Format. * Added "DisableEnemyProximityMusic.cpp" Added "VB_PLAY_ENEMY_PROXIMITY_MUSIC" enum to "GIVanillaBehavior" in "GameInteractor.h" "Audio_UpdateEnemyBgmVolume" is now wrapped in a "GameInteractor_Should" * Added "DisableTatlCallAudio.cpp" Added "VB_PLAY_TATL_CALL_AUDIO" enum to "GIVanillaBehavior" in "GameInteractor.h" "Audio_PlaySfx(NA_SE_VO_NAVY_CALL)" is now wrapped in a "GameInteractor_Should" * Added "LinksVoicePitchMultiplier.cpp" Added "Enable Link's Voice Pitch Multiplier" checkbox to Audio Editor The "Link's Voice Pitch Multiplier" slider is now disabled when "Enable Link's Voice Pitch Multiplier" is not enabled. Added "VB_LINK_VOICE_PITCH_MULTIPLIER" enum to "GIVanillaBehavior" in "GameInteractor.h" "AudioSfx_PlaySfx" in the file "z_actor.c" in function "Player_PlaySfx" is now wrapped in a "GameInteractor_Should". * Removed "OnSceneChange" Hook. Removed "GameInteractor_ExecuteOnSceneChange". Removed "GameInteractor_ExecuteOnSceneChange(play->sceneId);" from "z_play_2SH.cpp:OTRPlay_SpawnScene" function Renamed "AudioEditorRegisterOnSceneChangeHook" to AudioEditorRegisterOnRoomInitHook". * Made Changes requested by Eblo to "LinksVoicePitchMultiplier.cpp" and "z_actor.c" * WIP Randomize On New Scene
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-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-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-16Animation Cleanup: En_Z* (#1727)engineer124
* cleanup * more progress * finish off z * one more thing * one more animIndex * fix spacing
2025-09-15Cleaner AudioScript_SequenceChannelProcessScript Match (#1662)inspectredc
* Cleaner AudioScript_SequenceChannelProcessScript * cadmic suggestion
2025-09-14Animation Cleanup: En_T* (#1522)engineer124
* anim T cleanup * more cleanup * brackets and floats * small thing * more floats * fix name * fix * format --------- Co-authored-by: angie <angheloalf95@gmail.com>
2025-09-13Misc Cleanup 2 (#1521)engineer124
* begin cleanup * more cleanup * more cleanup * more cleanup * more cleanup * more cleanup * fake matches * more cleanup * more cleanup * small thing * PR Review * PR Review
2025-09-12Misc Cleanup (#1509)engineer124
* begin anim R * sTexturesDesegmented * more misc docs * more misc cleanup * small adjustments * oh sneaky * PR Review * adj comment, reads better * missed an enum * this one actor reverses true/false * bool * CARNIVOROUS_LILY
2025-09-12`z_en_test7.c` Documentation Pass (#1497)engineer124
* copy over docs * more docs * some docs * more docs * small cleanup * more small cleanup * more small cleanup * lerp time * small reordering * feather type * general owl warp docs * more cleanup * rm redundant info * PR Review * PR Review
2025-09-11Audio Voice Decompiled (#1490)engineer124
* Add Tharo's documentation comments * Voice progress * Match osVoiceControlGain * Match osVoiceStartReadData * Cleanup * Add docs from n64devkit * WIP on osVoiceGetReadData * Add comment * Match voiceinit.c * Remove CONT_ERR, already present in controller.h * Really close to matching osVoiceStopReadData * Progress on voicecheckword * Match osVoiceSetWord * Add error codes * Matched __osVoiceContRead2... Somehow... * Add small amount of docs * __osVoiceContRead36 was basically identical from __osVoiceContRead2 * docs, but maybe a little carried away * Match __osVoiceContWrite4, Write is very similar to Read * Match __osVoiceContWrite20 from __osVoiceContWrite4, ez * Some docs * Improve osVoiceGetReadData * Match osVoiceCheckWord * currentSyllable -> currSyllable * Match osVoiceMaskDictionary * Match __osVoiceSetADConverter * Meme matched osVoiceStopReadData * small cleanup * Missed macros * osVoiceGetReadData Meme Match * Small clean-up * format * Properly split voice files from code * Use proper flags for voice files * Add basic docs for func_801A5AF0 * Import Voice Data * Update matching functions in code_801A51F0 from audio WIP * Update matching functions in code_801A4EB0 from audio WIP * Match func_801A5A1C * Match func_801A5228 * Match func_801A54D0 * Doc padmgr functions used * Match func_801A5680, it's near identical to func_801A54D0 * code_801A51F0 OK * Match func_801A4EB8 * Match func_801A4FD8 (mips2c got it matching directly) * code_801A4EB0 & all of voice, OK * Import bss * Better match for func_801A5A1C * format * Cleanup * Clean up dictionary * Introduce OSVoiceDictionary * More voice docs * Fix bss * Import code_801A4EB0 data * Introduce Word Id enum * Dictionary: u8 -> u16 * Introduce bgms * Fill in bgm enums * Rename bgm to clearer names * Fix spacing * Fix "No_Music" define * remove comment * import rodata * Improve bgm names, found another seqId function * Another seqId function * Another name change * Woods of Mystery -> Sarias Song * Fix match in osVoiceControlGain * Fix bss reordering * Fix bss file split * add saria's song bgm to pierre * Another bgm function found! * Add bgm's to `gSaveContext.seqIndex` * Fix BSS * fix bss * Fix bss * cleanup * more cleanup * cow voice weekeventflag * small cleanup * some docs * cleanup var * global * more docs * PR Review --------- Co-authored-by: Elliptic Ellipsis <elliptic.ellipsis@gmail.com> Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
2025-09-10Revert "Fix cracking/buzzing with streamed audio (#1153)" (#1233)Eblo
This reverts commit 120c657607dc3c7b5d8e063d457744733bb5b668.
2025-09-10Revert "Merge develop-rena -> develop (#1258)" (#1269)Eblo
This reverts commit 47771de011abced823d9b699fffc8832fedff1b7.
2025-09-03Merge develop-rena -> develop (#1258)Eblo
* add health check preventing hop counter reset on death (#1214) * Fix rando refills for Chateau Romani (#1216) * Allow access to smithy checks without a sword (#1208) * Fix float slider labels (#1210) * Do not allow gameover audio to be changed (#1225) * Fix slider labels where position is None (#1227) * Fix BSoDT bugs with audio and early day change (#1228) * Properly configure INCLUDE_MPQ_SUPPORT (#1243) * Check previousBankValue in custom bank thresholds (#1232) * Restore vertices after geometry seams patch (#1237) * Fix softlock with Magic Hag's Blue Potion (#1252) * Revert "Fix cracking/buzzing with streamed audio (#1153)" (#1233) This reverts commit 120c657607dc3c7b5d8e063d457744733bb5b668. * [Rando] Reset cycle collectible flags on cycle save (#1254) * bump to Rena Bravo (#1257) --------- Co-authored-by: mckinlee <mckinlee@ymail.com> Co-authored-by: balloondude2 <55861555+balloondude2@users.noreply.github.com>
2025-06-28Fix BGM replay bug caused by enhancements that bypass normal scene ↵Eblo
transitions (#1169) * Add enhancement to fix BGM replay bug * Only enable BGM fix when related enhancement is on * Fix ShipInit * Add VB_PLAY_SCENE_SEQUENCE * Remove unused vararg, invert should condition
2025-05-18Fix audio crackling (#1154)lilacLunatic
2025-05-14Fix cracking/buzzing with streamed audio (#1153)lilacLunatic
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-03-22Bump LUS and LUS header cleanup (#1059)louist103
2025-03-11FIx some audio crashes (#1055)louist103
* Fix it? * Fix for custom songs. * Update load.c * Apply suggestions from code review
2025-03-02Custom Audio Support (#778)louist103
* Implement custom sequences and the audio editor. * Fix implicit function declaration `AudioEditor_GetReplacementSeq` * Fix mac again. * String and header cleanup * Oops * WIP ZIP Sound fonts * The game opens and audio seems to play correctly. Needs extensive testing. * Name sequences * Cleanup the SF importer a little. * XML Sequences good * Fix mac * Destructor * Bump submodule * Thread safe queue * Add WAV decoder * sequenceMap->mSequenceMap and a string fix * Streamed sequence importer * Add s16 sample processing. * Fix drwave define * Fix STB * Reorder the loading to enable custom sound fonts * New streamed solution * Bump exporter * Generate 1 minute long looping sequence. * Very long sample support (113 minutes or so) * MP3 Decoding * Don't byteswap the crc from XML. * WIP OGG * add windows cmake stuff (broken) and fixes to OGG * Just throw more cores at the problem * Dynamically allocate fontMap * Re-add OOB read fix from old branch * FLAC decoder, threads for the other compressed formats * Remove thread from class * timings * cleanup conflicts * update submodules * update submodules * update submodules * loop or not to loop * named audio XML * Update submodules * format * format again cause git didnt see it for some reason * move drlib to submodule * Update apt-deps.txt * Fix for new cmake * fix game interactor * Update macports-deps.txt * PR fixes and fix OTRExporter for mac * format * format * ifdef intrin header * Docs * use macro for preview * Small fixes * format * fix 2nd day clock town * Update exporter * Fix duplicate global in stubs.c * restore editor to use cvars again sadge * Format * warn if more than 255 sequences * use main seq player to avoid an overflow * fix the wrong seq playing in the editor again * 16 bit seqIds * fix shop crash * format * cleanups * Delete audio collection * Add entry to modern menu * Cleanup the audio collection * fix clock town randomization * format * format again * some fixes for custom audio (#1) * how I would sort the sequences (#2) clang one more forgot to revert Co-authored-by: mckinlee <mckinlee@ymail.com> * Adjustments to ocarina song types * stereo * format * Loop point support * Part of a PR review * Remove drlib submodule * Clarify change * Format * Add tag * switch to find_package * bump ZAPDTR * Milk bar day/night fix * x86 SIMD for aMixImpl * format * NEON * format * remove | 0x900 causing a crash * Asan fixes * add missing define for MSVC * Clock town fixes Co-authored-by: mckinlee <mckinlee@ymail.com> * format * Fix underscore logic in audio collection * Use torch sample XML format * fix font map size and format * quick fix * Update exporter * Opus * actions packages * fix it again? * Fix a few missed 16 bit masks * Remove unused stubs * Revert "Fix a few missed 16 bit masks" This reverts commit 7143c4ff92d23157a79a10b4ee62e93e35acb23e. * Opus decoding * Fixes for linux and other things * free opus data * format * Update FindOpusFile.cmake * bria's fix? * Update BenMenuBar.cpp * Update BenMenuBar.cpp * Split ocarina tabs * better error handling * Remove unused vectors * move audio editor to enhancements * Fix mac again? * Final cleanups * Format * extern C * Allow custom fanfares to be used in songs * format * WIP sf editor support * Format * Jacks fixes * Bump submodule * Archez's fixes * Format --------- Co-authored-by: mckinlee <mckinlee@ymail.com> Co-authored-by: Archez <archez39@me.com>
2025-01-07Set Sample rate to 32 Khz (#916)Alejandro Asenjo Nitti
* Set Sample rate to 32 Khz * format * review * Update mm/2s2h/BenPort.cpp --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-10-05Move GameInteractor & NameTag src up to root of 2s2h (#799)Garrett Cox
2024-10-05Change GI_VB_ to VB_ (#798)Garrett Cox
2024-10-02Mirror Mode (#535)Garrett Cox
* Mirror mode initial version * Update mm/src/code/z_actor.c Co-authored-by: Archez <Archez@users.noreply.github.com> * mirror mode support for minimaps and dungeon pause map * mirror mode support overworld pause map and song of soaring * mirror mode support for various remaining things * mirror mode support pause warp enhancement * Add searchable menu item --------- Co-authored-by: Archez <Archez@users.noreply.github.com> Co-authored-by: Archez <archez39@me.com>
2024-05-31Fix Dpad Ocarina L Btn & GI Dpad Stuff (#578)inspectredc
2024-05-25[Enhancement] Dpad Ocarina (#324)Patrick12115
* Add dpad ocarina option Co-authored-by: Patrick12115 <115201185+Patrick12115@users.noreply.github.com> * uint8_t --------- Co-authored-by: Garrett Cox <garrettjcox@gmail.com>
2024-05-22run clang format (#448)briaguya
* add linux clang format script * first shot at powershell * whoops * webrequest is slow, try webclient * just get the one file * simplify and maybe make it work? * whoops again * try a different suggestion * why is it always windows * again * try again * bit of path stuff * chmod +x * add action to check * fix workflow name * run clang format
2024-05-22No dropped inputs (#325)Patrick12115
2024-05-22bump latest lus; window changes; header updates (#345)Archez
2024-05-22Remove BenPort.h from functions.h (#309)inspectredc
* Remove BenPort.h from functions.h * use specific z64 includes * this -> thisx
2024-05-22[Enhancement] Enable Suns Song (#262)aMannus
* Enable Suns Song * Move Sun's Song to no longer check for save data at all * Update description * Address review comments --------- Co-authored-by: Archez <Archez@users.noreply.github.com>
2024-05-22Add log level combo box (#286)Garrett Cox
2024-05-22Fix song of soaring crash on linux. (#280)louist103
* Fix audio on linux * Text hack
2024-05-22Add volume slider support (#201)Archez
* Add volume slider support * extern fix?
2024-05-22Audio Works (#180)Kenix3
* initial audio work * Implements caching and fixes a ton of issues with audio * Uses correct memory sizes in mixer.c * Resets mixer values * Actually correct dmem buff values in mixer.c * Remove breakpoints * Fix sequences not playing * The forbidden type. * Forbidden TYPES?! * Thanks Louis * Thanks Louis Part 2 * Fix garbled audio * Fixed ADSR bugs * Fixes ASAN crash in loading samples. This code is causing the game to attempt to read sample data beyond the actual sample data. * Comments out the sample clamping since we aren't affecting the rest of the calculations in the function. * Fixes crashing while loading audio samples. Additionally, lowers the log level for audio commands. * Textbox SFX UB Fix * Decreases priority of more debug messages * Fixed a couple uintptr_t issues * Adds context to Jack's hack of shortcutting later loading sequences. * Audio corruption fix * Few uintptr_t fixes * Fix build on linux * Fix build on mac * call audio exit * fix sfx in dialog * unstub more audio funcs --------- Co-authored-by: Random06457 <28494085+Random06457@users.noreply.github.com> Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> Co-authored-by: louis <35883445+louist103@users.noreply.github.com> Co-authored-by: Adam Bird <archez39@me.com>
2024-05-22Use libc functions for bcmp, bcpy, bzero, LibMemset, LibMemCmp.louist103
2024-05-22Stub AudioOcarina_SetInstrument to fix audio crash temporarily (#35)Garrett Cox
2024-05-22Temporary fix for fanfares crashing until we get audio working (#21)Garrett Cox
* Temporary fix for fanfares crashing until we get audio working * Update mm/src/audio/lib/load.c * Update code_8019AF00.c --------- Co-authored-by: louist103 <35883445+louist103@users.noreply.github.com>
2024-05-22Initial commit for 2S2HGarrett Cox
Co-authored-by: Louis <35883445+louist103@users.noreply.github.com> Co-authored-by: Nicholas Estelami <NEstelami@users.noreply.github.com> Co-authored-by: Random06457 <28494085+Random06457@users.noreply.github.com>
generated by cgit v1.2.3 (git 2.25.1) at 2026-08-03 13:20:59 +0000