2 files changed, 10 insertions, 55 deletions
diff --git a/include/sdat.h b/include/sdat.h
deleted file mode 100644
index 3ba8583c..00000000
--- a/include/sdat.h
+++ /dev/null
@@ -1,47 +0,0 @@
-#ifndef GUARD_LIBSDAT_H
-#define GUARD_LIBSDAT_H
-
-struct SDATHeader
-{
-    // Generic header
-    char magic[4];
-    u16 bom;
-    u16 version;
-    u32 filesize;
-    u16 header_size;
-    u16 section_count;
-    // SDAT chunks
-    u32 symb_offset, symb_size;
-    u32 info_offset, info_size;
-    u32 fat_offset, fat_size;
-    u32 file_offset, file_size;
-};
-
-struct SDATFileMgr
-{
-    struct SDATHeader header;
-    BOOL is_init;
-    FSFile file; // 00034
-    FSFileID fileID; // 7C
-    void * fat_p;
-    void * symb_p;
-    void * info_p;
-};
-
-void SDAT_Init(void);
-void * FUN_020C2A94(void *, u32);
-void SDAT_Open(struct SDATFileMgr *, char *, void *, u32);
-void FUN_020C39CC(void *);
-void FUN_020C01A0(void);
-int FUN_020C290C(void *);
-void FUN_020C2828(void *, int);
-BOOL FUN_020C36A8(u32 *, void *);
-BOOL FUN_020C3674(u32 *, void *);
-BOOL FUN_020C35E0(u32 *, u32 *, void *);
-BOOL FUN_020C360C(u32 *, void *);
-BOOL FUN_020C3640(u32 *, void *);
-void FUN_020C0F80(u32 *);
-void FUN_020C1040(int, int);
-void FUN_020C0F68(void);
-
-#endif //GUARD_LIBSDAT_H
diff --git a/include/sound.h b/include/sound.h
index 9b50542f..9e171634 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -2,13 +2,15 @@
 #define POKEDIAMOND_SOUND_H
 
 #include "FS_file.h"
-#include "sdat.h"
+#include "NNS_SND_arc.h"
+#include "NNS_SND_heap.h"
+#include "NNS_SND_arc_loader.h"
 #include "player_data.h"
 
 struct SoundData
 {
-    struct SDATFileMgr header;
-    void * unk_00090;
+    NNSSndArc header;
+    NNSSndHeapHandle * heap; // 0x00090
     u8 unk_00094[0xBBC00];
     u32 unk_BBC94[9];
     u32 unk_BBCB8;
@@ -54,11 +56,11 @@ void InitSoundData(void * a0, struct Options * a1);
 void * FUN_02003D38(u32 a0);
 int FUN_02003F3C(int * a0);
 void FUN_02003F64(int a0);
-BOOL FUN_02003F78(u32 * a0);
-BOOL FUN_02003F90(u32 * a0);
-BOOL FUN_02003FA8(u32 * a0, u32 * a1);
-BOOL FUN_02003FC4(u32 * a0);
-BOOL FUN_02003FDC(u32 * a0);
+BOOL FUN_02003F78(int a0);
+BOOL FUN_02003F90(int a0);
+BOOL FUN_02003FA8(int a0, u32 a1);
+BOOL FUN_02003FC4(int a0);
+BOOL FUN_02003FDC(int a0);
 u32 * FUN_02003FF4(int a0);
 u32 FUN_02004018(u32 a0);
 void DoSoundUpdateFrame(void);