4 files changed, 25 insertions, 39 deletions
diff --git a/arm7/asm/SND_capture.s b/arm7/asm/SND_capture.s
deleted file mode 100644
index d40e792e..00000000
--- a/arm7/asm/SND_capture.s
+++ /dev/null
@@ -1,38 +0,0 @@
-	.include "asm/macros.inc"
-	.include "global.inc"
-
-    .text
-
-	arm_func_start SND_IsCaptureActive
-SND_IsCaptureActive: ; 0x037FC4C0
-	add	r0, r0, #67108864	; 0x4000000
-	ldrb	r0, [r0, #1288]	; 0x508
-	ands	r0, r0, #128	; 0x80
-	movne	r0, #1
-	moveq	r0, #0
-	bx	lr
-
-	arm_func_start SND_SetupCapture
-SND_SetupCapture: ; 0x037FC4D8
-	stmdb	sp!, {r4, r5, lr}
-	sub	sp, sp, #4
-	mov	r4, r0, lsl #3
-	ldr	ip, [sp, #16]
-	cmp	ip, #0
-	movne	r5, #0
-	moveq	r5, #1
-	ldr	lr, [sp, #24]
-	ldr	ip, [sp, #20]
-	mov	r1, r1, lsl #3
-	orr	r1, r1, r5, lsl #2
-	orr	r1, r1, ip, lsl #1
-	orr	r1, lr, r1
-	add	r0, r0, #67108864	; 0x4000000
-	strb	r1, [r0, #1288]	; 0x508
-	add	r0, r4, #67108864	; 0x4000000
-	str	r2, [r0, #1296]	; 0x510
-	add	r0, r0, #1280	; 0x500
-	strh	r3, [r0, #20]
-	add	sp, sp, #4
-	ldmia	sp!, {r4, r5, lr}
-	bx	lr
diff --git a/arm7/lib/include/SND_capture.h b/arm7/lib/include/SND_capture.h
index 78a09efa..1878f90e 100644
--- a/arm7/lib/include/SND_capture.h
+++ b/arm7/lib/include/SND_capture.h
@@ -1,6 +1,9 @@
 #ifndef GUARD_SND_CAPTURE_H
 #define GUARD_SND_CAPTURE_H
 
-BOOL SND_IsCaptureActive(s32 idx);
+#include "nitro/types.h"
+
+void SND_SetupCapture(int idx, int format, void *captureData, int size, BOOL loop, int capCtrlSrc, int capCtrlDst);
+BOOL SND_IsCaptureActive(int idx);
 
 #endif //GUARD_SND_CAPTURE_H
diff --git a/arm7/lib/include/registers.h b/arm7/lib/include/registers.h
index bc55d0d8..e9280957 100644
--- a/arm7/lib/include/registers.h
+++ b/arm7/lib/include/registers.h
@@ -12,6 +12,8 @@
 #define reg_SOUNDxPNT(x) (*((REGType16v *)0x400040A + ((int)x) * 0x10))
 #define reg_SOUNDxLEN(x) (*((REGType32v *)0x400040C + ((int)x) * 0x10))
 
+#define reg_SNDCAPxCNT(x) (*((REGType8v *)0x4000508 + ((int)(x))))
+
 #define EXTKEYIN_X (1<<0)
 #define EXTKEYIN_Y (1<<1)
 #define EXTKEYIN_DEBUG (1<<3)
diff --git a/arm7/lib/src/SND_capture.c b/arm7/lib/src/SND_capture.c
new file mode 100644
index 00000000..8b604d10
--- /dev/null
+++ b/arm7/lib/src/SND_capture.c
@@ -0,0 +1,19 @@
+#include "SND_capture.h"
+
+#include "registers.h"
+
+enum SNDLoop {
+    SND_CAP_LOOP = 0, SND_CAP_ONESHOT = 1
+};
+
+void SND_SetupCapture(int idx, int format, void *captureData, int size, BOOL loop, int capCtrlSrc, int capCtrlDst) {
+    int off = idx * 8;
+
+    reg_SNDCAPxCNT(idx) = (u8)((format << 3) | ((loop ? SND_CAP_LOOP : SND_CAP_ONESHOT) << 2) | (capCtrlSrc << 1) | capCtrlDst);
+    *(vu32 *)(0x4000510 + off) = (u32)captureData;
+    *(vu16 *)(0x4000514 + off) = (u16)size;
+}
+
+BOOL SND_IsCaptureActive(int idx) {
+    return (reg_SNDCAPxCNT(idx) & 0x80) != 0;
+}