memcard progress

Author: niko1point0

decompile/WorkInProgress/src/MEMCARD/MEMCARD_19_Load.c

@@ -21,25 +21,19 @@ uint8_t MEMCARD_Load(int slotIdx, char *name, uint8_t *ptrMemcard, int memcardFi
     }
     else
     {
-        // NOTE: Commented out because param5 is always 0, Will always eval to false
-        /*
         if ((param5 & 2) == 0)
-            {
-                // dont process crc16 to the end of memory,
-                // just the next 0x200 bytes (async)
-                sdata->memcardStatusFlags = sdata->memcardStatusFlags & 0xfffffff7;
-            }
-            else
-            {
-        */
-        // process crc16 to the end of memory
-        sdata->memcardStatusFlags = sdata->memcardStatusFlags | 8;
+        {
+            // dont process crc16 to the end of memory,
+            // just the next 0x200 bytes (async)
+            sdata->memcardStatusFlags = sdata->memcardStatusFlags & 0xfffffff7;
+        }
+        else
+        {
+			// process crc16 to the end of memory
+			sdata->memcardStatusFlags = sdata->memcardStatusFlags | 8;
+		}
+		
         sdata->memcard_stage = MC_STAGE_LOAD_PART1_ICON;
-
-        // Read memory card
         return MEMCARD_ReadFile(0, 0x80);
-        /*
-            }
-        */
-    }
+	}
 }

decompile/WorkInProgress/src/MEMCARD/MEMCARD_20_Save.c

@@ -18,20 +18,16 @@ uint8_t MEMCARD_Save(int slotIdx, char *name,
 	// Search for "MEMCARD_SET_SIZE_BYTE3"
 
     // NOTE: Commented out because param6 always 0, will always eval to false
-    /*
     if (((param6 & 1) == 0) && (1 < sdata->memcardIconSize + fileSize * 2 + 0x1fff >> 0xd))
-        {
-            DAT_800857a3 = (byte)(sdata->memcardIconSize + fileSize + 0x1fff >> 0xd);
-            sdata->memcardStatusFlags = sdata->memcardStatusFlags | 4;
-        }
-        else
-        {
-    */
-    sdata->memcardStatusFlags = sdata->memcardStatusFlags & 0xfffffffb;
-    *((uint8_t *)(data.memcardIcon_PsyqHand) + 3) = ((sdata->memcardIconSize + fileSize * 2 + 0x1fff) >> 0xd) & 0xFF;
-    /*
-        }
-    */
+    {
+        DAT_800857a3 = (byte)(sdata->memcardIconSize + fileSize + 0x1fff >> 0xd);
+        sdata->memcardStatusFlags = sdata->memcardStatusFlags | 4;
+    }
+    else
+    {
+		sdata->memcardStatusFlags = sdata->memcardStatusFlags & 0xfffffffb;
+		*((uint8_t *)(data.memcardIcon_PsyqHand) + 3) = ((sdata->memcardIconSize + fileSize * 2 + 0x1fff) >> 0xd) & 0xFF;
+	}
 
     uint8_t *memcardIconPtr = (uint8_t *)data.memcardIcon_PsyqHand[1];
     for (int i = 0; i < 64; i += 2)

decompile/WorkInProgress/src/MEMCARD/MEMCARD_Unkown.c

@@ -169,13 +169,7 @@ int FUN_8003ddac(void)
             sdata->crc16_checkpoint_byteIndex = 0;
             sdata->crc16_checkpoint_status = 0;
             sdata->memcard_stage++;
-			
-            if ((sdata->memcardStatusFlags & 8) == 0)
-            {
-                return 7;
-            }
-			
-			// === Do NOT break, goto 5/7 ===
+			return MC_RETURN_PENDING;
         }
 		else
 		{
@@ -189,8 +183,6 @@ int FUN_8003ddac(void)
 			extra = MC_EXTRA_READ_FILE;
 			break;
 		}
-		
-		// === Do NOT break, goto 5/7 ===
 
     case 5:
     case 7: