diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-25 13:23:02 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-07-25 13:23:02 -0400 |
| commit | 5e0e326b75402a36c4d31502b8b5a05b862ac23c (patch) | |
| tree | 1b5807c1efb72dbdd9d01f329cefb41171913a64 /arm9/src/sound.c | |
| parent | 1f9d4503c898f9138422215132b53224571a281a (diff) | |
| parent | 68d7aa47cc52ef822220e0e35890863d7cad479f (diff) | |
Merge remote-tracking branch 'origin/master' into pikalax_work
Diffstat (limited to 'arm9/src/sound.c')
| -rw-r--r-- | arm9/src/sound.c | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/arm9/src/sound.c b/arm9/src/sound.c index a5228dab..ec65dd06 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 @@ -15,12 +16,8 @@ void GF_InitMic(void); void GF_SoundDataInit(struct SoundData *); void FUN_02004088(struct SoundData *); 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 +36,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 +96,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 +243,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)) @@ -257,7 +254,7 @@ u32 * FUN_02003FF4(int playerNo) return &sdat->players[playerNo]; } -u32 FUN_02004018(u32 a0) +int FUN_02004018(u32 a0) { switch (a0) { @@ -317,6 +314,5 @@ void GF_InitMic(void) void FUN_020040DC(void) { NNS_SndPlayerStopSeqByPlayerNo(7, 0); - FUN_02003FF4(7); - NNS_SndHandleReleaseSeq(); + NNS_SndHandleReleaseSeq(GetSoundPlayer(7)); } |