memcard progress

Author: niko1point0

decompile/General/MEMCARD/MEMCARD_04_StringInit.c

@@ -8,8 +8,6 @@ char *DECOMP_MEMCARD_StringInit(int slotIndex, char *dstString)
 		dstString = &sdata->s_memcardDirHeader[0];
 	}
 
-	// *dstString = (((int)slotIndex >> 4 & 1U) + 0x30) * 0x10000 |
-	//          ((slotIndex & 3) + 0x30) * 0x1000000 | 0x7562;
 	*(int *)&dstString[0] = 0x30307562; // bu00
 	dstString[3] = '0' + slotIndex; 	// bu0X where X = slotIndex
 

decompile/General/MEMCARD/MEMCARD_05_StringSet.c

@@ -3,18 +3,20 @@
 void DECOMP_MEMCARD_StringSet(char *dstString, int slotIdx, char *srcString)
 
 {
+  int i;
   MEMCARD_StringInit(slotIdx, dstString);
 
-  int i;
-  for (i = 0; dstString[i] != '\0'; i++)
-    ;
+  // fast strlen
+  for (i = 0; dstString[i] != '\0'; i++);
 
   // copy string from src to dst
   for (int j = 0; (srcString[j] != '\0' && i < 63); j++)
   {
     dstString[i] = srcString[j];
     i++;
   }
+  
+  // nullptr
   dstString[i] = '\0';
   return;
 }

decompile/General/MEMCARD/MEMCARD_16_GetFreeBytes.c

@@ -9,16 +9,20 @@ void DECOMP_MEMCARD_GetFreeBytes(int slotIdx)
   struct DIRENTRY *firstEntry;
   struct DIRENTRY entry;
 
-  MEMCARD_StringSet(sdata->s_bu00_BASCUS_94426_slots, slotIdx, sdata->s_AnyFile);
-
   int bytesUsedMemCard = 0;
+  MEMCARD_StringSet(sdata->s_bu00_BASCUS_94426_slots, slotIdx, sdata->s_AnyFile);
 
   // string for directory and file of save that is in use
   firstEntry = firstfile(sdata->s_bu00_BASCUS_94426_slots, &entry);
 
-  for (struct DIRENTRY *nxtEntry = &entry; firstEntry == nxtEntry; nxtEntry = nextfile(&entry))
+  for (
+		struct DIRENTRY *nxtEntry = &entry; 
+		firstEntry == nxtEntry; 
+		nxtEntry = nextfile(&entry)
+	  )
   {
-    bytesUsedMemCard = bytesUsedMemCard + (entry.size + 0x1fffU & 0xffffe000);
+    bytesUsedMemCard += entry.size + 0x1fffU;
+	bytesUsedMemCard &= 0xffffe000;
   }
 
   sdata->memoryCard_SizeRemaining = 0x1e000 - bytesUsedMemCard;

decompile/General/MEMCARD/MEMCARD_25_EraseFile.c

@@ -3,8 +3,9 @@
 // NOTE: unused function?
 uint8_t DECOMP_MEMCARD_EraseFile(int slotIdx, char *srcString)
 {
-    if (sdata->memcard_stage)
+    if (sdata->memcard_stage != 0)
         return 1;
+	
     char name[64];
     MEMCARD_StringSet(name, slotIdx, srcString);
     sdata->memcard_stage = (erase(name)) ? 14 : 13;