5 files changed, 21 insertions, 13 deletions
diff --git a/include/map_header.h b/include/map_header.h
index 0adb5886..e4e96a59 100644
--- a/include/map_header.h
+++ b/include/map_header.h
@@ -4,8 +4,8 @@
 u8 FUN_02034724(u32 mapno);
 u8 FUN_02034738(u32 mapno);
 u16 FUN_0203474C(u32 mapno);
-u16 FUN_02034774(u32 mapno);
-u16 FUN_02034788(u32 mapno);
+u16 MapHeader_GetMsgBank(u32 mapno);
+u16 MapHeader_GetScrSeqReleaseNo(u32 mapno);
 u16 FUN_0203479C(u32 mapno);
 u16 FUN_020347B0(u32 mapno);
 u16 FUN_020347C4(u32 mapno);
diff --git a/include/msgdata.h b/include/msgdata.h
index fae8ca78..c2f37274 100644
--- a/include/msgdata.h
+++ b/include/msgdata.h
@@ -1,6 +1,7 @@
 #ifndef POKEDIAMOND_MSG_DATA_H
 #define POKEDIAMOND_MSG_DATA_H
 
+#include "filesystem.h"
 #include "string16.h"
 
 struct MsgDataAlloc
diff --git a/include/script.h b/include/script.h
index 87ac778b..494a9d9f 100644
--- a/include/script.h
+++ b/include/script.h
@@ -2,6 +2,7 @@
 #define _SCRIPT_H_
 
 #include "global.h"
+#include "msgdata.h"
 
 struct ScriptContext;
 
@@ -17,17 +18,17 @@ struct ScriptContext
     const u8 *scriptPtr;
     const u8 *stack[20];
     ScrCmdFunc *cmdTable;
-    ScrCmdFunc *cmdTableEnd;
+    u32 cmdCount;
     u32 data[4];
 	u32 unk74;
-	u32 unk78;
-	u32 unk7C;
+	struct MsgData * unk78;
+	u8 *unk7C;
 	void * unk80;
 };
 
 #define ScriptReadByte(ctx) (*(ctx->scriptPtr++))
 
-void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, void *cmdTableEnd);
+void InitScriptContext(struct ScriptContext *ctx, void *cmdTable, u32 cmdCount);
 u8 SetupBytecodeScript(struct ScriptContext *ctx, const u8 *ptr);
 void SetupNativeScript(struct ScriptContext *ctx, u8 (*ptr)(struct ScriptContext *));
 void StopScript(struct ScriptContext *ctx);
diff --git a/include/sdat.h b/include/sdat.h
index 70522a3d..3ba8583c 100644
--- a/include/sdat.h
+++ b/include/sdat.h
@@ -15,17 +15,22 @@ struct SDATHeader
     u32 info_offset, info_size;
     u32 fat_offset, fat_size;
     u32 file_offset, file_size;
-    u32 unk_00030;
+};
+
+struct SDATFileMgr
+{
+    struct SDATHeader header;
+    BOOL is_init;
     FSFile file; // 00034
     FSFileID fileID; // 7C
-    u32 unk_00084;
-    u32 unk_00088;
-    void * unk_0008C;
+    void * fat_p;
+    void * symb_p;
+    void * info_p;
 };
 
-void FUN_020C01D0(void);
+void SDAT_Init(void);
 void * FUN_020C2A94(void *, u32);
-void FUN_020C26F8(struct SDATHeader *, char *, void *, u32);
+void SDAT_Open(struct SDATFileMgr *, char *, void *, u32);
 void FUN_020C39CC(void *);
 void FUN_020C01A0(void);
 int FUN_020C290C(void *);
diff --git a/include/sound.h b/include/sound.h
index 0a4fc4ed..a79e6ecf 100644
--- a/include/sound.h
+++ b/include/sound.h
@@ -7,7 +7,7 @@
 
 struct SoundData
 {
-    struct SDATHeader header;
+    struct SDATFileMgr header;
     void * unk_00090;
     u8 unk_00094[0xBBC00];
     u32 unk_BBC94[9];
@@ -61,5 +61,6 @@ BOOL FUN_02003FC4(u32 * a0);
 BOOL FUN_02003FDC(u32 * a0);
 u32 * FUN_02003FF4(int a0);
 u32 FUN_02004018(u32 a0);
+void DoSoundUpdateFrame(void);
 
 #endif //POKEDIAMOND_SOUND_H