3 files changed, 14 insertions, 12 deletions
diff --git a/arm7/lib/include/MI_memory.h b/arm7/lib/include/MI_memory.h
index 73d62e97..6fa1d0ec 100644
--- a/arm7/lib/include/MI_memory.h
+++ b/arm7/lib/include/MI_memory.h
@@ -24,7 +24,7 @@ static inline void MI_CpuClear32(void *dest, u32 size)
 
 static inline void MI_CpuCopy32(void *src, void *dst, u32 size)
 {
-    MIi_CopyCopy32((u32 *)src, (u32 *)dst, size);
+    MIi_CpuCopy32((u32 *)src, (u32 *)dst, size);
 }
 
 #endif //POKEDIAMOND_ARM7_MI_MEMORY_H
diff --git a/arm7/lib/include/SND_lockChannel.h b/arm7/lib/include/SND_lockChannel.h
index 9673fb51..461745b3 100644
--- a/arm7/lib/include/SND_lockChannel.h
+++ b/arm7/lib/include/SND_lockChannel.h
@@ -3,10 +3,10 @@
 
 #include "nitro/types.h"
 
-void SND_StopUnlockedChannel(u32 channelMask);
-void SND_LockChannel(u32 channelMask, u32 locked);
-void SND_UnlockChannel(u32 channelMask, u32 locked);
-u32 SND_GetLockedChannel(u32 locked);
+void SND_StopUnlockedChannel(u32 channelMask, u32 weak);
+void SND_LockChannel(u32 channelMask, u32 weak);
+void SND_UnlockChannel(u32 channelMask, u32 weak);
+u32 SND_GetLockedChannel(u32 weak);
 
 // TODO remove these externs if lockChannel is merged with exChannel
 extern u32 sLockedChannelMask;
diff --git a/arm7/lib/src/SND_lockChannel.c b/arm7/lib/src/SND_lockChannel.c
index 92e04e5e..608ed67a 100644
--- a/arm7/lib/src/SND_lockChannel.c
+++ b/arm7/lib/src/SND_lockChannel.c
@@ -8,7 +8,9 @@
 u32 sLockedChannelMask;
 u32 sWeakLockedChannelMask;
 
-void SND_StopUnlockedChannel(u32 channelMask) {
+void SND_StopUnlockedChannel(u32 channelMask, u32 weak) {
+    (void)weak;
+
     struct SNDExChannel *chn;
     
     for (int i = 0; i < SND_CHANNEL_COUNT && channelMask != 0; i++, channelMask >>= 1) {
@@ -31,7 +33,7 @@ void SND_StopUnlockedChannel(u32 channelMask) {
     }
 }
 
-void SND_LockChannel(u32 channelMask, u32 locked) {
+void SND_LockChannel(u32 channelMask, u32 weak) {
     struct SNDExChannel *chn;
     u32 j = channelMask;
     int i = 0;
@@ -55,23 +57,23 @@ void SND_LockChannel(u32 channelMask, u32 locked) {
         chn->flags.active = 0;
     }
 
-    if (locked & 1) {
+    if (weak & 1) {
         sWeakLockedChannelMask |= channelMask;
     } else {
         sLockedChannelMask |= channelMask;
     }
 }
 
-void SND_UnlockChannel(u32 channelMask, u32 locked) {
-    if (locked & 1) {
+void SND_UnlockChannel(u32 channelMask, u32 weak) {
+    if (weak & 1) {
         sWeakLockedChannelMask &= ~channelMask;
     } else {
         sLockedChannelMask &= ~channelMask;
     }
 }
 
-u32 SND_GetLockedChannel(u32 locked) {
-    if (locked & 1) {
+u32 SND_GetLockedChannel(u32 weak) {
+    if (weak & 1) {
         return sWeakLockedChannelMask;
     } else {
         return sLockedChannelMask;