diff --git a/include/sfx.h b/include/sfx.h index 7fc597867a..3d028817ae 100644 --- a/include/sfx.h +++ b/include/sfx.h @@ -133,7 +133,7 @@ void Audio_ProcessSfxRequest(void); void Audio_ChooseActiveSfx(u8 bankId); void Audio_PlayActiveSfx(u8 bankId); void Audio_StopSfxByBank(u8 bankId); -void func_800F8884(u8 bankId, Vec3f* pos); +void Audio_RemoveSfxFromBankByPos(u8 bankId, Vec3f* pos); void Audio_StopSfxByPosAndBank(u8 bankId, Vec3f* pos); void Audio_StopSfxByPos(Vec3f* pos); void Audio_StopSfxByPosAndId(Vec3f* pos, u16 sfxId); diff --git a/src/audio/sfx.c b/src/audio/sfx.c index 338559773d..4debc94b77 100644 --- a/src/audio/sfx.c +++ b/src/audio/sfx.c @@ -533,7 +533,7 @@ void Audio_StopSfxByBank(u8 bankId) { Audio_RemoveMatchingSfxRequests(0, &cmp); } -void func_800F8884(u8 bankId, Vec3f* pos) { +void Audio_RemoveSfxFromBankByPos(u8 bankId, Vec3f* pos) { SfxBankEntry* entry; u8 entryIndex = gSfxBanks[bankId][0].next; u8 prevEntryIndex = 0; @@ -557,7 +557,7 @@ void func_800F8884(u8 bankId, Vec3f* pos) { void Audio_StopSfxByPosAndBank(u8 bankId, Vec3f* pos) { SfxBankEntry cmp; - func_800F8884(bankId, pos); + Audio_RemoveSfxFromBankByPos(bankId, pos); cmp.sfxId = bankId << 12; cmp.posX = &pos->x; Audio_RemoveMatchingSfxRequests(1, &cmp); @@ -568,7 +568,7 @@ void Audio_StopSfxByPos(Vec3f* pos) { SfxBankEntry cmp; for (i = 0; i < ARRAY_COUNT(gSfxBanks); i++) { - func_800F8884(i, pos); + Audio_RemoveSfxFromBankByPos(i, pos); } cmp.posX = &pos->x; Audio_RemoveMatchingSfxRequests(2, &cmp); diff --git a/tools/disasm/ntsc-1.2/functions.txt b/tools/disasm/ntsc-1.2/functions.txt index 9f2106cc3d..63fc5ddabe 100644 --- a/tools/disasm/ntsc-1.2/functions.txt +++ b/tools/disasm/ntsc-1.2/functions.txt @@ -2795,7 +2795,7 @@ Audio_RemoveSfxBankEntry = 0x800C8F78; // type:func Audio_ChooseActiveSfx = 0x800C9110; // type:func Audio_PlayActiveSfx = 0x800C9844; // type:func Audio_StopSfxByBank = 0x800C9B64; // type:func -func_800F8884 = 0x800C9C48; // type:func +Audio_RemoveSfxFromBankByPos = 0x800C9C48; // type:func Audio_StopSfxByPosAndBank = 0x800C9D64; // type:func Audio_StopSfxByPos = 0x800C9DAC; // type:func Audio_StopSfxByPosAndId = 0x800C9E08; // type:func