MEMCARD Refactor

Author: niko1point0

decompile/General/MEMCARD/MEMCARD_00_SetIcon.c

@@ -2,32 +2,5 @@
 
 void DECOMP_MEMCARD_SetIcon(int icon)
 {
-	int* dst;
-	int* src;
-	int i;
-	
-	// overwrite psyqHand
-	dst = &data.memcardIcon_PsyqHand[0];
-	
-	// if ghost
-	if(icon == 0)
-	{
-		src = &data.memcardIcon_Ghost[0];
-	}
-	
-	// if crash head
-	else
-	{
-		src = &data.memcardIcon_CrashHead[0];
-	}
-	
-	// TODO: inline memcpy asm
-	// Aligned copy, reduce loop jumps
-	for(i = 0; i < 0x40; i+= 4)
-	{
-		dst[i+0] = src[i+0];
-		dst[i+1] = src[i+1];
-		dst[i+2] = src[i+2];
-		dst[i+3] = src[i+3];
-	}
+	// -- deprecated
 }

decompile/General/MEMCARD/MEMCARD_02_ChecksumSave.c

@@ -1,54 +1,14 @@
 #include <common.h>
 
-#if 1 // 132
-// Rewrite looks like this
-// Potentially allowing inline optimizations
-// Problem: Does not use multi-frame checksum (like loading)
-void DECOMP_MEMCARD_ChecksumSave(unsigned char* saveBytes, int len)
-{
-	int i;
-	int crc = 0;
-	int nextByte;
-	
-	for(i = 0; i < len; i++)
-	{
-		nextByte = 0;
-		if(i < len-2) nextByte = (int)saveBytes[i];
-		crc = MEMCARD_CRC16(crc, nextByte);
-	}
-	
-	// write checksum to data (last 2 bytes),
-	// swap endians to throw off hackers,
-	// which didn't really throw anyone off at all
-	saveBytes[len-2] = (char)(crc>>8);
-	saveBytes[len-1] = (char)(crc);
-}
-#endif
+int MEMCARD_NewFunc_AsyncCRC(unsigned char* saveBytes, int len);
 
-#if 0 // 156
-// Closer resembles the loading function
-void DECOMP_MEMCARD_ChecksumSave(unsigned char* saveBytes, int len)
+int DECOMP_MEMCARD_ChecksumSave(unsigned char* saveBytes, int len)
 {
-	int i;
-	int crc;
-	int byteIndexEnd;
-	int byteIndexStart;
-	int boolFinishThisFrame = 1;
+	int ret = MEMCARD_NewFunc_AsyncCRC(saveBytes, len);
+	if (ret == MC_RETURN_PENDING)
+		return ret;
 
-	// Leave 2 bytes at the end,
-	// the checksum is stored there
-	len -= 2;
-	byteIndexEnd = len;
-	
-	// Option 1: Set ZERO for a one-frame load
-	crc = 0;
-	byteIndexStart = 0;
-	
-	// run checksum
-	for (i = byteIndexStart; i < byteIndexEnd; i++)
-	{
-		crc = MEMCARD_CRC16(crc, (int)saveBytes[i]);
-	}
+	int crc = sdata->crc16_checkpoint_status;
 
 	// finishing check
 	crc = MEMCARD_CRC16(crc, 0);
@@ -57,30 +17,8 @@ void DECOMP_MEMCARD_ChecksumSave(unsigned char* saveBytes, int len)
 	// write checksum to data (last 2 bytes),
 	// swap endians to throw off hackers,
 	// which didn't really throw anyone off at all
-	saveBytes[i+0] = (char)(crc>>8);
-	saveBytes[i+1] = (char)(crc);
-}
-#endif
-
-#if 0 // 156
-// Original game looked like this
-void DECOMP_MEMCARD_ChecksumSave(unsigned char* saveBytes, int len)
-{
-	int i;
-	int crc = 0;
-	
-	for(i = 0; i < len-2; i++)
-	{
-		crc = MEMCARD_CRC16(crc, (int)saveBytes[i]);
-	}
-	
-	crc = MEMCARD_CRC16(crc, 0);
-	crc = MEMCARD_CRC16(crc, 0);
+	saveBytes[len-2] = (char)(crc>>8);
+	saveBytes[len-1] = (char)(crc);
 
-	// write checksum to data (last 2 bytes),
-	// swap endians to throw off hackers,
-	// which didn't really throw anyone off at all
-	saveBytes[i+0] = (char)(crc>>8);
-	saveBytes[i+1] = (char)(crc);
+	return MC_RETURN_IOE;
 }
-#endif

decompile/General/MEMCARD/MEMCARD_03_ChecksumLoad.c

@@ -1,53 +1,18 @@
 #include <common.h>
 
+int MEMCARD_NewFunc_AsyncCRC(unsigned char* saveBytes, int len);
+
 int DECOMP_MEMCARD_ChecksumLoad(unsigned char* saveBytes, int len)
 {
-	int i;
-	int crc;
-	int byteIndexEnd;
-	int byteIndexStart;
-	int boolFinishThisFrame = 1;
+	int ret = MEMCARD_NewFunc_AsyncCRC(saveBytes, len);
+	if (ret == MC_RETURN_PENDING)
+		return ret;
 
-	// Leave 2 bytes at the end,
-	// the checksum is stored there
-	len -= 2;
-	byteIndexEnd = len;
+	int crc = sdata->crc16_checkpoint_status;
 
-	// Option 1: Set ZERO for a one-frame load
-	// Option 2: Set ZERO for first-frame of multi-frame load
-	// Option 3: Set existing checkpoint from previous frame
-	crc = sdata->crc16_checkpoint_status;
-	byteIndexStart = sdata->crc16_checkpoint_byteIndex;
-	
-	// if this is not a one-frame load
-	if((sdata->memcardStatusFlags & 8) == 0)
-	{	
-		// if more than 512 bytes remain
-		if (byteIndexEnd > (byteIndexStart + 0x200))
-		{
-			// cap to 512 bytes, and then continue next frame
-			byteIndexEnd = (byteIndexStart + 0x200);
-			boolFinishThisFrame = 0;
-		}
-	}
-	
-	// run checksum
-	for (i = byteIndexStart; i < byteIndexEnd; i++)
-	{
-		crc = MEMCARD_CRC16(crc, saveBytes[i]);
-	}
-		
-	// save checkpoints for next frame
-	if (boolFinishThisFrame == 0)
-	{	
-		sdata->crc16_checkpoint_status = crc;
-		sdata->crc16_checkpoint_byteIndex = byteIndexEnd;
-		return MC_RETURN_PENDING;
-	}
-	
 	// finishing check
-	crc = MEMCARD_CRC16(crc, saveBytes[byteIndexEnd]);
-	crc = MEMCARD_CRC16(crc, saveBytes[byteIndexEnd+1]);
+	crc = MEMCARD_CRC16(crc, saveBytes[len-2]);
+	crc = MEMCARD_CRC16(crc, saveBytes[len-1]);
 
 	// Will return one of these:
 	// 0: MC_RETURN_IOE

decompile/General/MEMCARD/MEMCARD_12_NewTask.c

@@ -1,7 +1,7 @@
 #include <common.h>
 
 // NOTE: Always returns 0, should it become a void fn?
-int DECOMP_MEMCARD_NewTask(int slotIdx, char *name, uint8_t *ptrMemcard, int memcardFileSize)
+int DECOMP_MEMCARD_NewTask(int slotIdx, char *name, uint8_t *ptrMemcard, int memcardFileSize, int unused)
 {
     sdata->memcardSlot = slotIdx;