Fix mDvd createOrDie symbol (#122)

3 files changed, 9 insertions, 9 deletions

diff --git a/include/DynamicLink.h b/include/DynamicLink.h
index b4638c68..d1cfcd63 100644
--- a/include/DynamicLink.h
+++ b/include/DynamicLink.h
@@ -70,7 +70,7 @@ struct DynamicModuleControl : DynamicModuleControlBase {
     /* 802dfa60 */ virtual bool do_unlink();
     /* 802df3d0 */ DynamicModuleControl(char const *, EGG::ExpHeap *);
     /* 802df4d0 */ static void initialize(EGG::ExpHeap *heap);
-    /* 802df530 */ static u32 callback(void *);
+    /* 802df530 */ static void *callback(void *);
     void checkHeapStatus();
 
     /* 0x10 */ UNKWORD unk_16;
diff --git a/include/d/d_s_boot.h b/include/d/d_s_boot.h
index ba0c9f31..5f159f44 100644
--- a/include/d/d_s_boot.h
+++ b/include/d/d_s_boot.h
@@ -65,7 +65,7 @@ private:
     sFPhaseBase::sFPhaseState cb8();
     sFPhaseBase::sFPhaseState cb9();
 
-    static u32 dvdCallback(void *data);
+    static void *dvdCallback(void *data);
 
     static sFPhase<dScBoot_c>::phaseCallback sCallbacks[];
 
diff --git a/include/m/m_dvd.h b/include/m/m_dvd.h
index c54b5e2c..6dc49b88 100644
--- a/include/m/m_dvd.h
+++ b/include/m/m_dvd.h
@@ -69,7 +69,7 @@ public:
     u8 mCompressionType;
 };
 
-typedef u32 (*dvdReadCallback)(void *);
+typedef void *(*dvdReadCallback)(void *);
 
 class mDvd_callback_c : public mDvd_command_c {
 public:
@@ -79,19 +79,19 @@ public:
 
     static mDvd_callback_c *create(dvdReadCallback cb, void *cbData);
     // createOrDie__15mDvd_callback_cFPFPv_PvPv ?
-    static mDvd_callback_c *createOrFail(dvdReadCallback cb, void *cbData);
+    static mDvd_callback_c *createOrDie(dvdReadCallback cb, void *cbData);
 
     dvdReadCallback mCallback;
     void *mCallbackData;
-    u32 mCallbackResult;
+    void *mCallbackResult;
 };
 
 class mDvd_mountMemArchive_c : public mDvd_command_c {
 public:
     mDvd_mountMemArchive_c(int mountDirection);
     virtual ~mDvd_mountMemArchive_c();
-    virtual u32 execute();
-    virtual void doClear();
+    virtual u32 execute() override;
+    virtual void doClear() override;
 
     static mDvd_mountMemArchive_c *create(const char *path, u8 mountDirection, EGG::Heap *heap);
     void *getArcBinary();
@@ -122,7 +122,7 @@ public:
 
     static mDvd_toMainRam_arc_c *makeRequest(EGG::Archive *arc, int entryNum, int mountDirection, EGG::Heap *heap);
     static mDvd_toMainRam_arc_c *create(EGG::Archive *arc, const char *path, int mountDirection, EGG::Heap *heap);
-    static mDvd_toMainRam_arc_c *createOrFail(EGG::Archive *arc, const char *path, int mountDirection, EGG::Heap *heap);
+    static mDvd_toMainRam_arc_c *createOrDie(EGG::Archive *arc, const char *path, int mountDirection, EGG::Heap *heap);
 
     EGG::Archive *mArcPtr;
     int mEntryNum;
@@ -136,7 +136,7 @@ public:
     virtual void doClear();
 
     static mDvd_toMainRam_normal_c *create(const char *path, int mountDirection, EGG::Heap *heap);
-    static mDvd_toMainRam_normal_c *createOrFail(const char *path, int mountDirection, EGG::Heap *heap);
+    static mDvd_toMainRam_normal_c *createOrDie(const char *path, int mountDirection, EGG::Heap *heap);
     static void create2(mDvd_toMainRam_normal_c **cmd, const char *path, int mountDirection, EGG::Heap *heap);
 
     u8 mCompressionType2;