kobayashi90/marioparty4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

name audio.c and board/audio.c (#561)

Browse source
This commit is contained in:
CreateSource 2025-02-05 22:02:56 -05:00 • committed by GitHub
parent da072c209a
commit ea3af4e95a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 208 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

50
include/game/audio.h
View file

@ -30,41 +30,41 @@ void HuAudFXFadeOut(int seNo, s32 speed);
void HuAudFXPanning(int seNo, s16 pan); void HuAudFXPanning(int seNo, s16 pan);
void HuAudFXListnerSet(Vec *pos, Vec *heading, float sndDist, float sndSpeed); void HuAudFXListnerSet(Vec *pos, Vec *heading, float sndDist, float sndSpeed);
void HuAudFXListnerSetEX(Vec *pos, Vec *heading, float sndDist, float sndSpeed, float startDis, float frontSurDis, float backSurDis); void HuAudFXListnerSetEX(Vec *pos, Vec *heading, float sndDist, float sndSpeed, float startDis, float frontSurDis, float backSurDis);
void HuAudFXListnerUpdate(Vec *arg0, Vec *arg1); void HuAudFXListnerUpdate(Vec *pos, Vec *heading);
int HuAudFXEmiterPlay(int seId, Vec *pos); int HuAudFXEmiterPlay(int seId, Vec *pos);
void HuAudFXEmiterUpDate(int seNo, Vec *pos); void HuAudFXEmiterUpDate(int seNo, Vec *pos);
void HuAudFXListnerKill(void); void HuAudFXListnerKill(void);
void HuAudFXPauseAll(s32 arg0); void HuAudFXPauseAll(s32 pause);
s32 HuAudFXStatusGet(int seNo); s32 HuAudFXStatusGet(int seNo);
s32 HuAudFXPitchSet(int seNo, s16 pitch); s32 HuAudFXPitchSet(int seNo, s16 pitch);
s32 HuAudFXVolSet(int seNo, s16 vol); s32 HuAudFXVolSet(int seNo, s16 vol);
s32 HuAudSeqPlay(s16 arg0); s32 HuAudSeqPlay(s16 musId);
void HuAudSeqStop(s32 arg0); void HuAudSeqStop(s32 musNo);
void HuAudSeqFadeOut(s32 arg0, s32 arg1); void HuAudSeqFadeOut(s32 musNo, s32 speed);
void HuAudSeqAllFadeOut(s32 arg0); void HuAudSeqAllFadeOut(s32 speed);
void HuAudSeqAllStop(void); void HuAudSeqAllStop(void);
void HuAudSeqPauseAll(s32 arg0); void HuAudSeqPauseAll(s32 pause);
void HuAudSeqPause(s32 arg0, s32 arg1, s32 arg2); void HuAudSeqPause(s32 musNo, s32 pause, s32 speed);
s32 HuAudSeqMidiCtrlGet(s32 arg0, s8 arg1, s8 arg2); s32 HuAudSeqMidiCtrlGet(s32 musNo, s8 channel, s8 ctrl);
s32 HuAudSStreamPlay(s16 arg0); s32 HuAudSStreamPlay(s16 streamId);
void HuAudSStreamStop(s32 arg0); void HuAudSStreamStop(s32 seNo);
void HuAudSStreamFadeOut(s32 arg0, s32 arg1); void HuAudSStreamFadeOut(s32 seNo, s32 speed);
void HuAudSStreamAllFadeOut(s32 arg0); void HuAudSStreamAllFadeOut(s32 speed);
void HuAudSStreamAllStop(void); void HuAudSStreamAllStop(void);
s32 HuAudSStreamStatGet(s32 arg0); s32 HuAudSStreamStatGet(s32 seNo);
void HuAudDllSndGrpSet(u16 ovl); void HuAudDllSndGrpSet(u16 ovl);
void HuAudSndGrpSetSet(s16 arg0); void HuAudSndGrpSetSet(s16 data_size);
void HuAudSndGrpSet(s16 arg0); void HuAudSndGrpSet(s16 grpId);
void HuAudSndCommonGrpSet(s16 arg0, s32 arg1); void HuAudSndCommonGrpSet(s16 grpId, s32 groupCheck);
void HuAudAUXSet(s32 arg0, s32 arg1); void HuAudAUXSet(s32 auxA, s32 auxB);
void HuAudAUXVolSet(s8 arg0, s8 arg1); void HuAudAUXVolSet(s8 auxA, s8 auxB);
void HuAudVoiceInit(s16 ovl); void HuAudVoiceInit(s16 ovl);
s32 HuAudPlayerVoicePlay(s16 arg0, s16 arg1); s32 HuAudPlayerVoicePlay(s16 player, s16 seId);
s32 HuAudPlayerVoicePlayPos(s16 arg0, s16 arg1, Vec *arg2); s32 HuAudPlayerVoicePlayPos(s16 player, s16 seId, Vec *pos);
void HuAudPlayerVoicePlayEntry(s16 arg0, s16 arg1); void HuAudPlayerVoicePlayEntry(s16 player, s16 seId);
s32 HuAudCharVoicePlay(s16 arg0, s16 arg1); s32 HuAudCharVoicePlay(s16 charNo, s16 seId);
s32 HuAudCharVoicePlayPos(s16 arg0, s16 arg1, Vec *arg2); s32 HuAudCharVoicePlayPos(s16 charNo, s16 seId, Vec *pos);
void HuAudCharVoicePlayEntry(s16 arg0, s16 arg1); void HuAudCharVoicePlayEntry(s16 charNo, s16 seId);
extern float Snd3DBackSurDisOffset; extern float Snd3DBackSurDisOffset;
extern float Snd3DFrontSurDisOffset; extern float Snd3DFrontSurDisOffset;

14
include/game/board/audio.h
View file

@ -4,13 +4,13 @@
#include "dolphin/types.h" #include "dolphin/types.h"
void BoardMusStartBoard(void); void BoardMusStartBoard(void);
void BoardMusStart(s32 arg0, s32 arg1, s8 arg2, u16 arg3); void BoardMusStart(s32 boardNo, s32 musId, s8 vol, u16 speed);
void BoardAudSeqFadeOutFast(s32 arg0); void BoardAudSeqFadeOutFast(s32 boardNo);
void BoardAudSeqFadeOut(s32 arg0, u16 arg1); void BoardAudSeqFadeOut(s32 boardNo, u16 speed);
void BoardMusLoudSet(s32 arg0, s32 arg1); void BoardMusLoudSet(s32 boardNo, s32 isQuieter);
void BoardMusVolPanSet(s32 arg0, s8 arg1, u16 arg2); void BoardMusVolPanSet(s32 boardNo, s8 vol, u16 fadeSpeed);
void BoardAudSeqPause(s32 arg0, s32 arg1, u16 arg2); void BoardAudSeqPause(s32 boardNo, s32 pause, u16 speed);
s32 BoardMusStatusGet(s32 arg0); s32 BoardMusStatusGet(s32 boardNo);
void BoardAudSeqClear(void); void BoardAudSeqClear(void);
void BoardAudSeqFadeOutAll(void); void BoardAudSeqFadeOutAll(void);
void BoardAudFXPlay(void); void BoardAudFXPlay(void);

262
src/game/audio.c
View file

@ -100,10 +100,10 @@ void HuAudAllStop(void) {
HuAudSStreamAllStop(); HuAudSStreamAllStop();
} }
void HuAudFadeOut(s32 arg0) { void HuAudFadeOut(s32 speed) {
HuAudFXAllStop(); HuAudFXAllStop();
HuAudSeqAllFadeOut(arg0); HuAudSeqAllFadeOut(speed);
HuAudSStreamAllFadeOut(arg0); HuAudSStreamAllFadeOut(speed);
} }
int HuAudFXPlay(int seId) int HuAudFXPlay(int seId)
@ -228,8 +228,8 @@ void HuAudFXListnerKill(void) {
msmSeDelListener(); msmSeDelListener();
} }
void HuAudFXPauseAll(s32 arg0) { void HuAudFXPauseAll(s32 pause) {
msmSePauseAll(arg0, 0x64); msmSePauseAll(pause, 0x64);
} }
s32 HuAudFXStatusGet(int seNo) { s32 HuAudFXStatusGet(int seNo) {
@ -259,35 +259,35 @@ s32 HuAudFXVolSet(int seNo, s16 vol)
return msmSeSetParam(seNo, &param); return msmSeSetParam(seNo, &param);
} }
s32 HuAudSeqPlay(s16 arg0) { s32 HuAudSeqPlay(s16 musId) {
s32 temp_r31; s32 channel;
if (musicOffF != 0 || omSysExitReq != 0) { if (musicOffF != 0 || omSysExitReq != 0) {
return 0; return 0;
} }
temp_r31 = msmMusPlay(arg0, NULL); channel = msmMusPlay(musId, NULL);
return temp_r31; return channel;
} }
void HuAudSeqStop(s32 arg0) { void HuAudSeqStop(s32 musNo) {
if (musicOffF != 0 || omSysExitReq != 0) { if (musicOffF != 0 || omSysExitReq != 0) {
return; return;
} }
msmMusStop(arg0, 0); msmMusStop(musNo, 0);
} }
void HuAudSeqFadeOut(s32 arg0, s32 arg1) { void HuAudSeqFadeOut(s32 musNo, s32 speed) {
if (musicOffF == 0) { if (musicOffF == 0) {
msmMusStop(arg0, arg1); msmMusStop(musNo, speed);
} }
} }
void HuAudSeqAllFadeOut(s32 arg0) { void HuAudSeqAllFadeOut(s32 speed) {
s16 i; s16 i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
if (msmMusGetStatus(i) == 2) { if (msmMusGetStatus(i) == 2) {
msmMusStop(i, arg0); msmMusStop(i, speed);
} }
} }
} }
@ -296,22 +296,22 @@ void HuAudSeqAllStop(void) {
msmMusStopAll(0, 0); msmMusStopAll(0, 0);
} }
void HuAudSeqPauseAll(s32 arg0) { void HuAudSeqPauseAll(s32 pause) {
msmMusPauseAll(arg0, 0x64); msmMusPauseAll(pause, 0x64);
} }
void HuAudSeqPause(s32 arg0, s32 arg1, s32 arg2) { void HuAudSeqPause(s32 musNo, s32 pause, s32 speed) {
if (musicOffF != 0 || omSysExitReq != 0) { if (musicOffF != 0 || omSysExitReq != 0) {
return; return;
} }
msmMusPause(arg0, arg1, arg2); msmMusPause(musNo, pause, speed);
} }
s32 HuAudSeqMidiCtrlGet(s32 arg0, s8 arg1, s8 arg2) { s32 HuAudSeqMidiCtrlGet(s32 musNo, s8 channel, s8 ctrl) {
if (musicOffF != 0 || omSysExitReq != 0) { if (musicOffF != 0 || omSysExitReq != 0) {
return 0; return 0;
} }
return msmMusGetMidiCtrl(arg0, arg1, arg2); return msmMusGetMidiCtrl(musNo, channel, ctrl);
} }
s32 HuAudSStreamPlay(s16 streamId) { s32 HuAudSStreamPlay(s16 streamId) {
@ -326,28 +326,28 @@ s32 HuAudSStreamPlay(s16 streamId) {
return result; return result;
} }
void HuAudSStreamStop(s32 arg0) { void HuAudSStreamStop(s32 seNo) {
if (musicOffF == 0) { if (musicOffF == 0) {
msmStreamStop(arg0, 0); msmStreamStop(seNo, 0);
} }
} }
void HuAudSStreamFadeOut(s32 arg0, s32 arg1) { void HuAudSStreamFadeOut(s32 seNo, s32 speed) {
if (musicOffF == 0) { if (musicOffF == 0) {
msmStreamStop(arg0, arg1); msmStreamStop(seNo, speed);
} }
} }
void HuAudSStreamAllFadeOut(s32 arg0) { void HuAudSStreamAllFadeOut(s32 speed) {
msmStreamStopAll(arg0); msmStreamStopAll(speed);
} }
void HuAudSStreamAllStop(void) { void HuAudSStreamAllStop(void) {
msmStreamStopAll(0); msmStreamStopAll(0);
} }
s32 HuAudSStreamStatGet(s32 arg0) { s32 HuAudSStreamStatGet(s32 seNo) {
return msmStreamGetStatus(arg0); return msmStreamGetStatus(seNo);
} }
SNDGRPTBL sndGrpTable[] = { SNDGRPTBL sndGrpTable[] = {
@ -445,75 +445,75 @@ SNDGRPTBL sndGrpTable[] = {
}; };
void HuAudDllSndGrpSet(u16 ovl) { void HuAudDllSndGrpSet(u16 ovl) {
SNDGRPTBL *var_r31; SNDGRPTBL *sndGrp;
s16 var_r29; s16 grpSet;
var_r31 = sndGrpTable; sndGrp = sndGrpTable;
while (1) { while (1) {
if (var_r31->ovl == ovl) { if (sndGrp->ovl == ovl) {
var_r29 = var_r31->grpSet; grpSet = sndGrp->grpSet;
break; break;
} }
if (var_r31->ovl == OVL_INVALID) { if (sndGrp->ovl == OVL_INVALID) {
var_r29 = 0x12; grpSet = 0x12;
break; break;
} }
var_r31++; sndGrp++;
} }
if (var_r29 != -1) { if (grpSet != -1) {
OSReport("SOUND ##########################\n"); OSReport("SOUND ##########################\n");
HuAudSndGrpSetSet(var_r29); HuAudSndGrpSetSet(grpSet);
if (var_r31->auxANo != auxANoBak || var_r31->auxBNo != auxBNoBak) { if (sndGrp->auxANo != auxANoBak || sndGrp->auxBNo != auxBNoBak) {
msmSysSetAux(var_r31->auxANo, var_r31->auxBNo); msmSysSetAux(sndGrp->auxANo, sndGrp->auxBNo);
OSReport("Change AUX %d,%d\n", var_r31->auxANo, var_r31->auxBNo); OSReport("Change AUX %d,%d\n", sndGrp->auxANo, sndGrp->auxBNo);
auxANoBak = var_r31->auxANo; auxANoBak = sndGrp->auxANo;
auxBNoBak = var_r31->auxBNo; auxBNoBak = sndGrp->auxBNo;
HuPrcVSleep(); HuPrcVSleep();
} }
HuAudAUXVolSet(var_r31->auxAVol, var_r31->auxBVol); HuAudAUXVolSet(sndGrp->auxAVol, sndGrp->auxBVol);
OSReport("##########################\n"); OSReport("##########################\n");
} }
} }
void HuAudSndGrpSetSet(s16 arg0) { void HuAudSndGrpSetSet(s16 data_size) {
void *temp_r3; void *buf;
OSTick temp_r31; OSTick osTick;
s32 temp_r26; s32 numPlay;
s32 temp_r27; s32 err;
if (sndGroupBak != arg0) { if (sndGroupBak != data_size) {
msmMusStopAll(1, 0); msmMusStopAll(1, 0);
msmSeStopAll(1, 0); msmSeStopAll(1, 0);
temp_r31 = OSGetTick(); osTick = OSGetTick();
while ((msmMusGetNumPlay(1) != 0 || msmSeGetNumPlay(1) != 0) while ((msmMusGetNumPlay(1) != 0 || msmSeGetNumPlay(1) != 0)
&& OSTicksToMilliseconds(OSGetTick() - temp_r31) < 500); && OSTicksToMilliseconds(OSGetTick() - osTick) < 500);
OSReport("%d\n", OSTicksToMilliseconds(OSGetTick() - temp_r31)); OSReport("%d\n", OSTicksToMilliseconds(OSGetTick() - osTick));
if (OSTicksToMilliseconds(OSGetTick() - temp_r31) >= 500) { if (OSTicksToMilliseconds(OSGetTick() - osTick) >= 500) {
temp_r26 = msmSeGetNumPlay(1); numPlay = msmSeGetNumPlay(1);
OSReport("Timed Out! Mus %d:SE %d\n", msmMusGetNumPlay(1), temp_r26); OSReport("Timed Out! Mus %d:SE %d\n", msmMusGetNumPlay(1), numPlay);
} }
OSReport("GroupSet %d\n", arg0); OSReport("GroupSet %d\n", data_size);
sndGroupBak = arg0; sndGroupBak = data_size;
temp_r27 = msmSysDelGroupAll(); err = msmSysDelGroupAll();
temp_r3 = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(1)); buf = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(1));
temp_r27 = msmSysLoadGroupSet(arg0, temp_r3); err = msmSysLoadGroupSet(data_size, buf);
OSReport("***********GroupSet Error %d\n", temp_r27); OSReport("***********GroupSet Error %d\n", err);
HuMemDirectFree(temp_r3); HuMemDirectFree(buf);
} }
} }
void HuAudSndGrpSet(s16 arg0) { void HuAudSndGrpSet(s16 grpId) {
void *temp_r3; void *buf;
temp_r3 = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(arg0)); buf = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(grpId));
msmSysLoadGroup(arg0, temp_r3, 0); msmSysLoadGroup(grpId, buf, 0);
HuMemDirectFree(temp_r3); HuMemDirectFree(buf);
} }
void HuAudSndCommonGrpSet(s16 arg0, s32 arg1) { void HuAudSndCommonGrpSet(s16 grpId, s32 groupCheck) {
s16 temp_r30; s16 err;
OSTick temp_r27; OSTick osTick;
void *temp_r3; void *buf;
s16 i; s16 i;
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
@ -521,75 +521,75 @@ void HuAudSndCommonGrpSet(s16 arg0, s32 arg1) {
} }
msmMusStopAll(1, 0); msmMusStopAll(1, 0);
msmSeStopAll(1, 0); msmSeStopAll(1, 0);
temp_r27 = OSGetTick(); osTick = OSGetTick();
while ((msmMusGetNumPlay(1) != 0 || msmSeGetNumPlay(1) != 0) while ((msmMusGetNumPlay(1) != 0 || msmSeGetNumPlay(1) != 0)
&& OSTicksToMilliseconds(OSGetTick() - temp_r27) < 500); && OSTicksToMilliseconds(OSGetTick() - osTick) < 500);
OSReport("CommonGrpSet %d\n", arg0); OSReport("CommonGrpSet %d\n", grpId);
if (arg1 != 0) { if (groupCheck != 0) {
temp_r30 = msmSysDelGroupBase(0); err = msmSysDelGroupBase(0);
if (temp_r30 < 0) { if (err < 0) {
OSReport("Del Group Error %d\n", temp_r30); OSReport("Del Group Error %d\n", err);
} }
} }
temp_r3 = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(arg0)); buf = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(grpId));
msmSysLoadGroupBase(arg0, temp_r3); msmSysLoadGroupBase(grpId, buf);
HuMemDirectFree(temp_r3); HuMemDirectFree(buf);
sndGroupBak = -1; sndGroupBak = -1;
} }
void HuAudAUXSet(s32 arg0, s32 arg1) { void HuAudAUXSet(s32 auxA, s32 auxB) {
if (arg0 == -1) { if (auxA == -1) {
arg0 = 0; auxA = 0;
} }
if (arg1 == -1) { if (auxB == -1) {
arg1 = 1; auxB = 1;
} }
msmSysSetAux(arg0, arg1); msmSysSetAux(auxA, auxB);
} }
void HuAudAUXVolSet(s8 arg0, s8 arg1) { void HuAudAUXVolSet(s8 auxA, s8 auxB) {
HuAuxAVol = arg0; HuAuxAVol = auxA;
HuAuxBVol = arg1; HuAuxBVol = auxB;
} }
void HuAudVoiceInit(s16 ovl) { void HuAudVoiceInit(s16 ovl) {
SNDGRPTBL *var_r29; SNDGRPTBL *sndGrp;
OSTick temp_r23; OSTick osTick;
s16 var_r27; s16 numNotChars;
s16 temp_r26; s16 grpId;
s16 temp_r25; s16 temp_r25;
s16 temp_r30; s16 character;
void *temp_r3; void *buf;
s16 i; s16 i;
if (ovl != OVL_INVALID) { if (ovl != OVL_INVALID) {
var_r29 = sndGrpTable; sndGrp = sndGrpTable;
while (1) { while (1) {
if (var_r29->ovl == ovl && var_r29->grpSet == -1) { if (sndGrp->ovl == ovl && sndGrp->grpSet == -1) {
return; return;
} }
if (var_r29->ovl == OVL_INVALID) { if (sndGrp->ovl == OVL_INVALID) {
break; break;
} }
var_r29++; sndGrp++;
} }
} }
for (i = var_r27 = 0; i < 4; i++) { for (i = numNotChars = 0; i < 4; i++) {
temp_r30 = GWPlayerCfg[i].character; character = GWPlayerCfg[i].character;
if (temp_r30 < 0 || temp_r30 >= 8 || temp_r30 == 0xFF || charVoiceGroupStat[temp_r30] != 0) { if (character < 0 || character >= 8 || character == 0xFF || charVoiceGroupStat[character] != 0) {
var_r27++; numNotChars++;
} }
} }
if (var_r27 < 4) { if (numNotChars < 4) {
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
charVoiceGroupStat[i] = 0; charVoiceGroupStat[i] = 0;
} }
msmMusStopAll(1, 0); msmMusStopAll(1, 0);
msmSeStopAll(1, 0); msmSeStopAll(1, 0);
temp_r23 = OSGetTick(); osTick = OSGetTick();
while ((msmMusGetNumPlay(1) != 0 || msmSeGetNumPlay(1) != 0) while ((msmMusGetNumPlay(1) != 0 || msmSeGetNumPlay(1) != 0)
&& OSTicksToMilliseconds(OSGetTick() - temp_r23) < 500); && OSTicksToMilliseconds(OSGetTick() - osTick) < 500);
OSReport("############CharGrpSet\n"); OSReport("############CharGrpSet\n");
temp_r25 = msmSysDelGroupBase(0); temp_r25 = msmSysDelGroupBase(0);
if (temp_r25 < 0) { if (temp_r25 < 0) {
@ -598,39 +598,39 @@ void HuAudVoiceInit(s16 ovl) {
OSReport("Del Group OK\n"); OSReport("Del Group OK\n");
} }
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
temp_r30 = GWPlayerCfg[i].character; character = GWPlayerCfg[i].character;
if (temp_r30 >= 0 && temp_r30 < 8 && temp_r30 != 0xFF) { if (character >= 0 && character < 8 && character != 0xFF) {
charVoiceGroupStat[temp_r30] = 1; charVoiceGroupStat[character] = 1;
temp_r26 = temp_r30 + 0xA; grpId = character + 10;
temp_r3 = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(temp_r26)); buf = HuMemDirectMalloc(HEAP_DATA, msmSysGetSampSize(grpId));
#if VERSION_NTSC #if VERSION_NTSC
msmSysLoadGroupBase(temp_r26, temp_r3); msmSysLoadGroupBase(grpId, buf);
#else #else
temp_r25 = msmSysLoadGroupBase(temp_r26, temp_r3); temp_r25 = msmSysLoadGroupBase(grpId, buf);
#endif #endif
HuMemDirectFree(temp_r3); HuMemDirectFree(buf);
} }
} }
sndGroupBak = -1; sndGroupBak = -1;
} }
} }
s32 HuAudPlayerVoicePlay(s16 arg0, s16 arg1) { s32 HuAudPlayerVoicePlay(s16 player, s16 seId) {
s16 temp_r31 = GWPlayerCfg[arg0].character; s16 charNo = GWPlayerCfg[player].character;
return HuAudCharVoicePlay(temp_r31, arg1); return HuAudCharVoicePlay(charNo, seId);
} }
s32 HuAudPlayerVoicePlayPos(s16 arg0, s16 arg1, Vec *arg2) { s32 HuAudPlayerVoicePlayPos(s16 player, s16 seId, Vec *pos) {
s16 temp_r31 = GWPlayerCfg[arg0].character; s16 charNo = GWPlayerCfg[player].character;
return HuAudCharVoicePlayPos(temp_r31, arg1, arg2); return HuAudCharVoicePlayPos(charNo, seId, pos);
} }
void HuAudPlayerVoicePlayEntry(s16 arg0, s16 arg1) { void HuAudPlayerVoicePlayEntry(s16 player, s16 seId) {
s16 temp_r31 = GWPlayerCfg[arg0].character; s16 charNo = GWPlayerCfg[player].character;
HuAudCharVoicePlayEntry(temp_r31, arg1); HuAudCharVoicePlayEntry(charNo, seId);
} }
s32 HuAudCharVoicePlay(s16 charNo, s16 seId) s32 HuAudCharVoicePlay(s16 charNo, s16 seId)
@ -676,14 +676,14 @@ s32 HuAudCharVoicePlayPos(s16 charNo, s16 seId, Vec *pos) {
} }
void HuAudCharVoicePlayEntry(s16 charNo, s16 seId) { void HuAudCharVoicePlayEntry(s16 charNo, s16 seId) {
int spC[MSM_ENTRY_SENO_MAX]; // size unknown (min: 30, max: 33) int seNoTbl[MSM_ENTRY_SENO_MAX]; // size unknown (min: 30, max: 33)
u16 temp_r29; u16 id;
u16 i; u16 i;
seId += (charNo << 6); seId += (charNo << 6);
temp_r29 = msmSeGetEntryID(seId, spC); id = msmSeGetEntryID(seId, seNoTbl);
for (i = 0; i < temp_r29; i++) { for (i = 0; i < id; i++) {
msmSeStop(spC[i], 0); msmSeStop(seNoTbl[i], 0);
} }
} }

