diff options
| author | Akira Akashi <rubenru09@aol.com> | 2021-07-09 16:49:01 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 16:49:01 +0100 |
| commit | 8aa6bcd0c030301f5d5b7712c457aa15db88fec1 (patch) | |
| tree | 0195f92c26cbe7eb7ea08dc021cb486d3b3a39e0 /arm9/src/sound.c | |
| parent | 79d007487abb2706c42f2d01d74c8d8a41e6ac43 (diff) | |
| parent | 948727e73dfd5250bc0de03489a51d433982dfe0 (diff) | |
Merge pull request #424 from remicalixte/unk_020040F4
decompile unk_020040F4.s
Diffstat (limited to 'arm9/src/sound.c')
| -rw-r--r-- | arm9/src/sound.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/arm9/src/sound.c b/arm9/src/sound.c index a5228dab..6efef50a 100644 --- a/arm9/src/sound.c +++ b/arm9/src/sound.c @@ -2,6 +2,7 @@ #include "sound.h" #include "SPI_mic.h" #include "SPI_pm.h" +#include "unk_020040F4.h" #pragma thumb on @@ -18,9 +19,6 @@ void FUN_020040A4(struct SoundData *); void FUN_02003CE8(int); void FUN_020040DC(void); -extern BOOL FUN_020048BC(int); -extern void FUN_02004D60(u32); -extern BOOL FUN_02004D94(void); extern void FUN_0200521C(int); extern void FUN_0200538C(int, int, int); extern BOOL FUN_02005404(void); @@ -39,7 +37,7 @@ void InitSoundData(struct SaveChatotSoundClip * chatot, struct Options * options FUN_020040A4(sdat); UNK_02107074 = 0; sdat->chatot = chatot; - FUN_02004D60(options->soundMethod); + GF_SndSetMonoFlag(options->soundMethod); } void DoSoundUpdateFrame(void) @@ -99,7 +97,7 @@ void FUN_02003CE8(int a0) BOOL FUN_02003D04(void) { struct SoundData * sdat = GetSoundDataPointer(); - if (FUN_020048BC(2)) + if (GF_SndPlayerCountPlayingSeqByPlayerNo(2)) return TRUE; return sdat->unk_BCD12 != 0; } @@ -246,7 +244,7 @@ BOOL GF_Snd_LoadBank(int bankNo) return NNS_SndArcLoadBank(bankNo, sdat->heap); } -u32 * FUN_02003FF4(int playerNo) +u32 * GetSoundPlayer(int playerNo) { struct SoundData * sdat = GetSoundDataPointer(); if (playerNo >= (s32)NELEMS(sdat->players)) @@ -317,6 +315,6 @@ void GF_InitMic(void) void FUN_020040DC(void) { NNS_SndPlayerStopSeqByPlayerNo(7, 0); - FUN_02003FF4(7); + GetSoundPlayer(7); NNS_SndHandleReleaseSeq(); } |