Match destructor and msl_c header include fixes

3 files changed, 70 insertions, 3 deletions

diff --git a/include/DynamicLink.h b/include/DynamicLink.h
index 0ad0393ece..633ba0abf8 100644
--- a/include/DynamicLink.h
+++ b/include/DynamicLink.h
@@ -2,5 +2,72 @@
 #define DYNAMICLINK_H
 
 #include "dolphin/types.h"
+#include "dolphin/os/OSLink.h"
+#include "m_Do/m_Do_dvd_thread.h"
+#include "JSystem/JKernel/JKRFileCache.h"
+
+struct DynamicModuleControlBase {
+    u16 mLinkCount; //0x0
+    u16 mDoLinkCount; //0x2
+    DynamicModuleControlBase* mPrev; //0x4
+    DynamicModuleControlBase* mNext; //0x8
+
+    /* 802621CC */ virtual ~DynamicModuleControlBase(); //0xC
+    /* 800188DC */ virtual const char* getModuleName() const;
+    /* 80263210 */ virtual int getModuleSize() const;
+    /* 80263200 */ virtual const char* getModuleTypeString() const;
+    /* 80262470 */ virtual void dump();
+    /* 802631FC */ virtual void dump2();
+    /* 802631DC */ virtual bool do_load();
+    /* 802631F4 */ virtual bool do_load_async();
+    /* 802631E4 */ virtual bool do_unload();
+    /* 802631D4 */ virtual BOOL do_link();
+    /* 802631EC */ virtual bool do_unlink();
+    /* 80262284 */ DynamicModuleControlBase();
+    /* 802622D0 */ bool link();
+    /* 80262364 */ bool unlink();
+    /* 802623EC */ bool load_async();
+    /* 8026242C */ bool force_unlink();
+
+    static inline DynamicModuleControlBase* getFirstClass() {return mFirst;}
+    inline DynamicModuleControlBase* getNextClass() {return mNext;}
+
+
+    static DynamicModuleControlBase* mFirst;
+    static DynamicModuleControlBase* mLast;
+};
+
+struct DynamicModuleControl : DynamicModuleControlBase {
+    /* 800188E4 */ virtual ~DynamicModuleControl();
+    /* 80263218 */ virtual const char* getModuleName() const;
+    /* 80263000 */ virtual int getModuleSize() const;
+    /* 80263070 */ virtual const char* getModuleTypeString() const;
+    virtual void dump() = 0;
+    /* 80262C0C */ virtual void dump2();
+    /* 802627E8 */ virtual bool do_load();
+    /* 80262AFC */ virtual bool do_load_async();
+    /* 80262BC4 */ virtual bool do_unload();
+    /* 80262C5C */ virtual BOOL do_link();
+    /* 80262F28 */ virtual bool do_unlink();
+    /* 80262660 */ DynamicModuleControl(char const*);
+    /* 802626D0 */ static JKRArchive* mountCallback(void*);
+    /* 8026275C */ bool initialize();
+    /* 80262794 */ static void* callback(void*);
+    
+    OSModuleInfo* mModule; //0x10
+    void* mBss; //0x14
+    u32 unk_24; //0x18
+    const char* mName; //0x1c
+    u8 mResourceType; //0x20
+    u8 unk_33; //0x21
+    u16 mChecksum; //0x22
+    s32 mSize; //0x24
+    mDoDvdThd_callback_c* mAsyncLoadCallback; //0x28
+
+    static u32 sAllocBytes;
+    static JKRArchive* sArchive;
+    static JKRFileCache* sFileCache;
+};
+
 
 #endif /* DYNAMICLINK_H */
diff --git a/include/d/save/d_save.h b/include/d/save/d_save.h
index 217ba4c419..f7c906c0e9 100644
--- a/include/d/save/d_save.h
+++ b/include/d/save/d_save.h
@@ -1,8 +1,8 @@
 #ifndef D_SAVE_D_SAVE_H
 #define D_SAVE_D_SAVE_H
 
-#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/printf.h"
-#include "MSL_C.PPCEABI.bare.H/MSL_Common/src/string.h"
+#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/printf.h"
+#include "MSL_C.PPCEABI.bare.H/MSL_Common/Src/string.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"
 
diff --git a/include/dolphin/os/OSLink.h b/include/dolphin/os/OSLink.h
index 44476eb485..12a1ba6001 100644
--- a/include/dolphin/os/OSLink.h
+++ b/include/dolphin/os/OSLink.h
@@ -13,7 +13,7 @@ struct OSModuleInfo {
     OSModuleInfo* mNext;
     OSModuleInfo* mPrev;
     u32 mNumSections;
-    struct { //Needed to get an assert corret; very likely bigger
+    struct { //Needed to get an assert correct; very likely bigger
         u32 sectionInfoOffset;
     } info;
     u32 mModuleNameOffset;