Decompile func00033390

src/include/constants.h

@@ -3416,6 +3416,7 @@
 #define SNDSTATEFLAG_02 0x02
 #define SNDSTATEFLAG_04 0x04
 #define SNDSTATEFLAG_10 0x10
+#define SNDSTATEFLAG_20 0x20
 
 #define SOLOSTAGEINDEX_DEFECTION     0x00
 #define SOLOSTAGEINDEX_INVESTIGATION 0x01

src/include/data.h

@@ -74,8 +74,6 @@ extern u16 *g_RdpOutBufferEnd;
 extern u16 *g_RdpOutBufferStart;
 extern struct rdptask *g_RdpCurTask;
 extern N_ALSndPlayer *g_SndPlayer;
-extern u32 var8005f134;
-extern u32 var8005f138;
 extern u32 var8005f4dc;
 extern u32 var8005f548;
 extern s16 n_eqpower[];

src/include/lib/lib_317f0.h

@@ -8,7 +8,7 @@ void func00033090(struct sndstate *handle);
 u32 func00033100(void);
 u16 sndpCountStates(s16 *numfreeptr, s16 *numallocedptr);
 void func00033378(void *fn);
-struct sndstate *func00033390(s32 arg0, struct var80099024 *arg1);
+struct sndstate *func00033390(s32 arg0, struct sndstate_08 *arg1);
 void func00033634(void *fn);
 bool audioIsPlaying(struct sndstate *handle);
 struct sndstate *func00033820(s32 arg0, s16 soundnum, u16 arg2, u8 arg3, f32 arg4, u8 arg5, u8 arg6, struct sndstate **handleptr);

src/include/lib/snd.h

@@ -18,7 +18,7 @@ u32 snd0000efa8(void);
 u32 snd0000f0d4(void);
 u32 snd0000f228(void);
 void sndSetSoundMode(s32 mode);
-struct var80099024 *snd0000f49c(u16 soundnum);
+struct sndstate_08 *snd0000f49c(u16 soundnum);
 void seqInit(struct seqinstance *seq);
 void sndInit(void);
 bool sndIsMp3(u16 soundnum);

src/include/types.h

@@ -2123,13 +2123,22 @@ struct eyespy {
 	/*0x7c*/ f32 pitch;
 };
 
+struct sndstate_08_00 {
+	u32 unk00;
+	u32 unk04;
+};
+
 struct sndstate_08_04 {
-	u16 unk00;
+	u8 unk00;
+	u8 unk01;
 	u8 unk02;
+	u8 unk03;
+	u8 unk04;
+	s8 unk05;
 };
 
 struct sndstate_08 {
-	u32 unk00;
+	struct sndstate_08_00 *unk00;
 	struct sndstate_08_04 *unk04;
 };
 
@@ -2137,7 +2146,7 @@ struct sndstate {
 	/*0x00*/ ALLink node;
 	/*0x08*/ struct sndstate_08 *unk08;
 	/*0x0c*/ N_ALVoice voice;
-	/*0x28*/ u32 unk28;
+	/*0x28*/ f32 unk28;
 	/*0x2c*/ f32 unk2c;
 	/*0x30*/ struct sndstate **unk30;
 	/*0x34*/ u32 unk34;
@@ -7401,15 +7410,4 @@ struct asistream {
 	bool (*unk847c)(struct asistream *stream);
 };
 
-struct var80099024_04 {
-	u8 unk00;
-	u8 unk01;
-	u8 unk02;
-};
-
-struct var80099024 {
-	u32 unk00;
-	struct var80099024_04 *unk04;
-};
-
 #endif