summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEblo <7004497+Eblo@users.noreply.github.com>2026-05-19 16:52:47 -0400
committerGitHub <noreply@github.com>2026-05-19 16:52:47 -0400
commit754be5c5db4fcc429b7ff6df805436e9890dd877 (patch)
treebe1e3a2c7633b7dbbc3f66cdf35bc2d56a4d0de3
parent892aa02461b04cdf5f46fac11756eb5e33e445db (diff)
Disable SFX replacement (#1679)
* Disable SFX replacement * Comment out dead code instead
-rw-r--r--mm/src/audio/sfx.c12
1 files changed, 7 insertions, 5 deletions
diff --git a/mm/src/audio/sfx.c b/mm/src/audio/sfx.c
index adca7fde2..aec1abae3 100644
--- a/mm/src/audio/sfx.c
+++ b/mm/src/audio/sfx.c
@@ -223,11 +223,13 @@ void AudioSfx_ProcessRequest(void) {
if (req->sfxId == 0) {
return;
}
- u16 newSfxId = AudioEditor_GetReplacementSeq(req->sfxId);
- if (req->sfxId != newSfxId) {
- gAudioCtx.seqReplaced[SEQ_PLAYER_SFX] = 1;
- req->sfxId = newSfxId;
- }
+ // All custom sequences use the same collection, which can result in collisions when different types (e.g. SFX and
+ // BGM) share the same IDs. As we do not yet shuffle SFX, simply do not get the replacement sequence for now.
+ // u16 newSfxId = AudioEditor_GetReplacementSeq(req->sfxId);
+ // if (req->sfxId != newSfxId) {
+ // gAudioCtx.seqReplaced[SEQ_PLAYER_SFX] = 1;
+ // req->sfxId = newSfxId;
+ // }
// #end region
bankId = SFX_BANK(req->sfxId);
channelCount = 0;