From 067a94af916cdc506fd468aaff3de336f5a9cbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Fri, 2 Jul 2021 22:17:13 +0200 Subject: add header --- include/unk_020040F4.h | 84 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 include/unk_020040F4.h (limited to 'include') diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h new file mode 100644 index 00000000..56f43d40 --- /dev/null +++ b/include/unk_020040F4.h @@ -0,0 +1,84 @@ +#include "global.h" + +void FUN_020040F4(u8 param0); +u8 FUN_02004104(); +void FUN_02004110(u16 param0); +u16 FUN_02004124(); +void FUN_02004130(u16 param0); +u16 FUN_02004140(); +void FUN_0200414C(u16 param0); +void FUN_0200415C(u8 param0); +BOOL FUN_02004180(s32 param0); +u32 FUN_0200433C(u8 param0, u32 param1, u32 param2); +void FUN_020044A8(s32 param0); +void FUN_020044D4(int param0, u32 param1); +void FUN_02004568(int seqNo, u16 param1); +void FUN_020045C4(u32 param0, u32 param1); +void FUN_02004648(u32 param0, u32 param1); +void FUN_02004680(u32 param0, u32 param1); +void FUN_020046A0(u32 param0, u32 param1); +void FUN_020046C4(u32 param0, u32 param1); +void FUN_020046E8(u32 param0); +void FUN_02004704(u32 param0, u32 param1, u32 param2); +void FUN_02004724(u32 param0); +void FUN_02004738(); +int FUN_02004748(s32 param0); +void FUN_020047C8(u8 param0, u8 param1); +void FUN_02004810(); +void FUN_02004828(u32 param0, u32 param1, u32 param2); +void FUN_0200483C(u32 param0, s32 param1); +void FUN_02004858(u32 param0, u32 param1); +void FUN_0200488C(u16 param0, u16 param1); +void FUN_020048A0(int param0, u32 param1, u32 param2); +BOOL FUN_020048BC(int param0); +u8 FUN_020048D0(u16 param0); +u32 FUN_020048EC(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); +void *FUN_02004930(u32 param0); +u32 FUN_02004984(u32 param0); +void FUN_02004A04(u32 param0); +u32 FUN_02004A6C(u32 *param0, u32 param1); +void FUN_02004AAC(u32 param0); +void FUN_02004ABC(u32 param0); +void FUN_02004ACC(u32 param0, u32 param1); +void FUN_02004AE4(u32 param0, u32 param1); +void FUN_02004AF8(u32 param0, s32 param1); +u32 FUN_02004B30(u32 param0, u32 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(); +void FUN_02004CB4(); +void FUN_02004CFC(); +void FUN_02004D04(s32 param0); +void FUN_02004D20(u32 param0, u32 param1, u32 param2); +void FUN_02004D34(u16 param0, u32 param1, u32 param2); +void FUN_02004D4C(u32 param0, u32 param1, u32 param2); +void FUN_02004D60(u32 param0); +void FUN_02004D74(u32 param0); +void FUN_02004D84(u32 param0); +u16 FUN_02004D94(); +u8 *FUN_02004DB4(); +void FUN_02004DBC(u8 param0); +u32 FUN_02004DCC(u32 param0, u16 param1, u32 param2, u32 param3, u8 param4, u32 param5); +u32 FUN_02004E08( + u32 param0, u16 param1, u32 param2, u32 param3, u32 param35, u8 param4, u32 param5); +void FUN_02004E44(u32 param0, u16 param1, u32 param2, u32 param3, u8 param4, u32 param5); +u32 FUN_02004E80(u32 param0); +u32 FUN_02004E8C(u32 *param0); +u32 FUN_02004E98(s32 param0); +u32 FUN_02004ED0(s32 param0); +u32 FUN_02004F28(u32 param0, u32 *param1, s32 param2); +u32 FUN_02004F64(int param0); +void FUN_02004F70(u8 *param0, u8 *param1, int param2, u32 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); -- cgit v1.2.3 From 5caaf8bb4d662d33dfcb16db0cb6d059bc04a9ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 4 Jul 2021 19:08:46 +0200 Subject: fix warnings --- include/unk_020040F4.h | 64 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 46 insertions(+), 18 deletions(-) (limited to 'include') diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h index 56f43d40..9bcc5cc4 100644 --- a/include/unk_020040F4.h +++ b/include/unk_020040F4.h @@ -1,5 +1,33 @@ #include "global.h" + +struct WaveArcInfo +{ + u32 unk00 : 24; +}; + +struct UnkStruct1 { + void *unk00; + u32 unk04; + void *unk08; + u32 unk0c; + u32 unk10; + u32 unk14; + u32 unk18; + s32 unk1c; + u32 unk20; + u32 unk24; +}; + + +struct UnkStruct2 { + u32 unk00; + u32 unk04; + u32 unk08; + u8 unk0c[9]; +}; + + void FUN_020040F4(u8 param0); u8 FUN_02004104(); void FUN_02004110(u16 param0); @@ -9,25 +37,25 @@ u16 FUN_02004140(); void FUN_0200414C(u16 param0); void FUN_0200415C(u8 param0); BOOL FUN_02004180(s32 param0); -u32 FUN_0200433C(u8 param0, u32 param1, u32 param2); +u32 FUN_0200433C(u8 param0, int param1, u32 param2); void FUN_020044A8(s32 param0); void FUN_020044D4(int param0, u32 param1); void FUN_02004568(int seqNo, u16 param1); -void FUN_020045C4(u32 param0, u32 param1); -void FUN_02004648(u32 param0, u32 param1); -void FUN_02004680(u32 param0, u32 param1); -void FUN_020046A0(u32 param0, u32 param1); -void FUN_020046C4(u32 param0, u32 param1); -void FUN_020046E8(u32 param0); -void FUN_02004704(u32 param0, u32 param1, u32 param2); -void FUN_02004724(u32 param0); +void FUN_020045C4(int param0, u32 param1); +void FUN_02004648(int param0, u32 param1); +void FUN_02004680(int param0, u32 param1); +void FUN_020046A0(int param0, u32 param1); +void FUN_020046C4(int param0, u32 param1); +void FUN_020046E8(s32 param0); +void FUN_02004704(s32 param0, int param1, u32 param2); +void FUN_02004724(int param0); void FUN_02004738(); int FUN_02004748(s32 param0); void FUN_020047C8(u8 param0, u8 param1); void FUN_02004810(); -void FUN_02004828(u32 param0, u32 param1, u32 param2); -void FUN_0200483C(u32 param0, s32 param1); -void FUN_02004858(u32 param0, u32 param1); +void FUN_02004828(int param0, u32 param1, u32 param2); +void FUN_0200483C(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); @@ -41,13 +69,13 @@ u32 FUN_02004928(u32 param0, u32 param1, u32 param2, u32 param3); void *FUN_02004930(u32 param0); u32 FUN_02004984(u32 param0); void FUN_02004A04(u32 param0); -u32 FUN_02004A6C(u32 *param0, u32 param1); +u32 FUN_02004A6C(struct UnkStruct1 *param0, u32 param1); void FUN_02004AAC(u32 param0); void FUN_02004ABC(u32 param0); void FUN_02004ACC(u32 param0, u32 param1); void FUN_02004AE4(u32 param0, u32 param1); void FUN_02004AF8(u32 param0, s32 param1); -u32 FUN_02004B30(u32 param0, u32 param1, u32 param2, u32 param3, u32 param4); +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(); @@ -57,9 +85,9 @@ void FUN_02004CAC(); void FUN_02004CB4(); void FUN_02004CFC(); void FUN_02004D04(s32 param0); -void FUN_02004D20(u32 param0, u32 param1, u32 param2); +void FUN_02004D20(int param0, u32 param1, u32 param2); void FUN_02004D34(u16 param0, u32 param1, u32 param2); -void FUN_02004D4C(u32 param0, u32 param1, u32 param2); +void FUN_02004D4C(int param0, u32 param1, u32 param2); void FUN_02004D60(u32 param0); void FUN_02004D74(u32 param0); void FUN_02004D84(u32 param0); @@ -74,9 +102,9 @@ u32 FUN_02004E80(u32 param0); u32 FUN_02004E8C(u32 *param0); u32 FUN_02004E98(s32 param0); u32 FUN_02004ED0(s32 param0); -u32 FUN_02004F28(u32 param0, u32 *param1, s32 param2); +u32 FUN_02004F28(u32 param0, struct UnkStruct2 *param1, s32 param2); u32 FUN_02004F64(int param0); -void FUN_02004F70(u8 *param0, u8 *param1, int param2, u32 param3); +void FUN_02004F70(struct UnkStruct2 *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); -- cgit v1.2.3 From d1f82d018d0034baa1554a5d3dc79fd92b408d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Sun, 4 Jul 2021 19:25:57 +0200 Subject: cleanup --- include/unk_020040F4.h | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) (limited to 'include') diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h index 9bcc5cc4..4169aca5 100644 --- a/include/unk_020040F4.h +++ b/include/unk_020040F4.h @@ -1,12 +1,12 @@ #include "global.h" - struct WaveArcInfo { u32 unk00 : 24; }; -struct UnkStruct1 { +struct UnkStruct_020040F4_1 +{ void *unk00; u32 unk04; void *unk08; @@ -19,15 +19,14 @@ struct UnkStruct1 { u32 unk24; }; - -struct UnkStruct2 { - u32 unk00; - u32 unk04; - u32 unk08; - u8 unk0c[9]; +struct UnkStruct_020040F4_2 +{ + u32 unk00; + u32 unk04; + u32 unk08; + u8 unk0c[9]; }; - void FUN_020040F4(u8 param0); u8 FUN_02004104(); void FUN_02004110(u16 param0); @@ -69,7 +68,7 @@ u32 FUN_02004928(u32 param0, u32 param1, u32 param2, u32 param3); void *FUN_02004930(u32 param0); u32 FUN_02004984(u32 param0); void FUN_02004A04(u32 param0); -u32 FUN_02004A6C(struct UnkStruct1 *param0, u32 param1); +u32 FUN_02004A6C(struct UnkStruct_020040F4_1 *param0, u32 param1); void FUN_02004AAC(u32 param0); void FUN_02004ABC(u32 param0); void FUN_02004ACC(u32 param0, u32 param1); @@ -102,9 +101,9 @@ u32 FUN_02004E80(u32 param0); u32 FUN_02004E8C(u32 *param0); u32 FUN_02004E98(s32 param0); u32 FUN_02004ED0(s32 param0); -u32 FUN_02004F28(u32 param0, struct UnkStruct2 *param1, s32 param2); +u32 FUN_02004F28(u32 param0, struct UnkStruct_020040F4_2 *param1, s32 param2); u32 FUN_02004F64(int param0); -void FUN_02004F70(struct UnkStruct2 *param0, u8 *param1, int param2, s32 param3); +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); -- cgit v1.2.3 From d7a8de0573dc9c373e32035e596989ff9e22bf73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Thu, 8 Jul 2021 09:41:04 +0200 Subject: document some sound stuff --- include/sound.h | 2 +- include/unk_020040F4.h | 36 ++++++++++++++++++------------------ 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'include') 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); -- cgit v1.2.3 From 0607178b56bbfd2843afb310602af9854bbc01cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Thu, 8 Jul 2021 09:43:27 +0200 Subject: fix header --- include/unk_020040F4.h | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'include') 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 -- cgit v1.2.3 From 019ca636430a8addc98e189b84cb1f5cc1f8c47f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Calixte?= Date: Thu, 8 Jul 2021 09:46:01 +0200 Subject: u32 -> BOOL --- include/unk_020040F4.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h index 16449c5e..641decb7 100644 --- a/include/unk_020040F4.h +++ b/include/unk_020040F4.h @@ -39,7 +39,7 @@ u16 FUN_02004140(); void FUN_0200414C(u16 param0); void FUN_0200415C(u8 param0); BOOL FUN_02004180(s32 param0); -u32 FUN_0200433C(u8 param0, int param1, u32 param2); +BOOL FUN_0200433C(u8 param0, int param1, u32 param2); void FUN_020044A8(s32 param0); void FUN_020044D4(int seqNo, u32 param1); void FUN_02004568(int seqNo, u16 param1); @@ -69,7 +69,7 @@ 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); +BOOL FUN_02004984(u32 param0); void FUN_02004A04(u32 param0); u32 FUN_02004A6C(struct UnkStruct_020040F4_1 *param0, u32 param1); void FUN_02004AAC(u32 param0); -- cgit v1.2.3