Rename sndStartMp3 to sndStartMp3ByFilenum and decompile new sndStartMp3

src/include/game/file.h

@@ -4,7 +4,7 @@
 #include "data.h"
 #include "types.h"
 
-void *fileGetRomAddress(s32 filenum);
+u32 fileGetRomAddress(s32 filenum);
 u32 fileGetRomSizeByTableAddress(u32 *filetableaddr);
 s32 fileGetRomSizeByFileNum(s32 filenum);
 u32 func0f166ea8(u32 *filetableaddr);

src/include/lib/mp3.h

@@ -5,16 +5,16 @@
 #include "types.h"
 
 void mp3Init(ALHeap *heap);
-void func00037d88(s32 arg0, s32 arg1);
+void mp3PlayFile(s32 romaddr, s32 filesize);
 void func00037e1c(void);
 void func00037e38(void);
 void func00037e68(void);
 s32 func00037ea4(void);
-void func00037f08(s32 arg0, s32 arg1);
+void func00037f08(s32 arg0, bool arg1);
 void func00037f5c(s32 arg0, bool arg1);
 s32 func00037fc0(s32 arg0, Acmd **cmd);
 void func00038924(struct mp3vars *vars);
 void func00038b90(void *fn);
-void func00038cac(void);
+void mp3Dma(void);
 
 #endif

src/include/lib/snd.h

@@ -5,11 +5,11 @@
 #include "types.h"
 
 bool sndIsFiltered(s32 audioid);
-u32 snd0000e9d0(void);
+bool sndIsPlayingMp3(void);
 u16 snd0000e9dc(void);
 void sndSetSfxVolume(u16 volume);
 void snd0000ea80(u16 volume);
-void snd0000eadc(void);
+void sndResetCurMp3(void);
 void sndLoadSfxCtl(void);
 void snd0000ed14(void);
 u32 snd0000ed68(void);
@@ -31,11 +31,11 @@ void snd0000fe20(void);
 void snd0000fe50(void);
 void sndTick(void);
 bool sndIsDisabled(void);
-void sndStartMp3(u32 filenum);
+void sndStartMp3ByFilenum(u32 filenum);
 void sndAdjust(struct sndstate **handle, s32 arg1, s32 arg2, s32 pan, s32 soundnum, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
 struct sndstate *snd00010718(struct sndstate **handle, s32 arg1, s32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
 struct sndstate *sndStart(s32 arg0, s16 sound, struct sndstate **handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7);
-void snd00010ae4(s32 soundnum, s32 arg1, s32 arg2, s32 arg3);
+void sndStartMp3(s16 soundnum, s32 arg1, s32 arg2, s32 arg3);
 void sndPlayNosedive(s32 seconds);
 void sndStopNosedive(void);
 void sndTickNosedive(void);

src/include/types.h

@@ -3585,22 +3585,16 @@ union soundnumhack {
 	s16 packed;
 
 	struct {
-		u16 isruss : 1;
-		u16 id : 15;
-	} bits;
+		u16 hasconfig : 1;
+		u16 confignum : 15;
+	};
 
 	struct {
-		u16 isruss : 1;
+		u16 hasconfig : 1;
 		u16 unk02 : 2;
-		u16 id : 13;
-	} bits2;
-
-	struct {
-		u16 isruss : 1;
-		u16 unk02 : 2;
-		u16 unk04 : 2;
+		u16 mp3priority : 2;
 		u16 id : 11;
-	} bits3;
+	};
 };
 
 struct audiorussmapping {
@@ -6987,7 +6981,7 @@ struct mp3thing {
 };
 
 struct mp3vars {
-	/*0x00*/ s32 var8009c390;
+	/*0x00*/ s32 romaddr;
 	/*0x04*/ struct asistream *var8009c394;
 	/*0x08*/ u8 *var8009c398;
 	/*0x0c*/ s16 var8009c39c;
@@ -7005,7 +6999,7 @@ struct mp3vars {
 	/*0x24*/ s16 var8009c3b4;
 	/*0x28*/ s32 samples;
 	/*0x2c*/ s32 var8009c3bc;
-	/*0x30*/ s32 var8009c3c0;
+	/*0x30*/ s32 filesize;
 	/*0x34*/ s32 var8009c3c4;
 	/*0x38*/ struct mp3thing *var8009c3c8;
 	/*0x3c*/ s32 var8009c3cc;