PrimeDecomp/prime
2
0
Fork 0
mirror of https://github.com/PrimeDecomp/prime.git synced 2025-12-12 20:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move EMemoryCardPort/CCardFileInfo back to CMemoryCardSys

Browse Source 
Former-commit-id: cfcf615e23
This commit is contained in:
Henrique Gemignani Passos Lima
2022-10-12 01:11:22 +03:00
parent 85173e2bd8
commit 756f43e2d6
6 changed files with 96 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/MetroidPrime/CMemoryCardDriver.hpp
View File

@@ -29,7 +29,7 @@ struct SMemoryCardFileInfo {
ECardResult Open();
ECardResult Close();
EMemoryCardPort GetFileCardPort() const { return x0_fileInfo.slot; }
CMemoryCardSys::EMemoryCardPort GetFileCardPort() const { return x0_fileInfo.slot; }
int GetFileNo() const; // { return x0_fileInfo.GetFileNo(); }
ECardResult StartRead();
ECardResult TryFileRead();
@@ -118,7 +118,7 @@ public:
enum EFileState { kFS_Unknown, kFS_NoFile, kFS_File, kFS_BadFile };
private:
EMemoryCardPort x0_cardPort;
CMemoryCardSys::EMemoryCardPort x0_cardPort;
CAssetId x4_saveBanner;
CAssetId x8_saveIcon0;
CAssetId xc_saveIcon1;
@@ -132,14 +132,14 @@ private:
rstl::reserved_vector< rstl::auto_ptr< SGameFileSlot >, 3 > xe4_fileSlots;
rstl::reserved_vector< rstl::pair< EFileState, SMemoryCardFileInfo >, 2 > x100_mcFileInfos;
int x194_fileIdx;
rstl::single_ptr< CCardFileInfo > x198_fileInfo;
rstl::single_ptr< CMemoryCardSys::CCardFileInfo > x198_fileInfo;
bool x19c_;
bool x19d_importPersistent;
public:
static bool IsCardBusy(EState);
static bool IsCardWriting(EState);
CMemoryCardDriver(EMemoryCardPort cardPort, CAssetId saveBanner, CAssetId saveIcon0,
CMemoryCardDriver(CMemoryCardSys::EMemoryCardPort cardPort, CAssetId saveBanner, CAssetId saveIcon0,
CAssetId saveIcon1, bool importPersistent);
void ClearFileInfo();
~CMemoryCardDriver();