diff options
| author | djevangelia <263709373+djevangelia@users.noreply.github.com> | 2026-07-19 18:54:43 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-07-19 16:54:43 +0000 |
| commit | 29d4ff4205025fc2684abd166af14be1d9a1311d (patch) | |
| tree | 43f87d4467155c8188d74ca36792b93520c34930 /soh/src/code/code_800F9280.c | |
| parent | 81009e9dce5b68580e13b77bd46a61e3109fe780 (diff) | |
Decomp, update AudioOcarina (code_800EC960.c) (#6941)
Diffstat (limited to 'soh/src/code/code_800F9280.c')
| -rw-r--r-- | soh/src/code/code_800F9280.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/soh/src/code/code_800F9280.c b/soh/src/code/code_800F9280.c index 90eaadda0..5cf462299 100644 --- a/soh/src/code/code_800F9280.c +++ b/soh/src/code/code_800F9280.c @@ -36,7 +36,7 @@ u8 D_80133418 = 0; #define Audio_SetVolScaleNow(playerIdx, volFadeTimer, volScale) \ Audio_ProcessSeqCmd(0x40000000 | ((u8)playerIdx << 24) | ((u8)volFadeTimer << 16) | ((u8)(volScale * 127.0f))); -void func_800F9280(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer) { +void Audio_StartSequence(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer) { u8 i; u16 dur; u16 resolvedSeqId; @@ -145,7 +145,7 @@ void Audio_ProcessSeqCmd(u32 cmd) { seqArgs = (cmd & 0xFF00) >> 8; fadeTimer = (cmd & 0xFF0000) >> 13; if ((gActiveSeqs[playerIdx].isWaitingForFonts == 0) && (seqArgs < 0x80)) { - func_800F9280(playerIdx, seqId, seqArgs, fadeTimer); + Audio_StartSequence(playerIdx, seqId, seqArgs, fadeTimer); } break; @@ -164,7 +164,7 @@ void Audio_ProcessSeqCmd(u32 cmd) { for (i = 0; i < sNumSeqRequests[playerIdx]; i++) { if (D_8016E320[playerIdx][i].unk_0 == seqId) { if (i == 0) { - func_800F9280(playerIdx, seqId, seqArgs, fadeTimer); + Audio_StartSequence(playerIdx, seqId, seqArgs, fadeTimer); } return; } @@ -189,7 +189,7 @@ void Audio_ProcessSeqCmd(u32 cmd) { D_8016E320[playerIdx][found].unk_0 = seqId; if (found == 0) { - func_800F9280(playerIdx, seqId, seqArgs, fadeTimer); + Audio_StartSequence(playerIdx, seqId, seqArgs, fadeTimer); } break; @@ -217,7 +217,8 @@ void Audio_ProcessSeqCmd(u32 cmd) { if (found == 0) { func_800F9474(playerIdx, fadeTimer); if (sNumSeqRequests[playerIdx] != 0) { - func_800F9280(playerIdx, D_8016E320[playerIdx][0].unk_0, D_8016E320[playerIdx][0].unk_1, fadeTimer); + Audio_StartSequence(playerIdx, D_8016E320[playerIdx][0].unk_0, D_8016E320[playerIdx][0].unk_1, + fadeTimer); } } break; @@ -380,7 +381,7 @@ void Audio_ProcessSeqCmd(u32 cmd) { } void Audio_QueueSeqCmd(u32 cmd) { - // Replacement is resolved per-command in func_800F9280(). + // Replacement is resolved per-command in Audio_StartSequence(). sAudioSeqCmds[sSeqCmdWrPos++] = cmd; } |