memcard progress

Author: niko1point0

decompile/General/MEMCARD/MEMCARD_12_NewTask.c

@@ -5,7 +5,7 @@ int DECOMP_MEMCARD_NewTask(int slotIdx, char *name, uint8_t *ptrMemcard, int mem
 {
     sdata->memcardSlot = slotIdx;
 
-    MEMCARD_StringSet(sdata->s_bu00_BASCUS_94426_slots, slotIdx, name);
+    MEMCARD_StringSet(sdata->s_memcardFileCurr, slotIdx, name);
 
     // pointer to memcard 800992e4
     sdata->memcard_ptrStart = ptrMemcard;

decompile/General/MEMCARD/MEMCARD_16_GetFreeBytes.c

@@ -10,10 +10,10 @@ void DECOMP_MEMCARD_GetFreeBytes(int slotIdx)
   struct DIRENTRY entry;
 
   int bytesUsedMemCard = 0;
-  MEMCARD_StringSet(sdata->s_bu00_BASCUS_94426_slots, slotIdx, sdata->s_AnyFile);
+  MEMCARD_StringSet(sdata->s_memcardFileCurr, slotIdx, sdata->s_AnyFile);
 
   // string for directory and file of save that is in use
-  firstEntry = firstfile(sdata->s_bu00_BASCUS_94426_slots, &entry);
+  firstEntry = firstfile(sdata->s_memcardFileCurr, &entry);
 
   for (
 		struct DIRENTRY *nxtEntry = &entry; 

decompile/General/MEMCARD/MEMCARD_23_FindFirstGhost.c

@@ -9,9 +9,9 @@ char* DECOMP_MEMCARD_FindFirstGhost(int slotIdx, char *srcString)
 
     struct DIRENTRY *firstEntry;
     struct DIRENTRY someEntry;
-    MEMCARD_StringSet(sdata->s_bu00_BASCUS_94426_slots, slotIdx, srcString);
+    MEMCARD_StringSet(sdata->s_memcardFileCurr, slotIdx, srcString);
 
-    firstEntry = firstfile(sdata->s_bu00_BASCUS_94426_slots, &someEntry);
+    firstEntry = firstfile(sdata->s_memcardFileCurr, &someEntry);
     if (firstEntry == 0)
 		return 0;
 

decompile/WorkInProgress/src/MEMCARD/MEMCARD_19_Load.c

@@ -12,7 +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
 
-    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, FASYNC|FREAD);
+    sdata->memcard_fd = open(sdata->s_memcardFileCurr, FASYNC|FREAD);
 
     if (sdata->memcard_fd == -1)
     {

decompile/WorkInProgress/src/MEMCARD/MEMCARD_20_Save.c

@@ -54,7 +54,7 @@ uint8_t MEMCARD_Save(int slotIdx, char *name,
 	// Search for "MEMCARD_SET_SIZE_BYTE3"
 	int whatIsThis = (unsigned int)*((uint8_t *)(data.memcardIcon_PsyqHand) + 3) << 0x10;
 
-    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, whatIsThis | FCREATE);
+    sdata->memcard_fd = open(sdata->s_memcardFileCurr, whatIsThis | FCREATE);
 
     if (sdata->memcard_fd != -1)
     {
@@ -66,7 +66,7 @@ uint8_t MEMCARD_Save(int slotIdx, char *name,
 	// ====== Open 2 ======
 
 
-    sdata->memcard_fd = open(sdata->s_bu00_BASCUS_94426_slots, FASYNC|FWRITE);
+    sdata->memcard_fd = open(sdata->s_memcardFileCurr, FASYNC|FWRITE);
 
     if (sdata->memcard_fd != -1)
     {

include/regionsEXE.h

@@ -4803,7 +4803,7 @@ struct sData
 	// 80098058 -- JpnTrial
 	// 8009946C -- EurRetail
 	// 8009C56C -- JpnRetail
-	char s_bu00_BASCUS_94426_slots[0x20];
+	char s_memcardFileCurr[0x20];
 
 	// 800990c4
 	char s_memcardFindGhostFile[0x20];