summaryrefslogtreecommitdiff
path: root/soh/include/functions.h
diff options
context:
space:
mode:
Diffstat (limited to 'soh/include/functions.h')
-rw-r--r--soh/include/functions.h26
1 files changed, 13 insertions, 13 deletions
diff --git a/soh/include/functions.h b/soh/include/functions.h
index 3e2954b77..942f83a3b 100644
--- a/soh/include/functions.h
+++ b/soh/include/functions.h
@@ -2050,20 +2050,20 @@ void AudioSeq_SkipForwardSequence(SequencePlayer* seqPlayer);
void AudioSeq_ResetSequencePlayer(SequencePlayer* seqPlayer);
void AudioSeq_InitSequencePlayerChannels(s32 playerIdx);
void AudioSeq_InitSequencePlayers(void);
-void func_800ECC04(u16);
+void AudioOcarina_Start(u16);
void AudioOcarina_SetInstrument(u8);
-void Audio_OcaSetSongPlayback(s8 songIdxPlusOne, s8 playbackState);
-void Audio_OcaSetRecordingState(u8);
-OcarinaStaff* Audio_OcaGetRecordingStaff(void);
-OcarinaStaff* Audio_OcaGetPlayingStaff(void);
-OcarinaStaff* Audio_OcaGetDisplayingStaff(void);
-void Audio_OcaMemoryGameStart(u8 minigameIdx);
-s32 Audio_OcaMemoryGameGenNote(void);
-void func_800EE824(void);
+void AudioOcarina_SetPlaybackSong(s8 songIdxPlusOne, s8 playbackState);
+void AudioOcarina_SetRecordingState(u8);
+OcarinaStaff* AudioOcarina_GetRecordingStaff(void);
+OcarinaStaff* AudioOcarina_GetPlayingStaff(void);
+OcarinaStaff* AudioOcarina_GetPlaybackStaff(void);
+void AudioOcarina_MemoryGameInit(u8 minigameIdx);
+s32 AudioOcarina_MemoryGameNextNote(void);
+void AudioOcarina_PlayLongScarecrowSong(void);
void AudioDebug_Draw(GfxPrint* printer);
void AudioDebug_ScrPrt(const s8* str, u16 num);
-void func_800F3054(void);
-void Audio_SetSoundProperties(u8 bankId, u8 entryIdx, u8 channelIdx);
+void Audio_Update(void);
+void Audio_SetSfxProperties(u8 bankId, u8 entryIdx, u8 channelIdx);
void func_800F3F3C(u8);
void func_800F4010(Vec3f* pos, u16 sfxId, f32);
void Audio_PlaySoundRandom(Vec3f* pos, u16 baseSfxId, u8 randLim);
@@ -2132,7 +2132,7 @@ void Audio_Init();
void Audio_InitSound();
void func_800F7170(void);
void func_800F71BC(s32 arg0);
-void Audio_SetSoundBanksMute(u16 muteMask);
+void Audio_SetSfxBanksMute(u16 muteMask);
void Audio_QueueSeqCmdMute(u8 channelIdx);
void Audio_ClearBGMMute(u8 channelIdx);
void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* a4, s8* reverbAdd);
@@ -2143,7 +2143,7 @@ void Audio_StopSfxByBank(u8 bankId);
void func_800F8884(u8, Vec3f*);
void Audio_StopSfxByPosAndBank(u8, Vec3f*);
void Audio_StopSfxByPos(Vec3f*);
-void func_800F9280(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer);
+void Audio_StartSequence(u8 playerIdx, u8 seqId, u8 arg2, u16 fadeTimer);
void Audio_QueueSeqCmd(u32 bgmID);
void Audio_QueuePreviewSeqCmd(u16 seqId);
void Audio_StopSfxByPosAndId(Vec3f* pos, u16 sfxId);