Improve audio types

This commit is contained in:
gamemasterplc 2024-11-04 22:17:14 -06:00
parent 44107236ed
commit 4a4967d4a3
11 changed files with 430 additions and 298 deletions

View file

@ -502,13 +502,13 @@ static BOOL TitleProc(void)
{
float scale;
float scale_time;
s32 y_offset[32];
int seNo[32];
s16 i;
Hu3DModelAttrReset(titleModel[0], HU3D_ATTR_DISPOFF);
Hu3DModelAttrReset(titleModel[1], HU3D_ATTR_DISPOFF);
HuSprAttrReset(titleGroup, 0, HUSPR_ATTR_DISPOFF);
HuSprAttrReset(titleGroup, 1, HUSPR_ATTR_DISPOFF);
OSReport(">>>>>>>>MSM_SE_SEL_01 %d\n", msmSeGetEntryID(2092, y_offset));
OSReport(">>>>>>>>MSM_SE_SEL_01 %d\n", msmSeGetEntryID(2092, seNo));
OSReport(">>>>>>>>SE Num %d\n", msmSeGetNumPlay(0));
HuAudSStreamPlay(20);
WipeCreate(WIPE_MODE_IN, WIPE_TYPE_NORMAL, 30);

View file

@ -65,13 +65,13 @@ void ObjectSetup(void)
lbl_1_bss_10 = 0;
lbl_1_bss_4 = 0;
_ClearFlag(0x1000C);
for (i = 0; HuSndGrpTbl[i].ovl != OVL_INVALID; i++) {
if (HuSndGrpTbl[i].ovl == mgInfoTbl[lbl_1_bss_14].ovl) {
for (i = 0; sndGrpTable[i].ovl != OVL_INVALID; i++) {
if (sndGrpTable[i].ovl == mgInfoTbl[lbl_1_bss_14].ovl) {
break;
}
}
if (HuSndGrpTbl[i].ovl != OVL_INVALID) {
HuAudSndGrpSetSet(HuSndGrpTbl[i].grpset);
if (sndGrpTable[i].ovl != OVL_INVALID) {
HuAudSndGrpSetSet(sndGrpTable[i].grpSet);
}
if (mgInfoTbl[lbl_1_bss_14].ovl == OVL_M411) {
if (GWMGTypeGet() == -1) {

View file

@ -972,13 +972,13 @@ void fn_1_3F30(omObjData *object)
}
}
void fn_1_445C(s32 arg0, s16 arg1)
void fn_1_445C(int seId, s16 vol)
{
UnkMsmStruct_01 sp8;
MSM_SEPARAM param;
sp8.unk00 = 1;
sp8.unk04 = arg1;
msmSeSetParam(arg0, &sp8);
param.flag = MSM_SEPARAM_VOL;
param.vol = vol;
msmSeSetParam(seId, &param);
}
void fn_1_44A0(omObjData *object)

View file

@ -2196,10 +2196,10 @@ void fn_1_79FC(Mtx arg0, Mtx arg1)
arg1[2][3] = 0;
}
s32 fn_1_7A78(s32 arg0, s16 arg1)
s32 fn_1_7A78(s32 arg0, s16 vol)
{
UnkMsmStruct_01 sp10;
sp10.unk00 = 1;
sp10.unk04 = arg1;
return msmSeSetParam(arg0, &sp10);
MSM_SEPARAM seParam;
seParam.flag = MSM_SEPARAM_VOL;
seParam.vol = vol;
return msmSeSetParam(arg0, &seParam);
}

View file

@ -235,7 +235,7 @@ static void fn_1_D0DC(void) {
}
static void fn_1_D174(omObjData *arg0) {
UnkMsmStruct_03 sp8;
MSM_MUSPARAM musParam;
if (arg0->work[0] == 0) {
arg0->work[0] = MGSeqCreate(3, 0);
@ -243,11 +243,11 @@ static void fn_1_D174(omObjData *arg0) {
return;
}
if (MGSeqStatGet(arg0->work[0]) == 0) {
sp8.unk00 = 1;
sp8.unk06 = 0;
sp8.unk05 = 0x7F;
sp8.unk04 = 1;
lbl_1_data_588 = msmMusPlay(0x1D, &sp8);
musParam.flag = MSM_MUSPARAM_CHAN;
musParam.fadeSpeed = 0;
musParam.vol = 0x7F;
musParam.chan = 1;
lbl_1_data_588 = msmMusPlay(0x1D, &musParam);
arg0->func = fn_1_D230;
}
}