mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2024-11-14 21:40:03 +00:00
Code Issues Projects Releases Wiki Activity

Naming a function (#2124)

Browse source 
* Naming a function

* Naming function

* Update functions.txt

* Update function name

* Update function name

* Update function name

* Update function name
This commit is contained in:
Ozero4 2024-09-05 14:57:30 +02:00 committed by GitHub
parent acb5c7f20c
commit 0b011033fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/sfx.h
View file

@ -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);

6
src/audio/sfx.c
View file

@ -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);

2
tools/disasm/ntsc-1.2/functions.txt
View file

@ -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