4 files changed, 17 insertions, 8 deletions
diff --git a/include/DynamicLink.h b/include/DynamicLink.h
index da4a5a21..c63c3077 100644
--- a/include/DynamicLink.h
+++ b/include/DynamicLink.h
@@ -63,7 +63,7 @@ struct DynamicModuleControl : DynamicModuleControlBase {
     /* 802dfa60 */ virtual bool do_unlink();
     /* 802df3d0 */ DynamicModuleControl(char const*, EGG::ExpHeap *);
     /* 802df4d0 */ static void initialize(EGG::ExpHeap *heap);
-    /* 802df530 */ static bool callback(void*);
+    /* 802df530 */ static u32 callback(void*);
     void checkHeapStatus();
 
     /* 0x10 */ UNKWORD unk_16;
diff --git a/include/d/d_dylink.h b/include/d/d_dylink.h
index c7a0a6a2..3aef764e 100644
--- a/include/d/d_dylink.h
+++ b/include/d/d_dylink.h
@@ -3,10 +3,18 @@
 
 #include <common.h>
 
-namespace dDyl {
+class dDynamicModuleControl {
+public:
+    dDynamicModuleControl() {}
+    virtual ~dDynamicModuleControl();
 
-bool Unlink(u16 relId);
+    void set(u16 *ptr, int count);
+    BOOL do_link() const;
+    BOOL do_unlink();
 
-} // dDyl
+private:
+    u16 *mPtr;
+    int mCount;
+};
 
 #endif
diff --git a/include/m/m_dvd.h b/include/m/m_dvd.h
index 11890653..8045f220 100644
--- a/include/m/m_dvd.h
+++ b/include/m/m_dvd.h
@@ -69,7 +69,7 @@ public:
     u8 mCompressionType;
 };
 
-typedef bool (*dvdReadCallback)(void *);
+typedef u32 (*dvdReadCallback)(void *);
 
 class mDvd_callback_c : public mDvd_command_c {
 public:
@@ -78,10 +78,11 @@ public:
     virtual u32 execute() override;
 
     static mDvd_callback_c *create(dvdReadCallback cb, void *cbData);
+    static mDvd_callback_c *createOrFail(dvdReadCallback cb, void *cbData);
 
     dvdReadCallback mCallback;
     void *mCallbackData;
-    BOOL mSuccess;
+    u32 mCallbackResult;
 };
 
 class mDvd_mountMemArchive_c : public mDvd_command_c {
diff --git a/include/m/m_heap.h b/include/m/m_heap.h
index 3cc53ff3..c6681bb6 100644
--- a/include/m/m_heap.h
+++ b/include/m/m_heap.h
@@ -32,7 +32,7 @@ public:
     }
     /* 802f12b0 */ mHeap(EGG::Heap *heap);
     /* 802f12f0 */ ~mHeap();
-    /* 802f1350 */ static EGG::Heap *createHeap(size_t size, EGG::Heap *, const char *name);
+    /* 802f1350 */ static EGG::ExpHeap *createHeap(size_t size, EGG::Heap *, const char *name);
     /* 802f13d0 */ static void saveCurrentHeap();
     /* 802f13e0 */ static void restoreCurrentHeap();
     /* 802f1410 */ static EGG::FrmHeap *makeFrmHeapAndUpdate(size_t size, EGG::Heap *parentHeap, const char *name,
@@ -56,7 +56,7 @@ public:
     static EGG::Heap *s_SavedCurrentHeap;
     static EGG::Heap *g_archiveHeap;
     static EGG::Heap *g_commandHeap;
-    static EGG::Heap *g_dylinkHeap;
+    static EGG::ExpHeap *g_dylinkHeap;
     static EGG::AssertHeap *g_assertHeap;
     static u8 g_DefaultGameHeapId;
     static const char *const s_GameHeapNames[4];