Merge branch 'zapd_audio_support' into zelda64

1 files changed, 8 insertions, 12 deletions

diff --git a/soh/src/code/code_800F7260.c b/soh/src/code/code_800F7260.c
index bdc3a64ac..1210a0114 100644
--- a/soh/src/code/code_800F7260.c
+++ b/soh/src/code/code_800F7260.c
@@ -122,7 +122,7 @@ void Audio_ClearBGMMute(u8 channelIdx) {
     }
 }
 
-void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* vol, s8* reverbAdd) 
+void Audio_PlaySoundGeneral(u16 sfxId, Vec3f* pos, u8 token, f32* freqScale, f32* vol, s8* reverbAdd)
 {
     u8 i;
     SoundRequest* req;
@@ -204,7 +204,7 @@ void Audio_RemoveMatchingSoundRequests(u8 aspect, SoundBankEntry* cmp) {
     }
 }
 
-void Audio_ProcessSoundRequest(void) 
+void Audio_ProcessSoundRequest(void)
 {
     u16 sfxId;
     u8 count;
@@ -307,7 +307,7 @@ void Audio_ProcessSoundRequest(void)
     }
 }
 
-void Audio_RemoveSoundBankEntry(u8 bankId, u8 entryIndex) 
+void Audio_RemoveSoundBankEntry(u8 bankId, u8 entryIndex)
 {
     SoundBankEntry* entry = &gSoundBanks[bankId][entryIndex];
     u8 i;
@@ -335,7 +335,7 @@ void Audio_RemoveSoundBankEntry(u8 bankId, u8 entryIndex)
     }
 }
 
-void Audio_ChooseActiveSounds(u8 bankId) 
+void Audio_ChooseActiveSounds(u8 bankId)
 {
     u8 numChosenSounds;
     u8 numChannels;
@@ -492,7 +492,7 @@ void Audio_ChooseActiveSounds(u8 bankId)
     }
 }
 
-void Audio_PlayActiveSounds(u8 bankId) 
+void Audio_PlayActiveSounds(u8 bankId)
 {
     u8 entryIndex;
     SequenceChannel* channel;
@@ -553,7 +553,7 @@ void Audio_PlayActiveSounds(u8 bankId)
     }
 }
 
-void Audio_StopSfxByBank(u8 bankId) 
+void Audio_StopSfxByBank(u8 bankId)
 {
     SoundBankEntry* entry;
     s32 pad;
@@ -579,8 +579,6 @@ void func_800F8884(u8 bankId, Vec3f* pos) {
     u8 entryIndex = gSoundBanks[bankId][0].next;
     u8 prevEntryIndex = 0;
 
-    return; // OTRTODO64
-
     while (entryIndex != 0xFF) {
         entry = &gSoundBanks[bankId][entryIndex];
         if (entry->posX == &pos->x) {
@@ -617,7 +615,7 @@ void Audio_StopSfxByPos(Vec3f* pos) {
     Audio_RemoveMatchingSoundRequests(2, &cmp);
 }
 
-void Audio_StopSfxByPosAndId(Vec3f* pos, u16 sfxId) 
+void Audio_StopSfxByPosAndId(Vec3f* pos, u16 sfxId)
 {
     SoundBankEntry* entry;
     u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next;
@@ -678,7 +676,6 @@ void Audio_StopSfxById(u32 sfxId) {
     u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next;
     u8 prevEntryIndex = 0;
     SoundBankEntry cmp;
-    return; // OTRTODO64
 
     while (entryIndex != 0xFF) {
         entry = &gSoundBanks[SFX_BANK(sfxId)][entryIndex];
@@ -738,9 +735,8 @@ void func_800F8F88(void) {
     }
 }
 
-u8 Audio_IsSfxPlaying(u32 sfxId) 
+u8 Audio_IsSfxPlaying(u32 sfxId)
 {
-    return; // OTRTODO64
     SoundBankEntry* entry;
     u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next;