Merge pull request #440 from remicalixte/unk_02005CFC

decompile unk_02005CFC.s into sound_chatot.c

4 files changed, 35 insertions, 18 deletions

diff --git a/include/pokemon.h b/include/pokemon.h
index d107bf85..60fa1838 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -10,6 +10,7 @@
 #include "constants/pokemon.h"
 #include "string16.h"
 #include "player_data.h"
+#include "sound_chatot.h"
 
 struct BaseStats {
     /* 0x00 */ u8 hp;
@@ -294,7 +295,7 @@ void Party_SpreadPokerus(struct PlayerParty * party);
 BOOL Pokemon_HasPokerus(struct Pokemon * pokemon);
 BOOL Pokemon_IsImmuneToPokerus(struct Pokemon * pokemon);
 void Pokemon_UpdateArceusForme(struct Pokemon * pokemon);
-void FUN_02069FB0(u32 r7, u32 r5, u32 r4, u32 r6, u32 sp18, u32 sp1C, u32 sp20);
+void FUN_02069FB0(struct SaveChatotSoundClip *r7, u32 r5, u16 r4, s32 r6, s32 sp18, u32 sp1C, u32 sp20);
 void FUN_0206A014(struct Pokemon * pokemon, struct PlayerData * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id);
 void FUN_0206A094(struct Pokemon * pokemon, u32 a1, u32 a2);
 BOOL FUN_0206A13C(struct Pokemon * pokemon, u32 a1);
diff --git a/include/proto.h b/include/proto.h
index 7af3f19d..43ed28ac 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -11,10 +11,6 @@ int TrainerClass_GetGenderOrTrainerCount(int x);
 int FUN_02014C3C(u8);
 void FUN_02014C54(int, int, struct UnkStruct_02069038 *, u8);
 u32 IsNighttime(void); // is day or night
-int FUN_02005F14(int);
-void FUN_02005E80(int);
-void FUN_02005E90(int, int, int, int);
-void FUN_020056AC(int, int, int, int, int);
 void FUN_020808AC(struct BoxPokemon *, struct PlayerData *, int, u32, u32);
 
 #endif //POKEDIAMOND_PROTO_H
diff --git a/include/sound_chatot.h b/include/sound_chatot.h
new file mode 100644
index 00000000..fbbba0c6
--- /dev/null
+++ b/include/sound_chatot.h
@@ -0,0 +1,19 @@
+#ifndef POKEDIAMOND_SOUND_CHATOT_H
+#define POKEDIAMOND_SOUND_CHATOT_H
+
+#include "global.h"
+#include "sav_chatot.h"
+
+BOOL FUN_02005CFC(void);
+BOOL Chatot_checkCry(struct SaveChatotSoundClip *param0);
+u32 FUN_02005D48(struct SaveChatotSoundClip *param0, u32 param1, s32 param2, s32 param3);
+void FUN_02005DFC(void);
+u32 Chatot_startRecording(void);
+void Chatot_stopRecording(void);
+void Chatot_saveRecording(struct SaveChatotSoundClip *param0);
+void FUN_02005E80(u8 param0);
+void FUN_02005E90(struct SaveChatotSoundClip *param0, u32 param1, s32 param2, s32 param3);
+u32 FUN_02005EE0(struct SaveChatotSoundClip *param0);
+BOOL FUN_02005F14(s32 param0);
+
+#endif // POKEDIAMOND_UNK_02005CFC_H
diff --git a/include/unk_020040F4.h b/include/unk_020040F4.h
index 413e853f..819a96fa 100644
--- a/include/unk_020040F4.h
+++ b/include/unk_020040F4.h
@@ -2,6 +2,7 @@
 #define POKEDIAMOND_UNK_020040F4_H
 
 #include "global.h"
+#include "SPI_mic.h"
 
 struct WaveArcInfo
 {
@@ -31,11 +32,11 @@ struct UnkStruct_020040F4_2
 };
 
 void FUN_020040F4(u8 param0);
-u8 FUN_02004104();
+u8 FUN_02004104(void);
 void FUN_02004110(u16 param0);
-u16 FUN_02004124();
+u16 FUN_02004124(void);
 void FUN_02004130(u16 param0);
-u16 FUN_02004140();
+u16 FUN_02004140(void);
 void FUN_0200414C(u16 param0);
 void FUN_0200415C(u8 param0);
 BOOL FUN_02004180(s32 param0);
@@ -51,10 +52,10 @@ 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();
+void FUN_02004738(void);
 int FUN_02004748(s32 param0);
 void FUN_020047C8(u8 param0, u8 param1);
-void FUN_02004810();
+void FUN_02004810(void);
 void GF_SndPlayerMoveVolume(int playerNo, s32 param1, s32 param2);
 void GF_SndPlayerSetInitialVolume(int playerNo, s32 param1);
 void FUN_02004858(u32 param0, int playerNo);
@@ -65,8 +66,8 @@ u8 FUN_020048D0(u16 param0);
 u32 GF_SndPlayerGetSeqNo(u32 *param0);
 u32 FUN_020048F4(u16 param0);
 u16 FUN_02004900(u32 param0);
-u32 GF_MIC_StartAutoSampling(u32 param0);
-u32 GF_MIC_StopAutoSampling(u32 param0);
+u32 GF_MIC_StartAutoSampling(struct MIC_SamplingData *param0);
+u32 GF_MIC_StopAutoSampling(void);
 u32 GF_MIC_DoSamplingAsync(u32 param0, u32 param1, u32 param2, u32 param3);
 void *FUN_02004930(u32 param0);
 BOOL FUN_02004984(u32 param0);
@@ -80,12 +81,12 @@ void FUN_02004AF8(u32 param0, s32 param1);
 u32 FUN_02004B30(u32 param0, s32 param1, s32 param2, u32 param3, u32 param4);
 void FUN_02004C1C(u8 *param0, u32 param1);
 void FUN_02004C3C(u32 param0);
-BOOL GF_SndCaptureIsActive();
+BOOL GF_SndCaptureIsActive(void);
 u32 GF_SndCaptureStartReverb(u32 param0);
 void GF_SndCaptureStopReverb(u32 param0);
 void GF_SndCaptureSetReverbVolume(u32 param0, u32 param1);
-void FUN_02004CB4();
-void GF_SndCaptureStopEffect();
+void FUN_02004CB4(void);
+void GF_SndCaptureStopEffect(void);
 void FUN_02004D04(s32 param0);
 void GF_SndPlayerSetTrackPitch(int playerNo, u32 param1, s32 param2);
 void FUN_02004D34(u16 param0, u32 param1, s32 param2);
@@ -93,8 +94,8 @@ void GF_SndPlayerSetTrackPan(int playerNo, u32 param1, s32 param2);
 void GF_SndSetMonoFlag(u32 param0);
 void FUN_02004D74(s32 param0);
 void FUN_02004D84(u32 param0);
-u16 FUN_02004D94();
-u8 *FUN_02004DB4();
+u16 FUN_02004D94(void);
+u8 *FUN_02004DB4(void);
 void FUN_02004DBC(u8 param0);
 u32 FUN_02004DCC(u32 param0, u16 param1, u32 param2, u32 param3, u8 param4, u32 param5);
 u32 FUN_02004E08(
@@ -110,7 +111,7 @@ void FUN_02004F70(struct UnkStruct_020040F4_2 *param0, u8 *param1, int param2, s
 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_020051AC(void);
 void GF_SndPlayerSetPlayerVolume(u32 param0, u8 param1);
 
 #endif // POKEDIAMOND_UNK_020040F4_H