8 files changed, 30 insertions, 6 deletions
diff --git a/arm7/lib/include/SND.h b/arm7/lib/include/SND.h
index b471ac72..c417ab0e 100644
--- a/arm7/lib/include/SND.h
+++ b/arm7/lib/include/SND.h
@@ -4,8 +4,6 @@
 #include "nitro/types.h"
 
 void SND_Enable(void);
-void SND_SetOutputSelector(u8 leftOutputFrom, u8 rightOutputFrom, u8 outputCh1ToMixer, u8 outputCh3ToMixer);
-void SND_SetMasterVolume(u8 vol);
-void SND_StopChannel(s32 idx, BOOL hold);
+void SND_SetOutputSelector(int leftOutputFrom, int rightOutputFrom, int outputCh1ToMixer, int outputCh3ToMixer);
 
 #endif //GUARD_SND_H
diff --git a/arm7/lib/include/SND_channel.h b/arm7/lib/include/SND_channel.h
index ea179968..8b74b579 100644
--- a/arm7/lib/include/SND_channel.h
+++ b/arm7/lib/include/SND_channel.h
@@ -5,6 +5,8 @@
 
 #include "SND_exChannel.h"
 
+void SNDi_SetSurroundDecay(int decay);
+
 void SND_SetupChannelPcm(
     s32 chnIdx,
     const void *data,
@@ -41,6 +43,8 @@ void SND_SetChannelVolume(s32 chnIdx, s32 volume, s32 volumeDiv);
 void SND_SetChannelPan(s32 chnIdx, s32 pan);
 void SND_SetChannelTimer(s32 chnIdx, s32 timer);
 
+u32 SND_GetChannelControl(int idx);
+
 // TODO move this function to SND_exChannel.c
 u16 CalcDecayCoeff(int value);
 
diff --git a/arm7/lib/include/SND_command.h b/arm7/lib/include/SND_command.h
index ea5452b9..c22cd459 100644
--- a/arm7/lib/include/SND_command.h
+++ b/arm7/lib/include/SND_command.h
@@ -1,6 +1,8 @@
 #ifndef GUARD_SND_COMMAND_H
 #define GUARD_SND_COMMAND_H
 
+#include "nitro/SND_command_shared.h"
+
 void SND_CommandInit(void);
 void SND_CommandProc(void);
 
diff --git a/arm7/lib/include/SND_exChannel.h b/arm7/lib/include/SND_exChannel.h
index fcc3a548..038a1a49 100644
--- a/arm7/lib/include/SND_exChannel.h
+++ b/arm7/lib/include/SND_exChannel.h
@@ -22,6 +22,7 @@ BOOL SND_IsExChannelActive(struct SNDExChannel *chn);
 struct SNDExChannel *SND_AllocExChannel(u32 channelMask, int priority, u32 flags, SNDExChannelCallback callback, void *callbackUserData);
 void SND_FreeExChannel(struct SNDExChannel *chn);
 BOOL SND_IsChannelActive(s32 idx);
+void SND_InvalidateWave(const void *start, const void *end);
 
 // TODO internal functions, move these so exChannel
 int ExChannelSweepUpdate(struct SNDExChannel *chn, BOOL step);
diff --git a/arm7/lib/include/SND_main.h b/arm7/lib/include/SND_main.h
index eba3ff44..fc72ae33 100644
--- a/arm7/lib/include/SND_main.h
+++ b/arm7/lib/include/SND_main.h
@@ -12,5 +12,7 @@ u32 SND_WaitForIntervalTimer(void);
 void SND_SendWakeupMessage(void);
 void SNDi_LockMutex(void);
 void SNDi_UnlockMutex(void);
+void SND_SetMasterVolume(int vol);
+void SND_SetMasterPan(int pan);
 
 #endif //GUARD_SND_MAIN_H
diff --git a/arm7/lib/include/SND_seq.h b/arm7/lib/include/SND_seq.h
index 642cff3e..25b63a35 100644
--- a/arm7/lib/include/SND_seq.h
+++ b/arm7/lib/include/SND_seq.h
@@ -1,7 +1,24 @@
 #ifndef GUARD_SND_SEQ_H
 #define GUARD_SND_SEQ_H
 
+#include "nitro/types.h"
+
+#include "nitro/SND_bank_shared.h"
+
 void SND_SeqInit(void);
 void SND_SeqMain(BOOL update);
 
+void SND_StartSeq(int player, const void *seq, u32 offset, struct SNDBankData *bank);
+void SND_StopSeq(int player);
+void SND_PrepareSeq(int player, const void *seq, u32 offset, struct SNDBankData *bank);
+void SND_StartPreparedSeq(int player);
+void SND_PauseSeq(int player, BOOL pause);
+void SND_SkipSeq(int player, u32 tick);
+void SNDi_SetPlayerParam(int player, u32 offset, u32 data, int size);
+void SNDi_SetTrackParam(int player, u32 trackMask, u32 offset, u32 data, int size);
+void SND_SetTrackMute(int player, u32 trackMask, BOOL mute);
+void SND_SetTrackAllocatableChannel(int player, u32 trackMask, u32 channelMask);
+void SND_InvalidateSeq(const void *start, const void *end);
+void SND_InvalidateBank(const void *start, const void *end);
+
 #endif //GUARD_SND_SEQ_H
diff --git a/arm7/lib/include/SND_wave.h b/arm7/lib/include/SND_wave.h
index e1ae93fe..fd76b1a5 100644
--- a/arm7/lib/include/SND_wave.h
+++ b/arm7/lib/include/SND_wave.h
@@ -1,6 +1,6 @@
 #ifndef GUARD_SND_WAVE_H
 #define GUARD_SND_WAVE_H
 
-void SND_InvalidateWave(void *begin, void *end);
+void SND_InvalidateWave(const void *begin, const void *end);
 
 #endif //GUARD_SND_WAVE_H
diff --git a/arm7/lib/include/SND_work.h b/arm7/lib/include/SND_work.h
index 49933fc7..0125a52d 100644
--- a/arm7/lib/include/SND_work.h
+++ b/arm7/lib/include/SND_work.h
@@ -6,8 +6,8 @@
 extern struct SNDWork SNDi_Work;
 extern struct SNDSharedWork *SNDi_SharedWork;
 
-void SND_SetPlayerLocalVariable(u32 player, u32 var, s16 value);
-void SND_SetPlayerGlobalVariable(u32 var, s16 value);
+void SND_SetPlayerLocalVariable(int player, int var, s16 value);
+void SND_SetPlayerGlobalVariable(int var, s16 value);
 void SND_UpdateSharedWork(void);
 
 #endif //GUARD_SND_WORK_H