memcard progress

Author: niko1point0

decompile/General/MEMCARD/MEMCARD_08_GetNextSwEvent.c

@@ -24,14 +24,3 @@ uint8_t DECOMP_MEMCARD_GetNextSwEvent(void)
         return 7;
     }
 }
-
-/*
-MC_EVENT_NONE = 0
-MC_EVENT_BAD_CARD = 1
-MC_EVENT_NO_CARD = 2
-MC_EVENT_NEW_CARD = 3
-MC_EVENT_NOT_FORMATTED = 4
-MC_EVENT_FILE_NOT_EXISTS = 5
-MC_EVENT_FILE_ALREADY_EXISTS = 6
-MC_EVENT_BLOCKS_FULL = 7
-*/

decompile/General/MEMCARD/MEMCARD_25_EraseFile.c

@@ -7,7 +7,7 @@ uint8_t DECOMP_MEMCARD_EraseFile(int slotIdx, char *srcString)
         return 1;
     char name[64];
     MEMCARD_StringSet(name, slotIdx, srcString);
-    sdata->unk_card_8008D404 = (erase(name)) ? 0xe : 0xd;
+    sdata->unk_card_8008D404 = (erase(name)) ? 14 : 13;
     MEMCARD_GetFreeBytes(slotIdx);
     return 7;
 }

decompile/WorkInProgress/src/MEMCARD/MEMCARD_Unkown.c

@@ -193,12 +193,12 @@ int FUN_8003ddac(void)
 
             // at this point, assume checksum succeeded (return 1)
 
-            if (((sdata->memcardStatusFlags & 4) == 0) && (iVar4 = sdata->unk_card_8008D404 - 3, sdata->unk_card_8008D404 < 7))
+            if (((sdata->memcardStatusFlags & 4) == 0) && (sdata->unk_card_8008D404 < 7))
             {
                 // Make "switch" statement go to "next" stage
                 sdata->unk_card_8008D404 = sdata->unk_card_8008D404 + 1;
 
-                iVar4 = sdata->memcardIconSize + iVar4 * sdata->memoryCardFileSize_0x1680;
+                iVar4 = sdata->memcardIconSize + (sdata->unk_card_8008D404 - 4) * sdata->memoryCardFileSize_0x1680;
                 event = sdata->memoryCardFileSize_0x1680;
             READCARD_JUMP:
 
@@ -227,9 +227,11 @@ int FUN_8003ddac(void)
 
                 return 0;
             }
-            event = sdata->unk_card_8008D404 - 9;
-            sdata->unk_card_8008D404 = sdata->unk_card_8008D404 + 1;
+            
+			sdata->unk_card_8008D404 = sdata->unk_card_8008D404 + 1;
+			
         LAB_8003e1e4:
+            event = sdata->unk_card_8008D404 - 10;
             iVar4 = sdata->memcardIconSize + event * sdata->memoryCardFileSize_0x1680;
 
             // pointer to memory card bytes
@@ -253,10 +255,10 @@ int FUN_8003ddac(void)
             if (sdata->memcard_remainingAttempts < 1)
                 goto CLOSEFILE_JUMP;
 
-            event = sdata->unk_card_8008D404 - 10;
             sdata->memcard_remainingAttempts = iVar4;
             if (sdata->unk_card_8008D404 != 9)
                 goto LAB_8003e1e4;
+			
             iVar4 = 0;
 
             // pointer to memory card icon

include/namespace_Memcard.h

@@ -1,3 +1,37 @@
+enum MC_STAGE
+{
+	MC_STAGE_NONE = 0,
+	MC_STAGE_GETINFO = 1,
+	MC_STAGE_FORMAT = 2,
+	
+	MC_STAGE_LOAD_PART1_ICON = 3,
+	MC_STAGE_LOAD_PART2_CHECK = 4,
+	MC_STAGE_LOAD_PART3_READ = 5,
+	MC_STAGE_LOAD_PART4_CHECK = 6,
+	MC_STAGE_LOAD_PART5_READ = 7,
+	MC_STAGE_LOAD_PART6_DONE = 8,
+	
+	MC_STAGE_SAVE_PART1_ICON = 9,
+	MC_STAGE_SAVE_PART2_WRITE = 10,
+	MC_STAGE_SAVE_PART3_WRITE = 11,
+	MC_STAGE_SAVE_PART4_DONE = 12,
+	
+	MC_STAGE_ERASE_PASS = 13,
+	MC_STAGE_ERASE_FAIL = 14,
+};
+
+enum MC_EVENT
+{
+	MC_EVENT_NONE = 0,
+	MC_EVENT_BAD_CARD = 1,
+	MC_EVENT_NO_CARD = 2,
+	MC_EVENT_NEW_CARD = 3,
+	MC_EVENT_NOT_FORMATTED = 4,
+	MC_EVENT_FILE_NOT_EXISTS = 5,
+	MC_EVENT_FILE_ALREADY_EXISTS = 6,
+	MC_EVENT_BLOCKS_FULL = 7
+};
+
 // 0x18 (24) bytes each
 struct HighScoreEntry
 {