From 50baf812ace378f7dfc4fd088605ec65c9b86b33 Mon Sep 17 00:00:00 2001
From: louist103 <35883445+louist103@users.noreply.github.com>
Date: Wed, 4 Aug 2021 11:39:28 -0400
Subject: [PATCH] Mark func_800DC910 as NON_EQUIVALENT (#882)

* fix

* add missing function
---
 include/functions.h        | 2 +-
 src/code/audio_seqplayer.c | 7 +++----
 src/code/audio_synthesis.c | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/include/functions.h b/include/functions.h
index cdce868f27..37e5182b6b 100644
--- a/include/functions.h
+++ b/include/functions.h
@@ -2003,7 +2003,7 @@ s32 Audio_SyncLoadSample(s32 arg0, s32 arg1, u8* arg2);
 s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, u8* arg2);
 void Audio_AsyncLoadReqInit(void);
 void func_800E4D94(void);
-// ? func_800E4EEC(?);
+void func_800E4EEC(s32 arg0, s32 arg1, u8* arg2);
 void func_800E4F58(void);
 void func_800E4FB0(void);
 AudioTask* func_800E4FE0(void);
diff --git a/src/code/audio_seqplayer.c b/src/code/audio_seqplayer.c
index 5998ae702f..5214ac33ef 100644
--- a/src/code/audio_seqplayer.c
+++ b/src/code/audio_seqplayer.c
@@ -374,7 +374,6 @@ s32 func_800E9F64(SequenceChannelLayer* layer, s32 arg1);
 s32 func_800EA0C0(SequenceChannelLayer* layer);
 s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1);
 s32 func_800EAAE0(SequenceChannelLayer* layer, s32 arg1);
-s32 func_800E3414(u8 bankId, s32 value, s8* value2);
 
 void Audio_SeqChannelLayerProcessScript(SequenceChannelLayer* layer) {
     s32 val;
@@ -1411,14 +1410,14 @@ void Audio_SequenceChannelProcessScript(SequenceChannel* channel) {
                 case 0x10:
                     if (lowBits < 8) {
                         channel->soundScriptIO[lowBits] = -1;
-                        if (func_800E3414(channel->bankId, scriptState->value, &channel->soundScriptIO[lowBits]) ==
+                        if (Audio_SyncLoadSample(channel->bankId, scriptState->value, &channel->soundScriptIO[lowBits]) ==
                             -1) {
                             break;
                         }
                     } else {
                         lowBits -= 8;
                         channel->soundScriptIO[lowBits] = -1;
-                        if (func_800E3414(channel->bankId, channel->unk_22 + 0x100, &channel->soundScriptIO[lowBits]) ==
+                        if (Audio_SyncLoadSample(channel->bankId, channel->unk_22 + 0x100, &channel->soundScriptIO[lowBits]) ==
                             -1) {
                             break;
                         }
@@ -1730,7 +1729,7 @@ void Audio_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) {
                     case 0xB0:
                         command = Audio_M64ReadU8(seqScript);
                         temp = Audio_M64ReadS16(seqScript);
-                        func_800E390C(command, &seqPlayer->seqData[temp], &seqPlayer->unk_158[commandLow]);
+                        Audio_SyncLoadSeq(command, &seqPlayer->seqData[temp], &seqPlayer->unk_158[commandLow]);
                         break;
                     case 0x60: {
                         command = Audio_M64ReadU8(seqScript);
diff --git a/src/code/audio_synthesis.c b/src/code/audio_synthesis.c
index a1881492ce..3a183f480b 100644
--- a/src/code/audio_synthesis.c
+++ b/src/code/audio_synthesis.c
@@ -623,7 +623,7 @@ Acmd* func_800DC384(s16* aiBuf, s32 aiBufLen, Acmd* cmd, s32 updateIdx) {
 #pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_800DC384.s")
 #endif
 
-#ifdef NON_MATCHING
+#ifdef NON_EQUIVALENT
 Acmd* func_800DC910(s32 noteIdx, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s16* aiBuf, s32 aiBufLen,
                     Acmd* cmd, s32 updateIdx) {
     AudioBankSample* sp150;