diff options
| author | Kenix3 <kenixwhisperwind@gmail.com> | 2022-06-21 22:17:47 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-21 22:17:47 -0400 |
| commit | d5db4a86bd1267ac0189e23c0320cca90587ece4 (patch) | |
| tree | 3ba04dd59f89c6148f6bd353c2de3c3e20af460b /soh/src/code/code_800F7260.c | |
| parent | abcf713cc1e38b1091cb9fa0a1dfb0bff64c4efd (diff) | |
| parent | f8e3dcd7c02bd12f745fce8443683c6ec7438cdf (diff) | |
Merge pull request #431 from HarbourMasters/zelda64
Ship of Harkinian 64 bit compilation
Diffstat (limited to 'soh/src/code/code_800F7260.c')
| -rw-r--r-- | soh/src/code/code_800F7260.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/soh/src/code/code_800F7260.c b/soh/src/code/code_800F7260.c index bd8e4091f..4a6189947 100644 --- a/soh/src/code/code_800F7260.c +++ b/soh/src/code/code_800F7260.c @@ -122,9 +122,9 @@ 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; + size_t i; SoundRequest* req; if (!gSoundBankMuted[SFX_BANK_SHIFT(sfxId)]) { @@ -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; @@ -615,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; @@ -735,7 +735,7 @@ void func_800F8F88(void) { } } -u8 Audio_IsSfxPlaying(u32 sfxId) +u8 Audio_IsSfxPlaying(u32 sfxId) { SoundBankEntry* entry; u8 entryIndex = gSoundBanks[SFX_BANK(sfxId)][0].next; |