mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-12-27 23:36:22 +00:00
Code Issues Projects Releases Wiki Activity

Mark func_800DC910 as NON_EQUIVALENT (#882)

Browse source 
* fix

* add missing function
This commit is contained in:
louist103 2021-08-04 11:39:28 -04:00 committed by GitHub
parent 8ecd77a8f1
commit 50baf812ac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/functions.h
View file

@ -2003,7 +2003,7 @@ s32 Audio_SyncLoadSample(s32 arg0, s32 arg1, u8* arg2);
s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, u8* arg2); s32 Audio_SyncLoadSeq(s32 seqIdx, u8* ramAddr, u8* arg2);
void Audio_AsyncLoadReqInit(void); void Audio_AsyncLoadReqInit(void);
void func_800E4D94(void); void func_800E4D94(void);
// ? func_800E4EEC(?); void func_800E4EEC(s32 arg0, s32 arg1, u8* arg2);
void func_800E4F58(void); void func_800E4F58(void);
void func_800E4FB0(void); void func_800E4FB0(void);
AudioTask* func_800E4FE0(void); AudioTask* func_800E4FE0(void);

7
src/code/audio_seqplayer.c
View file

@ -374,7 +374,6 @@ s32 func_800E9F64(SequenceChannelLayer* layer, s32 arg1);
s32 func_800EA0C0(SequenceChannelLayer* layer); s32 func_800EA0C0(SequenceChannelLayer* layer);
s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1); s32 func_800EA440(SequenceChannelLayer* layer, s32 arg1);
s32 func_800EAAE0(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) { void Audio_SeqChannelLayerProcessScript(SequenceChannelLayer* layer) {
s32 val; s32 val;
@ -1411,14 +1410,14 @@ void Audio_SequenceChannelProcessScript(SequenceChannel* channel) {
case 0x10: case 0x10:
if (lowBits < 8) { if (lowBits < 8) {
channel->soundScriptIO[lowBits] = -1; 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) { -1) {
break; break;
} }
} else { } else {
lowBits -= 8; lowBits -= 8;
channel->soundScriptIO[lowBits] = -1; 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) { -1) {
break; break;
} }
@ -1730,7 +1729,7 @@ void Audio_SequencePlayerProcessSequence(SequencePlayer* seqPlayer) {
case 0xB0: case 0xB0:
command = Audio_M64ReadU8(seqScript); command = Audio_M64ReadU8(seqScript);
temp = Audio_M64ReadS16(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; break;
case 0x60: { case 0x60: {
command = Audio_M64ReadU8(seqScript); command = Audio_M64ReadU8(seqScript);

2
src/code/audio_synthesis.c
View file

@ -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") #pragma GLOBAL_ASM("asm/non_matchings/code/audio_synthesis/func_800DC384.s")
#endif #endif
#ifdef NON_MATCHING #ifdef NON_EQUIVALENT
Acmd* func_800DC910(s32 noteIdx, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s16* aiBuf, s32 aiBufLen, Acmd* func_800DC910(s32 noteIdx, NoteSubEu* noteSubEu, NoteSynthesisState* synthState, s16* aiBuf, s32 aiBufLen,
Acmd* cmd, s32 updateIdx) { Acmd* cmd, s32 updateIdx) {
AudioBankSample* sp150; AudioBankSample* sp150;