From 8fd374a0bb5c4517907a5b4cb24e11780de52bc6 Mon Sep 17 00:00:00 2001
From: Henrique Gemignani Passos Lima <henrique@gemignani.org>
Date: Tue, 11 Oct 2022 14:54:12 +0300
Subject: [PATCH] Match CMemoryCardDriver::StartFileDeleteAlt

---
 src/MetroidPrime/CMemoryCardDriver.cpp | 32 ++++++++++++++++++--------
 1 file changed, 23 insertions(+), 9 deletions(-)

diff --git a/src/MetroidPrime/CMemoryCardDriver.cpp b/src/MetroidPrime/CMemoryCardDriver.cpp
index 1a8f7001..fe3c426b 100644
--- a/src/MetroidPrime/CMemoryCardDriver.cpp
+++ b/src/MetroidPrime/CMemoryCardDriver.cpp
@@ -427,9 +427,7 @@ void CMemoryCardDriver::StartCardCheck() {
     UpdateCardCheck(result);
 }
 
-void CMemoryCardDriver::ClearError() {
-  x14_error = kE_OK;
-}
+void CMemoryCardDriver::ClearError() { x14_error = kE_OK; }
 
 void CMemoryCardDriver::CheckCardCapacity() {
   if (x18_cardFreeBytes >= 0x2000 && x1c_cardFreeFiles >= 1) {
@@ -454,8 +452,7 @@ void CMemoryCardDriver::IndexFiles() {
         continue;
       } else if (result == kCR_READY) {
         CardStat stat;
-        if (CMemoryCardSys::GetStatus(x0_cardPort, info.second.GetFileNo(), stat) ==
-            kCR_READY) {
+        if (CMemoryCardSys::GetStatus(x0_cardPort, info.second.GetFileNo(), stat) == kCR_READY) {
           int comment = stat.GetCommentAddr();
           if (comment == -1)
             info.first = kFS_BadFile;
@@ -479,9 +476,11 @@ void CMemoryCardDriver::IndexFiles() {
   if (x100_mcFileInfos[0].first == kFS_File) {
     if (x100_mcFileInfos[1].first == kFS_File) {
       CardStat stat;
-      if (CMemoryCardSys::GetStatus(x0_cardPort, x100_mcFileInfos[0].second.GetFileNo(), stat) == kCR_READY) {
+      if (CMemoryCardSys::GetStatus(x0_cardPort, x100_mcFileInfos[0].second.GetFileNo(), stat) ==
+          kCR_READY) {
         u32 timeA = stat.GetTime();
-        if (CMemoryCardSys::GetStatus(x0_cardPort, x100_mcFileInfos[1].second.GetFileNo(), stat) == kCR_READY) {
+        if (CMemoryCardSys::GetStatus(x0_cardPort, x100_mcFileInfos[1].second.GetFileNo(), stat) ==
+            kCR_READY) {
           u32 timeB = stat.GetTime();
           if (timeA > timeB)
             x194_fileIdx = 0;
@@ -519,7 +518,7 @@ void CMemoryCardDriver::IndexFiles() {
 void CMemoryCardDriver::StartFileDeleteBad() {
   x14_error = kE_OK;
   x10_state = kS_FileDeleteBad;
-  
+
   for (int idx = 0; idx < x100_mcFileInfos.capacity(); ++idx) {
     rstl::pair< EFileState, SMemoryCardFileInfo >& info = x100_mcFileInfos[idx];
     if (info.first == kFS_BadFile) {
@@ -533,7 +532,22 @@ void CMemoryCardDriver::StartFileDeleteBad() {
   }
 }
 
-void CMemoryCardDriver::StartFileDeleteAlt() {}
+void CMemoryCardDriver::StartFileDeleteAlt() {
+  x14_error = kE_OK;
+  x10_state = kS_FileDeleteAlt;
+
+  int altFileIdx;
+  if (x194_fileIdx == 0) {
+    altFileIdx = 1;
+  } else {
+    altFileIdx = 0;
+  }
+
+  SMemoryCardFileInfo& fileInfo = x100_mcFileInfos[altFileIdx].second;
+  ECardResult result = CMemoryCardSys::FastDeleteFile(x0_cardPort, fileInfo.GetFileNo());
+  if (result != kCR_READY)
+    UpdateFileDeleteAlt(result);
+}
 
 void CMemoryCardDriver::StartFileRead() {}