8 files changed, 13 insertions, 21 deletions
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
index 25689701..94bf6e35 100644
--- a/arm9/arm9.lsf
+++ b/arm9/arm9.lsf
@@ -15,7 +15,7 @@ Static arm9
 	Object sound.o
 	Object unk_020040F4.o
 	Object unk_020051F4.o
-	Object unk_02005CFC.o
+	Object sound_chatot.o
 	Object poke_overlay.o
 	Object unk_020061E8.o
 	Object overlay_manager.o
diff --git a/arm9/src/pokemon.c b/arm9/src/pokemon.c
index bd6c702a..6139a21f 100644
--- a/arm9/src/pokemon.c
+++ b/arm9/src/pokemon.c
@@ -19,10 +19,7 @@
 #include "constants/sinnoh_dex.h"
 #include "constants/trainer_classes.h"
 #include "unk_020051F4.h"
-
-extern void FUN_02005E80(u8);
-extern void FUN_02005E90(u32 param0, u32 param1, u32 param2, u32 param3);
-extern u32 FUN_02005F14(s32 param0);
+#include "sound_chatot.h"
 
 
 #pragma thumb on
@@ -3309,7 +3306,7 @@ void LoadWotbl_HandleAlternateForme(int species, int forme, u16 * wotbl)
     ReadWholeNarcMemberByIdPair(wotbl, NARC_POKETOOL_PERSONAL_WOTBL, ResolveMonForme(species, forme));
 }
 
-void FUN_02069FB0(u32 r7, u32 r5, u16 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)
 {
     if (r4 == SPECIES_CHATOT)
     {
@@ -3322,7 +3319,7 @@ void FUN_02069FB0(u32 r7, u32 r5, u16 r4, u32 r6, u32 sp18, u32 sp1C, u32 sp20)
         {
             if (sp1C)
                 FUN_02005E80(1);
-            FUN_02005E90((int)r7, 0, (int)sp18, (int)r6);
+            FUN_02005E90(r7, 0, sp18, r6);
         }
     }
     else
diff --git a/arm9/src/scrcmd_sound.c b/arm9/src/scrcmd_sound.c
index ae20b5a4..b2bba9a6 100644
--- a/arm9/src/scrcmd_sound.c
+++ b/arm9/src/scrcmd_sound.c
@@ -1,11 +1,7 @@
 #include "scrcmd.h"
 #include "unk_020040F4.h"
+#include "sound_chatot.h"
 
-extern void* Sav2_Chatot_get(struct SaveBlock2* sav2);
-extern u32 FUN_02005D20(void *);
-extern void FUN_02005E6C(void *);
-extern u32 FUN_02005E28(void);
-extern void FUN_02005E64(void);
 extern BOOL FUN_02005CBC(void);
 extern void PlaySound(u16);
 extern void FUN_0204AB20(struct UnkSavStruct80 *ctx, u16);
diff --git a/arm9/src/sound.c b/arm9/src/sound.c
index ec65dd06..210aec2e 100644
--- a/arm9/src/sound.c
+++ b/arm9/src/sound.c
@@ -3,6 +3,7 @@
 #include "SPI_mic.h"
 #include "SPI_pm.h"
 #include "unk_020040F4.h"
+#include "sound_chatot.h"
 
 #pragma thumb on
 
@@ -21,7 +22,6 @@ void FUN_020040DC(void);
 extern void FUN_0200521C(int);
 extern void FUN_0200538C(int, int, int);
 extern BOOL FUN_02005404(void);
-extern void FUN_02005CFC(void);
 
 void InitSoundData(struct SaveChatotSoundClip * chatot, struct Options * options)
 {
diff --git a/arm9/src/unk_02005CFC.c b/arm9/src/sound_chatot.c
index bc34f2a3..c2a4e913 100644
--- a/arm9/src/unk_02005CFC.c
+++ b/arm9/src/sound_chatot.c
@@ -1,5 +1,5 @@
 #include "global.h"
-#include "unk_02005CFC.h"
+#include "sound_chatot.h"
 #include "SPI_mic.h"
 #include "math_util.h"
 #include "proto.h"
diff --git a/arm9/src/unk_020051F4.c b/arm9/src/unk_020051F4.c
index 64cab171..53311039 100644
--- a/arm9/src/unk_020051F4.c
+++ b/arm9/src/unk_020051F4.c
@@ -6,6 +6,7 @@
 #include "sound.h"
 #include "unk_020040F4.h"
 #include "unk_0200CA44.h"
+#include "sound_chatot.h"
 
 extern u32 NNS_SndArcPlayerStartSeq(u32 *, u32);
 extern u32 NNS_SndArcPlayerStartSeqEx(u32 *, s32, s32, s32, u32);
@@ -13,9 +14,6 @@ extern void NNS_SndPlayerStopSeqBySeqNo(u32, u32);
 extern void NNS_SndPlayerStopSeqAll(u32);
 extern void NNS_SndPlayerStopSeq(u32 *, u32);
 extern void NNS_SndPlayerSetTrackPan(u32 *, u32, u32);
-extern u32 FUN_02005D48(u32, u32, u32, u32);
-extern void FUN_02005E80(u8);
-extern void FUN_02005DFC();
 extern void *FUN_0201B6C8(u32 *);
 
 THUMB_FUNC u32 FUN_020051F4(u16 param0)
@@ -281,7 +279,7 @@ THUMB_FUNC void FUN_0200554C(u32 param0)
 THUMB_FUNC u32 FUN_02005578(u16 species)
 {
     u8 *r4 = FUN_02003D38(17);
-    u32 *r0 = FUN_02003D38(35);
+    struct SaveChatotSoundClip **r0 = FUN_02003D38(35);
 
     if (species != SPECIES_CHATOT)
     {
diff --git a/include/pokemon.h b/include/pokemon.h
index ec3ac77a..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, u16 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/unk_02005CFC.h b/include/sound_chatot.h
index 7b5f73e2..fd7184cf 100644
--- a/include/unk_02005CFC.h
+++ b/include/sound_chatot.h
@@ -1,5 +1,5 @@
-#ifndef POKEDIAMOND_UNK_02005CFC_H
-#define POKEDIAMOND_UNK_02005CFC_H
+#ifndef POKEDIAMOND_SOUND_CHATOT_H
+#define POKEDIAMOND_SOUND_CHATOT_H
 
 #include "global.h"
 #include "sav_chatot.h"