summaryrefslogtreecommitdiff
path: root/src/m_Do/m_Do_MemCard.cpp
diff options
context:
space:
mode:
authorLagoLunatic <LagoLunatic@users.noreply.github.com>2025-08-12 16:30:44 -0400
committerGitHub <noreply@github.com>2025-08-12 16:30:44 -0400
commit2eaf012e4f8749bf83a6dc00cf1900f64663a33f (patch)
treee4b512b394015bb6ab04946c0b59f37c7f3066a2 /src/m_Do/m_Do_MemCard.cpp
parentc5878bf0687e54c23f72e72a1514fe7221b1350e (diff)
Fix some version differences (#852)
* Fix some version differences * Found real inline name for checkBowMiniGame
Diffstat (limited to 'src/m_Do/m_Do_MemCard.cpp')
-rw-r--r--src/m_Do/m_Do_MemCard.cpp13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp
index 0d69555b..59de78a3 100644
--- a/src/m_Do/m_Do_MemCard.cpp
+++ b/src/m_Do/m_Do_MemCard.cpp
@@ -45,6 +45,12 @@ void mDoMemCd_Ctrl_c::main() {
while (mCommand == CARD_NO_COMMAND)
OSWaitCond(&mCond, &mMutex);
+#if VERSION == VERSION_DEMO
+ if (mDoRst::isReset()) {
+ mCommand = CARD_NO_COMMAND;
+ }
+#endif
+
switch (mCommand) {
case CARD_RESTORE:
restore();
@@ -75,13 +81,16 @@ void mDoMemCd_Ctrl_c::main() {
/* 80018EC8-80018FD8 .text update__15mDoMemCd_Ctrl_cFv */
void mDoMemCd_Ctrl_c::update() {
+#if VERSION > VERSION_DEMO
if (mDoRst::isReset()) {
OSLockMutex(&mMutex);
mCommand = CARD_DETACH;
field_0x165A = 3;
OSUnlockMutex(&mMutex);
OSSignalCond(&mCond);
- } else {
+ } else
+#endif
+ {
if (getStatus(0) != 14) {
if (CARDProbe(0) && getStatus(0) == 0) {
OSLockMutex(&mMutex);
@@ -423,10 +432,12 @@ void mDoMemCd_Ctrl_c::setCardState(s32 state) {
/* 800198C4-80019918 .text mDoMemCd_main__FPv */
int mDoMemCd_main(void*) {
+#if VERSION > VERSION_DEMO
{ JKRThread thread(OSGetCurrentThread(), 0); }
JKRHeap* heap = NULL;
heap->becomeCurrentHeap();
+#endif
g_mDoMemCd_control.main();
return 0;