memcard progress

Author: niko1point0

decompile/General/MEMCARD/MEMCARD_22_IsFile.c

@@ -6,15 +6,18 @@ int DECOMP_MEMCARD_IsFile(int slotIdx, char *save_name)
 
     MEMCARD_StringSet(name, slotIdx, save_name);
 
-    // 0x8002, in sys/fcntl.h
-    // 0x8000 = FASYNC, for asynchronous I/O
-    // 0x0002 = FWRITE, for writing
-    sdata->memcard_fd = open(name, FASYNC|FWRITE);
+	// This temporary FD will not be saved,
+	// The global FD will always be wiped
+	int fd;
+	sdata->memcard_fd = -1;
 
-    if (sdata->memcard_fd == -1)
-        return MC_RETURN_NODATA;
+    fd = open(name, FASYNC|FWRITE);
 
-    close(sdata->memcard_fd);
-    sdata->memcard_fd = -1;
-    return MC_RETURN_IOE;
+    if (fd != -1)
+	{
+		close(fd);
+		return MC_RETURN_IOE;
+	}
+
+	return MC_RETURN_NODATA;
 }

decompile/WorkInProgress/src/MEMCARD/MEMCARD_Load.c

@@ -12,12 +12,7 @@ uint8_t MEMCARD_Load(int slotIdx, char *name, uint8_t *ptrMemcard, int memcardFi
 
     MEMCARD_NewTask(slotIdx, name, ptrMemcard, memcardFileSize, param5); // Too many params to NewTask. param5 is always 0
 
-
-    // 0x8001, in sys/fcntl.h
-    // 0x8000 = FASYNC, for asynchronous I/O
-    // 0x0001 = FREAD, for reading
-
-    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, 0x8001);
+    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, FASYNC|FREAD);
 
     if (sdata->memcard_fd == -1)
     {

decompile/WorkInProgress/src/MEMCARD/MEMCARD_Save.c

@@ -49,25 +49,28 @@ uint8_t MEMCARD_Save(int slotIdx, char *name,
 
     MEMCARD_ChecksumSave(ptrData, fileSize);
 
-    // In sys/fcntl.h
-    // 0x200 is FCREAT, create if it does not exist,
-    // DAT_800857a3 handles read or write
+
+
+	// ====== Open 1 ======
+
+
 
 	// Search for "MEMCARD_SET_SIZE_BYTE3"
-    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, 
-    (unsigned int)*((uint8_t *)(data.memcardIcon_PsyqHand) + 3) << 0x10 | FCREATE);
+	int whatIsThis = (unsigned int)*((uint8_t *)(data.memcardIcon_PsyqHand) + 3) << 0x10;
+	
+    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, whatIsThis | FCREATE);
 
     if (sdata->memcard_fd != -1)
     {
         close(sdata->memcard_fd);
         sdata->memcard_fd = -1;
     }
 
-    // 0x8002, in sys/fcntl.h
-    // 0x8000 = FASYNC, for asynchronous I/O
-    // 0x0002 = FWRITE, for writing
 
-    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, 0x8002);
+	// ====== Open 2 ======
+
+
+    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, FASYNC|FWRITE);
 
     if (sdata->memcard_fd != -1)
     {