From 7b01b104bfcfa636156e59333adf4424e2f80dc8 Mon Sep 17 00:00:00 2001
From: Ryan Dwyer <ryandwyer1@gmail.com>
Date: Thu, 1 Apr 2021 11:32:18 +1000
Subject: [PATCH] Attempt to decompile sndStart

---
 src/include/lib/lib_317f0.h |  2 +-
 src/include/lib/snd.h       |  2 +-
 src/lib/snd.c               | 63 +++++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/src/include/lib/lib_317f0.h b/src/include/lib/lib_317f0.h
index 337b10860..fa45dedd6 100644
--- a/src/include/lib/lib_317f0.h
+++ b/src/include/lib/lib_317f0.h
@@ -15,7 +15,7 @@ u32 func00033390(void);
 void func00033634(void *fn);
 u32 func0003364c(void);
 u32 audioIsPlaying(struct audiohandle *handle);
-u32 func00033820(void);
+struct audiohandle *func00033820(s32 arg0, s16 soundnum, s32 arg2, s32 arg3, f32 arg4, s32 arg5, s32 arg6, struct audiohandle **handle);
 void audioStop(struct audiohandle *handle);
 u32 func00033bc0(void);
 u32 func00033c30(void);
diff --git a/src/include/lib/snd.h b/src/include/lib/snd.h
index f30c46ab0..8354bfa27 100644
--- a/src/include/lib/snd.h
+++ b/src/include/lib/snd.h
@@ -35,7 +35,7 @@ u32 snd0001036c(void);
 void sndAdjust(struct audiohandle **handle, s32 arg1, s32 arg2, s32 speakerweight, s16 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
 struct audiohandle *snd00010718(struct audiohandle **handle, s32 arg1, s32 arg2, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7, s32 arg8);
 struct audiohandle *sndStart(s32 arg0, s16 sound, struct audiohandle **handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7);
-u32 snd00010ae4(void);
+void snd00010ae4(s32 soundnum, s32 arg1, s32 arg2, s32 arg3);
 void sndPlayNosedive(s32 seconds);
 void sndStopNosedive(void);
 void sndTickNosedive(void);
diff --git a/src/lib/snd.c b/src/lib/snd.c
index 87fff353b..12fa1fe09 100644
--- a/src/lib/snd.c
+++ b/src/lib/snd.c
@@ -4431,6 +4431,69 @@ glabel sndStart
 /*    10adc:	03e00008 */ 	jr	$ra
 /*    10ae0:	00000000 */ 	nop
 );
+
+// Mismatch: Likely related to soundnumhack
+//struct audiohandle *sndStart(s32 arg0, s16 sound, struct audiohandle **handle, s32 arg3, s32 arg4, f32 arg5, s32 arg6, s32 arg7)
+//{
+//	union soundnumhack sp44;
+//	union soundnumhack sp40;
+//	u8 sp3f;
+//	u8 sp3e;
+//	u8 sp3d;
+//	u8 sp3c;
+//	s16 sp3a;
+//	u16 sp38;
+//	f32 sp34;
+//
+//	// 91c
+//	sp3f = arg7 != -1 ? arg7 : 0;
+//
+//	// 93c
+//	sp3e = arg6 != -1 ? arg6 : 1;
+//
+//	// 958
+//	sp3d = arg4 != -1 ? arg4 : 64;
+//
+//	// 968
+//	sp3a = arg3 != -1 ? arg3 : 0x7fff;
+//
+//	// 988
+//	sp34 = arg5 > 0.0f ? arg5 : 1.0f;
+//
+//	sp44.packed = sound & 0xffff;
+//
+//	// 9ac
+//	if (g_SndDisabled) {
+//		return NULL;
+//	}
+//
+//	// 9cc
+//	sp40.packed = sp44.bits.isruss ? g_AudioRussMappings[sp44.bits.id].soundnum : sp44.packed;
+//
+//	// 9ec
+//	if (sp40.bits3.id == 0x37 || sp40.bits3.id == 9) {
+//		return NULL;
+//	}
+//
+//	// a18
+//	if (sndIsMp3(sp40.packed)) {
+//		snd00010ae4(sp40.packed, sp3a, sp3d, 0);
+//
+//		if (handle != NULL) {
+//			*handle = NULL;
+//		}
+//
+//		return NULL;
+//	}
+//
+//	// a68
+//	if (sp40.bits3.id < g_NumSounds) {
+//		return func00033820(arg0, sp40.bits3.id, sp3a, sp3d & 0x7f,
+//				sp34, sp3f, IS4MB() ? 0 : sp3e, handle);
+//	}
+//
+//	return NULL;
+//}
 #else
 GLOBAL_ASM(
 glabel sndStart