Matched most of msmsys (5 functions left) (#528)

include/game/msm.h

@@ -40,7 +40,9 @@
 #define MSM_ERR_OUTOFMEM -10
 #define MSM_ERR_OUTOFAMEM -20
 #define MSM_ERR_INITFAIL -20
+#define MSM_ERR_1E -30
 #define MSM_ERR_INVALID_AUXPARAM -31
+#define MSM_ERR_20 -32
 #define MSM_ERR_PLAYFAIL -33
 #define MSM_ERR_22 -34
 #define MSM_ERR_STREAMALLOC_FAIL -35
@@ -166,7 +168,7 @@ typedef struct msmStreamParam_s {
 } MSM_STREAMPARAM;
 
 s32 msmSysInit(MSM_INIT *init, MSM_ARAM *aram);
-void msmSysSetOutputMode(SND_OUTPUTMODE mode);
+s32 msmSysSetOutputMode(SND_OUTPUTMODE mode);
 s32 msmSysDelGroupAll(void);
 s32 msmSysLoadGroup(s32 grp, void *buf, BOOL flag);
 s32 msmSysGetSampSize(BOOL baseGrp);

include/msm/msmstream.h

@@ -4,7 +4,7 @@
 #include "dolphin/types.h"
 
 void msmStreamPeriodicProc(void);
-void msmStreamSetOutputMode(s8);
+void msmStreamSetOutputMode(s32);
 void msmStreamAmemFree(void);
 s32 msmStreamAmemAlloc(void);
 s32 msmStreamInit(char *);

include/msm/msmsys.h

@@ -1,47 +1,47 @@
 #ifndef MSMSYS_H
 #define MSMSYS_H
 
+#include "musyx/musyx.h"
+
 #include "dolphin.h"
 
+typedef struct {
+    u32 tempDisableFX;
+    f32 coloration;
+    f32 mix;
+    f32 time;
+    f32 damping;
+    f32 preDelay;
+    f32 crosstalk;
+} SubStructRev;
+
+typedef struct {
+    u32 baseDelay;
+    u32 variation;
+    u32 period;
+} SubStructCh;
+
+typedef struct {
+    u32 delay[3];
+    u32 feedback[3];
+    u32 output[3];
+} SubDelay;
+
 typedef struct _unkSubStruct {
     s8 unk0;
     union {
-        f32 unk4f[9];
-        s32 unk4s[9];
+        SubStructRev rev;
+        SubStructCh ch;
+        SubDelay delay;
     };
 } unkSubStruct;
 
-typedef struct _unkSubStruct2 {
-    char unk[0x3C];
-    s32 unk3C;
-    s32 unk40;
-    s32 unk44;
-    s32 unk48;
-    s32 unk4C;
-    s32 unk50;
-    s32 unk54;
-    s32 unk58;
-    s32 unk5C;
-    char unk60[0x30];
-    s32 unk90;
-    s32 unk94;
-    s32 unk98;
-    char unk9C[0xA0];
-    u8 unk13C;
-    f32 unk140;
-    f32 unk144;
-    f32 unk148;
-    f32 unk14C;
-    f32 unk150;
-    char unk154[0x70];
-    u8 unk1C4;
-    f32 unk1C8;
-    f32 unk1CC;
-    f32 unk1D0;
-    f32 unk1D4;
-    f32 unk1D8;
-    f32 unk1DC;
-} unkSubStruct2; // sizeof unk1E0
+typedef union {
+    SND_AUX_REVERBHI revHi;
+    SND_AUX_REVERBSTD revStd;
+    SND_AUX_CHORUS ch;
+    SND_AUX_DELAY delay;
+} UnkSndAuxUnion; // Size 0x1E0
 
 typedef struct _unkSubStruct3 {
     char unk[0x4];
@@ -51,7 +51,8 @@ typedef struct _unkSubStruct3 {
     u32 unk14; // length
     s32 unk18; // offset
     u32 unk1C; // length
-    char unk20[8];
+    s32 unk20;
+    s32 unk24;
     s32 unk28;
     s32 unk2C;
     s32 unk30;
@@ -61,7 +62,10 @@ typedef struct _unkSubStruct3 {
     s32 unk40;
     char unk44[4];
     s32 unk48;
-    char unk4C[0x14];
+    char unk4C[4];
+    s32 unk50;
+    s32 unk54;
+    char unk58[8];
 } unkSubStruct3; // sizeof 0x60
 
 typedef struct _unkStruct3 {
@@ -74,21 +78,44 @@ typedef struct _sndInitData {
     s8 unk0;
     s8 unk1;
     s8 unk2;
-    char unk3[1];
+    s8 unk3;
     s16 unk4;
     s16 unk6;
     s8 unk8;
-    char unk9[5];
+    s8 unk9;
+    s8 unkA;
+    s8 unkB;
+    char unkC[2];
     s8 unkE;
     s8 unkF;
     u32 unk10;
     s32 unk14;
-    char unk18[8];
+    s32 unk18;
+    s32 unk1C;
     s32 unk20;
-    char unk24[5];
+    char unk24[4];
+    s8 unk28;
     s8 unk29[10]; // size unknown
 } sndInitData;
 
+typedef struct {
+    /* 0x00 */ s8 unk00;
+    /* 0x01 */ s8 unk01;
+    /* 0x02 */ char unk02[2];
+    /* 0x04 */ u32 unk04;
+    /* 0x08 */ void *unk08;
+} UnkStructSys43C; // Size 0xC
+
+typedef struct _unkStruct4 {
+    SND_GROUPID unk0;
+    s8 unk2;
+    s32 unk4;
+    s32 unk8;
+    s32 unkC;
+    s32 unk10;
+    char unk14[0xC];
+} unkStruct4; // Size 0x20
+
 typedef struct _sysData {
     s32 unk0;
     s8 unk4;
@@ -99,20 +126,34 @@ typedef struct _sysData {
     unkSubStruct3 *unkC;
     sndInitData *unk10;
     unkSubStruct *unk14;
-    s8 unk18;
-    s8 unk19;
+    s8 unk18[2];
     s8 unk1A;
     s8 unk1B;
-    unkSubStruct2 unk1C; // userA
-    unkSubStruct2 unk1FC; // userB
-    char unk3DC[0x8];
-    s32 unk3E4;
-    s32 unk3E8;
-    s32 unk3EC;
-    s32 unk3F0;
+    UnkSndAuxUnion unk1C[2]; // 0: userA, 1: userB
+    s8 unk3DC;
+    char unk3DD[3];
+    s32 unk3E0;
+    u32 unk3E4;
+    u32 unk3E8;
+    unkStruct4 *unk3EC;
+    void *unk3F0;
     s8 unk3F4;
-    unkStruct3 *unk3F8;
-    char unk3FC[0xF0];
+    unkStruct3 *unk3F8[1]; // unknown array length
+    char unk3FC[0x38];
+    s8 unk434;
+    s8 unk435;
+    s8 unk436;
+    char unk437[1];
+    void *unk438;
+    UnkStructSys43C unk43C[1]; // unknown array length
+    char unk448[0x24];
+    s8 unk46C;
+    s8 unk46D;
+    s8 unk46E;
+    char unk46F[1];
+    void *unk470;
+    UnkStructSys43C unk474[1]; // unknown array length
+    char unk480[0x6C];
     s32 unk4EC;
     BOOL unk4F0;
     AIDCallback unk4F4;