From 650fc00522a3b37baafd7afe066bdd3136220ba3 Mon Sep 17 00:00:00 2001
From: LagoLunatic <LagoLunatic@users.noreply.github.com>
Date: Sun, 3 Dec 2023 21:46:24 -0500
Subject: [PATCH] m_Do_MemCard not done on PAL

---
 configure.py              |  2 +-
 src/m_Do/m_Do_MemCard.cpp | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/configure.py b/configure.py
index d4365caba..bb6828fdf 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(Matching,    "m_Do/m_Do_MemCard.cpp"),
+            Object(NonMatching, "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 feaa8525d..505079d15 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -44,8 +44,6 @@ void mDoMemCd_Ctrl_c::main() {
             OSWaitCond(&mCond, &mMutex);
 
         switch (mCommand) {
-        case CARD_NO_COMMAND:
-            break;
         case CARD_RESTORE:
             restore();
             break;
@@ -61,6 +59,11 @@ void mDoMemCd_Ctrl_c::main() {
         case CARD_DETACH:
             detach();
             break;
+#if VERSION == VERSION_PAL
+        case 6:
+            // restore2();
+            break;
+#endif
         }
 
         mCommand = CARD_NO_COMMAND;
@@ -194,8 +197,10 @@ s32 mDoMemCd_Ctrl_c::SaveSync() {
         if (field_0x1660 == 4) {
             field_0x1660 = 1;
             ret = 1;
+#if VERSION != VERSION_JPN
         } else if (field_0x1660 == 1) {
             ret = 0;
+#endif
         } else {
             ret = 2;
         }
@@ -364,6 +369,11 @@ void mDoMemCd_Ctrl_c::setCardState(s32 state) {
     case CARD_ERROR_ENCODING:
         field_0x1660 = 6;
         break;
+#if VERSION == VERSION_PAL
+    case CARD_ERROR_NOFILE:
+        field_0x1660 = 2;
+        break;
+#endif
     }
 }