Prevent saving/loading settings if vanilla code is doing memory card stuff

This check is done via cardIsExec.

Also adjusted the text that is displayed when saving/loading settings.

Author: Zephiles

ttyd-tools/rel/include/global.h

@@ -255,6 +255,7 @@ enum SETTINGS_OPTIONS
 
 enum SETTINGS_RETURN_CODES
 {
+    MEMCARD_IN_USE = -200,
     LOAD_FAILED = 1,
     LOAD_FAILED_NO_FILE,
     LOAD_SUCCESSFUL,
@@ -803,7 +804,7 @@ struct DisplayActionCommandsTiming
 
 struct MemoryCardStruct
 {
-    uint8_t ReturnCode;
+    int32_t ReturnCode;
     const char *SettingsFileName;
     const char *SettingsDescription;
     const char *RelFileName;

ttyd-tools/rel/include/ttyd.eu.lst

@@ -1050,7 +1050,7 @@
 // 800B33D8:cardCopy2Main
 // 800B3564:cardMain
 // 800B3BDC:cardGetCode
-// 800B3BE8:cardIsExec
+800B3BE8:cardIsExec
 // 800B3CB4:cardInit
 // 800B3F28:cardBufReset
 // 800B4118:cardGetFilePtr

ttyd-tools/rel/include/ttyd.jp.lst

@@ -1047,7 +1047,7 @@
 // 800B0640:cardCopy2Main
 // 800B07AC:cardMain
 // 800B0E24:cardGetCode
-// 800B0E30:cardIsExec
+800B0E30:cardIsExec
 // 800B0EFC:cardInit
 // 800B1304:cardBufReset
 // 800B1688:cardGetFilePtr

ttyd-tools/rel/include/ttyd.us.lst

@@ -1048,7 +1048,7 @@
 // 800B2388:cardCopy2Main
 // 800B2508:cardMain
 // 800B2B80:cardGetCode
-// 800B2B8C:cardIsExec
+800B2B8C:cardIsExec
 // 800B2C58:cardInit
 // 800B3060:cardBufReset
 // 800B33E4:cardGetFilePtr

ttyd-tools/rel/include/ttyd/cardmgr.h

@@ -69,7 +69,7 @@ extern "C" {
 // cardCopy2Main
 // cardMain
 // cardGetCode
-// cardIsExec
+bool cardIsExec();
 // cardInit
 // cardBufReset
 // cardGetFilePtr

ttyd-tools/rel/source/draw.cpp

@@ -5487,37 +5487,73 @@ void drawSettingsCurrentWork()
 {
     const char *String;
     int32_t WindowWidth;
+    int32_t TextPosX = -50;
 
     switch (MenuSettings.ReturnCode)
     {
         case LOAD_FAILED:
         {
             String = "Load Failed";
             WindowWidth = 129;
+            
+#ifdef TTYD_JP
+            WindowWidth -= 7;
+            TextPosX += 4;
+#endif
             break;
         }
         case LOAD_FAILED_NO_FILE:
         {
-            String = "Settings file not found";
-            WindowWidth = 218;
+            String = "Settings File Not Found";
+            WindowWidth = 226;
+            TextPosX -= 48;
+            
+#ifdef TTYD_JP
+            WindowWidth -= 8;
+            TextPosX += 3;
+#endif
             break;
         }
         case LOAD_SUCCESSFUL:
         {
             String = "Load Successful";
             WindowWidth = 162;
+            TextPosX -= 16;
             break;
         }
         case SAVE_FAILED:
         {
             String = "Save Failed";
             WindowWidth = 129;
+            
+#ifdef TTYD_JP
+            WindowWidth -= 7;
+            TextPosX += 4;
+#endif
             break;
         }
         case SAVE_SUCCESSFUL:
         {
             String = "Save Successful";
-            WindowWidth = 162;
+            WindowWidth = 160;
+            TextPosX -= 15;
+            
+#ifdef TTYD_JP
+            WindowWidth += 4;
+            TextPosX -= 2;
+#endif
+            break;
+        }
+        case MEMCARD_IN_USE:
+        {
+            String = "Memory Card Currently In Use";
+            WindowWidth = 275;
+            TextPosX -= 73;
+            
+#ifdef TTYD_JP
+            WindowWidth -= 3;
+            TextPosX += 2;
+#endif
             break;
         }
         default:
@@ -5530,7 +5566,6 @@ void drawSettingsCurrentWork()
     uint32_t TextColor   = 0xFFFFFFFF;
     uint32_t WindowColor = 0x151515F4;
     uint8_t Alpha        = 0xFF;
-    int32_t TextPosX     = -80;
     int32_t TextPosY     = 0;
     int32_t WindowCurve  = 10;
     float Scale          = 0.6;

ttyd-tools/rel/source/memcard.cpp

@@ -201,6 +201,12 @@ int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo)
 
 int32_t saveSettings()
 {
+    // Make sure the vanilla code isn't currently doing memory card stuff
+    if (ttyd::cardmgr::cardIsExec())
+    {
+        return MEMCARD_IN_USE;
+    }
+    
     // Make sure a memory card is inserted into slot A
     int32_t ReturnCode = checkForMemoryCard();
     if (ReturnCode != CARD_RESULT_READY)
@@ -369,6 +375,12 @@ int32_t saveSettings()
 
 int32_t loadSettings()
 {
+    // Make sure the vanilla code isn't currently doing memory card stuff
+    if (ttyd::cardmgr::cardIsExec())
+    {
+        return MEMCARD_IN_USE;
+    }
+    
     // Make sure a memory card is inserted into slot A
     int32_t ReturnCode = checkForMemoryCard();
     if (ReturnCode != CARD_RESULT_READY)

ttyd-tools/rel/source/menu.cpp

@@ -1679,6 +1679,12 @@ void menuCheckButton()
                                     MenuVar.Timer = secondsToFrames(3);
                                     break;
                                 }
+                                case MEMCARD_IN_USE:
+                                {
+                                    MenuSettings.ReturnCode = MEMCARD_IN_USE;
+                                    MenuVar.Timer = secondsToFrames(3);
+                                    break;
+                                }
                                 default:
                                 {
                                     MenuSettings.ReturnCode = LOAD_FAILED;
@@ -1699,6 +1705,12 @@ void menuCheckButton()
                                     MenuVar.Timer = secondsToFrames(3);
                                     break;
                                 }
+                                case MEMCARD_IN_USE:
+                                {
+                                    MenuSettings.ReturnCode = MEMCARD_IN_USE;
+                                    MenuVar.Timer = secondsToFrames(3);
+                                    break;
+                                }
                                 default:
                                 {
                                     MenuSettings.ReturnCode = SAVE_FAILED;