mirror of
https://github.com/zeldaret/oot.git
synced 2025-07-03 22:44:30 +00:00
code_800F9280 OK (#945)
* Match func_800F9280 * Match func_800FA3DC * Audio_ProcessSeqCmd * macro cleanup * review Co-authored-by: zelda2774 <zelda2774@invalid>
This commit is contained in:
zelda2774
GitHub
parent
b1cd46c37c
commit
d63ed0c17a
9 changed files with 468 additions and 1843 deletions
|
|
@ -373,23 +373,23 @@ void Audio_QueueCmd(u32 opArgs, void** data) {
|
|||
}
|
||||
|
||||
void Audio_QueueCmdF32(u32 opArgs, f32 data) {
|
||||
Audio_QueueCmd(opArgs, &data);
|
||||
Audio_QueueCmd(opArgs, (void**)&data);
|
||||
}
|
||||
|
||||
void Audio_QueueCmdS32(u32 opArgs, s32 data) {
|
||||
Audio_QueueCmd(opArgs, &data);
|
||||
Audio_QueueCmd(opArgs, (void**)&data);
|
||||
}
|
||||
|
||||
void Audio_QueueCmdS8(u32 opArgs, s8 data) {
|
||||
u32 uData = data << 0x18;
|
||||
|
||||
Audio_QueueCmd(opArgs, &uData);
|
||||
Audio_QueueCmd(opArgs, (void**)&uData);
|
||||
}
|
||||
|
||||
void Audio_QueueCmdU16(u32 opArgs, u16 data) {
|
||||
u32 uData = data << 0x10;
|
||||
|
||||
Audio_QueueCmd(opArgs, &uData);
|
||||
Audio_QueueCmd(opArgs, (void**)&uData);
|
||||
}
|
||||
|
||||
s32 Audio_ScheduleProcessCmds(void) {
|
||||
|
|
@ -522,7 +522,7 @@ void func_800E5F34(void) {
|
|||
// clang-format on
|
||||
}
|
||||
|
||||
s32 func_800E5F88(u32 resetPreloadID) {
|
||||
s32 func_800E5F88(s32 resetPreloadID) {
|
||||
s32 resetStatus;
|
||||
OSMesg msg;
|
||||
s32 pad;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,22 @@
|
|||
#include "ultra64.h"
|
||||
#include "global.h"
|
||||
|
||||
// TODO: can these macros be shared between files? code_800F9280 seems to use
|
||||
// versions without any casts...
|
||||
#define Audio_DisableSeq(seqIdx, fadeOut) Audio_QueueCmdS32(0x83000000 | ((u8)seqIdx << 16), fadeOut)
|
||||
#define Audio_StartSeq(seqIdx, fadeTimer, seqId) Audio_QueueSeqCmd(0x00000000 | ((u8)seqIdx << 24) | ((u8)(fadeTimer) << 0x10) | (u16)seqId)
|
||||
#define Audio_SeqCmd7(seqIdx, a, b) Audio_QueueSeqCmd(0x70000000 | ((u8)seqIdx << 0x18) | ((u8)a << 0x10) | (u8)(b))
|
||||
#define Audio_SeqCmdC(seqIdx, a, b, c) Audio_QueueSeqCmd(0xC0000000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b << 8) | ((u8)(c)))
|
||||
#define Audio_SeqCmdA(seqIdx, a) Audio_QueueSeqCmd(0xA0000000 | ((u8)seqIdx << 24) | ((u16)(a)))
|
||||
#define Audio_SeqCmd1(seqIdx, a) Audio_QueueSeqCmd(0x100000FF | ((u8)seqIdx << 24) | ((u8)(a) << 16))
|
||||
#define Audio_SeqCmdB(seqIdx, a, b, c) Audio_QueueSeqCmd(0xB0000000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b << 8) | ((u8)c))
|
||||
#define Audio_SeqCmdB40(seqIdx, a, b) Audio_QueueSeqCmd(0xB0004000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b))
|
||||
#define Audio_SeqCmd6(seqIdx, a, b, c) Audio_QueueSeqCmd(0x60000000 | ((u8)seqIdx << 24) | ((u8)(a) << 16) | ((u8)b << 8) | ((u8)c))
|
||||
#define Audio_SeqCmdE0(seqIdx, a) Audio_QueueSeqCmd(0xE0000000 | ((u8)seqIdx << 24) | ((u8)a))
|
||||
#define Audio_SeqCmdE01(seqIdx, a) Audio_QueueSeqCmd(0xE0000100 | ((u8)seqIdx << 24) | ((u16)a))
|
||||
#define Audio_SeqCmd8(seqIdx, a, b, c) Audio_QueueSeqCmd(0x80000000 | ((u8)seqIdx << 24) | ((u8)a << 16) | ((u8)b << 8) | ((u8)c))
|
||||
#define Audio_SeqCmdF(seqIdx, a) Audio_QueueSeqCmd(0xF0000000 | ((u8)seqIdx << 24) | ((u8)a))
|
||||
|
||||
typedef struct {
|
||||
/* 0x0 */ f32 unk_00;
|
||||
/* 0x4 */ f32 freqScale;
|
||||
|
|
@ -19,9 +35,9 @@ typedef struct {
|
|||
} FreqLerp;
|
||||
|
||||
typedef struct {
|
||||
u16 unk_00;
|
||||
u16 unk_02;
|
||||
u8 unk_04[100];
|
||||
/* 0x0 */ u16 unk_00;
|
||||
/* 0x2 */ u16 unk_02;
|
||||
/* 0x4 */ u8 unk_04[100];
|
||||
} D_801306DC_s; // size = 0x68
|
||||
|
||||
typedef enum {
|
||||
|
|
@ -389,7 +405,6 @@ OcarinaSongInfo gOcarinaSongNotes[14] = {
|
|||
extern u8 D_801333F0;
|
||||
extern u8 gAudioSEFlagSwapOff;
|
||||
extern u8 D_80133408;
|
||||
extern u8 D_8013340C;
|
||||
extern u8 D_80133418;
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -1,55 +1,66 @@
|
|||
#include "ultra64.h"
|
||||
#include "global.h"
|
||||
#include "ultra64/abi.h"
|
||||
|
||||
extern unk_D_8016E750 D_8016E750[4];
|
||||
extern u8 D_8016E348[4];
|
||||
extern u32 sAudioSeqCmds[0x100];
|
||||
extern u8 sSeqCmdRdPos;
|
||||
extern u8 sSeqCmdWrPos;
|
||||
extern u8 D_80133408;
|
||||
extern u8 D_80133418;
|
||||
extern u8 D_801333CC;
|
||||
extern u8 D_80133410[];
|
||||
|
||||
void Audio_ProcessSeqCmd(u32 cmd);
|
||||
// TODO: clean up these macros. They are similar to ones in code_800EC960.c but without casts.
|
||||
#define Audio_StartSeq(seqIdx, fadeTimer, seqId) \
|
||||
Audio_QueueSeqCmd(0x00000000 | ((seqIdx) << 24) | ((fadeTimer) << 16) | (seqId))
|
||||
#define Audio_SeqCmdA(seqIdx, a) Audio_QueueSeqCmd(0xA0000000 | ((seqIdx) << 24) | (a))
|
||||
#define Audio_SeqCmdB30(seqIdx, a, b) Audio_QueueSeqCmd(0xB0003000 | ((seqIdx) << 24) | ((a) << 16) | (b))
|
||||
#define Audio_SeqCmdB40(seqIdx, a, b) Audio_QueueSeqCmd(0xB0004000 | ((seqIdx) << 24) | ((a) << 16) | (b))
|
||||
#define Audio_SeqCmd3(seqIdx, a) Audio_QueueSeqCmd(0x30000000 | ((seqIdx) << 24) | (a))
|
||||
#define Audio_SeqCmd5(seqIdx, a, b) Audio_QueueSeqCmd(0x50000000 | ((seqIdx) << 24) | ((a) << 16) | (b))
|
||||
#define Audio_SeqCmd4(seqIdx, a, b) Audio_QueueSeqCmd(0x40000000 | ((seqIdx) << 24) | ((a) << 16) | (b))
|
||||
#define Audio_SetVolScaleNow(seqIdx, volFadeTimer, volScale) \
|
||||
Audio_ProcessSeqCmd(0x40000000 | ((u8)seqIdx << 24) | ((u8)volFadeTimer << 16) | ((u8)(volScale * 127.0f)));
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
void func_800F9280(u8 seqIdx, u8 seqId, u8 arg2, u16 fadeTimer) {
|
||||
u8 temp_s0;
|
||||
u8 i;
|
||||
u16 dur;
|
||||
s32 pad;
|
||||
|
||||
temp_s0 = seqIdx;
|
||||
if (D_80133408 == 0 || temp_s0 == 2) {
|
||||
if (D_80133408 == 0 || seqIdx == 2) {
|
||||
arg2 &= 0x7F;
|
||||
if (arg2 == 0x7F) {
|
||||
Audio_QueueCmdS32(0x85000000 | ((u8)seqIdx << 16) | (seqId << 8),
|
||||
((fadeTimer >> 3) * 0x3C * gAudioContext.audioBufferParameters.updatesPerFrame) & 0xFFFF);
|
||||
dur = (fadeTimer >> 3) * 60 * gAudioContext.audioBufferParameters.updatesPerFrame;
|
||||
Audio_QueueCmdS32(0x85000000 | _SHIFTL(seqIdx, 16, 8) | _SHIFTL(seqId, 8, 8), dur);
|
||||
} else {
|
||||
Audio_QueueCmdS32(0x82000000 | ((u8)seqIdx << 16) | (seqId << 8),
|
||||
Audio_QueueCmdS32(0x82000000 | _SHIFTL(seqIdx, 16, 8) | _SHIFTL(seqId, 8, 8),
|
||||
(fadeTimer * (u16)gAudioContext.audioBufferParameters.updatesPerFrame) / 4);
|
||||
}
|
||||
|
||||
D_8016E750[temp_s0].unk_256 = D_8016E750[temp_s0].unk_254 = (arg2 << 8) | seqId;
|
||||
D_8016E750[seqIdx].unk_254 = seqId | (arg2 << 8);
|
||||
D_8016E750[seqIdx].unk_256 = seqId | (arg2 << 8);
|
||||
|
||||
if (D_8016E750[temp_s0].volCur != 1.0f) {
|
||||
Audio_QueueCmdF32(0x41000000 | ((u8)seqIdx << 16), D_8016E750[temp_s0].volCur);
|
||||
if (D_8016E750[seqIdx].volCur != 1.0f) {
|
||||
Audio_QueueCmdF32(0x41000000 | _SHIFTL(seqIdx, 16, 8), D_8016E750[seqIdx].volCur);
|
||||
}
|
||||
|
||||
D_8016E750[temp_s0].unk_28 = 0;
|
||||
D_8016E750[temp_s0].unk_18 = 0;
|
||||
D_8016E750[temp_s0].unk_14 = 0;
|
||||
D_8016E750[seqIdx].unk_28 = 0;
|
||||
D_8016E750[seqIdx].unk_18 = 0;
|
||||
D_8016E750[seqIdx].unk_14 = 0;
|
||||
|
||||
for (i = 0; i < 0x10; i++) {
|
||||
D_8016E750[temp_s0].unk_50[i].unk_00 = 1.0f;
|
||||
D_8016E750[temp_s0].unk_50[i].unk_0C = 0;
|
||||
D_8016E750[temp_s0].unk_50[i].unk_10 = 1.0f;
|
||||
D_8016E750[temp_s0].unk_50[i].unk_1C = 0;
|
||||
D_8016E750[seqIdx].unk_50[i].unk_00 = 1.0f;
|
||||
D_8016E750[seqIdx].unk_50[i].unk_0C = 0;
|
||||
D_8016E750[seqIdx].unk_50[i].unk_10 = 1.0f;
|
||||
D_8016E750[seqIdx].unk_50[i].unk_1C = 0;
|
||||
}
|
||||
|
||||
D_8016E750[temp_s0].unk_250 = 0;
|
||||
D_8016E750[temp_s0].unk_252 = 0;
|
||||
D_8016E750[seqIdx].unk_250 = 0;
|
||||
D_8016E750[seqIdx].unk_252 = 0;
|
||||
}
|
||||
}
|
||||
#else
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800F9280.s")
|
||||
#endif
|
||||
|
||||
void func_800F9474(u8 arg0, u16 arg1) {
|
||||
Audio_QueueCmdS32(0x83000000 | ((u8)arg0 << 16),
|
||||
|
|
@ -76,8 +87,276 @@ typedef enum {
|
|||
CMDF
|
||||
} SeqCmdType;
|
||||
|
||||
extern u32 D_8013340C;
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/Audio_ProcessSeqCmd.s")
|
||||
typedef struct {
|
||||
u8 unk_0;
|
||||
u8 unk_1; // importance?
|
||||
} Struct_8016E320;
|
||||
extern Struct_8016E320 D_8016E320[][5]; // sorted by unk_1, descending
|
||||
|
||||
void Audio_ProcessSeqCmd(u32 cmd) {
|
||||
s32 pad[2];
|
||||
u16 fadeTimer;
|
||||
u16 channelMask;
|
||||
u16 val;
|
||||
u8 oldSpec;
|
||||
u8 spec;
|
||||
u8 op;
|
||||
u8 subOp;
|
||||
u8 seqIdx;
|
||||
u8 seqId;
|
||||
u8 seqArgs;
|
||||
u8 found;
|
||||
u8 port;
|
||||
u8 duration;
|
||||
u8 chanIdx;
|
||||
u8 i;
|
||||
s32 new_var;
|
||||
f32 freqScale;
|
||||
|
||||
if (D_8013340C && (cmd & 0xF0000000) != 0x70000000) {
|
||||
AudioDebug_ScrPrt((const s8*)D_80133390, (cmd >> 16) & 0xFFFF); // "SEQ H"
|
||||
AudioDebug_ScrPrt((const s8*)D_80133398, cmd & 0xFFFF); // " L"
|
||||
}
|
||||
|
||||
op = cmd >> 28;
|
||||
seqIdx = (cmd & 0xF000000) >> 24;
|
||||
|
||||
switch (op) {
|
||||
case 0x0:
|
||||
// play sequence immediately
|
||||
seqId = cmd & 0xFF;
|
||||
seqArgs = (cmd & 0xFF00) >> 8;
|
||||
fadeTimer = (cmd & 0xFF0000) >> 13;
|
||||
if ((D_8016E750[seqIdx].unk_260 == 0) && (seqArgs < 0x80)) {
|
||||
func_800F9280(seqIdx, seqId, seqArgs, fadeTimer);
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x1:
|
||||
// disable seq player
|
||||
fadeTimer = (cmd & 0xFF0000) >> 13;
|
||||
func_800F9474(seqIdx, fadeTimer);
|
||||
break;
|
||||
|
||||
case 0x2:
|
||||
// queue sequence
|
||||
seqId = cmd & 0xFF;
|
||||
seqArgs = (cmd & 0xFF00) >> 8;
|
||||
fadeTimer = (cmd & 0xFF0000) >> 13;
|
||||
new_var = seqArgs;
|
||||
for (i = 0; i < D_8016E348[seqIdx]; i++) {
|
||||
if (D_8016E320[seqIdx][i].unk_0 == seqId) {
|
||||
if (i == 0) {
|
||||
func_800F9280(seqIdx, seqId, seqArgs, fadeTimer);
|
||||
}
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
found = D_8016E348[seqIdx];
|
||||
for (i = 0; i < D_8016E348[seqIdx]; i++) {
|
||||
if (D_8016E320[seqIdx][i].unk_1 <= new_var) {
|
||||
found = i;
|
||||
i = D_8016E348[seqIdx]; // "break;"
|
||||
}
|
||||
}
|
||||
|
||||
if (D_8016E348[seqIdx] < 5) {
|
||||
D_8016E348[seqIdx]++;
|
||||
}
|
||||
for (i = D_8016E348[seqIdx] - 1; i != found; i--) {
|
||||
D_8016E320[seqIdx][i].unk_1 = D_8016E320[seqIdx][i - 1].unk_1;
|
||||
D_8016E320[seqIdx][i].unk_0 = D_8016E320[seqIdx][i - 1].unk_0;
|
||||
}
|
||||
D_8016E320[seqIdx][found].unk_1 = seqArgs;
|
||||
D_8016E320[seqIdx][found].unk_0 = seqId;
|
||||
|
||||
if (found == 0) {
|
||||
func_800F9280(seqIdx, seqId, seqArgs, fadeTimer);
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x3:
|
||||
// unqueue/stop sequence
|
||||
seqId = cmd & 0xFF;
|
||||
fadeTimer = (cmd & 0xFF0000) >> 13;
|
||||
|
||||
found = D_8016E348[seqIdx];
|
||||
for (i = 0; i < D_8016E348[seqIdx]; i++) {
|
||||
if (D_8016E320[seqIdx][i].unk_0 == seqId) {
|
||||
found = i;
|
||||
i = D_8016E348[seqIdx]; // "break;"
|
||||
}
|
||||
}
|
||||
|
||||
if (found != D_8016E348[seqIdx]) {
|
||||
for (i = found; i < D_8016E348[seqIdx] - 1; i++) {
|
||||
D_8016E320[seqIdx][i].unk_1 = D_8016E320[seqIdx][i + 1].unk_1;
|
||||
D_8016E320[seqIdx][i].unk_0 = D_8016E320[seqIdx][i + 1].unk_0;
|
||||
}
|
||||
D_8016E348[seqIdx]--;
|
||||
}
|
||||
|
||||
if (found == 0) {
|
||||
func_800F9474(seqIdx, fadeTimer);
|
||||
if (D_8016E348[seqIdx] != 0) {
|
||||
func_800F9280(seqIdx, D_8016E320[seqIdx][0].unk_0, D_8016E320[seqIdx][0].unk_1, fadeTimer);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x4:
|
||||
// transition seq volume
|
||||
duration = (cmd & 0xFF0000) >> 15;
|
||||
val = cmd & 0xFF;
|
||||
if (duration == 0) {
|
||||
duration++;
|
||||
}
|
||||
D_8016E750[seqIdx].volTarget = (f32)val / 127.0f;
|
||||
if (D_8016E750[seqIdx].volCur != D_8016E750[seqIdx].volTarget) {
|
||||
D_8016E750[seqIdx].unk_08 = (D_8016E750[seqIdx].volCur - D_8016E750[seqIdx].volTarget) / (f32)duration;
|
||||
D_8016E750[seqIdx].unk_0C = duration;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x5:
|
||||
// transition freq scale for all channels
|
||||
duration = (cmd & 0xFF0000) >> 15;
|
||||
val = cmd & 0xFFFF;
|
||||
if (duration == 0) {
|
||||
duration++;
|
||||
}
|
||||
freqScale = (f32)val / 1000.0f;
|
||||
for (i = 0; i < 16; i++) {
|
||||
D_8016E750[seqIdx].unk_50[i].unk_14 = freqScale;
|
||||
D_8016E750[seqIdx].unk_50[i].unk_1C = duration;
|
||||
D_8016E750[seqIdx].unk_50[i].unk_18 = (D_8016E750[seqIdx].unk_50[i].unk_10 - freqScale) / (f32)duration;
|
||||
}
|
||||
D_8016E750[seqIdx].unk_250 = 0xFFFF;
|
||||
break;
|
||||
|
||||
case 0xD:
|
||||
// transition freq scale
|
||||
duration = (cmd & 0xFF0000) >> 15;
|
||||
chanIdx = (cmd & 0xF000) >> 12;
|
||||
val = cmd & 0xFFF;
|
||||
if (duration == 0) {
|
||||
duration++;
|
||||
}
|
||||
freqScale = (f32)val / 1000.0f;
|
||||
D_8016E750[seqIdx].unk_50[chanIdx].unk_14 = freqScale;
|
||||
D_8016E750[seqIdx].unk_50[chanIdx].unk_18 =
|
||||
(D_8016E750[seqIdx].unk_50[chanIdx].unk_10 - freqScale) / (f32)duration;
|
||||
D_8016E750[seqIdx].unk_50[chanIdx].unk_1C = duration;
|
||||
D_8016E750[seqIdx].unk_250 |= 1 << chanIdx;
|
||||
break;
|
||||
|
||||
case 0x6:
|
||||
// transition vol scale
|
||||
duration = (cmd & 0xFF0000) >> 15;
|
||||
chanIdx = (cmd & 0xF00) >> 8;
|
||||
val = cmd & 0xFF;
|
||||
if (duration == 0) {
|
||||
duration++;
|
||||
}
|
||||
D_8016E750[seqIdx].unk_50[chanIdx].unk_04 = (f32)val / 127.0f;
|
||||
if (D_8016E750[seqIdx].unk_50[chanIdx].unk_00 != D_8016E750[seqIdx].unk_50[chanIdx].unk_04) {
|
||||
D_8016E750[seqIdx].unk_50[chanIdx].unk_08 =
|
||||
(D_8016E750[seqIdx].unk_50[chanIdx].unk_00 - D_8016E750[seqIdx].unk_50[chanIdx].unk_04) /
|
||||
(f32)duration;
|
||||
D_8016E750[seqIdx].unk_50[chanIdx].unk_0C = duration;
|
||||
D_8016E750[seqIdx].unk_252 |= 1 << chanIdx;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x7:
|
||||
// set global io port
|
||||
port = (cmd & 0xFF0000) >> 16;
|
||||
val = cmd & 0xFF;
|
||||
Audio_QueueCmdS8(0x46000000 | _SHIFTL(seqIdx, 16, 8) | _SHIFTL(port, 0, 8), val);
|
||||
break;
|
||||
|
||||
case 0x8:
|
||||
// set io port if channel masked
|
||||
chanIdx = (cmd & 0xF00) >> 8;
|
||||
port = (cmd & 0xFF0000) >> 16;
|
||||
val = cmd & 0xFF;
|
||||
if ((D_8016E750[seqIdx].unk_258 & (1 << chanIdx)) == 0) {
|
||||
Audio_QueueCmdS8(0x06000000 | _SHIFTL(seqIdx, 16, 8) | _SHIFTL(chanIdx, 8, 8) | _SHIFTL(port, 0, 8),
|
||||
val);
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x9:
|
||||
// set channel mask for command 0x8
|
||||
D_8016E750[seqIdx].unk_258 = cmd & 0xFFFF;
|
||||
break;
|
||||
|
||||
case 0xA:
|
||||
// set channel stop mask
|
||||
channelMask = cmd & 0xFFFF;
|
||||
if (channelMask != 0) {
|
||||
// with channel mask channelMask...
|
||||
Audio_QueueCmdU16(0x90000000 | _SHIFTL(seqIdx, 16, 8), channelMask);
|
||||
// stop channels
|
||||
Audio_QueueCmdS8(0x08000000 | _SHIFTL(seqIdx, 16, 8) | 0xFF00, 1);
|
||||
}
|
||||
if ((channelMask ^ 0xFFFF) != 0) {
|
||||
// with channel mask ~channelMask...
|
||||
Audio_QueueCmdU16(0x90000000 | _SHIFTL(seqIdx, 16, 8), (channelMask ^ 0xFFFF));
|
||||
// unstop channels
|
||||
Audio_QueueCmdS8(0x08000000 | _SHIFTL(seqIdx, 16, 8) | 0xFF00, 0);
|
||||
}
|
||||
break;
|
||||
|
||||
case 0xB:
|
||||
// update tempo
|
||||
D_8016E750[seqIdx].unk_14 = cmd;
|
||||
break;
|
||||
|
||||
case 0xC:
|
||||
// start sequence with setup commands
|
||||
subOp = (cmd & 0xF00000) >> 20;
|
||||
if (subOp != 0xF) {
|
||||
if (D_8016E750[seqIdx].unk_4D < 7) {
|
||||
found = D_8016E750[seqIdx].unk_4D++;
|
||||
if (found < 8) {
|
||||
D_8016E750[seqIdx].unk_2C[found] = cmd;
|
||||
D_8016E750[seqIdx].unk_4C = 2;
|
||||
}
|
||||
}
|
||||
} else {
|
||||
D_8016E750[seqIdx].unk_4D = 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0xE:
|
||||
subOp = (cmd & 0xF00) >> 8;
|
||||
val = cmd & 0xFF;
|
||||
switch (subOp) {
|
||||
case 0:
|
||||
// set sound mode
|
||||
Audio_QueueCmdS32(0xF0000000, D_80133410[val]);
|
||||
break;
|
||||
case 1:
|
||||
// set sequence starting disabled?
|
||||
D_80133408 = val & 1;
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case 0xF:
|
||||
// change spec
|
||||
spec = cmd & 0xFF;
|
||||
D_801333CC = (cmd & 0xFF00) >> 8;
|
||||
oldSpec = gAudioSpecId;
|
||||
gAudioSpecId = spec;
|
||||
func_800E5F88(spec);
|
||||
func_800F71BC(oldSpec);
|
||||
Audio_QueueCmdS32(0xF8000000, 0);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
void Audio_QueueSeqCmd(u32 cmd) {
|
||||
sAudioSeqCmds[sSeqCmdWrPos++] = cmd;
|
||||
|
|
@ -116,15 +395,13 @@ void func_800FA18C(u8 arg0, u8 arg1) {
|
|||
u8 i;
|
||||
|
||||
for (i = 0; i < D_8016E750[arg0].unk_4D; i++) {
|
||||
u8 unkb = (D_8016E750[arg0].unk_2C[i] & 0xF00000) >> 0x14;
|
||||
u8 unkb = (D_8016E750[arg0].unk_2C[i] & 0xF00000) >> 20;
|
||||
|
||||
if (unkb == arg1) {
|
||||
D_8016E750[arg0].unk_2C[i] = 0xFF000000;
|
||||
}
|
||||
}
|
||||
}
|
||||
#define Audio_SetVolScaleNow(seqIdx, volFadeTimer, volScale) \
|
||||
Audio_ProcessSeqCmd(0x40000000 | ((u8)seqIdx << 0x18) | ((u8)volFadeTimer << 0x10) | ((u8)(volScale * 127.0f)));
|
||||
|
||||
void Audio_SetVolScale(u8 seqIdx, u8 scaleIdx, u8 targetVol, u8 volFadeTimer) {
|
||||
f32 volScale;
|
||||
|
|
@ -144,160 +421,118 @@ void Audio_SetVolScale(u8 seqIdx, u8 scaleIdx, u8 targetVol, u8 volFadeTimer) {
|
|||
}
|
||||
}
|
||||
|
||||
#ifdef NON_MATCHING
|
||||
void func_800FA3DC(void) {
|
||||
u32 sp70;
|
||||
f32 temp_f0;
|
||||
f32 temp_f0_2;
|
||||
f32 temp_f16;
|
||||
f32 temp_f2;
|
||||
f32 temp_f6;
|
||||
f32 temp_f8;
|
||||
s32 temp_a0_2;
|
||||
s32 temp_a2;
|
||||
s32 temp_a3;
|
||||
u32 temp_a1;
|
||||
u16 temp_lo;
|
||||
s32 temp_s0;
|
||||
s32 temp_s0_2;
|
||||
u8 temp_s1;
|
||||
s32 temp_s3;
|
||||
s32 temp_s3_2;
|
||||
s32 temp_s5;
|
||||
s32 temp_v0_10;
|
||||
u8 temp_v0_4;
|
||||
s32 temp_v1;
|
||||
u16 temp_t4;
|
||||
u16 temp_t5;
|
||||
u16 temp_t5_2;
|
||||
u16 temp_t8;
|
||||
u16 temp_v0_2;
|
||||
u16 temp_v0_5;
|
||||
u16 temp_v0_6;
|
||||
u16 temp_v1_2;
|
||||
u16 temp_v1_3;
|
||||
u8 temp_a0;
|
||||
u32 temp_v0;
|
||||
u8 temp_a3_3;
|
||||
u8 temp_s0_3;
|
||||
u8 temp_t3;
|
||||
u8 temp_v0_9;
|
||||
u8 temp_v1_4;
|
||||
unk_D_8016E750* temp_s0_4;
|
||||
unk_D_8016E750* temp_s0_5;
|
||||
unk_D_8016E750* temp_s2;
|
||||
void* temp_v0_7;
|
||||
void* temp_v0_8;
|
||||
s32 phi_s3;
|
||||
f32 phi_f0;
|
||||
f32 phi_f6;
|
||||
u16 temp_v1;
|
||||
u16 phi_a2;
|
||||
s32 phi_a2_2;
|
||||
f32 phi_f0_2;
|
||||
u8 temp_v0_4;
|
||||
u8 temp_a0;
|
||||
u8 temp_s1;
|
||||
u8 temp_s0_3;
|
||||
u8 temp_a3_3;
|
||||
s32 pad[3];
|
||||
u32 sp70;
|
||||
f32 phi_f0;
|
||||
u8 phi_t0;
|
||||
f32 phi_f8;
|
||||
s32 phi_s0;
|
||||
s32 phi_s0_2;
|
||||
s32 phi_s3_2;
|
||||
s32 phi_v1;
|
||||
f32 phi_f16;
|
||||
u8 i;
|
||||
u8 j;
|
||||
u8 k;
|
||||
|
||||
for (i = 0; i < 4; i++) {
|
||||
temp_s2 = &D_8016E750[i];
|
||||
if (temp_s2->unk_260 != 0) {
|
||||
if (D_8016E750[i].unk_260 != 0) {
|
||||
switch (func_800E5E20(&sp70)) {
|
||||
case 1:
|
||||
case 2:
|
||||
case 3:
|
||||
case 4:
|
||||
temp_s2->unk_260 = 0;
|
||||
Audio_ProcessSeqCmd(temp_s2->unk_25C);
|
||||
D_8016E750[i].unk_260 = 0;
|
||||
Audio_ProcessSeqCmd(D_8016E750[i].unk_25C);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (temp_s2->fadeVolUpdate) {
|
||||
for (j = 0, phi_f0 = 1.0f; j < 4; j++) {
|
||||
if (D_8016E750[i].fadeVolUpdate) {
|
||||
phi_f0 = 1.0f;
|
||||
for (j = 0; j < 4; j++) {
|
||||
phi_f0 *= (D_8016E750[i].volScales[j] / 127.0f);
|
||||
}
|
||||
|
||||
Audio_SeqCmd4(i, temp_s2->volFadeTimer, phi_f0 * 127.0f);
|
||||
temp_s2->fadeVolUpdate = 0;
|
||||
Audio_SeqCmd4(i, D_8016E750[i].volFadeTimer, (u8)(phi_f0 * 127.0f));
|
||||
D_8016E750[i].fadeVolUpdate = 0;
|
||||
}
|
||||
|
||||
if (temp_s2->unk_0C != 0) {
|
||||
temp_s2->unk_0C--;
|
||||
if (D_8016E750[i].unk_0C != 0) {
|
||||
D_8016E750[i].unk_0C--;
|
||||
|
||||
if (temp_s2->unk_0C != 0) {
|
||||
temp_s2->volCur = temp_s2->volCur - temp_s2->unk_08;
|
||||
if (D_8016E750[i].unk_0C != 0) {
|
||||
D_8016E750[i].volCur = D_8016E750[i].volCur - D_8016E750[i].unk_08;
|
||||
} else {
|
||||
temp_s2->volCur = temp_s2->volTarget;
|
||||
D_8016E750[i].volCur = D_8016E750[i].volTarget;
|
||||
}
|
||||
|
||||
Audio_QueueCmdF32(0x41000000 | _SHIFTL(i, 16, 8), temp_s2->volCur);
|
||||
Audio_QueueCmdF32(0x41000000 | _SHIFTL(i, 16, 8), D_8016E750[i].volCur);
|
||||
}
|
||||
|
||||
if (temp_s2->unk_14 != 0) {
|
||||
phi_a2 = temp_s2->unk_14 & 0xFFF;
|
||||
phi_t0 = (temp_s2->unk_14 & 0xFF0000) >> 0xF;
|
||||
if (D_8016E750[i].unk_14 != 0) {
|
||||
temp_a1 = D_8016E750[i].unk_14;
|
||||
phi_t0 = (temp_a1 & 0xFF0000) >> 15;
|
||||
phi_a2 = temp_a1 & 0xFFF;
|
||||
if (phi_t0 == 0) {
|
||||
phi_t0++;
|
||||
}
|
||||
|
||||
if (gAudioContext.seqPlayers[i].enabled) {
|
||||
temp_v0_4 = (temp_s2->unk_14 & 0xF000) >> 0xC;
|
||||
temp_lo = gAudioContext.seqPlayers[i].tempo / 0x30;
|
||||
temp_v0_4 = (temp_a1 & 0xF000) >> 12;
|
||||
switch (temp_v0_4) {
|
||||
case 1:
|
||||
phi_a2 += temp_lo;
|
||||
break;
|
||||
case 2:
|
||||
phi_a2 = temp_a2;
|
||||
if (temp_v1 < temp_lo) {
|
||||
phi_a2 = temp_lo - temp_v1;
|
||||
if (phi_a2 < temp_lo) {
|
||||
phi_a2 = temp_lo - phi_a2;
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
phi_a2 = temp_lo * (phi_a2 / 100.0f);
|
||||
break;
|
||||
case 4:
|
||||
temp_v0_5 = temp_s2->unk_18;
|
||||
phi_a2 = temp_lo;
|
||||
if (temp_v0_5 != 0) {
|
||||
phi_a2 = temp_v0_5 & 0xFFFF;
|
||||
if (D_8016E750[i].unk_18) {
|
||||
phi_a2 = D_8016E750[i].unk_18;
|
||||
} else {
|
||||
phi_a2 = temp_lo;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
if (phi_a2 >= 0x12D) {
|
||||
phi_a2 = 0x12C;
|
||||
if (phi_a2 > 300) {
|
||||
phi_a2 = 300;
|
||||
}
|
||||
|
||||
if (temp_s2->unk_18 == 0) {
|
||||
temp_s2->unk_18 = temp_lo;
|
||||
if (D_8016E750[i].unk_18 == 0) {
|
||||
D_8016E750[i].unk_18 = temp_lo;
|
||||
}
|
||||
|
||||
temp_s2->unk_20 = phi_a2;
|
||||
temp_s2->unk_1C = temp_lo;
|
||||
temp_s2->unk_28 = phi_t0;
|
||||
temp_s2->unk_14 = 0;
|
||||
temp_s2->unk_24 = (temp_s2->unk_1C - temp_s2->unk_20) / temp_s2->unk_28;
|
||||
D_8016E750[i].unk_20 = phi_a2;
|
||||
D_8016E750[i].unk_1C = gAudioContext.seqPlayers[i].tempo / 0x30;
|
||||
D_8016E750[i].unk_24 = (D_8016E750[i].unk_1C - D_8016E750[i].unk_20) / phi_t0;
|
||||
D_8016E750[i].unk_28 = phi_t0;
|
||||
D_8016E750[i].unk_14 = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (temp_s2->unk_28 != 0) {
|
||||
temp_s2->unk_28--;
|
||||
if (temp_s2->unk_28 != 0) {
|
||||
temp_s2->unk_1C = temp_s2->unk_1C - temp_s2->unk_24;
|
||||
if (D_8016E750[i].unk_28 != 0) {
|
||||
D_8016E750[i].unk_28--;
|
||||
if (D_8016E750[i].unk_28 != 0) {
|
||||
D_8016E750[i].unk_1C = D_8016E750[i].unk_1C - D_8016E750[i].unk_24;
|
||||
} else {
|
||||
temp_s2->unk_1C = temp_s2->unk_20;
|
||||
D_8016E750[i].unk_1C = D_8016E750[i].unk_20;
|
||||
}
|
||||
Audio_QueueCmdS32(0x47000000 | _SHIFTL(i, 16, 8), temp_s2->unk_1C);
|
||||
// set tempo
|
||||
Audio_QueueCmdS32(0x47000000 | _SHIFTL(i, 16, 8), D_8016E750[i].unk_1C);
|
||||
}
|
||||
|
||||
if (temp_s2->unk_252 != 0) {
|
||||
if (D_8016E750[i].unk_252 != 0) {
|
||||
for (k = 0; k < 0x10; k++) {
|
||||
if (D_8016E750[i].unk_50[k].unk_0C != 0) {
|
||||
D_8016E750[i].unk_50[k].unk_0C--;
|
||||
|
|
@ -305,13 +540,16 @@ void func_800FA3DC(void) {
|
|||
D_8016E750[i].unk_50[k].unk_00 -= D_8016E750[i].unk_50[k].unk_08;
|
||||
} else {
|
||||
D_8016E750[i].unk_50[k].unk_00 = D_8016E750[i].unk_50[k].unk_04;
|
||||
temp_s2->unk_252 ^= (1 << k);
|
||||
D_8016E750[i].unk_252 ^= (1 << k);
|
||||
}
|
||||
Audio_QueueCmdF32(0x01000000 | _SHIFTL(i, 16, 8) | (k, 8, 8), D_8016E750[i].unk_50[k].unk_00);
|
||||
// CHAN_UPD_VOL_SCALE (i = seq, k = chan)
|
||||
Audio_QueueCmdF32(0x01000000 | _SHIFTL(i, 16, 8) | _SHIFTL(k, 8, 8),
|
||||
D_8016E750[i].unk_50[k].unk_00);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (temp_s2->unk_250 != 0) {
|
||||
|
||||
if (D_8016E750[i].unk_250 != 0) {
|
||||
for (k = 0; k < 0x10; k++) {
|
||||
if (D_8016E750[i].unk_50[k].unk_1C != 0) {
|
||||
D_8016E750[i].unk_50[k].unk_1C--;
|
||||
|
|
@ -319,112 +557,109 @@ void func_800FA3DC(void) {
|
|||
D_8016E750[i].unk_50[k].unk_10 -= D_8016E750[i].unk_50[k].unk_18;
|
||||
} else {
|
||||
D_8016E750[i].unk_50[k].unk_10 = D_8016E750[i].unk_50[k].unk_14;
|
||||
temp_s2->unk_250 ^= (1 << k);
|
||||
D_8016E750[i].unk_250 ^= (1 << k);
|
||||
}
|
||||
// CHAN_UPD_FREQ_SCALE
|
||||
Audio_QueueCmdF32(0x04000000 | _SHIFTL(i, 16, 8) | _SHIFTL(k, 8, 8),
|
||||
D_8016E750[i].unk_50[k].unk_10);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (temp_s2->unk_4D != 0) {
|
||||
if (D_8016E750[i].unk_4D != 0) {
|
||||
if (func_800FA11C(0xF0000000, 0xF0000000) == 0) {
|
||||
temp_s2->unk_4D = 0;
|
||||
D_8016E750[i].unk_4D = 0;
|
||||
return;
|
||||
}
|
||||
|
||||
if (temp_s2->unk_4C != 0) {
|
||||
temp_s2->unk_4C--;
|
||||
} else if (!gAudioContext.seqPlayers[i].enabled) {
|
||||
for (j = 0; j < temp_s2->unk_4D; j++) {
|
||||
// temp_a0 = (temp_v0_10 & 0x00F00000) >> 20;
|
||||
// temp_s1 = (temp_v0_10 & 0x000F0000) >> 16;
|
||||
// temp_s0_3 = (temp_v0_10 & 0xFF00) >> 8;
|
||||
// temp_a3_3 = (temp_v0_10 & 0xFF) >> 0;
|
||||
temp_v0_10 = D_8016E750[i].unk_2C[j];
|
||||
temp_a0 = Unk2C_B8(temp_v0_10);
|
||||
temp_s1 = Unk2C_B12(temp_v0_10);
|
||||
temp_s0_3 = Unk2C_B16(temp_v0_10);
|
||||
temp_a3_3 = Unk2C_B24(temp_v0_10);
|
||||
switch (temp_a0) {
|
||||
case 0:
|
||||
Audio_SetVolScale(temp_s1, 1, 0x7F, temp_a3_3);
|
||||
break;
|
||||
case 7:
|
||||
if (temp_a3_3 == D_8016E348[i]) {
|
||||
Audio_SetVolScale(temp_s1, 1, 0x7F, temp_s0_3);
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
Audio_SeqCmd3(i, temp_s2->unk_254);
|
||||
break;
|
||||
case 2:
|
||||
Audio_StartSeq(temp_s1, 0, D_8016E750[temp_s1].unk_254);
|
||||
D_8016E750[temp_s1].fadeVolUpdate = 1;
|
||||
D_8016E750[temp_s1].volScales[1] = 0x7F;
|
||||
break;
|
||||
case 3:
|
||||
Audio_SeqCmdB30(temp_s1, temp_s0_3, temp_a3_3);
|
||||
break;
|
||||
case 4:
|
||||
Audio_SeqCmdB40(temp_s1, temp_a3_3, 0);
|
||||
break;
|
||||
case 5:
|
||||
Audio_StartSeq(temp_s1, D_8016E750[temp_s1].unk_4E, temp_v0_10);
|
||||
Audio_SetVolScale(temp_s1, 1, 0x7F, 0);
|
||||
D_8016E750[temp_s1].unk_4E = 0;
|
||||
break;
|
||||
case 6:
|
||||
temp_s2->unk_4E = temp_s0_3;
|
||||
break;
|
||||
case 8:
|
||||
Audio_SetVolScale(temp_s1, temp_s0_3, 0x7F, temp_a3_3);
|
||||
break;
|
||||
case 14:
|
||||
if (temp_a3_3 & 1) {
|
||||
Audio_QueueCmdS32(0xE3000000, 0);
|
||||
}
|
||||
if (temp_a3_3 & 2) {
|
||||
Audio_QueueCmdS32(0xE3000000U, 1);
|
||||
}
|
||||
if (temp_a3_3 & 4) {
|
||||
Audio_QueueCmdS32(0xE3000000U, 2);
|
||||
}
|
||||
break;
|
||||
case 9:
|
||||
Audio_SeqCmdA(temp_s1, temp_v0_10);
|
||||
break;
|
||||
case 10:
|
||||
Audio_SeqCmd5(temp_s1, temp_s0_3, (temp_a3_3 * 0xA));
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
temp_s2->unk_4D = 0;
|
||||
if (D_8016E750[i].unk_4C != 0) {
|
||||
D_8016E750[i].unk_4C--;
|
||||
continue;
|
||||
}
|
||||
|
||||
if (gAudioContext.seqPlayers[i].enabled) {
|
||||
continue;
|
||||
}
|
||||
|
||||
for (j = 0; j < D_8016E750[i].unk_4D; j++) {
|
||||
temp_a0 = (D_8016E750[i].unk_2C[j] & 0x00F00000) >> 20;
|
||||
temp_s1 = (D_8016E750[i].unk_2C[j] & 0x000F0000) >> 16;
|
||||
temp_s0_3 = (D_8016E750[i].unk_2C[j] & 0xFF00) >> 8;
|
||||
temp_a3_3 = D_8016E750[i].unk_2C[j] & 0xFF;
|
||||
|
||||
switch (temp_a0) {
|
||||
case 0:
|
||||
Audio_SetVolScale(temp_s1, 1, 0x7F, temp_a3_3);
|
||||
break;
|
||||
case 7:
|
||||
if (D_8016E348[i] == temp_a3_3) {
|
||||
Audio_SetVolScale(temp_s1, 1, 0x7F, temp_s0_3);
|
||||
}
|
||||
break;
|
||||
case 1:
|
||||
Audio_SeqCmd3(i, D_8016E750[i].unk_254);
|
||||
break;
|
||||
case 2:
|
||||
Audio_StartSeq(temp_s1, 1, D_8016E750[temp_s1].unk_254);
|
||||
D_8016E750[temp_s1].fadeVolUpdate = 1;
|
||||
D_8016E750[temp_s1].volScales[1] = 0x7F;
|
||||
break;
|
||||
case 3:
|
||||
Audio_SeqCmdB30(temp_s1, temp_s0_3, temp_a3_3);
|
||||
break;
|
||||
case 4:
|
||||
Audio_SeqCmdB40(temp_s1, temp_a3_3, 0);
|
||||
break;
|
||||
case 5:
|
||||
temp_v1 = D_8016E750[i].unk_2C[j] & 0xFFFF;
|
||||
Audio_StartSeq(temp_s1, D_8016E750[temp_s1].unk_4E, temp_v1);
|
||||
Audio_SetVolScale(temp_s1, 1, 0x7F, 0);
|
||||
D_8016E750[temp_s1].unk_4E = 0;
|
||||
break;
|
||||
case 6:
|
||||
D_8016E750[i].unk_4E = temp_s0_3;
|
||||
break;
|
||||
case 8:
|
||||
Audio_SetVolScale(temp_s1, temp_s0_3, 0x7F, temp_a3_3);
|
||||
break;
|
||||
case 14:
|
||||
if (temp_a3_3 & 1) {
|
||||
Audio_QueueCmdS32(0xE3000000, 0);
|
||||
}
|
||||
if (temp_a3_3 & 2) {
|
||||
Audio_QueueCmdS32(0xE3000000, 1);
|
||||
}
|
||||
if (temp_a3_3 & 4) {
|
||||
Audio_QueueCmdS32(0xE3000000, 2);
|
||||
}
|
||||
break;
|
||||
case 9:
|
||||
temp_v1 = D_8016E750[i].unk_2C[j] & 0xFFFF;
|
||||
Audio_SeqCmdA(temp_s1, temp_v1);
|
||||
break;
|
||||
case 10:
|
||||
Audio_SeqCmd5(temp_s1, temp_s0_3, (temp_a3_3 * 10) & 0xFFFF);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
D_8016E750[i].unk_4D = 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
#else
|
||||
void func_800FA3DC(void);
|
||||
#pragma GLOBAL_ASM("asm/non_matchings/code/code_800F9280/func_800FA3DC.s")
|
||||
#endif
|
||||
|
||||
extern u8 D_80133418;
|
||||
extern u8 D_801333CC;
|
||||
#define CMD46(a) (_SHIFTL(0x46, 24, 8) | _SHIFTL(a, 16, 8))
|
||||
u8 func_800FAD34(void) {
|
||||
if (D_80133418 != 0) {
|
||||
if (D_80133418 == 1) {
|
||||
if (func_800E5EDC() == 1) {
|
||||
D_80133418 = 0;
|
||||
Audio_QueueCmdS8(CMD46(2), D_801333CC);
|
||||
Audio_QueueCmdS8(0x46020000, D_801333CC);
|
||||
func_800F7170();
|
||||
}
|
||||
} else if (D_80133418 == 2) {
|
||||
while (func_800E5EDC() != 1) {}
|
||||
D_80133418 = 0;
|
||||
Audio_QueueCmdS8(CMD46(2), D_801333CC);
|
||||
Audio_QueueCmdS8(0x46020000, D_801333CC);
|
||||
func_800F7170();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue