summaryrefslogtreecommitdiff
path: root/soh/src/code/audio_seqplayer.c
diff options
context:
space:
mode:
authorbriaguya <70942617+briaguya-ai@users.noreply.github.com>2023-02-16 09:49:45 -0500
committerGitHub <noreply@github.com>2023-02-16 09:49:45 -0500
commit1e6ec1bddadfb75ad0d57a44255bf62ff729a784 (patch)
treeb78c7092d6a3a667a2590ac78c6ad9b0406bbd0a /soh/src/code/audio_seqplayer.c
parent27f961ac4f50e8ae384f7953e8ccf0f35e7c29c4 (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/audio_seqplayer.c')
-rw-r--r--soh/src/code/audio_seqplayer.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/soh/src/code/audio_seqplayer.c b/soh/src/code/audio_seqplayer.c
index 4c38524c6..0b5192b0b 100644
--- a/soh/src/code/audio_seqplayer.c
+++ b/soh/src/code/audio_seqplayer.c
@@ -1067,7 +1067,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
seqPlayer->seqId = gAudioContext.seqToPlay[seqPlayer->playerIdx];
gAudioContext.seqReplaced[seqPlayer->playerIdx] = 0;
}
- u16 seqId = SfxEditor_GetReplacementSeq(seqPlayer->seqId);
+ u16 seqId = AudioEditor_GetReplacementSeq(seqPlayer->seqId);
SequenceData sDat = ResourceMgr_LoadSeqByName(sequenceMap[seqId]);
command = sDat.fonts[sDat.numFonts - result - 1];
}
@@ -1184,7 +1184,7 @@ void AudioSeq_SequenceChannelProcessScript(SequenceChannel* channel) {
seqPlayer->seqId = gAudioContext.seqToPlay[seqPlayer->playerIdx];
gAudioContext.seqReplaced[seqPlayer->playerIdx] = 0;
}
- u16 seqId = SfxEditor_GetReplacementSeq(seqPlayer->seqId);
+ u16 seqId = AudioEditor_GetReplacementSeq(seqPlayer->seqId);
SequenceData sDat = ResourceMgr_LoadSeqByName(sequenceMap[seqId]);
// The game apparantely would sometimes do negative array lookups, the result of which would get rejected by AudioHeap_SearchCaches, never