PrimeDecomp
/
prime
mirror of https://github.com/PrimeDecomp/prime.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Match CMemoryCardDriver::StartFileDeleteAlt

This commit is contained in:
Henrique Gemignani Passos Lima 2022-10-11 14:54:12 +03:00
parent 7ca5b720aa
commit 8fd374a0bb
No known key found for this signature in database
GPG Key ID: E224F951761145F8
1 changed files with 23 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/MetroidPrime/CMemoryCardDriver.cpp
View File

@ -427,9 +427,7 @@ void CMemoryCardDriver::StartCardCheck() {
UpdateCardCheck(result); UpdateCardCheck(result);
} }
void CMemoryCardDriver::ClearError() { void CMemoryCardDriver::ClearError() { x14_error = kE_OK; }
x14_error = kE_OK;
}
void CMemoryCardDriver::CheckCardCapacity() { void CMemoryCardDriver::CheckCardCapacity() {
if (x18_cardFreeBytes >= 0x2000 && x1c_cardFreeFiles >= 1) { if (x18_cardFreeBytes >= 0x2000 && x1c_cardFreeFiles >= 1) {
@ -454,8 +452,7 @@ void CMemoryCardDriver::IndexFiles() {
continue; continue;
} else if (result == kCR_READY) { } else if (result == kCR_READY) {
CardStat stat; CardStat stat;
if (CMemoryCardSys::GetStatus(x0_cardPort, info.second.GetFileNo(), stat) == if (CMemoryCardSys::GetStatus(x0_cardPort, info.second.GetFileNo(), stat) == kCR_READY) {
kCR_READY) {
int comment = stat.GetCommentAddr(); int comment = stat.GetCommentAddr();
if (comment == -1) if (comment == -1)
info.first = kFS_BadFile; info.first = kFS_BadFile;
@ -479,9 +476,11 @@ void CMemoryCardDriver::IndexFiles() {
if (x100_mcFileInfos[0].first == kFS_File) { if (x100_mcFileInfos[0].first == kFS_File) {
if (x100_mcFileInfos[1].first == kFS_File) { if (x100_mcFileInfos[1].first == kFS_File) {
CardStat stat; 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(); 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(); u32 timeB = stat.GetTime();
if (timeA > timeB) if (timeA > timeB)
x194_fileIdx = 0; x194_fileIdx = 0;
@ -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() {} void CMemoryCardDriver::StartFileRead() {}