90
src/game/board/audio.c
View file

@ -15,64 +15,64 @@ static s16 boardMusTbl[] = {
}; };
void BoardMusStartBoard(void) { void BoardMusStartBoard(void) {
s16 temp_r31 = boardMusTbl[GWBoardGet()]; s16 musIdx = boardMusTbl[GWBoardGet()];
BoardMusStart(0, temp_r31, 0x7F, 0); BoardMusStart(0, musIdx, 0x7F, 0);
BoardAudFXPlay(); BoardAudFXPlay();
} }
void BoardMusStart(s32 arg0, s32 arg1, s8 arg2, u16 arg3) { void BoardMusStart(s32 boardNo, s32 musId, s8 vol, u16 speed) {
s16 *temp_r31 = boardSeq[arg0]; s16 *board = boardSeq[boardNo];
MSM_MUSPARAM param; MSM_MUSPARAM param;
if (arg1 == temp_r31[1]) { if (musId == board[1]) {
return; return;
} }
if (temp_r31[0] != -1) { if (board[0] != -1) {
BoardAudSeqFadeOutFast(temp_r31[0]); BoardAudSeqFadeOutFast(board[0]);
} }
param.flag = MSM_MUSPARAM_CHAN; param.flag = MSM_MUSPARAM_CHAN;
if (arg3 != 0) { if (speed != 0) {
param.flag |= MSM_MUSPARAM_FADESPEED; param.flag |= MSM_MUSPARAM_FADESPEED;
} }
if (arg2 < 0) { if (vol < 0) {
param.flag |= MSM_MUSPARAM_VOL; param.flag |= MSM_MUSPARAM_VOL;
arg2 = 0x7F; vol = 0x7F;
} }
param.fadeSpeed = arg3; param.fadeSpeed = speed;
param.vol = arg2; param.vol = vol;
param.chan = arg0; param.chan = boardNo;
temp_r31[0] = msmMusPlay(arg1, &param); board[0] = msmMusPlay(musId, &param);
temp_r31[1] = arg1; board[1] = musId;
} }
void BoardAudSeqFadeOutFast(s32 arg0) { void BoardAudSeqFadeOutFast(s32 boardNo) {
BoardAudSeqFadeOut(arg0, 0x64); BoardAudSeqFadeOut(boardNo, 0x64);
} }
void BoardAudSeqFadeOut(s32 arg0, u16 arg1) { void BoardAudSeqFadeOut(s32 boardNo, u16 speed) {
s16 *temp_r31 = boardSeq[arg0]; s16 *board = boardSeq[boardNo];
if (temp_r31[0] == -1) { if (board[0] == -1) {
return; return;
} }
HuAudSeqFadeOut(temp_r31[0], arg1); HuAudSeqFadeOut(board[0], speed);
temp_r31[1] = temp_r31[0] = -1; board[1] = board[0] = -1;
} }
void BoardMusLoudSet(s32 arg0, s32 arg1) { void BoardMusLoudSet(s32 boardNo, s32 isQuieter) {
if (arg1 != 0) { if (isQuieter != 0) {
BoardMusVolPanSet(arg0, 0x60, 0x1F4); BoardMusVolPanSet(boardNo, 0x60, 0x1F4);
} else { } else {
BoardMusVolPanSet(arg0, 0x7F, 0x1F4); BoardMusVolPanSet(boardNo, 0x7F, 0x1F4);
} }
} }
void BoardMusVolPanSet(s32 arg0, s8 vol, u16 fadeSpeed) { void BoardMusVolPanSet(s32 boardNo, s8 vol, u16 fadeSpeed) {
s16 *temp_r31 = boardSeq[arg0]; s16 *board = boardSeq[boardNo];
MSM_MUSPARAM param; MSM_MUSPARAM param;
if (temp_r31[0] == -1) { if (board[0] == -1) {
return; return;
} }
param.flag = MSM_MUSPARAM_CHAN; param.flag = MSM_MUSPARAM_CHAN;
@ -82,32 +82,32 @@ void BoardMusVolPanSet(s32 arg0, s8 vol, u16 fadeSpeed) {
} }
param.fadeSpeed = fadeSpeed; param.fadeSpeed = fadeSpeed;
param.vol = vol; param.vol = vol;
msmMusSetParam(temp_r31[0], &param); msmMusSetParam(board[0], &param);
} }
void BoardAudSeqPause(s32 arg0, s32 arg1, u16 arg2) { void BoardAudSeqPause(s32 boardNo, s32 pause, u16 speed) {
s16 *temp_r31 = boardSeq[arg0]; s16 *board = boardSeq[boardNo];
if (temp_r31[0] == -1) { if (board[0] == -1) {
return; return;
} }
if (arg1 != 0) { if (pause != 0) {
if (BoardMusStatusGet(arg0) == 3) { if (BoardMusStatusGet(boardNo) == 3) {
return; return;
} }
} else if (BoardMusStatusGet(arg0) != 3) { } else if (BoardMusStatusGet(boardNo) != 3) {
return; return;
} }
HuAudSeqPause(temp_r31[0], arg1, arg2); HuAudSeqPause(board[0], pause, speed);
} }
s32 BoardMusStatusGet(s32 arg0) { s32 BoardMusStatusGet(s32 boardNo) {
s16 *temp_r31 = boardSeq[arg0]; s16 *board = boardSeq[boardNo];
if (temp_r31[0] == -1) { if (board[0] == -1) {
return 0; return 0;
} }
return msmMusGetStatus(temp_r31[0]); return msmMusGetStatus(board[0]);
} }
void BoardAudSeqClear(void) { void BoardAudSeqClear(void) {
@ -134,20 +134,20 @@ void BoardAudSeqFadeOutAll(void) {
} }
void BoardAudFXPlay(void) { void BoardAudFXPlay(void) {
s32 var_r31; s32 seId;
switch (GWBoardGet()) { switch (GWBoardGet()) {
case BOARD_ID_MAIN5: case BOARD_ID_MAIN5:
var_r31 = 0x48D; seId = 0x48D;
break; break;
case BOARD_ID_MAIN6: case BOARD_ID_MAIN6:
var_r31 = 0x4A2; seId = 0x4A2;
break; break;
default: default:
return; return;
} }
if (boardFX == -1) { if (boardFX == -1) {
boardFX = HuAudFXPlay(var_r31); boardFX = HuAudFXPlay(seId);
} }
} }