m_Do_MemCardRWmng work

This commit is contained in:
Jasper St. Pierre
2024-07-14 11:02:14 -07:00
parent ebfca99f16
commit 7cc7ad2b14
4 changed files with 57 additions and 34 deletions
+1 -1
View File
@@ -504,7 +504,7 @@ public:
JKRAramBlock* getPictureBoxData(int i) { return mPictureBoxData[i]; }
void setPictureBoxData(JKRAramBlock* aramBlock, int i) { mPictureBoxData[i] = aramBlock; }
bool isPictureFlag(u8 i) { return mPictureFlag & (1 << i); }
bool isPictureFlag(u8 i) { return mPictureFlag & (u8)(1 << i); }
void offPictureFlag(u8 i) {
u8 mask = (1 << i);
mPictureFlag &= ~mask;
+29 -4
View File
@@ -45,11 +45,16 @@ public:
s32 checkspace();
void setCardState(s32);
bool isCardCommNone() { return mCardCommand != NULL; }
bool isCardCommNone() { return mCommand != CARD_NO_COMMAND; }
u8 getNowSlot() { return mCardSlot; }
u8* getPictDataPtr() { return mPictDataPtr; }
u8* getPictWriteDataPtr() { return mPictDataWritePtr; }
void setCardSerialNo(u64 v) { mCardSerialNo = v; }
void setDataVersion(u32 v) { mDataVersion = v; }
/* 0x0000 */ u8 mData[0x1650];
/* 0x1650 */ u8* mCardCommand;
/* 0x1654 */ u8* mCardBuf;
/* 0x1650 */ u8* mPictDataPtr;
/* 0x1654 */ u8* mPictDataWritePtr;
/* 0x1658 */ u8 mCardSlot;
/* 0x1659 */ u8 field_0x1659;
/* 0x165A */ u8 field_0x165A;
@@ -60,7 +65,7 @@ public:
/* 0x167C */ OSCond mCond;
/* 0x1684 */ u32 field_0x1684;
/* 0x1688 */ u64 mCardSerialNo;
/* 0x1690 */ u32 field_0x1690;
/* 0x1690 */ u32 mDataVersion;
/* 0x1694 */ u32 field_0x1694;
}; // Size: 0x1698
@@ -80,4 +85,24 @@ inline void mDoMemCd_save(void* i_data, u32 param_1, u32 param_2) {
g_mDoMemCd_control.save(i_data,param_1,param_2);
}
inline u8 mDoMemCd_getNowSlot() {
return g_mDoMemCd_control.getNowSlot();
}
inline void mDoMemCd_setCardSerialNo(u64 v) {
g_mDoMemCd_control.setCardSerialNo(v);
}
inline void mDoMemCd_setDataVersion(u32 v) {
g_mDoMemCd_control.setDataVersion(v);
}
inline u8* mDoMemCd_getPictDataPtr() {
return g_mDoMemCd_control.getPictDataPtr();
}
inline u8* mDoMemCd_getPictWriteDataPtr() {
return g_mDoMemCd_control.getPictWriteDataPtr();
}
#endif /* M_DO_M_DO_MEMCARD_H */