diff options
author | Michael Panzlaff <michael.panzlaff@fau.de> | 2021-07-08 13:38:52 +0200 |
---|---|---|
committer | Michael Panzlaff <michael.panzlaff@fau.de> | 2021-08-25 18:03:47 +0200 |
commit | 6e37656a84a76cd315b870a8002e2fec0fa0f00e (patch) | |
tree | 6b6f7209646361ac983fe1b131f69b54c6e0fb35 /arm7/lib/include | |
parent | 62059593a2d5dc7369ff898e0664fa0ae82c577c (diff) |
minor fixes
Diffstat (limited to 'arm7/lib/include')
-rw-r--r-- | arm7/lib/include/MI_memory.h | 2 | ||||
-rw-r--r-- | arm7/lib/include/SND_lockChannel.h | 8 |
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; |