1 files changed, 12 insertions, 36 deletions
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index cd6c889b00..0eeb7eaac4 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -1,7 +1,7 @@
-//
-// Generated By: dol2asm
-// Translation Unit: m_Do/m_Do_MemCard
-//
+/**
+ * m_Do_MemCard.cpp
+ * Memory Card Control
+ */
 
 #include "m_Do/m_Do_MemCard.h"
 #include "JSystem/JKernel/JKRThread.h"
@@ -12,21 +12,6 @@
 #include "m_Do/m_Do_ext.h"
 #include "m_Do/m_Do_Reset.h"
 
-//
-// Forward References:
-//
-
-extern "C" void mount__15mDoMemCd_Ctrl_cFv();
-extern "C" void setCardState__15mDoMemCd_Ctrl_cFl();
-
-//
-// External References:
-//
-
-//
-// Declarations:
-//
-
 /* 8001672C-80016730 01106C 0004+00 1/1 0/0 0/0 .text            __ct__15mDoMemCd_Ctrl_cFv */
 mDoMemCd_Ctrl_c::mDoMemCd_Ctrl_c() {}
 
@@ -458,34 +443,25 @@ s32 mDoMemCd_Ctrl_c::loadfile() {
 
 /* 800172D4-80017360 011C14 008C+00 1/1 0/0 0/0 .text            checkspace__15mDoMemCd_Ctrl_cFv */
 // 
-#ifdef NONMATCHING
-// final return statement
 s32 mDoMemCd_Ctrl_c::checkspace() {
     s32 bytesNotUsed, filesNotUsed;
-    s32 result;
-    result = CARDFreeBlocks(mChannel, &bytesNotUsed, &filesNotUsed);
+    s32 result = CARDFreeBlocks(mChannel,&bytesNotUsed,&filesNotUsed);
 
-    if (result) {
+    if (result != 0) {
         setCardState(result);
-        return 3;
+        return 3;  
     }
 
     if (bytesNotUsed < 0x8000) {
         return 1;
     }
 
-    return (filesNotUsed - 1 < 0);
-}
-#else
-#pragma push
-#pragma optimization_level 0
-#pragma optimizewithasm off
-asm s32 mDoMemCd_Ctrl_c::checkspace() {
-    nofralloc
-#include "asm/m_Do/m_Do_MemCard/checkspace__15mDoMemCd_Ctrl_cFv.s"
+    if (filesNotUsed < 1) {
+        return 2;
+    }
+    
+    return 0;
 }
-#pragma pop
-#endif
 
 /* 80017360-8001741C 011CA0 00BC+00 5/5 0/0 0/0 .text            setCardState__15mDoMemCd_Ctrl_cFl
  */