Replace SDATHeader etc with NNSSndArc

2 files changed, 24 insertions, 25 deletions

diff --git a/include/sdat.h b/include/sdat.h
index db60e13e..53e0a729 100644
--- a/include/sdat.h
+++ b/include/sdat.h
@@ -1,36 +1,35 @@
 #ifndef GUARD_LIBSDAT_H
 #define GUARD_LIBSDAT_H
 
-struct SDATHeader
+#include "SND_main.h"
+
+typedef struct NNSSndArcHeader
 {
-    // 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 SNDBinaryFileHeader fileHeader;
+    u32 symbolDataOffset;
+    u32 symbolDataSize;
+    u32 infoOffset;
+    u32 infoSize;
+    u32 fatOffset;
+    u32 fatSize;
+    u32 fileImageOffset;
+    u32 fileImageSize;
+} NNSSndArcHeader;
 
-struct SDATFileMgr
+typedef struct NNSSndArc
 {
-    struct SDATHeader header;
-    BOOL is_init;
-    FSFile file; // 00034
-    FSFileID fileID; // 7C
-    void * fat_p;
-    void * symb_p;
-    void * info_p;
-};
+    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(struct SDATFileMgr *, char *, void *, u32);
+void NNS_SndArcInit(NNSSndArc *, const char *, void *, u32);
 void NNS_SndArcPlayerSetup(void *);
 void NNS_SndMain(void);
 int NNS_SndHeapSaveState(void *);
diff --git a/include/sound.h b/include/sound.h
index 9b50542f..d48dd9ac 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -7,7 +7,7 @@
 
 struct SoundData
 {
-    struct SDATFileMgr header;
+    NNSSndArc header;
     void * unk_00090;
     u8 unk_00094[0xBBC00];
     u32 unk_BBC94[9];