falso
/
mm
mirror of https://github.com/zeldaret/mm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match and Document code_80172BC0.c (#909) 

* Match code_80172BC0.c

* Better match

* brackets

* Fix
This commit is contained in:
engineer124 2022-07-11 23:14:07 -04:00 committed by GitHub
parent 08ff2a6184
commit ab6ef2535e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/functions.h
View File

@ -2741,7 +2741,7 @@ u32 THA_IsCrash(TwoHeadArena* tha);
void THA_Init(TwoHeadArena* tha);
void THA_Ct(TwoHeadArena* tha, void* ptr, size_t size);
void THA_Dt(TwoHeadArena* tha);
void func_80172BC0(void);
void AudioMgr_StopAllSfxExceptSystem(void);
void func_80172C30(AudioMgr* audioMgr);
void AudioMgr_HandleRetrace(AudioMgr* audioMgr);
void AudioMgr_HandlePRENMI(AudioMgr* audioMgr);
@ -3477,7 +3477,7 @@ void Audio_PlaySfxGeneral(u16 sfxId, Vec3f* param_2, u8 param_3, f32* param_4, f
// void func_801A6430(void);
// void func_801A65C8(void);
// void func_801A6D0C(void);
// void func_801A7084(void);
void func_801A7084(u8 bankId);
// void func_801A7168(void);
// void func_801A7284(void);
void Audio_StopSfxByPos(Vec3f* pos);

14
src/code/code_80172BC0.c
View File

@ -1,3 +1,15 @@
#include "global.h"
#pragma GLOBAL_ASM("asm/non_matchings/code/code_80172BC0/func_80172BC0.s")
const u8 sSfxBankIds[] = {
BANK_PLAYER, BANK_ITEM, BANK_ENV, BANK_ENEMY, BANK_SYSTEM, BANK_OCARINA, BANK_VOICE,
};
void AudioMgr_StopAllSfxExceptSystem(void) {
volatile const u8* bankIdPtr;
for (bankIdPtr = sSfxBankIds; bankIdPtr < (sSfxBankIds + ARRAY_COUNT(sSfxBankIds)); bankIdPtr++) {
if (*bankIdPtr != BANK_SYSTEM) {
func_801A7084(*bankIdPtr);
}
}
}

2
src/code/game.c
View File

@ -224,7 +224,7 @@ void GameState_Init(GameState* gameState, GameStateFunc init, GraphicsContext* g
}
void GameState_Destroy(GameState* gameState) {
func_80172BC0();
AudioMgr_StopAllSfxExceptSystem();
func_8019E014();
osRecvMesg(&gameState->gfxCtx->queue, NULL, OS_MESG_BLOCK);

2
tools/disasm/functions.txt
View File

@ -3109,7 +3109,7 @@
0x80172B3C:("THA_Init",),
0x80172B58:("THA_Ct",),
0x80172B9C:("THA_Dt",),
0x80172BC0:("func_80172BC0",),
0x80172BC0:("AudioMgr_StopAllSfxExceptSystem",),
0x80172C30:("func_80172C30",),
0x80172C68:("AudioMgr_HandleRetrace",),
0x80172EAC:("AudioMgr_HandlePRENMI",),

2
tools/sizes/code_functions.csv
View File

@ -2623,7 +2623,7 @@ asm/non_matchings/code/TwoHeadArena/THA_IsCrash.s,THA_IsCrash,0x80172B18,0x9
asm/non_matchings/code/TwoHeadArena/THA_Init.s,THA_Init,0x80172B3C,0x7
asm/non_matchings/code/TwoHeadArena/THA_Ct.s,THA_Ct,0x80172B58,0x11
asm/non_matchings/code/TwoHeadArena/THA_Dt.s,THA_Dt,0x80172B9C,0x9
asm/non_matchings/code/code_80172BC0/func_80172BC0.s,func_80172BC0,0x80172BC0,0x1C
asm/non_matchings/code/code_80172BC0/AudioMgr_StopAllSfxExceptSystem.s,AudioMgr_StopAllSfxExceptSystem,0x80172BC0,0x1C
asm/non_matchings/code/audioMgr/func_80172C30.s,func_80172C30,0x80172C30,0xE
asm/non_matchings/code/audioMgr/AudioMgr_HandleRetrace.s,AudioMgr_HandleRetrace,0x80172C68,0x91
asm/non_matchings/code/audioMgr/AudioMgr_HandlePRENMI.s,AudioMgr_HandlePRENMI,0x80172EAC,0x9

1 asm/non_matchings/code/z_en_a_keep/EnAObj_Init.s EnAObj_Init 0x800A5AC0 0x2B
2623 asm/non_matchings/code/TwoHeadArena/THA_Init.s THA_Init 0x80172B3C 0x7
2624 asm/non_matchings/code/TwoHeadArena/THA_Ct.s THA_Ct 0x80172B58 0x11
2625 asm/non_matchings/code/TwoHeadArena/THA_Dt.s THA_Dt 0x80172B9C 0x9
2626 asm/non_matchings/code/code_80172BC0/func_80172BC0.s asm/non_matchings/code/code_80172BC0/AudioMgr_StopAllSfxExceptSystem.s func_80172BC0 AudioMgr_StopAllSfxExceptSystem 0x80172BC0 0x1C
2627 asm/non_matchings/code/audioMgr/func_80172C30.s func_80172C30 0x80172C30 0xE
2628 asm/non_matchings/code/audioMgr/AudioMgr_HandleRetrace.s AudioMgr_HandleRetrace 0x80172C68 0x91
2629 asm/non_matchings/code/audioMgr/AudioMgr_HandlePRENMI.s AudioMgr_HandlePRENMI 0x80172EAC 0x9