summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémi Calixte <remicalixte.rmc@gmail.com>2021-07-08 09:43:27 +0200
committerRémi Calixte <remicalixte.rmc@gmail.com>2021-07-08 09:43:27 +0200
commit0607178b56bbfd2843afb310602af9854bbc01cb (patch)
treedc706e4e329788ec78f0540134334e720b8cf875
parentd7a8de0573dc9c373e32035e596989ff9e22bf73 (diff)
fix header
-rw-r--r--arm9/src/unk_020040F4.c11
-rw-r--r--include/unk_020040F4.h27
2 files changed, 22 insertions, 16 deletions
diff --git a/arm9/src/unk_020040F4.c b/arm9/src/unk_020040F4.c
index c1809fbc..631897a5 100644
--- a/arm9/src/unk_020040F4.c
+++ b/arm9/src/unk_020040F4.c
@@ -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(u32,u32);
+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);
@@ -319,7 +319,7 @@ THUMB_FUNC void FUN_020044D4(int seqNo, u32 param1)
FUN_02003D38(23);
FUN_02003D38(31);
- u32 r4 = GF_SndPlayerGetSeqNo(GetSoundPlayer(0));
+ u32 r4 = GF_SndPlayerGetSeqNo(GetSoundPlayer(0));
if (*ptr == 0 && r4 == seqNo && FUN_02004140() != 1152)
{
@@ -538,7 +538,7 @@ THUMB_FUNC void FUN_020047C8(u8 param0, u8 param1)
if (param1 == 0)
{
- FUN_02004110((u16) GF_SndPlayerGetSeqNo(GetSoundPlayer(r4)));
+ FUN_02004110((u16)GF_SndPlayerGetSeqNo(GetSoundPlayer(r4)));
}
NNS_SndPlayerPause(GetSoundPlayer(r4), param1);
@@ -630,7 +630,7 @@ THUMB_FUNC u8 FUN_020048D0(u16 param0)
return ptr[5];
}
-THUMB_FUNC u32 GF_SndPlayerGetSeqNo(u32 *param0)
+THUMB_FUNC u32 GF_SndPlayerGetSeqNo(u32 *param0)
{
return NNS_SndPlayerGetSeqNo(param0);
}
@@ -1348,7 +1348,8 @@ THUMB_FUNC void FUN_0200516C(u32 param0)
THUMB_FUNC void FUN_020051AC()
{
- if (FUN_02005404() == FALSE && GF_SndPlayerGetSeqNo(GetSoundPlayer(0)) != -1 && FUN_02004124() != 0x47e)
+ if (FUN_02005404() == FALSE && GF_SndPlayerGetSeqNo(GetSoundPlayer(0)) != -1 &&
+ FUN_02004124() != 0x47e)
{
FUN_02005454();
diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h
index 27ef83ea..16449c5e 100644
--- a/include/unk_020040F4.h
+++ b/include/unk_020040F4.h
@@ -1,3 +1,6 @@
+#ifndef POKEDIAMOND_UNK_020040F4_H
+#define POKEDIAMOND_UNK_020040F4_H
+
#include "global.h"
struct WaveArcInfo
@@ -38,9 +41,9 @@ void FUN_0200415C(u8 param0);
BOOL FUN_02004180(s32 param0);
u32 FUN_0200433C(u8 param0, int param1, u32 param2);
void FUN_020044A8(s32 param0);
-void FUN_020044D4(int param0, u32 param1);
+void FUN_020044D4(int seqNo, u32 param1);
void FUN_02004568(int seqNo, u16 param1);
-void FUN_020045C4(int param0, u32 param1);
+void FUN_020045C4(int seqNo, u32 param1);
void FUN_02004648(int param0, u32 param1);
void FUN_02004680(int param0, u32 param1);
void FUN_020046A0(int param0, u32 param1);
@@ -52,14 +55,14 @@ void FUN_02004738();
int FUN_02004748(s32 param0);
void FUN_020047C8(u8 param0, u8 param1);
void FUN_02004810();
-void GF_SndPlayerMoveVolume(int param0, u32 param1, u32 param2);
-void GF_SndPlayerSetInitialVolume(int param0, s32 param1);
-void FUN_02004858(u32 param0, int param1);
+void GF_SndPlayerMoveVolume(int playerNo, u32 param1, u32 param2);
+void GF_SndPlayerSetInitialVolume(int playerNo, s32 param1);
+void FUN_02004858(u32 param0, int playerNo);
void FUN_0200488C(u16 param0, u16 param1);
-void GF_SndArcPlayerStartSeqEx(int param0, u32 param1, u32 param2);
-u16 GF_SndPlayerCountPlayingSeqByPlayerNo(int param0);
+void GF_SndArcPlayerStartSeqEx(int playerNo, u32 param1, u32 param2);
+u16 GF_SndPlayerCountPlayingSeqByPlayerNo(int playerNo);
u8 FUN_020048D0(u16 param0);
-u32 GF_SndPlayerGetSeqNo(u32 *param0);
+u32 GF_SndPlayerGetSeqNo(u32 *param0);
u32 FUN_020048F4(u16 param0);
u16 FUN_02004900(u16 param0);
u32 GF_MIC_StartAutoSampling(u32 param0);
@@ -84,9 +87,9 @@ void GF_SndCaptureSetReverbVolume(u32 param0, u32 param1);
void FUN_02004CB4();
void GF_SndCaptureStopEffect();
void FUN_02004D04(s32 param0);
-void GF_SndPlayerSetTrackPitch(int param0, u32 param1, u32 param2);
+void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, u32 param2);
void FUN_02004D34(u16 param0, u32 param1, u32 param2);
-void GF_SndPlayerSetTrackPan(int param0, u32 param1, u32 param2);
+void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, u32 param2);
void GF_SndSetMonoFlag(u32 param0);
void FUN_02004D74(u32 param0);
void FUN_02004D84(u32 param0);
@@ -102,10 +105,12 @@ 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 GF_SndPlayerGetTick(int param0);
+u32 GF_SndPlayerGetTick(int playerNo);
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 GF_SndPlayerSetPlayerVolume(u32 param0, u8 param1);
+
+#endif // POKEDIAMOND_UNK_020040F4_H