diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h index a55a0ff2b..288e2c602 100644 --- a/include/m_Do/m_Do_MemCard.h +++ b/include/m_Do/m_Do_MemCard.h @@ -49,6 +49,7 @@ public: u8 getNowSlot() { return mCardSlot; } u8* getPictDataPtr() { return mPictDataPtr; } u8* getPictWriteDataPtr() { return mPictDataWritePtr; } + void setPictDataPtr(u8* v) { mPictDataPtr = v; } void setCardSerialNo(u64 v) { mCardSerialNo = v; } void setDataVersion(u32 v) { mDataVersion = v; } @@ -101,6 +102,10 @@ inline u8* mDoMemCd_getPictDataPtr() { return g_mDoMemCd_control.getPictDataPtr(); } +inline void mDoMemCd_setPictDataPtr(u8* v) { + g_mDoMemCd_control.setPictDataPtr(v); +} + inline u8* mDoMemCd_getPictWriteDataPtr() { return g_mDoMemCd_control.getPictWriteDataPtr(); } diff --git a/src/d/d_s_name.cpp b/src/d/d_s_name.cpp index c51b8d245..e3fe797ec 100644 --- a/src/d/d_s_name.cpp +++ b/src/d/d_s_name.cpp @@ -696,7 +696,7 @@ void dScnName_c::FileSelectMainNormal() { dComIfGs_setPictureNum(pictureNum - failed); } dComIfGs_setEventReg(0x89ff, 0); - g_mDoMemCd_control.mCardCommand = 0; + mDoMemCd_setPictDataPtr(NULL); g_dComIfG_gameInfo.play.itemInit(); if (field_0x1bb9 != 0) { field_0x1bb6 = 3;