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

Match CMemoryCardDriver::GetCardFreeBytes 

Former-commit-id: 03a49bb75e
This commit is contained in:
Phillip Stephens 2022-10-11 10:02:35 -07:00
parent 155de1457f
commit 950d8e9d31
4 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/Kyoto/DolphinCMemoryCardSys.s
View File

@ -1106,8 +1106,8 @@ __ct__19SMemoryCardFileInfoFiRCQ24rstl6string:
/* 8034E2F0 0034B250 38 21 00 10 */ addi r1, r1, 0x10
/* 8034E2F4 0034B254 4E 80 00 20 */ blr
.global GetNumFreeBytes__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRUi
GetNumFreeBytes__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRUi:
.global GetNumFreeBytes__14CMemoryCardSysF15EMemoryCardPortRUiRUi
GetNumFreeBytes__14CMemoryCardSysF15EMemoryCardPortRUiRUi:
/* 8034E2F8 0034B258 94 21 FF E0 */ stwu r1, -0x20(r1)
/* 8034E2FC 0034B25C 7C 08 02 A6 */ mflr r0
/* 8034E300 0034B260 90 01 00 24 */ stw r0, 0x24(r1)

2
asm/MetroidPrime/CMemoryCardDriver.s
View File

@ -80,7 +80,7 @@ GetCardFreeBytes__17CMemoryCardDriverFv:
/* 8024C2A4 00249204 38 9F 00 18 */ addi r4, r31, 0x18
/* 8024C2A8 00249208 80 63 00 00 */ lwz r3, 0(r3)
/* 8024C2AC 0024920C 38 BF 00 1C */ addi r5, r31, 0x1c
/* 8024C2B0 00249210 48 10 20 49 */ bl GetNumFreeBytes__14CMemoryCardSysFQ214CMemoryCardSys15EMemoryCardPortRUi
/* 8024C2B0 00249210 48 10 20 49 */ bl GetNumFreeBytes__14CMemoryCardSysF15EMemoryCardPortRUiRUi
/* 8024C2B4 00249214 2C 03 00 00 */ cmpwi r3, 0
/* 8024C2B8 00249218 41 82 00 14 */ beq lbl_8024C2CC
/* 8024C2BC 0024921C 7F E3 FB 78 */ mr r3, r31

1
include/Kyoto/CMemoryCardSys.hpp
View File

@ -96,6 +96,7 @@ public:
static ECardResult GetSerialNo(EMemoryCardPort port, long long& serialOut);
static void UnmountCard(EMemoryCardPort);
static ECardResult Rename(EMemoryCardPort, const rstl::string&, const rstl::string&);
static ECardResult GetNumFreeBytes(EMemoryCardPort port, uint& freeBytes, uint& freeFiles);
void Initialize();

9
src/MetroidPrime/CMemoryCardDriver.cpp
View File

@ -789,4 +789,11 @@ const CGameState::GameFileStateInfo* CMemoryCardDriver::GetGameFileStateInfo(int
return nullptr;
};
bool CMemoryCardDriver::GetCardFreeBytes() { return false; }
bool CMemoryCardDriver::GetCardFreeBytes() {
if (CMemoryCardSys::GetNumFreeBytes(x0_cardPort, x18_cardFreeBytes, x1c_cardFreeFiles) != kCR_READY) {
NoCardFound();
return false;
}
return true;
}