more misc. cleanup (#2232)

include/m_Do/m_Do_MemCard.h

@@ -1,6 +1,7 @@
 #ifndef M_DO_M_DO_MEMCARD_H
 #define M_DO_M_DO_MEMCARD_H
 
+#include "card.h"
 #include "dolphin/os/OSMutex.h"
 #include "global.h"
 
@@ -42,6 +43,14 @@ public:
     void clearProbeStat() { mProbeStat = 2; }
     void setCopyToPos(u8 param_0) { mCopyToPos = param_0; }
     u32 getDataVersion() { return mDataVersion; }
+    void setDataVersion(u32 version) { mDataVersion = version; }
+    void getCardStatus(s32 fileNo, CARDStat* stat) { CARDGetStatus(mChannel, fileNo, stat); }
+    void setCardStatus(s32 fileNo, CARDStat* stat) { CARDSetStatus(mChannel, fileNo, stat); }
+    void setSerialNo() {
+        u64 serial_no;
+        CARDGetSerialNo(mChannel, &serial_no);
+        mSerialNo = serial_no;
+    }
 
     /* 0x0000 */ u8 mData[0x1FBC];
     /* 0x1FBC */ u8 mChannel;
@@ -111,8 +120,24 @@ inline u32 mDoMemCd_LoadSync(void* buffer, u32 size, u32 index) {
     return g_mDoMemCd_control.LoadSync(buffer, size, index);
 }
 
-inline s32 mDoMemCd_getDataVersion() {
+inline u32 mDoMemCd_getDataVersion() {
     return g_mDoMemCd_control.getDataVersion();
 }
 
+inline void mDoMemCd_setDataVersion(u32 version) {
+    g_mDoMemCd_control.setDataVersion(version);
+}
+
+inline void mDoMemCd_setSerialNo() {
+    g_mDoMemCd_control.setSerialNo();
+}
+
+inline void mDoMemCd_getCardStatus(s32 fileNo, CARDStat* stat) {
+    g_mDoMemCd_control.getCardStatus(fileNo, stat);
+}
+
+inline void mDoMemCd_setCardStatus(s32 fileNo, CARDStat* stat) {
+    g_mDoMemCd_control.setCardStatus(fileNo, stat);
+}
+
 #endif /* M_DO_M_DO_MEMCARD_H */

include/m_Do/m_Do_ext.h

@@ -43,7 +43,7 @@ private:
 class mDoExt_transAnmBas : public J3DAnmTransformKey {
 public:
     mDoExt_transAnmBas(void* bas) { mBas = bas; }
-    virtual ~mDoExt_transAnmBas();
+    virtual ~mDoExt_transAnmBas() {}
 
     void* getBas() { return mBas; }
 
@@ -224,10 +224,10 @@ private:
 
 class mDoExt_invJntPacket : public J3DPacket {
 public:
-    /* 8000E654 */ mDoExt_invJntPacket();
+    /* 8000E654 */ mDoExt_invJntPacket() {}
 
     /* 80012220 */ virtual void draw();
-    /* 8000E5F8 */ virtual ~mDoExt_invJntPacket();
+    /* 8000E5F8 */ virtual ~mDoExt_invJntPacket() {}
 
     void setJoint(J3DModel* i_model, u16 param_1, u8 param_2) {
         field_0x10 = i_model;
@@ -450,7 +450,7 @@ struct mDoExt_MtxCalcAnmBlendTbl
 
     /* 800D00BC */ J3DAnmTransform* getAnm(int);
 
-    /* 80014F3C */ virtual ~mDoExt_MtxCalcAnmBlendTbl();
+    /* 80014F3C */ virtual ~mDoExt_MtxCalcAnmBlendTbl() {}
     /* 8000F26C */ virtual void calc();
 
     /* 0x4 */ int mNum;
@@ -465,7 +465,7 @@ struct mDoExt_MtxCalcAnmBlendTblOld : public mDoExt_MtxCalcAnmBlendTbl {
         : mDoExt_MtxCalcAnmBlendTbl(num, anmRatio) {
         mOldFrame = oldFrame;
     }
-    /* 80014EB0 */ virtual ~mDoExt_MtxCalcAnmBlendTblOld();
+    /* 80014EB0 */ virtual ~mDoExt_MtxCalcAnmBlendTblOld() {}
     /* 8000F4B0 */ virtual void calc();
 
     /* 0xC */ mDoExt_MtxCalcOldFrame* mOldFrame;

include/m_Do/m_Do_graphic.h

@@ -8,8 +8,6 @@ class JUTFader;
 
 int mDoGph_Create();
 
-extern u8 mBlureFlag__13mDoGph_gInf_c;  // Blure
-extern u8 mFade__13mDoGph_gInf_c;    // Fade
 extern bool data_80450BE7;  // AutoForcus
 
 struct ResTIMG;
@@ -17,7 +15,7 @@ class mDoGph_gInf_c {
 public:
     class bloom_c {
     public:
-        // bloom_c() { m_buffer = NULL; } matches sinit
+        bloom_c() { m_buffer = NULL; }
         /* 80009544 */ void create();
         /* 800095F8 */ void remove();
         /* 80009650 */ void draw();