arm7: merge SND_wave into SND_exChannel

5 files changed, 13 insertions, 22 deletions

diff --git a/arm7/arm7.lsf b/arm7/arm7.lsf
index 46b4ffb8..c3960f04 100644
--- a/arm7/arm7.lsf
+++ b/arm7/arm7.lsf
@@ -46,7 +46,6 @@ Autoload WRAM
 	Object SND_capture.o
 	Object SND_channel.o
 	Object SND_lfo.o
-	Object SND_wave.o
 	Object SND_exChannel.o
 	Object SND_seq.o
 	Object SND_bank.o
diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h
index 9ebedc76..6bc4ab29 100644
--- a/arm7/lib/include/SND_exChannel.h
+++ b/arm7/lib/include/SND_exChannel.h
@@ -36,4 +36,6 @@ void SND_LockChannel(u32 channelMask, u32 weak);
 void SND_UnlockChannel(u32 channelMask, u32 weak);
 u32 SND_GetLockedChannel(u32 weak);
 
+void SND_InvalidateWave(const void *begin, const void *end);
+
 #endif //GUARD_SND_EXCHANNEL_H
diff --git a/arm7/lib/include/SND_wave.h b/arm7/lib/include/SND_wave.h
deleted file mode 100644
index fd76b1a5..00000000
--- a/arm7/lib/include/SND_wave.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef GUARD_SND_WAVE_H
-#define GUARD_SND_WAVE_H
-
-void SND_InvalidateWave(const void *begin, const void *end);
-
-#endif //GUARD_SND_WAVE_H
diff --git a/arm7/lib/src/SND_exChannel.c b/arm7/lib/src/SND_exChannel.c
index f3ba922b..54c5a3c4 100644
--- a/arm7/lib/src/SND_exChannel.c
+++ b/arm7/lib/src/SND_exChannel.c
@@ -418,3 +418,14 @@ u32 SND_GetLockedChannel(u32 weak) {
         return sLockedChannelMask;
     }
 }
+
+void SND_InvalidateWave(const void *start, const 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);
+        }
+    }
+}
diff --git a/arm7/lib/src/SND_wave.c b/arm7/lib/src/SND_wave.c
deleted file mode 100644
index 21c48dc8..00000000
--- a/arm7/lib/src/SND_wave.c
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "SND_wave.h"
-
-#include "SND_channel.h"
-#include "SND_work.h"
-
-void SND_InvalidateWave(const void *start, const 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);
-        }
-    }
-}