<feed xmlns='http://www.w3.org/2005/Atom'>
<title>2ship2harkinian/mm/src/audio/code_8019AF00.c, branch develop-mion</title>
<subtitle>2Ship2Harkinian: Majora’s Mask PC port</subtitle>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/'/>
<entry>
<title>Bump LUS and OTRExporter, add null audio backend (#1289)</title>
<updated>2025-10-29T16:56:57+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-10-29T16:56:57+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=83921dc012588c520efe0ed8c7ac1406806543c7'/>
<id>83921dc012588c520efe0ed8c7ac1406806543c7</id>
<content type='text'>
* 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</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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</pre>
</div>
</content>
</entry>
<entry>
<title>[Enhancement] Right Stick Ocarina (#1293)</title>
<updated>2025-10-26T15:34:22+00:00</updated>
<author>
<name>mckinlee</name>
<email>mckinlee@ymail.com</email>
</author>
<published>2025-10-26T15:34:22+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=e180e4666c06dc0d75d9d4bd247815184b9317cc'/>
<id>e180e4666c06dc0d75d9d4bd247815184b9317cc</id>
<content type='text'>
* right stick ocarina playback option

* fix: formatting

* long live GameInteractor_RightStickOcarina

---------

Co-authored-by: Felix Dietrich &lt;felixdietrich@gmail.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* right stick ocarina playback option

* fix: formatting

* long live GameInteractor_RightStickOcarina

---------

Co-authored-by: Felix Dietrich &lt;felixdietrich@gmail.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Misc Cleanup 2 (#1521)</title>
<updated>2025-09-14T02:32:44+00:00</updated>
<author>
<name>engineer124</name>
<email>47598039+engineer124@users.noreply.github.com</email>
</author>
<published>2024-03-23T11:04:07+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=54756970edad81bb6e1972a7cbb7c0ff231d15af'/>
<id>54756970edad81bb6e1972a7cbb7c0ff231d15af</id>
<content type='text'>
* begin cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* fake matches

* more cleanup

* more cleanup

* small thing

* PR Review

* PR Review
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* begin cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* more cleanup

* fake matches

* more cleanup

* more cleanup

* small thing

* PR Review

* PR Review
</pre>
</div>
</content>
</entry>
<entry>
<title>Audio Voice Decompiled (#1490)</title>
<updated>2025-09-11T20:53:29+00:00</updated>
<author>
<name>engineer124</name>
<email>47598039+engineer124@users.noreply.github.com</email>
</author>
<published>2023-11-17T01:29:42+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=c964de4a10dbd39971e6ba6b1ab8b45ac4aab551'/>
<id>c964de4a10dbd39971e6ba6b1ab8b45ac4aab551</id>
<content type='text'>
* 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 -&gt; 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 &amp; 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 -&gt; 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 -&gt; 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 &lt;elliptic.ellipsis@gmail.com&gt;
Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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 -&gt; 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 &amp; 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 -&gt; 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 -&gt; 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 &lt;elliptic.ellipsis@gmail.com&gt;
Co-authored-by: Derek Hensley &lt;hensley.derek58@gmail.com&gt;
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix BGM replay bug caused by enhancements that bypass normal scene transitions (#1169)</title>
<updated>2025-06-28T20:15:43+00:00</updated>
<author>
<name>Eblo</name>
<email>7004497+Eblo@users.noreply.github.com</email>
</author>
<published>2025-06-28T20:15:43+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=5994836a12485eb9ec792e7802dd5ea9a18fa9b9'/>
<id>5994836a12485eb9ec792e7802dd5ea9a18fa9b9</id>
<content type='text'>
* 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</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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</pre>
</div>
</content>
</entry>
<entry>
<title>Cleanup includes (#1072)</title>
<updated>2025-04-06T21:17:50+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-04-06T21:17:50+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=3d0feab897b065106f5d38ffbc55f075f990e784'/>
<id>3d0feab897b065106f5d38ffbc55f075f990e784</id>
<content type='text'>
* Cleanup

* Format

* Fixes

* Update macports-deps.txt

* Fix mac

* Update macports-deps.txt

Co-authored-by: Archez &lt;Archez@users.noreply.github.com&gt;

* Move includes around

---------

Co-authored-by: Archez &lt;Archez@users.noreply.github.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* Cleanup

* Format

* Fixes

* Update macports-deps.txt

* Fix mac

* Update macports-deps.txt

Co-authored-by: Archez &lt;Archez@users.noreply.github.com&gt;

* Move includes around

---------

Co-authored-by: Archez &lt;Archez@users.noreply.github.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Custom Audio Support (#778)</title>
<updated>2025-03-03T04:30:05+00:00</updated>
<author>
<name>louist103</name>
<email>35883445+louist103@users.noreply.github.com</email>
</author>
<published>2025-03-03T04:30:05+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=2d0942a1b187938f55d34c71e0965e37a70b1094'/>
<id>2d0942a1b187938f55d34c71e0965e37a70b1094</id>
<content type='text'>
* 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-&gt;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 &lt;mckinlee@ymail.com&gt;

* 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 &lt;mckinlee@ymail.com&gt;

* 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 &lt;mckinlee@ymail.com&gt;
Co-authored-by: Archez &lt;archez39@me.com&gt;</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
* 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-&gt;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 &lt;mckinlee@ymail.com&gt;

* 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 &lt;mckinlee@ymail.com&gt;

* 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 &lt;mckinlee@ymail.com&gt;
Co-authored-by: Archez &lt;archez39@me.com&gt;</pre>
</div>
</content>
</entry>
<entry>
<title>Move GameInteractor &amp; NameTag src up to root of 2s2h (#799)</title>
<updated>2024-10-05T15:33:10+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2024-10-05T15:33:10+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=a93f011253177647cf227669d51df201282c90f6'/>
<id>a93f011253177647cf227669d51df201282c90f6</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Change GI_VB_ to VB_ (#798)</title>
<updated>2024-10-05T15:02:53+00:00</updated>
<author>
<name>Garrett Cox</name>
<email>garrettjcox@gmail.com</email>
</author>
<published>2024-10-05T15:02:53+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=da04b7f859a3b8bbed11e9aed367053d023eb236'/>
<id>da04b7f859a3b8bbed11e9aed367053d023eb236</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
<entry>
<title>Fix Dpad Ocarina L Btn &amp; GI Dpad Stuff (#578)</title>
<updated>2024-06-01T00:21:57+00:00</updated>
<author>
<name>inspectredc</name>
<email>78732756+inspectredc@users.noreply.github.com</email>
</author>
<published>2024-06-01T00:21:57+00:00</published>
<link rel='alternate' type='text/html' href='https://git.dog6.net/2ship2harkinian/commit/?id=a3add6092b95248464e5a29b9cacd3a2719d57c0'/>
<id>a3add6092b95248464e5a29b9cacd3a2719d57c0</id>
<content type='text'>
</content>
<content type='xhtml'>
<div xmlns='http://www.w3.org/1999/xhtml'>
<pre>
</pre>
</div>
</content>
</entry>
</feed>
