arm7: decompile SND_wave

4 files changed, 22 insertions, 43 deletions

diff --git a/arm7/asm/SND_wave.s b/arm7/asm/SND_wave.s
deleted file mode 100644
index e18acc43..00000000
--- a/arm7/asm/SND_wave.s
+++ /dev/null
@@ -1,43 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-    .text
-
-	arm_func_start SND_InvalidateWave
-SND_InvalidateWave: ; 0x037FC8DC
-	stmdb	sp!, {r4, r5, r6, r7, r8, r9, lr}
-	sub	sp, sp, #4
-	mov	r7, r0
-	mov	r6, r1
-	mov	r5, #0
-	mov	r9, r5
-	ldr	r4, _037FC960	; =SNDi_Work
-	mov	r8, #84	; 0x54
-_037FC8FC:
-	mla	r2, r5, r8, r4
-	ldrb	r1, [r2, #3]
-	mov	r0, r1, lsl #31
-	movs	r0, r0, lsr #31
-	beq	_037FC944
-	ldrb	r0, [r2, #1]
-	cmp	r0, #0
-	bne	_037FC944
-	ldr	r0, [r2, #68]	; 0x44
-	cmp	r7, r0
-	bhi	_037FC944
-	cmp	r0, r6
-	bhi	_037FC944
-	bic	r0, r1, #2
-	strb	r0, [r2, #3]
-	mov	r0, r5
-	mov	r1, r9
-	bl	SND_StopChannel
-_037FC944:
-	add	r0, r5, #1
-	and	r5, r0, #255	; 0xff
-	cmp	r5, #16
-	bcc	_037FC8FC
-	add	sp, sp, #4
-	ldmia	sp!, {r4, r5, r6, r7, r8, r9, lr}
-	bx	lr
-_037FC960:	.word	SNDi_Work
diff --git a/arm7/lib/include/SND.h b/arm7/lib/include/SND.h
index 69db1a16..b471ac72 100644
--- a/arm7/lib/include/SND.h
+++ b/arm7/lib/include/SND.h
@@ -6,5 +6,6 @@
 void SND_Enable(void);
 void SND_SetOutputSelector(u8 leftOutputFrom, u8 rightOutputFrom, u8 outputCh1ToMixer, u8 outputCh3ToMixer);
 void SND_SetMasterVolume(u8 vol);
+void SND_StopChannel(s32 idx, BOOL hold);
 
 #endif //GUARD_SND_H
diff --git a/arm7/lib/include/SND_wave.h b/arm7/lib/include/SND_wave.h
new file mode 100644
index 00000000..e1ae93fe
--- /dev/null
+++ b/arm7/lib/include/SND_wave.h
@@ -0,0 +1,6 @@
+#ifndef GUARD_SND_WAVE_H
+#define GUARD_SND_WAVE_H
+
+void SND_InvalidateWave(void *begin, void *end);
+
+#endif //GUARD_SND_WAVE_H
diff --git a/arm7/lib/src/SND_wave.c b/arm7/lib/src/SND_wave.c
new file mode 100644
index 00000000..75d84e5f
--- /dev/null
+++ b/arm7/lib/src/SND_wave.c
@@ -0,0 +1,15 @@
+#include "SND_wave.h"
+
+#include "SND.h"
+#include "SND_work.h"
+
+void SND_InvalidateWave(void *start, void *end) {
+    for (u8 i = 0; i < SND_CHANNEL_COUNT; i++) {
+        struct SNDExChannel *chn = &SNDi_Work.channels[i];
+
+        if (chn->flags.active && chn->type == 0 && start <= chn->waveDataPtr && chn->waveDataPtr <= end) {
+            chn->flags.start = FALSE;
+            SND_StopChannel(i, 0);
+        }
+    }
+}