2ship2harkinian/mm/src/audio/code_8019AF00.c, branch develop

[Enhancement] Custom Ocarina Controls (#1598)

2026-03-20T01:41:57+00:00

* custom ocarina controls implemented

* clang format

* added blocking for vanilla inputs I forgot

Basic surround sound support. (#1516)

2026-03-10T21:37:50+00:00

* 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>

tlc (#1446)

2026-01-14T22:06:00+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>

Bump LUS and OTRExporter, add null audio backend (#1289)

2025-10-29T16:56:57+00:00

* 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

[Enhancement] Right Stick Ocarina (#1293)

2025-10-26T15:34:22+00:00

* right stick ocarina playback option

* fix: formatting

* long live GameInteractor_RightStickOcarina

---------

Co-authored-by: Felix Dietrich

Misc Cleanup 2 (#1521)

2025-09-14T02:32:44+00:00

* begin cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* fake matches

* more cleanup

* more cleanup

* small thing

* PR Review

* PR Review

Audio Voice Decompiled (#1490)

2025-09-11T20:53:29+00:00

* 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 
Co-authored-by: Derek Hensley

Fix BGM replay bug caused by enhancements that bypass normal scene transitions (#1169)

2025-06-28T20:15:43+00:00

* 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

Cleanup includes (#1072)

2025-04-06T21:17:50+00:00

* Cleanup

* Format

* Fixes

* Update macports-deps.txt

* Fix mac

* Update macports-deps.txt

Co-authored-by: Archez 

* Move includes around

---------

Co-authored-by: Archez