2 files changed, 9 insertions, 53 deletions
diff --git a/include/sdat.h b/include/sdat.h
deleted file mode 100644
index 53e0a729..00000000
--- a/include/sdat.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef GUARD_LIBSDAT_H
-#define GUARD_LIBSDAT_H
-
-#include "SND_main.h"
-
-typedef struct NNSSndArcHeader
-{
-    struct SNDBinaryFileHeader fileHeader;
-    u32 symbolDataOffset;
-    u32 symbolDataSize;
-    u32 infoOffset;
-    u32 infoSize;
-    u32 fatOffset;
-    u32 fatSize;
-    u32 fileImageOffset;
-    u32 fileImageSize;
-} NNSSndArcHeader;
-
-typedef struct NNSSndArc
-{
-    NNSSndArcHeader header;
-    BOOL file_open;
-    FSFile file;
-    FSFileID fileId;
-    struct NNSSndArcFat* fat;
-    struct NNSSndArcSymbol* symbol;
-    struct NNSSndArcInfo* info;
-} NNSSndArc;
-
-void NNS_SndInit(void);
-void * NNS_SndHeapCreate(void *, u32);
-void NNS_SndArcInit(NNSSndArc *, const char *, void *, u32);
-void NNS_SndArcPlayerSetup(void *);
-void NNS_SndMain(void);
-int NNS_SndHeapSaveState(void *);
-void NNS_SndHeapLoadState(void *, int);
-BOOL NNS_SndArcLoadGroup(u32 *, void *);
-BOOL NNS_SndArcLoadSeq(u32 *, void *);
-BOOL NNS_SndArcLoadSeqEx(u32 *, u32 *, void *);
-BOOL NNS_SndArcLoadWaveArc(u32 *, void *);
-BOOL NNS_SndArcLoadBank(u32 *, void *);
-void NNS_SndHandleInit(u32 *);
-void NNS_SndPlayerStopSeqByPlayerNo(int, int);
-void NNS_SndHandleReleaseSeq(void);
-
-#endif //GUARD_LIBSDAT_H
diff --git a/include/sound.h b/include/sound.h
index d48dd9ac..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
 {
     NNSSndArc header;
-    void * unk_00090;
+    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);