Custom Audio Support #778
Custom Audio Support #778
Conversation
…kinian into customAudio2
|
Is this in SoH too? |
Custom audio is in SoH. Streamed audio is not. I plan on back porting this when it is merged. |
clang one more forgot to revert Co-authored-by: mckinlee <[email protected]>
…kinian into customAudio2
| @@ -7,3 +7,6 @@ | |||
| [submodule "ZAPDTR"] | |||
| path = ZAPDTR | |||
| url = https://github.com/louist103/ZAPDTR.git | |||
| [submodule "mm/2s2h/Enhancements/Audio/dr_libs"] | |||
There was a problem hiding this comment.
I think we should just fetch the drlibs via cmake with Fetch_Content, this way it's controlled like our other dependencies.
Here is LUS doing it https://github.com/Kenix3/libultraship/blob/main/cmake/dependencies/common.cmake
| @@ -165,6 +165,7 @@ list(FILTER src__ EXCLUDE REGEX "src/libultra/libc/*") | |||
| list(FILTER src__ EXCLUDE REGEX "src/libultra/os/*") | |||
| list(FILTER src__ EXCLUDE REGEX "src/libultra/rmon/*") | |||
| list(FILTER src__ EXCLUDE REGEX "src/libultra/*") | |||
| list(FILTER ship__ EXCLUDE REGEX "2s2h/Enhancements/Audio/dr_libs/*") | |||
There was a problem hiding this comment.
Remove this once drlib is moved to cmake fetch.
| // 2S2H [Custom Audio] was originally `seqId + 7F00` This value did not work with the bit packing done | ||
| // for 16 bit seqIds. | ||
| temp_a0 = ((((AudioThread_NextRandom() % 30) & 0xFF) + 1) << 0x10) | (seqId + 0x7800); |
There was a problem hiding this comment.
Could you clarify what wasn't working with the original math here? What is the impact of this change?
|
Based on your comments, although we now made the seqId a u16, it seems like we can't use the full range of the data type for new songs. Should be capture somewhere or have a check to limit the amount of sequences that can be added? |
Adds custom audio support.
Needs:
Build Artifacts