m_Do_MemCard not done on PAL

This commit is contained in:
LagoLunatic
2023-12-03 21:46:24 -05:00
parent c0d9848102
commit 650fc00522
2 changed files with 13 additions and 3 deletions
+1 -1
View File
@@ -264,7 +264,7 @@ config.libs = [
Object(Matching, "m_Do/m_Do_Reset.cpp"),
Object(Matching, "m_Do/m_Do_dvd_thread.cpp"),
Object(Matching, "m_Do/m_Do_DVDError.cpp"),
Object(Matching, "m_Do/m_Do_MemCard.cpp"),
Object(NonMatching, "m_Do/m_Do_MemCard.cpp"),
Object(NonMatching, "m_Do/m_Do_MemCardRWmng.cpp"),
Object(Matching, "m_Do/m_Do_gba_com.cpp"),
Object(Matching, "m_Do/m_Do_machine_exception.cpp"),
+12 -2
View File
@@ -44,8 +44,6 @@ void mDoMemCd_Ctrl_c::main() {
OSWaitCond(&mCond, &mMutex);
switch (mCommand) {
case CARD_NO_COMMAND:
break;
case CARD_RESTORE:
restore();
break;
@@ -61,6 +59,11 @@ void mDoMemCd_Ctrl_c::main() {
case CARD_DETACH:
detach();
break;
#if VERSION == VERSION_PAL
case 6:
// restore2();
break;
#endif
}
mCommand = CARD_NO_COMMAND;
@@ -194,8 +197,10 @@ s32 mDoMemCd_Ctrl_c::SaveSync() {
if (field_0x1660 == 4) {
field_0x1660 = 1;
ret = 1;
#if VERSION != VERSION_JPN
} else if (field_0x1660 == 1) {
ret = 0;
#endif
} else {
ret = 2;
}
@@ -364,6 +369,11 @@ void mDoMemCd_Ctrl_c::setCardState(s32 state) {
case CARD_ERROR_ENCODING:
field_0x1660 = 6;
break;
#if VERSION == VERSION_PAL
case CARD_ERROR_NOFILE:
field_0x1660 = 2;
break;
#endif
}
}