summaryrefslogtreecommitdiff
path: root/arm7/lib/include
diff options
context:
space:
mode:
Diffstat (limited to 'arm7/lib/include')
-rw-r--r--arm7/lib/include/MI_memory.h2
-rw-r--r--arm7/lib/include/SND_lockChannel.h8
2 files changed, 5 insertions, 5 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;