memcard progress

Author: niko1point0

decompile/WorkInProgress/src/MEMCARD/MEMCARD_17_HandleEvent.c

@@ -131,8 +131,13 @@ int DECOMP_MEMCARD_HandleEvent(void)
 
 			// Search for "MEMCARD_SET_SIZE_BYTE3"
             if (
+				// if a ghost file (2x) is larger than 1 memcard block file
+				// if the number of blocks in this save, is more than 1 block
                 // ((sdata->memcardIconSize + sdata->memcardFileSize * 2 + 0x1fff >> 0xd) > 1) &&
-				   ((sdata->memcardIconSize + sdata->memcardFileSize * 1 + 0x1fff >> 0xd) < ((int)(unsigned char)sdata->memcard_ptrStart[3]))
+				// ((sdata->memcardIconSize + sdata->memcardFileSize * 1 + 0x1fff >> 0xd) < ((int)(unsigned char)sdata->memcard_ptrStart[3]))
+				
+				// if 2 blocks in the file
+				((int)(unsigned char)sdata->memcard_ptrStart[3]) == 2
 				)
             {
 				// 1-slot file

decompile/WorkInProgress/src/MEMCARD/MEMCARD_19_Load.c

@@ -21,12 +21,14 @@ uint8_t MEMCARD_Load(int slotIdx, char *name, uint8_t *ptrMemcard, int memcardFi
     }
     else
     {
+		// use ASYNC checksum load (ALWAYS)
         if ((param5 & 2) == 0)
         {
-            // dont process crc16 to the end of memory,
-            // just the next 0x200 bytes (async)
+            // Process 0x200 bytes per frame
             sdata->memcardStatusFlags = sdata->memcardStatusFlags & 0xfffffff7;
         }
+		
+		// skip ASYNC and use the check the full card (UNUSED)
         else
         {
 			// process crc16 to the end of memory

decompile/WorkInProgress/src/MEMCARD/MEMCARD_20_Save.c

@@ -20,13 +20,13 @@ uint8_t MEMCARD_Save(int slotIdx, char *name,
     // 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;
+        *((uint8_t *)(data.memcardIcon_PsyqHand) + 3) = ((sdata->memcardIconSize + fileSize * 1 + 0x1fff) >> 0xd);
     }
     else
     {
 		sdata->memcardStatusFlags = sdata->memcardStatusFlags & 0xfffffffb;
-		*((uint8_t *)(data.memcardIcon_PsyqHand) + 3) = ((sdata->memcardIconSize + fileSize * 2 + 0x1fff) >> 0xd) & 0xFF;
+		*((uint8_t *)(data.memcardIcon_PsyqHand) + 3) = ((sdata->memcardIconSize + fileSize * 2 + 0x1fff) >> 0xd);
 	}
 
     uint8_t *memcardIconPtr = (uint8_t *)data.memcardIcon_PsyqHand[1];