Settings - Allow saving/loading to/from memory card slot B

Author: Zephiles

ttyd-tools/rel/include/draw.h

@@ -142,6 +142,7 @@ void drawActionCommandsTiming();
 void drawEffsActive();
 void drawEvtsActive();
 void drawEnemyEncounterNotifier();
+void drawSettingsMemoryCardUsed();
 void drawSettingsCurrentWork();
 
 void drawHeapArrayErrors();

ttyd-tools/rel/include/global.h

@@ -249,7 +249,8 @@ enum STATS_FOLLOWER_SELECTION_OPTIONS
 
 enum SETTINGS_OPTIONS
 {
-    LOAD_SETTINGS = 1,
+    CHANGE_MEMORY_CARD_SLOT = 1,
+    LOAD_SETTINGS,
     SAVE_SETTINGS,
 };
 
@@ -804,6 +805,7 @@ struct DisplayActionCommandsTiming
 
 struct MemoryCardStruct
 {
+    int32_t MemoryCardSlot;
     int32_t ReturnCode;
     const char *SettingsFileName;
     const char *SettingsDescription;

ttyd-tools/rel/include/memcard.h

@@ -6,27 +6,24 @@
 
 namespace mod {
 
-int32_t checkForMemoryCard();
+int32_t checkForMemoryCard(int32_t memoryCardSlot);
 
-int32_t finishAsyncFunction(int32_t returnCode);
+int32_t finishAsyncFunction(int32_t memoryCardSlot, int32_t returnCode);
 
-int32_t mountCard();
+int32_t mountCard(int32_t memoryCardSlot);
 
-int32_t createFileOnCard(const char *fileName, 
-    uint32_t size, gc::card::CARDFileInfo *fileInfo);
+int32_t createFileOnCard(int32_t memoryCardSlot, const char *fileName, uint32_t size, gc::card::CARDFileInfo *fileInfo);
 
-int32_t readFromFileOnCard(gc::card::CARDFileInfo *fileInfo, 
-    void *buffer, int32_t length, int32_t offset);
+int32_t readFromFileOnCard(int32_t memoryCardSlot, gc::card::CARDFileInfo *fileInfo, void *buffer, int32_t length, int32_t offset);
 
-int32_t writeToFileOnCard(gc::card::CARDFileInfo *fileInfo, 
-    void *buffer, int32_t length, int32_t offset);
+int32_t writeToFileOnCard(int32_t memoryCardSlot, gc::card::CARDFileInfo *fileInfo, void *buffer, int32_t length, int32_t offset);
 
-int32_t setFileStatus(int32_t fileNum, gc::card::CARDStat *stat);
+int32_t setFileStatus(int32_t memoryCardSlot, int32_t fileNum, gc::card::CARDStat *stat);
 
-int32_t createSettingsFile(gc::card::CARDFileInfo *settingsFileInfo);
+int32_t createSettingsFile(int32_t memoryCardSlot, gc::card::CARDFileInfo *settingsFileInfo);
 
-int32_t saveSettings();
+int32_t saveSettings(int32_t memoryCardSlot);
 
-int32_t loadSettings();
+int32_t loadSettings(int32_t memoryCardSlot);
 
 }

ttyd-tools/rel/source/draw.cpp

@@ -9,6 +9,7 @@
 
 #include <gc/OSTime.h>
 #include <gc/OSError.h>
+#include <gc/card.h>
 #include <gc/gx.h>
 #include <gc/ppc.h>
 #include <gc/OSContext.h>
@@ -5483,6 +5484,33 @@ void drawEnemyEncounterNotifier()
     drawTextAndInit(tempDisplayBuffer, PosX, PosY, Alpha, Color, true, Scale);
 }
 
+void drawSettingsMemoryCardUsed()
+{
+    uint32_t Color = 0xFFFFFFFF;
+    int32_t PosX   = -232;
+    int32_t PosY   = 100;
+    float Scale    = 0.6;
+    
+    // Get the memory card slot being used
+    char CurrentMemoryCardSlot;
+    if (MenuSettings.MemoryCardSlot == CARD_SLOT_A)
+    {
+        CurrentMemoryCardSlot = 'A';
+    }
+    else
+    {
+        CurrentMemoryCardSlot = 'B';
+    }
+    
+    // Draw the text
+    char *tempDisplayBuffer = DisplayBuffer;
+    sprintf(tempDisplayBuffer,
+        "Memory Card Slot\nSlot %c",
+        CurrentMemoryCardSlot);
+    
+    drawText(tempDisplayBuffer, PosX, PosY, Color, Scale);
+}
+
 void drawSettingsCurrentWork()
 {
     const char *String;

ttyd-tools/rel/source/global.cpp

@@ -1186,6 +1186,7 @@ const char *StatsFollowerOptionsLines[] =
 
 const char *SettingsLines[] = 
 {
+    "Change Memory Card Slot",
     "Load Settings",
     "Save Settings",
 };
@@ -2066,7 +2067,12 @@ void initMenuVars()
     setInitialSettings();
 
     // Load the custom settings from the settings file if it exists
-    loadSettings();
+    // Try both memory card slots
+    int32_t ReturnCode = loadSettings(CARD_SLOT_A);
+    if (ReturnCode != CARD_RESULT_READY)
+    {
+        loadSettings(CARD_SLOT_B);
+    }
 }
 
 void setInitialSettings()