diff options
| author | briaguya <70942617+briaguya-ai@users.noreply.github.com> | 2023-02-16 09:49:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-16 09:49:45 -0500 |
| commit | 1e6ec1bddadfb75ad0d57a44255bf62ff729a784 (patch) | |
| tree | b78c7092d6a3a667a2590ac78c6ad9b0406bbd0a /soh/src/code/code_800EC960.c | |
| parent | 27f961ac4f50e8ae384f7953e8ccf0f35e7c29c4 (diff) | |
exclude audio from shuffle (#2411)
* Rename "SFX Editor" to "Audio Editor"
* Move some functionality out into a new class `AudioCollection`
* Add a tab to exclude sfx/sequences from shuffle pool
---------
Co-authored-by: briaguya <briaguya@alice>
Co-authored-by: briaguya <briaguya>
Co-authored-by: David Chavez <david@dcvz.io>
Diffstat (limited to 'soh/src/code/code_800EC960.c')
| -rw-r--r-- | soh/src/code/code_800EC960.c | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/soh/src/code/code_800EC960.c b/soh/src/code/code_800EC960.c index ed5bd6fee..2838cbdc5 100644 --- a/soh/src/code/code_800EC960.c +++ b/soh/src/code/code_800EC960.c @@ -1700,7 +1700,7 @@ void Audio_OcaSetInstrument(u8 arg0) { } u16 sfxEditorId = arg0 + 0x81; - u16 newArg0 = SfxEditor_GetReplacementSeq(sfxEditorId); + u16 newArg0 = AudioEditor_GetReplacementSeq(sfxEditorId); if (newArg0 != sfxEditorId) { gAudioContext.seqReplaced[SEQ_PLAYER_SFX] = 1; arg0 = newArg0 - 0x81; @@ -4601,6 +4601,22 @@ void func_800F5ACC(u16 seqId) { } } +// based on func_800F5ACC +void PreviewSequence(u16 seqId) { + u16 curSeqId = func_800FA0B4(SEQ_PLAYER_BGM_MAIN); + + if ((curSeqId & 0xFF) != NA_BGM_GANON_TOWER && (curSeqId & 0xFF) != NA_BGM_ESCAPE && curSeqId != seqId) { + Audio_SetSequenceMode(SEQ_MODE_IGNORE); + if (curSeqId != NA_BGM_DISABLED) { + sPrevMainBgmSeqId = curSeqId; + } else { + osSyncPrintf("Middle Boss BGM Start not stack \n"); + } + + Audio_QueuePreviewSeqCmd(seqId); + } +} + /** * Restores the previous sequence to the main bgm player before func_800F5ACC was called */ |