From 6af2f3a6cf97a4e7ed9bc16142823d429f521dab Mon Sep 17 00:00:00 2001 From: Jcw87 Date: Sun, 17 Dec 2023 19:14:23 -0800 Subject: [PATCH] m_Do_MemCardRWmng header --- include/m_Do/m_Do_MemCard.h | 15 --------------- include/m_Do/m_Do_MemCardRWmng.h | 4 ++-- src/m_Do/m_Do_MemCard.cpp | 1 + src/m_Do/m_Do_MemCardRWmng.cpp | 4 ++-- 4 files changed, 5 insertions(+), 19 deletions(-) diff --git a/include/m_Do/m_Do_MemCard.h b/include/m_Do/m_Do_MemCard.h index 75ad8229b..763719b83 100644 --- a/include/m_Do/m_Do_MemCard.h +++ b/include/m_Do/m_Do_MemCard.h @@ -71,19 +71,4 @@ inline void mDoMemCd_save(void* i_data, u32 param_1, u32 param_2) { g_mDoMemCd_control.save(i_data,param_1,param_2); } -struct CARDFileInfo; -struct mDoMemCdRWm_HeaderData; -s32 mDoMemCdRWm_Store(CARDFileInfo*, void*, u32); -s32 mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32); -void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData*); -void mDoMemCdRWm_SetCardStat(CARDFileInfo*); -void mDoMemCdRWm_CheckCardStat(CARDFileInfo*); -void mDoMemCdRWm_CalcCheckSum(void*, u32); -void mDoMemCdRWm_CalcCheckSumPictData(void*, u32); -void mDoMemCdRWm_TestCheckSumPictData(void*); -void mDoMemCdRWm_SetCheckSumPictData(u8*); -void mDoMemCdRWm_CalcCheckSumGameData(void*, u32); -void mDoMemCdRWm_TestCheckSumGameData(void*); -void mDoMemCdRWm_SetCheckSumGameData(u8*, u8); - #endif /* M_DO_M_DO_MEMCARD_H */ diff --git a/include/m_Do/m_Do_MemCardRWmng.h b/include/m_Do/m_Do_MemCardRWmng.h index 684cffd4e..30889580d 100644 --- a/include/m_Do/m_Do_MemCardRWmng.h +++ b/include/m_Do/m_Do_MemCardRWmng.h @@ -6,8 +6,8 @@ typedef struct CARDFileInfo CARDFileInfo; struct mDoMemCdRWm_HeaderData; -void mDoMemCdRWm_Store(CARDFileInfo*, void*, u32); -void mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32); +s32 mDoMemCdRWm_Store(CARDFileInfo*, void*, u32); +s32 mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32); void mDoMemCdRWm_BuildHeader(mDoMemCdRWm_HeaderData*); void mDoMemCdRWm_SetCardStat(CARDFileInfo*); void mDoMemCdRWm_CheckCardStat(CARDFileInfo*); diff --git a/src/m_Do/m_Do_MemCard.cpp b/src/m_Do/m_Do_MemCard.cpp index 6fff7689b..71f06bae2 100644 --- a/src/m_Do/m_Do_MemCard.cpp +++ b/src/m_Do/m_Do_MemCard.cpp @@ -4,6 +4,7 @@ // #include "m_Do/m_Do_MemCard.h" +#include "m_Do/m_Do_MemCardRWmng.h" #include "m_Do/m_Do_Reset.h" #include "JSystem/JKernel/JKRThread.h" #include "dolphin/card.h" diff --git a/src/m_Do/m_Do_MemCardRWmng.cpp b/src/m_Do/m_Do_MemCardRWmng.cpp index 81f7658ca..74eef405a 100644 --- a/src/m_Do/m_Do_MemCardRWmng.cpp +++ b/src/m_Do/m_Do_MemCardRWmng.cpp @@ -7,12 +7,12 @@ #include "dolphin/types.h" /* 80019940-80019CE8 .text mDoMemCdRWm_Store__FP12CARDFileInfoPvUl */ -void mDoMemCdRWm_Store(CARDFileInfo*, void*, u32) { +s32 mDoMemCdRWm_Store(CARDFileInfo*, void*, u32) { /* Nonmatching */ } /* 80019CE8-80019F4C .text mDoMemCdRWm_Restore__FP12CARDFileInfoPvUl */ -void mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32) { +s32 mDoMemCdRWm_Restore(CARDFileInfo*, void*, u32) { /* Nonmatching */ }