memcard progress

Author: niko1point0

decompile/WorkInProgress/src/MEMCARD/MEMCARD_FindFirstGhost.c

@@ -2,11 +2,11 @@
 
 // param2 = BASCUS-94426G* 
 // TODO: 4 bytes over budget
-char *DECOMP_MEMCARD_FindFirstGhost(int slotIdx, char *srcString)
+char* DECOMP_MEMCARD_FindFirstGhost(int slotIdx, char *srcString)
 {
-    if (sdata->memcard_stage)
+    if (sdata->memcard_stage != MC_STAGE_IDLE)
     {
-        return (char *)0;
+        return 0;
     }
 
     struct DIRENTRY *firstEntry;
@@ -16,9 +16,12 @@ char *DECOMP_MEMCARD_FindFirstGhost(int slotIdx, char *srcString)
     // string for directory and file of save that is in use
     firstEntry = firstfile(sdata->s_bu00_BASCUS_94426_slots, &someEntry);
 
+	// [error]
+	// They cant be true, a firstfile pointer wont "equal" a stack pointer,
+	// maybe compare the strings instead?
     if (firstEntry == &someEntry)
     {
-        sdata->memcard_stage = 0xf;
+        sdata->memcard_stage = MC_STAGE_GHOST_FOUND;
         strcpy(firstEntry->name, someEntry.name); // 0x80
         return &sdata->s_memcardFindGhostFile[0];
     }

decompile/WorkInProgress/src/MEMCARD/MEMCARD_FindNextGhost.c

@@ -9,16 +9,19 @@ char* DECOMP_MEMCARD_FindNextGhost(void)
     struct DIRENTRY *nextEntry;
     struct DIRENTRY someEntry;
 
-    if (sdata->memcard_stage == 0xf)
+    if (sdata->memcard_stage != MC_STAGE_GHOST_FOUND)
 	{
-		nextEntry = nextfile(&someEntry);
-		if (nextEntry == &someEntry)
-		{
-			strcpy(nextEntry->name, someEntry.name);
-			return &sdata->s_memcardFindGhostFile[0];
-		}
-		sdata->memcard_stage = 0;
+		return 0;
 	}
 
-	return (char *)0;
+	// [error]
+	// They cant be true, a firstfile pointer wont "equal" a stack pointer,
+	// maybe compare the strings instead?
+	nextEntry = nextfile(&someEntry);
+	if (nextEntry == &someEntry)
+	{
+		strcpy(nextEntry->name, someEntry.name);
+		return &sdata->s_memcardFindGhostFile[0];
+	}
+	sdata->memcard_stage = MC_STAGE_IDLE;
 }

decompile/WorkInProgress/src/MEMCARD/MEMCARD_GetInfo.c

@@ -1,25 +1,19 @@
 #include <common.h>
 
 uint8_t DECOMP_MEMCARD_GetInfo(int slotIdx)
-
 {
-    if (sdata->memcard_stage == 0)
-    {
-        MEMCARD_SkipEvents();
-        sdata->memcard_stage = 1;
-        sdata->memcardSlot = slotIdx;
-
-        // loop until check is "submitted",
-        // result is not "returned", result
-        // is found in SwCARD descriptor/event (see libref)
-        while (_card_info(slotIdx) != 1)
-            ;
-
-        sdata->memcard_remainingAttempts = 8;
-        return 7;
-    }
-    else
-    {
+    if (sdata->memcard_stage != MC_STAGE_IDLE)
         return 1;
-    }
+
+	// discard any pending events
+	// submit a card_info request,
+	// check the result of a GET INFO
+	// 8 tries to see if it worked
+    MEMCARD_SkipEvents();
+    while (!_card_info(slotIdx));
+    sdata->memcard_stage = MC_STAGE_GETINFO;
+    sdata->memcard_remainingAttempts = 8;
+    sdata->memcardSlot = slotIdx;
+	
+    return 7;
 }

decompile/WorkInProgress/src/MEMCARD/MEMCARD_Load.c

@@ -7,13 +7,11 @@
 uint8_t MEMCARD_Load(int slotIdx, char *name, uint8_t *ptrMemcard, int memcardFileSize, unsigned int param5)
 
 {
-    if (sdata->memcard_stage != 0)
-    {
+    if (sdata->memcard_stage != MC_STAGE_IDLE)
         return 1;
-    }
+
     MEMCARD_NewTask(slotIdx, name, ptrMemcard, memcardFileSize, param5); // Too many params to NewTask. param5 is always 0
-    // 800990a4
-    // string for directory and file of save that is in use
+
 
     // 0x8001, in sys/fcntl.h
     // 0x8000 = FASYNC, for asynchronous I/O

ghidra/RefreshCard.c

@@ -1189,7 +1189,8 @@ void FUN_80047a58(void)
 
 	iVar2 = 0;
 
-	// loop until you have gone through all memory card saves
+	// 0x0: MC_STAGE_IDLE (did not find ghost)
+	// 0xF: MC_STAGE_GHOST_FOUND (found ghost)
     while (iVar3 != 0)
 	{
 	  // If there are less than 7 ghosts loaded

include/namespace_Memcard.h

@@ -18,6 +18,8 @@ enum MC_STAGE
 
 	MC_STAGE_ERASE_FAIL = 13,
 	MC_STAGE_ERASE_PASS = 14,
+	
+	MC_STAGE_GHOST_FOUND = 15,
 };
 
 enum MC_EVENT