diff --git a/configure.py b/configure.py
index bb6828fdf..d4365caba 100644
--- a/configure.py
+++ b/configure.py
@@ -264,7 +264,7 @@ config.libs = [
             Object(Matching,    "m_Do/m_Do_Reset.cpp"),
             Object(Matching,    "m_Do/m_Do_dvd_thread.cpp"),
             Object(Matching,    "m_Do/m_Do_DVDError.cpp"),
-            Object(NonMatching, "m_Do/m_Do_MemCard.cpp"),
+            Object(Matching,    "m_Do/m_Do_MemCard.cpp"),
             Object(NonMatching, "m_Do/m_Do_MemCardRWmng.cpp"),
             Object(Matching,    "m_Do/m_Do_gba_com.cpp"),
             Object(Matching,    "m_Do/m_Do_machine_exception.cpp"),
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index 8bc83f5e5..feaa8525d 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -9,9 +9,9 @@
 #include "dolphin/card.h"
 #include "MSL_C/string.h"
 
+u8 MemCardStack[0x1000] __attribute__((aligned(32)));
 OSThread MemCardThread;
-u8 MemCardStack[0x1000]  __attribute__((aligned(32)));
-u8 MemCardWorkArea0[0xa000];
+u8 MemCardWorkArea0[0xa000] __attribute__((aligned(32)));
 
 mDoMemCd_Ctrl_c g_mDoMemCd_control;
 
@@ -209,8 +209,8 @@ u32 mDoMemCd_Ctrl_c::getStatus(u32) {
     if (OSTryLockMutex(&mMutex)) {
         s32 ret;
         switch (field_0x1660) {
-        case 2: ret = 2; break;
-        case 1: ret = 1; break;
+        case 1: ret = 2; break;
+        case 2: ret = 1; break;
         case 3: ret = 3; break;
         case 4: ret = 4; break;
         case 5: ret = 5; break;