diff options
author | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-07-08 09:41:04 +0200 |
---|---|---|
committer | Rémi Calixte <remicalixte.rmc@gmail.com> | 2021-07-08 09:41:04 +0200 |
commit | d7a8de0573dc9c373e32035e596989ff9e22bf73 (patch) | |
tree | 918f3896c62bfaa915fcd4a1fa5c383a0a5f3565 | |
parent | 9420f469c47e678c10342111cc3279715148ac1b (diff) |
document some sound stuff
-rw-r--r-- | arm9/asm/unk_020051F4.s | 112 | ||||
-rw-r--r-- | arm9/asm/unk_02005CFC.s | 6 | ||||
-rw-r--r-- | arm9/global.inc | 36 | ||||
-rw-r--r-- | arm9/modules/12/asm/module_12.s | 2 | ||||
-rw-r--r-- | arm9/modules/16/asm/module_16.s | 26 | ||||
-rw-r--r-- | arm9/modules/18/asm/module_18.s | 4 | ||||
-rw-r--r-- | arm9/modules/56/asm/module_56.s | 2 | ||||
-rw-r--r-- | arm9/modules/57/asm/module_57.s | 10 | ||||
-rw-r--r-- | arm9/modules/60/asm/module_60.s | 4 | ||||
-rw-r--r-- | arm9/src/sound.c | 8 | ||||
-rw-r--r-- | arm9/src/unk_020040F4.c | 102 | ||||
-rw-r--r-- | include/sound.h | 2 | ||||
-rw-r--r-- | include/unk_020040F4.h | 36 |
13 files changed, 175 insertions, 175 deletions
diff --git a/arm9/asm/unk_020051F4.s b/arm9/asm/unk_020051F4.s index d6d06005..6e6cec72 100644 --- a/arm9/asm/unk_020051F4.s +++ b/arm9/asm/unk_020051F4.s @@ -10,7 +10,7 @@ FUN_020051F4: ; 0x020051F4 bl FUN_020048D0 bl FUN_02004018 add r4, r0, #0x0 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r5, #0x0 bl NNS_SndArcPlayerStartSeq add r6, r0, #0x0 @@ -88,7 +88,7 @@ FUN_02005288: ; 0x02005288 bl FUN_02003D38 bl GF_Snd_SaveState add r0, r4, #0x0 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r5, #0x0 bl NNS_SndArcPlayerStartSeq pop {r3-r5, pc} @@ -106,14 +106,14 @@ FUN_020052B8: ; 0x020052B8 bl FUN_02003D38 add r4, r0, #0x0 mov r0, #0x0 - bl FUN_02003FF4 - bl FUN_020048EC + bl GetSoundPlayer + bl GF_SndPlayerGetSeqNo bl FUN_02004900 add r1, r0, #0x0 add r0, r5, #0x0 bl FUN_020045C4 add r0, r6, #0x0 - bl FUN_02003FF4 + bl GetSoundPlayer add r6, r0, #0x0 ldrh r0, [r4, #0x0] bl FUN_02004900 @@ -150,7 +150,7 @@ _0200532A: mov r1, #0x1 bl GF_Snd_LoadSeqEx mov r0, #0x7 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r5, #0x0 bl NNS_SndArcPlayerStartSeq add r4, r0, #0x0 @@ -171,7 +171,7 @@ FUN_02005350: ; 0x02005350 cmp r0, #0xff beq _0200536E bl FUN_02004018 - bl FUN_02003FF4 + bl GetSoundPlayer bl NNS_SndHandleReleaseSeq _0200536E: bl FUN_02005374 @@ -205,12 +205,12 @@ FUN_0200538C: ; 0x0200538C bne _020053B2 mov r1, #0x0 add r2, r1, #0x0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume _020053B2: add r0, r7, #0x0 add r1, r6, #0x0 add r2, r5, #0x0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume add r0, r5, #0x0 bl FUN_02004D74 mov r0, #0x3 @@ -236,7 +236,7 @@ FUN_020053CC: ; 0x020053CC bl FUN_02004018 add r1, r5, #0x0 add r2, r4, #0x0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume add r0, r4, #0x0 bl FUN_02004D74 _020053FC: @@ -257,7 +257,7 @@ FUN_02005404: ; 0x02005404 FUN_02005410: ; 0x02005410 push {r3, lr} bl FUN_020048D0 - bl FUN_020048BC + bl GF_SndPlayerCountPlayingSeqByPlayerNo pop {r3, pc} thumb_func_start FUN_0200541C @@ -297,7 +297,7 @@ FUN_02005454: ; 0x02005454 bl FUN_02003D38 add r6, r0, #0x0 mov r0, #0x7 - bl FUN_02003FF4 + bl GetSoundPlayer mov r1, #0x0 bl NNS_SndPlayerStopSeq bl FUN_02005374 @@ -349,7 +349,7 @@ PlaySE: ; 0x020054C8 bl FUN_020048D0 bl FUN_02004018 add r4, r0, #0x0 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r5, #0x0 bl NNS_SndArcPlayerStartSeq add r6, r0, #0x0 @@ -371,7 +371,7 @@ _020054F4: .word NNS_SndPlayerStopSeqBySeqNo FUN_020054F8: ; 0x020054F8 push {r4, lr} add r4, r1, #0x0 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r4, #0x0 bl NNS_SndPlayerStopSeq pop {r4, pc} @@ -380,7 +380,7 @@ FUN_020054F8: ; 0x020054F8 FUN_02005508: ; 0x02005508 push {r3, lr} bl FUN_020048D0 - bl FUN_020048BC + bl GF_SndPlayerCountPlayingSeqByPlayerNo pop {r3, pc} thumb_func_start FUN_02005514 @@ -389,7 +389,7 @@ FUN_02005514: ; 0x02005514 mov r4, #0x0 _02005518: add r0, r4, #0x3 - bl FUN_020048BC + bl GF_SndPlayerCountPlayingSeqByPlayerNo cmp r0, #0x1 bne _02005526 mov r0, #0x1 @@ -408,7 +408,7 @@ FUN_02005530: ; 0x02005530 add r4, r2, #0x0 bl FUN_020048D0 bl FUN_02004018 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r5, #0x0 add r2, r4, #0x0 bl NNS_SndPlayerSetTrackPan @@ -425,7 +425,7 @@ FUN_0200554C: ; 0x0200554C mov r5, #0x0 _0200555C: add r0, r4, r5 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r7, #0x0 add r2, r6, #0x0 bl NNS_SndPlayerSetTrackPan @@ -477,7 +477,7 @@ _020055BC: mov r0, #0x0 bl FUN_02005614 mov r0, #0x1 - bl FUN_02003FF4 + bl GetSoundPlayer mov r1, #0x2 str r1, [sp, #0x0] sub r1, r1, #0x3 @@ -491,7 +491,7 @@ _020055BC: b _02005606 _020055E8: mov r0, #0x8 - bl FUN_02003FF4 + bl GetSoundPlayer mov r1, #0x2 str r1, [sp, #0x0] sub r1, r1, #0x3 @@ -523,11 +523,11 @@ FUN_02005614: ; 0x02005614 mov r0, #0xe bl FUN_02003D38 mov r0, #0x1 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r5, #0x0 bl NNS_SndPlayerStopSeq mov r0, #0x8 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r5, #0x0 bl NNS_SndPlayerStopSeq ldrb r0, [r6, #0x0] @@ -575,7 +575,7 @@ _02005696: pop {r3-r5, pc} _020056A4: mov r0, #0x0 - bl FUN_020048BC + bl GF_SndPlayerCountPlayingSeqByPlayerNo pop {r3-r5, pc} thumb_func_start FUN_020056AC @@ -685,7 +685,7 @@ _02005772: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -741,7 +741,7 @@ _020057E6: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -753,7 +753,7 @@ _02005802: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -768,7 +768,7 @@ _02005826: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -776,14 +776,14 @@ _02005826: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 mov r2, #0x40 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch add r0, r4, #0x0 mov r1, #0x14 bl FUN_02005BC8 ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x8 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan ldr r2, [sp, #0x18] add r0, r4, #0x0 mov r1, #0x8 @@ -795,7 +795,7 @@ _02005868: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -806,14 +806,14 @@ _02005868: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 mov r2, #0xc0 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch add r0, r4, #0x0 mov r1, #0x10 bl FUN_02005BC8 ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x8 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan ldr r2, [sp, #0x18] add r0, r4, #0x0 mov r1, #0x8 @@ -858,7 +858,7 @@ _02005900: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -867,7 +867,7 @@ _02005900: add r2, r0, #0x0 ldr r1, _02005AB8 ; =0x0000FFFF sub r2, #0xe1 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch b _02005AC2 _02005928: add r0, r4, #0x0 @@ -875,7 +875,7 @@ _02005928: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -883,7 +883,7 @@ _02005928: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 mov r2, #0x2c - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch mov r1, #0x3f add r0, r4, #0x0 mvn r1, r1 @@ -891,7 +891,7 @@ _02005928: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x8 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan ldr r2, [sp, #0x18] add r0, r4, #0x0 mov r1, #0x8 @@ -903,7 +903,7 @@ _0200596C: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -915,7 +915,7 @@ _0200596C: add r2, r0, #0x0 ldr r1, _02005AB8 ; =0x0000FFFF sub r2, #0x81 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch b _02005AC2 _0200599C: add r0, r4, #0x0 @@ -923,7 +923,7 @@ _0200599C: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -934,7 +934,7 @@ _0200599C: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 mov r2, #0x3c - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch b _02005AC2 _020059CA: mov r0, #0xe @@ -964,7 +964,7 @@ _020059FE: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -976,7 +976,7 @@ _020059FE: add r2, r0, #0x0 ldr r1, _02005AB8 ; =0x0000FFFF sub r2, #0x2d - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch b _02005AC2 _02005A2E: add r0, r4, #0x0 @@ -984,7 +984,7 @@ _02005A2E: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -993,7 +993,7 @@ _02005A2E: add r2, r0, #0x0 ldr r1, _02005AB8 ; =0x0000FFFF sub r2, #0x61 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch b _02005AC2 _02005A56: add r0, r4, #0x0 @@ -1001,7 +1001,7 @@ _02005A56: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x1 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan add r0, r4, #0x0 mov r1, #0x1 add r2, r6, #0x0 @@ -1013,7 +1013,7 @@ _02005A56: add r2, r0, #0x0 ldr r1, _02005AB8 ; =0x0000FFFF sub r2, #0x61 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch b _02005AC2 _02005A86: add r0, r4, #0x0 @@ -1028,11 +1028,11 @@ _02005A86: ldr r1, _02005AB8 ; =0x0000FFFF mov r0, #0x8 add r2, r5, #0x0 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan mov r0, #0x8 add r1, r6, #0x0 mov r2, #0x0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume b _02005AC2 .balign 4 _02005AB4: .word 0x000001B9 @@ -1052,7 +1052,7 @@ FUN_02005AC8: ; 0x02005AC8 add r5, r0, #0x0 add r0, r4, #0x0 add r1, r2, #0x0 - bl FUN_0200483C + bl GF_SndPlayerSetInitialVolume add r0, r5, #0x0 add r1, r4, #0x0 bl FUN_02004858 @@ -1109,11 +1109,11 @@ FUN_02005B2C: ; 0x02005B2C bne _02005B58 mov r0, #0x1 mov r1, #0x0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume ldr r2, [r5, #0x0] mov r0, #0x8 mov r1, #0x0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume _02005B58: ldr r0, [r5, #0x0] sub r0, r0, #0x1 @@ -1186,7 +1186,7 @@ FUN_02005BC8: ; 0x02005BC8 ldr r1, _02005BF4 ; =0x0000FFFF mov r0, #0x8 add r2, r4, #0x0 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch add r0, r5, #0x0 pop {r3-r5, pc} .balign 4 @@ -1237,7 +1237,7 @@ _02005C48: mov r1, #0x3 bl GF_Snd_LoadSeqEx mov r0, #0x2 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r5, #0x0 bl NNS_SndArcPlayerStartSeq add r4, r0, #0x0 @@ -1254,7 +1254,7 @@ FUN_02005C74: ; 0x02005C74 bl FUN_02003D38 add r4, r0, #0x0 mov r0, #0x2 - bl FUN_020048BC + bl GF_SndPlayerCountPlayingSeqByPlayerNo cmp r0, #0x0 beq _02005C8C mov r0, #0x1 @@ -1277,7 +1277,7 @@ FUN_02005CA0: ; 0x02005CA0 push {r4, lr} add r4, r0, #0x0 mov r0, #0x2 - bl FUN_02003FF4 + bl GetSoundPlayer add r1, r4, #0x0 bl NNS_SndPlayerStopSeq mov r0, #0x6 diff --git a/arm9/asm/unk_02005CFC.s b/arm9/asm/unk_02005CFC.s index 8e521c5c..e56b613f 100644 --- a/arm9/asm/unk_02005CFC.s +++ b/arm9/asm/unk_02005CFC.s @@ -172,7 +172,7 @@ _02005E48: str r0, [sp, #0x14] str r0, [sp, #0x18] add r0, sp, #0x0 - bl FUN_02004914 + bl GF_MIC_StartAutoSampling add sp, #0x1c pop {pc} nop @@ -180,10 +180,10 @@ _02005E60: .word 0x00004174 thumb_func_start FUN_02005E64 FUN_02005E64: ; 0x02005E64 - ldr r3, _02005E68 ; =FUN_0200491C + ldr r3, _02005E68 ; =GF_MIC_StopAutoSampling bx r3 .balign 4 -_02005E68: .word FUN_0200491C +_02005E68: .word GF_MIC_StopAutoSampling thumb_func_start FUN_02005E6C FUN_02005E6C: ; 0x02005E6C diff --git a/arm9/global.inc b/arm9/global.inc index 284d26bf..73eddc70 100644 --- a/arm9/global.inc +++ b/arm9/global.inc @@ -276,7 +276,7 @@ .extern GF_Snd_LoadSeqEx .extern GF_Snd_LoadWaveArc .extern GF_Snd_LoadBank -.extern FUN_02003FF4 +.extern GetSoundPlayer .extern FUN_02004018 .extern FUN_020040F4 .extern FUN_02004104 @@ -291,19 +291,19 @@ .extern FUN_02004748 .extern FUN_020047C8 .extern FUN_02004810 -.extern FUN_02004828 -.extern FUN_0200483C +.extern GF_SndPlayerMoveVolume +.extern GF_SndPlayerSetInitialVolume .extern FUN_02004858 .extern FUN_0200488C -.extern FUN_020048A0 -.extern FUN_020048BC +.extern GF_SndArcPlayerStartSeqEx +.extern GF_SndPlayerCountPlayingSeqByPlayerNo .extern FUN_020048D0 -.extern FUN_020048EC +.extern GF_SndPlayerGetSeqNo .extern FUN_020048F4 .extern FUN_02004900 -.extern FUN_02004914 -.extern FUN_0200491C -.extern FUN_02004928 +.extern GF_MIC_StartAutoSampling +.extern GF_MIC_StopAutoSampling +.extern GF_MIC_DoSamplingAsync .extern FUN_02004930 .extern FUN_02004984 .extern FUN_02004A04 @@ -315,16 +315,16 @@ .extern FUN_02004AF8 .extern FUN_02004B30 .extern FUN_02004C3C -.extern FUN_02004C80 -.extern FUN_02004CA4 -.extern FUN_02004CAC +.extern GF_SndCaptureStartReverb +.extern GF_SndCaptureStopReverb +.extern GF_SndCaptureSetReverbVolume .extern FUN_02004CB4 -.extern FUN_02004CFC +.extern GF_SndCaptureStopEffect .extern FUN_02004D04 -.extern FUN_02004D20 +.extern GF_SndPlayerSetTrackPitch .extern FUN_02004D34 -.extern FUN_02004D4C -.extern FUN_02004D60 +.extern GF_SndPlayerSetTrackPan +.extern GF_SndSetMonoFlag .extern FUN_02004D74 .extern FUN_02004D94 .extern FUN_02004DB4 @@ -335,10 +335,10 @@ .extern FUN_02004E8C .extern FUN_02004E98 .extern FUN_02004F28 -.extern FUN_02004F64 +.extern GF_SndPlayerGetTick .extern FUN_02004F70 .extern FUN_0200516C -.extern FUN_020051EC +.extern GF_SndPlayerSetPlayerVolume .extern FUN_020051F4 .extern FUN_0200521C .extern FUN_02005308 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 53833b86..0df8207d 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -5564,7 +5564,7 @@ MOD12_022303C0: ; 0x022303C0 str r2, [r4, r0] mov r0, #7 str r1, [r3, #4] - bl FUN_02004F64 + bl GF_SndPlayerGetTick ldr r1, _02230498 ; =0x00000AF8 ldr r1, [r4, r1] mul r0, r1 diff --git a/arm9/modules/16/asm/module_16.s b/arm9/modules/16/asm/module_16.s index 73e8460b..16b3c00d 100644 --- a/arm9/modules/16/asm/module_16.s +++ b/arm9/modules/16/asm/module_16.s @@ -71,7 +71,7 @@ _021D7546: str r0, [r4] mov r0, #1 mov r1, #0x2a - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 add sp, #0x20 pop {r3, r4, r5, pc} @@ -171,7 +171,7 @@ _021D7630: bl DestroyHeap mov r0, #1 mov r1, #0x7f - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 pop {r4, pc} thumb_func_end MOD16_021D7614 @@ -44271,7 +44271,7 @@ _021EBCD4: cmp r0, #1 bne _021EBCE6 mov r0, #0 - bl FUN_02004CA4 + bl GF_SndCaptureStopReverb _021EBCE6: ldr r0, [r4, #0x50] cmp r0, #2 @@ -44291,13 +44291,13 @@ _021EBD02: ldr r0, [r4, #0x50] cmp r0, #2 bne _021EBD0C - bl FUN_02004CFC + bl GF_SndCaptureStopEffect _021EBD0C: ldr r0, [r4, #0x50] cmp r0, #1 beq _021EBD1C mov r0, #0 - bl FUN_02004C80 + bl GF_SndCaptureStartReverb mov r0, #1 str r0, [r4, #0x50] _021EBD1C: @@ -44316,7 +44316,7 @@ _021EBD26: sub r0, r0, #1 _021EBD34: mov r1, #0 - bl FUN_02004CAC + bl GF_SndCaptureSetReverbVolume pop {r4, pc} thumb_func_end MOD16_021EBCC4 @@ -44710,12 +44710,12 @@ MOD16_021EC010: ; 0x021EC010 cmp r0, #1 bne _021EC020 mov r0, #0 - bl FUN_02004CA4 + bl GF_SndCaptureStopReverb _021EC020: ldr r0, [r4, #0x50] cmp r0, #2 bne _021EC02A - bl FUN_02004CFC + bl GF_SndCaptureStopEffect _021EC02A: mov r0, #0 str r0, [r4, #0x50] @@ -44855,7 +44855,7 @@ MOD16_021EC0E8: ; 0x021EC0E8 ldr r1, _021EC10C ; =0x0000FFFF ldr r2, [r4, #0x40] mov r0, #1 - bl FUN_02004D4C + bl GF_SndPlayerSetTrackPan ldr r0, [r4, #0x44] bl MOD16_021EC110 _021EC108: @@ -44866,13 +44866,13 @@ _021EC10C: .word 0x0000FFFF thumb_func_start MOD16_021EC110 MOD16_021EC110: ; 0x021EC110 - ldr r3, _021EC11C ; =FUN_02004828 + ldr r3, _021EC11C ; =GF_SndPlayerMoveVolume add r1, r0, #0 mov r0, #8 mov r2, #0 bx r3 nop -_021EC11C: .word FUN_02004828 +_021EC11C: .word GF_SndPlayerMoveVolume thumb_func_end MOD16_021EC110 thumb_func_start MOD16_021EC120 @@ -44988,12 +44988,12 @@ MOD16_021EC1DC: ; 0x021EC1DC ldr r1, _021EC1F8 ; =0x0000FFFF mov r0, #1 add r2, r4, #0 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch add r4, #0x14 ldr r1, _021EC1F8 ; =0x0000FFFF mov r0, #8 add r2, r4, #0 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch pop {r4, pc} .align 2, 0 _021EC1F8: .word 0x0000FFFF diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 074ed1e0..a7e887c2 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -17263,7 +17263,7 @@ MOD18_02241AD0: ; 0x02241AD0 ldr r2, _02241D24 ; =MOD18_02241AB4 mov r3, #0 mov r0, #2 - bl FUN_02004928 + bl GF_MIC_DoSamplingAsync ldr r0, _02241D28 ; =0x022513A0 ldr r2, [r0, #4] ldr r0, _02241D2C ; =0x00000B3B @@ -20447,7 +20447,7 @@ _02243402: ldr r2, _02243530 ; =MOD18_02241AB4 mov r0, #2 mov r3, #0 - bl FUN_02004928 + bl GF_MIC_DoSamplingAsync ldr r0, [r5, #0x14] add r0, r0, #1 str r0, [r5, #0x14] diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 7e036d8c..61f44b88 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -8528,7 +8528,7 @@ _022161A8: mov r0, #7 mov r1, #0x12 mov r2, #0 - bl FUN_02004828 + bl GF_SndPlayerMoveVolume mov r0, #0x7f mov r1, #0x1e mov r2, #1 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 52ef15ff..bbf164b2 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -225,7 +225,7 @@ _021D76A8: bl FUN_02033F20 mov r0, #1 mov r1, #0x2a - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #6 str r0, [sp] mov r0, #1 @@ -564,7 +564,7 @@ MOD57_021D7944: ; 0x021D7944 bl DestroyHeap mov r0, #1 mov r1, #0x7f - bl FUN_020051EC + bl GF_SndPlayerSetPlayerVolume mov r0, #1 pop {r3, r4, r5, pc} .align 2, 0 @@ -4129,7 +4129,7 @@ _021D95FE: beq _021D9612 ldrb r0, [r5] add r0, r0, #3 - bl FUN_020048BC + bl GF_SndPlayerCountPlayingSeqByPlayerNo cmp r0, #0 bne _021D9612 strb r6, [r5, #1] @@ -4279,7 +4279,7 @@ MOD57_021D96F4: ; 0x021D96F4 add r4, r1, #0 ldr r2, _021D9720 ; =0x00000694 add r1, r0, #0 - bl FUN_020048A0 + bl GF_SndArcPlayerStartSeqEx ldr r2, _021D9724 ; =0x021D9A00 lsl r3, r4, #1 ldrh r2, [r2, r3] @@ -4290,7 +4290,7 @@ MOD57_021D96F4: ; 0x021D96F4 ldr r1, _021D9728 ; =0x0000FFFF add r0, r5, #3 sub r2, r2, r3 - bl FUN_02004D20 + bl GF_SndPlayerSetTrackPitch pop {r4, r5, r6, pc} .align 2, 0 _021D9720: .word 0x00000694 diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index bce93cc6..6d3eade4 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -205,7 +205,7 @@ _021D7680: ldrh r0, [r4, #0x18] lsl r0, r0, #0x1a lsr r0, r0, #0x1e - bl FUN_02004D60 + bl GF_SndSetMonoFlag ldrh r1, [r4, #0x18] mov r0, #0 lsl r1, r1, #0x16 @@ -1257,7 +1257,7 @@ _021D7F26: add r0, r0, r1 add r0, #0x5e ldrh r0, [r0] - bl FUN_02004D60 + bl GF_SndSetMonoFlag b _021D7F54 _021D7F3C: cmp r0, #4 diff --git a/arm9/src/sound.c b/arm9/src/sound.c index bc30b97a..6efef50a 100644 --- a/arm9/src/sound.c +++ b/arm9/src/sound.c @@ -37,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) @@ -97,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; } @@ -244,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)) @@ -315,6 +315,6 @@ void GF_InitMic(void) void FUN_020040DC(void) { NNS_SndPlayerStopSeqByPlayerNo(7, 0); - FUN_02003FF4(7); + GetSoundPlayer(7); NNS_SndHandleReleaseSeq(); } diff --git a/arm9/src/unk_020040F4.c b/arm9/src/unk_020040F4.c index d8624329..c1809fbc 100644 --- a/arm9/src/unk_020040F4.c +++ b/arm9/src/unk_020040F4.c @@ -19,7 +19,7 @@ extern void NNS_SndPlayerMoveVolume(u32 *, u32, u32); extern void NNS_SndPlayerSetInitialVolume(u32 *, s32); extern void *NNS_SndArcGetSeqParam(u32); extern void NNS_SndArcPlayerStartSeqEx(u32 *, u32, s32, s32, u32); -extern BOOL NNS_SndPlayerCountPlayingSeqByPlayerNo(int); +extern u16 NNS_SndPlayerCountPlayingSeqByPlayerNo(int); extern u32 NNS_SndPlayerGetSeqNo(u32 *); extern u32 NNS_SndArcGetBankInfo(u32); extern u32 MIC_StartAutoSampling(u32); @@ -39,7 +39,7 @@ extern s32 NNS_SndArcReadFile(u32, void *, u32, u32); extern BOOL NNS_SndCaptureIsActive(); extern u32 NNS_SndCaptureStartReverb(void *, u32, u32, u32, u32); extern void NNS_SndCaptureStopReverb(u32); -extern void NNS_SndCaptureSetReverbVolume(); +extern void NNS_SndCaptureSetReverbVolume(u32,u32); extern u32 NNS_SndCaptureStartEffect(void *, u32, u32, u32, u32, void (*)(), void *); extern void NNS_SndCaptureStopEffect(); extern void NNS_SndPlayerSetTrackPitch(u32 *, u32, u32); @@ -311,7 +311,7 @@ THUMB_FUNC void FUN_020044A8(s32 param0) GF_Snd_SaveState(ptr3); } -THUMB_FUNC void FUN_020044D4(int param0, u32 param1) +THUMB_FUNC void FUN_020044D4(int seqNo, u32 param1) { #pragma unused(param1) @@ -319,9 +319,9 @@ THUMB_FUNC void FUN_020044D4(int param0, u32 param1) FUN_02003D38(23); FUN_02003D38(31); - u32 r4 = FUN_020048EC(FUN_02003FF4(0)); + u32 r4 = GF_SndPlayerGetSeqNo(GetSoundPlayer(0)); - if (*ptr == 0 && r4 == param0 && FUN_02004140() != 1152) + if (*ptr == 0 && r4 == seqNo && FUN_02004140() != 1152) { return; } @@ -329,7 +329,7 @@ THUMB_FUNC void FUN_020044D4(int param0, u32 param1) FUN_02004DBC(1); FUN_02005454(); - if (r4 != param0) + if (r4 != seqNo) { FUN_020047C8(1, 0); FUN_0200541C(); @@ -341,15 +341,15 @@ THUMB_FUNC void FUN_020044D4(int param0, u32 param1) FUN_02004180(4); GF_Snd_SaveState((int *)FUN_02003D38(25)); - if (r4 != param0) + if (r4 != seqNo) { FUN_020047C8(1, 0); } - FUN_02004568(param0, (u16)r4); + FUN_02004568(seqNo, (u16)r4); return; } - FUN_0200521C(param0); + FUN_0200521C(seqNo); } THUMB_FUNC void FUN_02004568(int seqNo, u16 param1) @@ -375,7 +375,7 @@ THUMB_FUNC void FUN_02004568(int seqNo, u16 param1) FUN_02004DBC(0); } -THUMB_FUNC void FUN_020045C4(int param0, u32 param1) +THUMB_FUNC void FUN_020045C4(int seqNo, u32 param1) { u8 *ptr = FUN_02003D38(18); u16 *ptr2 = FUN_02003D38(31); @@ -395,7 +395,7 @@ THUMB_FUNC void FUN_020045C4(int param0, u32 param1) u32 r0 = FUN_02004900(*ptr2); if (r0 != 1001 && r0 != 1003) { - GF_Snd_LoadSeqEx(param0, 4); + GF_Snd_LoadSeqEx(seqNo, 4); GF_ASSERT(FALSE); } else @@ -538,10 +538,10 @@ THUMB_FUNC void FUN_020047C8(u8 param0, u8 param1) if (param1 == 0) { - FUN_02004110((u16)FUN_020048EC(FUN_02003FF4(r4))); + FUN_02004110((u16) GF_SndPlayerGetSeqNo(GetSoundPlayer(r4))); } - NNS_SndPlayerPause(FUN_02003FF4(r4), param1); + NNS_SndPlayerPause(GetSoundPlayer(r4), param1); *ptr = param1; } @@ -553,12 +553,12 @@ THUMB_FUNC void FUN_02004810() *ptr2 = 0; } -THUMB_FUNC void FUN_02004828(int param0, u32 param1, u32 param2) +THUMB_FUNC void GF_SndPlayerMoveVolume(int playerNo, u32 param1, u32 param2) { - NNS_SndPlayerMoveVolume(FUN_02003FF4(param0), param1, param2); + NNS_SndPlayerMoveVolume(GetSoundPlayer(playerNo), param1, param2); } -THUMB_FUNC void FUN_0200483C(int param0, s32 param1) +THUMB_FUNC void GF_SndPlayerSetInitialVolume(int playerNo, s32 param1) { if (param1 < 0) { @@ -570,14 +570,14 @@ THUMB_FUNC void FUN_0200483C(int param0, s32 param1) param1 = 127; } - NNS_SndPlayerSetInitialVolume(FUN_02003FF4(param0), param1); + NNS_SndPlayerSetInitialVolume(GetSoundPlayer(playerNo), param1); } -THUMB_FUNC void FUN_02004858(u32 param0, int param1) +THUMB_FUNC void FUN_02004858(u32 param0, int playerNo) { u8 *ret = NNS_SndArcGetSeqParam(param0); u8 r4; - if (param1 == 1 || param1 == 8) + if (playerNo == 1 || playerNo == 8) { r4 = 127; } @@ -593,25 +593,25 @@ THUMB_FUNC void FUN_02004858(u32 param0, int param1) if (FUN_020313EC() == 1) { - FUN_0200483C(param1, r4 / 5); + GF_SndPlayerSetInitialVolume(playerNo, r4 / 5); } } THUMB_FUNC void FUN_0200488C(u16 param0, u16 param1) { - FUN_0200483C((int)FUN_02004018(FUN_020048D0(param0)), param1); + GF_SndPlayerSetInitialVolume((int)FUN_02004018(FUN_020048D0(param0)), param1); } -THUMB_FUNC void FUN_020048A0(int param0, u32 param1, u32 param2) +THUMB_FUNC void GF_SndArcPlayerStartSeqEx(int playerNo, u32 param1, u32 param2) { - NNS_SndArcPlayerStartSeqEx(FUN_02003FF4(param0), param1, -1, -1, param2); + NNS_SndArcPlayerStartSeqEx(GetSoundPlayer(playerNo), param1, -1, -1, param2); } -THUMB_FUNC BOOL FUN_020048BC(int param0) +THUMB_FUNC u16 GF_SndPlayerCountPlayingSeqByPlayerNo(int playerNo) { - GF_ASSERT(param0 >= 0); + GF_ASSERT(playerNo >= 0); - return NNS_SndPlayerCountPlayingSeqByPlayerNo(param0); + return NNS_SndPlayerCountPlayingSeqByPlayerNo(playerNo); } THUMB_FUNC u8 FUN_020048D0(u16 param0) @@ -630,7 +630,7 @@ THUMB_FUNC u8 FUN_020048D0(u16 param0) return ptr[5]; } -THUMB_FUNC u32 FUN_020048EC(u32 *param0) +THUMB_FUNC u32 GF_SndPlayerGetSeqNo(u32 *param0) { return NNS_SndPlayerGetSeqNo(param0); } @@ -651,19 +651,19 @@ THUMB_FUNC u16 FUN_02004900(u16 param0) return *ptr; } -THUMB_FUNC u32 FUN_02004914(u32 param0) +THUMB_FUNC u32 GF_MIC_StartAutoSampling(u32 param0) { return MIC_StartAutoSampling(param0); } -THUMB_FUNC u32 FUN_0200491C(u32 param0) +THUMB_FUNC u32 GF_MIC_StopAutoSampling(u32 param0) { #pragma unused(param0) GetSoundDataPointer(); return MIC_StopAutoSampling(); } -THUMB_FUNC u32 FUN_02004928(u32 param0, u32 param1, u32 param2, u32 param3) +THUMB_FUNC u32 GF_MIC_DoSamplingAsync(u32 param0, u32 param1, u32 param2, u32 param3) { return MIC_DoSamplingAsync(param0, param1, param2, param3); } @@ -915,26 +915,26 @@ THUMB_FUNC void FUN_02004C3C(u32 param0) } } -THUMB_FUNC BOOL FUN_02004C78() +THUMB_FUNC BOOL GF_SndCaptureIsActive() { return NNS_SndCaptureIsActive(); } -THUMB_FUNC u32 FUN_02004C80(u32 param0) +THUMB_FUNC u32 GF_SndCaptureStartReverb(u32 param0) { GetSoundDataPointer(); return NNS_SndCaptureStartReverb(FUN_02003D38(3), 0x1000, 0, 0x3E80, param0); } -THUMB_FUNC void FUN_02004CA4(u32 param0) +THUMB_FUNC void GF_SndCaptureStopReverb(u32 param0) { NNS_SndCaptureStopReverb(param0); } -THUMB_FUNC void FUN_02004CAC() +THUMB_FUNC void GF_SndCaptureSetReverbVolume(u32 param0, u32 param1) { - NNS_SndCaptureSetReverbVolume(); + NNS_SndCaptureSetReverbVolume(param0, param1); } THUMB_FUNC void FUN_02004CB4() @@ -949,7 +949,7 @@ THUMB_FUNC void FUN_02004CB4() NNS_SndCaptureStartEffect(r4, 0x1000, 0, 0x55F0, 2, FUN_02005068, st8); } -THUMB_FUNC void FUN_02004CFC() +THUMB_FUNC void GF_SndCaptureStopEffect() { NNS_SndCaptureStopEffect(); } @@ -970,22 +970,22 @@ THUMB_FUNC void FUN_02004D04(s32 param0) *ptr = (u8)param0; } -THUMB_FUNC void FUN_02004D20(int param0, u32 param1, u32 param2) +THUMB_FUNC void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, u32 param2) { - NNS_SndPlayerSetTrackPitch(FUN_02003FF4(param0), param1, param2); + NNS_SndPlayerSetTrackPitch(GetSoundPlayer(playerNo), param1, param2); } THUMB_FUNC void FUN_02004D34(u16 param0, u32 param1, u32 param2) { - FUN_02004D20((int)FUN_02004018(FUN_020048D0(param0)), param1, param2); + GF_SndPlayerSetTrackPitch((int)FUN_02004018(FUN_020048D0(param0)), param1, param2); } -THUMB_FUNC void FUN_02004D4C(int param0, u32 param1, u32 param2) +THUMB_FUNC void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, u32 param2) { - NNS_SndPlayerSetTrackPan(FUN_02003FF4(param0), param1, param2); + NNS_SndPlayerSetTrackPan(GetSoundPlayer(playerNo), param1, param2); } -THUMB_FUNC void FUN_02004D60(u32 param0) +THUMB_FUNC void GF_SndSetMonoFlag(u32 param0) { NNS_SndSetMonoFlag(param0); UNK_021C3DD8[0] = param0; @@ -1129,7 +1129,7 @@ THUMB_FUNC u32 FUN_02004ED0(s32 param0) THUMB_FUNC u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 param2) { #pragma unused(param0) - u32 r4 = FUN_02004F64(1); + u32 r4 = GF_SndPlayerGetTick(1); u32 r5 = param1->unk08; s32 r1 = (param2 / (3 * 0x100)) << 1; @@ -1156,9 +1156,9 @@ THUMB_FUNC u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 return r0; } -THUMB_FUNC u32 FUN_02004F64(int param0) +THUMB_FUNC u32 GF_SndPlayerGetTick(int playerNo) { - return NNS_SndPlayerGetTick(FUN_02003FF4(param0)); + return NNS_SndPlayerGetTick(GetSoundPlayer(playerNo)); } THUMB_FUNC void FUN_02004F70( @@ -1330,25 +1330,25 @@ THUMB_FUNC void FUN_0200516C(u32 param0) if (param0 == 0) { FUN_02005160(0x7ff); - FUN_02004CA4(0); + GF_SndCaptureStopReverb(0); } else if (param0 == 1) { FUN_02005160(0x7fff); - FUN_02004C80(30); + GF_SndCaptureStartReverb(30); } else { FUN_02005160(0x7fff); - FUN_02004C80(15); + GF_SndCaptureStartReverb(15); } - FUN_02004C78(); + GF_SndCaptureIsActive(); } THUMB_FUNC void FUN_020051AC() { - if (FUN_02005404() == FALSE && FUN_020048EC(FUN_02003FF4(0)) != -1 && FUN_02004124() != 0x47e) + if (FUN_02005404() == FALSE && GF_SndPlayerGetSeqNo(GetSoundPlayer(0)) != -1 && FUN_02004124() != 0x47e) { FUN_02005454(); @@ -1359,7 +1359,7 @@ THUMB_FUNC void FUN_020051AC() FUN_0200541C(); } -THUMB_FUNC void FUN_020051EC(u32 param0, u8 param1) +THUMB_FUNC void GF_SndPlayerSetPlayerVolume(u32 param0, u8 param1) { NNS_SndPlayerSetPlayerVolume(param0, param1); } diff --git a/include/sound.h b/include/sound.h index 781c6b5b..aa2f1641 100644 --- a/include/sound.h +++ b/include/sound.h @@ -62,7 +62,7 @@ BOOL GF_Snd_LoadSeq(int seqNo); BOOL GF_Snd_LoadSeqEx(int seqNo, u32 loadFlag); BOOL GF_Snd_LoadWaveArc(int waveArcNo); BOOL GF_Snd_LoadBank(int bankNo); -u32 * FUN_02003FF4(int playerNo); +u32 * GetSoundPlayer(int playerNo); u32 FUN_02004018(u32 a0); void DoSoundUpdateFrame(void); diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h index 4169aca5..27ef83ea 100644 --- a/include/unk_020040F4.h +++ b/include/unk_020040F4.h @@ -52,19 +52,19 @@ void FUN_02004738(); int FUN_02004748(s32 param0); void FUN_020047C8(u8 param0, u8 param1); void FUN_02004810(); -void FUN_02004828(int param0, u32 param1, u32 param2); -void FUN_0200483C(int param0, s32 param1); +void GF_SndPlayerMoveVolume(int param0, u32 param1, u32 param2); +void GF_SndPlayerSetInitialVolume(int param0, s32 param1); void FUN_02004858(u32 param0, int param1); void FUN_0200488C(u16 param0, u16 param1); -void FUN_020048A0(int param0, u32 param1, u32 param2); -BOOL FUN_020048BC(int param0); +void GF_SndArcPlayerStartSeqEx(int param0, u32 param1, u32 param2); +u16 GF_SndPlayerCountPlayingSeqByPlayerNo(int param0); u8 FUN_020048D0(u16 param0); -u32 FUN_020048EC(u32 *param0); +u32 GF_SndPlayerGetSeqNo(u32 *param0); u32 FUN_020048F4(u16 param0); u16 FUN_02004900(u16 param0); -u32 FUN_02004914(u32 param0); -u32 FUN_0200491C(u32 param0); -u32 FUN_02004928(u32 param0, u32 param1, u32 param2, u32 param3); +u32 GF_MIC_StartAutoSampling(u32 param0); +u32 GF_MIC_StopAutoSampling(u32 param0); +u32 GF_MIC_DoSamplingAsync(u32 param0, u32 param1, u32 param2, u32 param3); void *FUN_02004930(u32 param0); u32 FUN_02004984(u32 param0); void FUN_02004A04(u32 param0); @@ -77,17 +77,17 @@ void FUN_02004AF8(u32 param0, s32 param1); u32 FUN_02004B30(u32 param0, s32 param1, u32 param2, u32 param3, u32 param4); void FUN_02004C1C(u8 *param0, u32 param1); void FUN_02004C3C(u32 param0); -BOOL FUN_02004C78(); -u32 FUN_02004C80(u32 param0); -void FUN_02004CA4(u32 param0); -void FUN_02004CAC(); +BOOL GF_SndCaptureIsActive(); +u32 GF_SndCaptureStartReverb(u32 param0); +void GF_SndCaptureStopReverb(u32 param0); +void GF_SndCaptureSetReverbVolume(u32 param0, u32 param1); void FUN_02004CB4(); -void FUN_02004CFC(); +void GF_SndCaptureStopEffect(); void FUN_02004D04(s32 param0); -void FUN_02004D20(int param0, u32 param1, u32 param2); +void GF_SndPlayerSetTrackPitch(int param0, u32 param1, u32 param2); void FUN_02004D34(u16 param0, u32 param1, u32 param2); -void FUN_02004D4C(int param0, u32 param1, u32 param2); -void FUN_02004D60(u32 param0); +void GF_SndPlayerSetTrackPan(int param0, u32 param1, u32 param2); +void GF_SndSetMonoFlag(u32 param0); void FUN_02004D74(u32 param0); void FUN_02004D84(u32 param0); u16 FUN_02004D94(); @@ -102,10 +102,10 @@ u32 FUN_02004E8C(u32 *param0); u32 FUN_02004E98(s32 param0); u32 FUN_02004ED0(s32 param0); u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 param2); -u32 FUN_02004F64(int param0); +u32 GF_SndPlayerGetTick(int param0); void FUN_02004F70(struct UnkStruct_020040F4_2 *param0, u8 *param1, int param2, s32 param3); void FUN_02005068(s16 *param0, s16 *param1, u32 param2, u32 param3, void *param4); void FUN_02005160(u32 param0); void FUN_0200516C(u32 param0); void FUN_020051AC(); -void FUN_020051EC(u32 param0, u8 param1); +void GF_SndPlayerSetPlayerVolume(u32 param0, u8 param1); |