m_Do_main OK

This commit is contained in:
TakaRikka
2023-09-10 21:04:21 -07:00
parent 3c97974e2c
commit 6406901ea7
14 changed files with 589 additions and 60 deletions
+12 -11
View File
@@ -105,8 +105,10 @@ public:
u8 getAnalogB() const { return mButton.mAnalogB; }
u8 getAnalogL() const { return mButton.mAnalogL; }
f32 getAnalogLf() const { return mButton.mAnalogLf; }
u8 getAnalogR() const { return mButton.mAnalogR; }
f32 getAnalogRf() const { return mButton.mAnalogRf; }
s8 getErrorStatus() const { return mErrorStatus; }
@@ -225,8 +227,7 @@ public:
/* 0x04 */ u32 field_0x4;
/* 0x08 */ u8* field_0x8;
/* 0x0C */ u32 field_0xc;
/* 0x10 */ u8* field_0x10;
}; // Size: 0x14
}; // Size: 0x10
void startMotorWave(void* param_2, CRumble::ERumble rumble, u32 param_4) {
mRumble.startPatternedRumble(param_2, rumble, param_4);
@@ -236,15 +237,15 @@ public:
/* 0x48 */ CStick mMainStick;
/* 0x58 */ CStick mSubStick;
/* 0x68 */ CRumble mRumble;
/* 0x7C */ s16 mPortNum;
/* 0x7E */ s8 mErrorStatus;
/* 0x80 */ JSULink<JUTGamePad> mLink;
/* 0x90 */ JUTGamePadRecordBase* mPadRecord;
/* 0x94 */ JUTGamePadRecordBase* mPadReplay;
/* 0x98 */ C3ButtonReset mButtonReset;
/* 0x9C */ u8 field_0x9c[4];
/* 0xA0 */ OSTime mResetTime;
/* 0xA8 */ u8 field_0xa8;
/* 0x78 */ s16 mPortNum;
/* 0x7A */ s8 mErrorStatus;
/* 0x7C */ JSULink<JUTGamePad> mLink;
/* 0x8C */ JUTGamePadRecordBase* mPadRecord;
/* 0x90 */ JUTGamePadRecordBase* mPadReplay;
/* 0x94 */ C3ButtonReset mButtonReset;
/* 0x98 */ u8 field_0x98[4];
/* 0x9C */ OSTime mResetTime;
/* 0xA4 */ u8 field_0xa4;
static JSUList<JUTGamePad> mPadList;
static bool mListInitialized;
+16 -2
View File
@@ -12,8 +12,22 @@ public:
/* 80018944 */ fapGm_HIO_c();
/* 80018AE0 */ virtual ~fapGm_HIO_c();
u32 pad[0x58];
}; // Size: 0x40
/* 0x04 */ u8 field_0x04[0x06 - 0x04];
/* 0x06 */ u8 mDisplayMeter;
/* 0x07 */ u8 field_0x07[0x0C - 0x07];
/* 0x0C */ f32 field_0x0c;
/* 0x10 */ u8 field_0x10[0x24 - 0x10];
/* 0x24 */ f32 mTriggerThreshLo;
/* 0x28 */ f32 mTriggerThreshHi;
/* 0x2C */ u16 field_0x2c;
/* 0x2E */ u16 field_0x2e;
/* 0x30 */ u8 field_0x30[0x4C - 0x30];
/* 0x4C */ u16 field_0x4c;
/* 0x4E */ u16 field_0x4e;
/* 0x50 */ u16 field_0x50;
/* 0x52 */ u16 field_0x52;
/* 0x54 */ u16 field_0x54;
}; // Size: 0x58
extern fapGm_HIO_c g_HIO;
+69
View File
@@ -0,0 +1,69 @@
#ifndef M_DO_M_DO_MEMCARD_H
#define M_DO_M_DO_MEMCARD_H
#include "dolphin/os/OSMutex.h"
#include "global.h"
class mDoMemCd_Ctrl_c {
public:
enum CardCommand {
CARD_NO_COMMAND,
CARD_RESTORE,
CARD_STORE,
CARD_FORMAT,
CARD_ATTACH,
CARD_DETACH,
};
/* 8001672C */ mDoMemCd_Ctrl_c();
/* 80016730 */ void ThdInit();
/* 800167D0 */ void main();
/* 80016894 */ void update();
/* 800169B4 */ void load();
/* 80016A0C */ void restore();
/* 80016AB0 */ s32 LoadSync(void*, u32, u32);
/* 80016B58 */ void save(void*, u32, u32);
/* 80016BD4 */ void store();
/* 80016CE0 */ s32 SaveSync();
/* 80016D74 */ u32 getStatus(u32);
/* 80016E58 */ void command_format();
/* 80016EA8 */ void format();
/* 80016F2C */ s32 FormatSync();
/* 80016FB8 */ void attach();
/* 800170B8 */ void command_attach();
/* 80017110 */ void detach();
/* 80017148 */ s32 mount();
/* 80017274 */ s32 loadfile();
/* 800172D4 */ s32 checkspace();
/* 80017360 */ void setCardState(s32);
bool isCardCommNone() { return mCardCommand == CARD_NO_COMMAND; }
/* 0x0000 */ u8 mData[0x1650];
/* 0x1650 */ s32 mCardCommand;
/* 0x1654 */ s32 mCardState;
/* 0x1658 */ s32 field_0x1658;
/* 0x165C */ s32 field_0x165c;
/* 0x1660 */ s32 field_0x1660;
/* 0x1664 */ OSMutex mMutex;
}; // Size: 0x167C
STATIC_ASSERT(sizeof(mDoMemCd_Ctrl_c) == 0x167C);
static int mDoMemCd_main(void*);
extern mDoMemCd_Ctrl_c g_mDoMemCd_control;
inline bool mDoMemCd_isCardCommNone() {
return g_mDoMemCd_control.isCardCommNone();
}
inline void mDoMemCd_ThdInit() {
g_mDoMemCd_control.ThdInit();
}
inline void mDoMemCd_save(void* i_data, u32 param_1, u32 param_2) {
g_mDoMemCd_control.save(i_data,param_1,param_2);
}
#endif /* M_DO_M_DO_MEMCARD_H */
-1
View File
@@ -6,7 +6,6 @@
void mDoRst_reset(int, u32, int);
void mDoRst_resetCallBack(int, void*);
extern bool SyncWidthSound;
extern u8 sDefaultDirection;
struct mDoRstData {
+4
View File
@@ -2,5 +2,9 @@
#define M_DO_AUDIO_H
void mDoAud_setSceneName(const char*, s32, s32);
void mDoAud_Execute();
class JKRSolidHeap;
extern JKRSolidHeap* g_mDoAud_audioHeap;
#endif /* M_DO_AUDIO_H */
+9
View File
@@ -1,4 +1,13 @@
#ifndef M_DO_CONTROLLER_PAD_H
#define M_DO_CONTROLLER_PAD_H
#include "JSystem/JUtility/JUTGamePad.h"
#include "SSystem/SComponent/c_API_controller_pad.h"
extern JUTGamePad* g_mDoCPd_gamePad[4];
extern interface_of_controller_pad g_mDoCPd_cpadInfo[4];
void mDoCPd_Create();
void mDoCPd_Read();
#endif
+1
View File
@@ -117,6 +117,7 @@ struct mDoDvdThd {
static OSThread l_thread;
static mDoDvdThdStack l_threadStack;
static mDoDvdThd_param_c l_param;
static bool SyncWidthSound;
};
#endif /* M_DO_M_DO_DVD_THREAD_H */
+9
View File
@@ -255,4 +255,13 @@ void mDoExt_modelUpdate(J3DModel* i_model);
void mDoExt_modelUpdateDL(J3DModel* i_model);
void mDoExt_modelEntryDL(J3DModel* i_model);
JKRExpHeap* mDoExt_getCommandHeap();
JKRExpHeap* mDoExt_getZeldaHeap();
JKRExpHeap* mDoExt_getGameHeap();
JKRExpHeap* mDoExt_getArchiveHeap();
extern JKRExpHeap* zeldaHeap;
extern JKRExpHeap* gameHeap;
extern JKRExpHeap* archiveHeap;
#endif
+6
View File
@@ -0,0 +1,6 @@
#ifndef M_DO_M_DO_GRAPHIC_H
#define M_DO_M_DO_GRAPHIC_H
void mDoGph_Create();
#endif /* M_DO_M_DO_GRAPHIC_H */
+7
View File
@@ -0,0 +1,7 @@
#ifndef M_DO_M_DO_MACHINE_H
#define M_DO_M_DO_MACHINE_H
void mDoMch_Create();
void mDoMch_HeapCheckAll();
#endif /* M_DO_M_DO_MACHINE_H */
+12 -19
View File
@@ -9,17 +9,13 @@ class JKRExpHeap;
void version_check();
s32 LOAD_COPYDATE(void*);
#define HeapCheckTableNum 6
class HeapCheck {
public:
HeapCheck(JKRExpHeap* heap, const char* name, const char* jName) {
mName = name;
mJName = jName;
setHeap(heap);
}
void CheckHeap1(void);
s32 getUsedCount(void) const;
void heapDisplay(void) const;
void CheckHeap1();
s32 getUsedCount() const;
void heapDisplay();
u32& getUsedCountRef() { return mUsedCount; }
u32& getTotalUsedSizeRef() { return mTotalUsedSize; }
@@ -37,23 +33,20 @@ public:
u32 getRelUsedCount() const { return getUsedCount() - mUsedCount; }
u32 getRelTotalUsedSize() const { return mHeap->getTotalUsedSize() - mTotalUsedSize; }
private:
/* 0x00 */ const char* mName;
/* 0x04 */ const char* mJName;
/* 0x08 */ JKRExpHeap* mHeap;
/* 0x0C */ s32 mMaxTotalUsedSize;
/* 0x10 */ s32 mMaxTotalFreeSize;
/* 0x04 */ JKRExpHeap* mHeap;
/* 0x08 */ s32 mMaxTotalUsedSize;
/* 0x0C */ s32 mMaxTotalFreeSize;
/* 0x10 */ s32 field_0x10;
/* 0x14 */ s32 field_0x14;
/* 0x18 */ s32 field_0x18;
/* 0x1C */ u32 mTargetHeapSize;
/* 0x20 */ u32 mUsedCount;
/* 0x24 */ u32 mTotalUsedSize;
/* 0x18 */ u32 mTargetHeapSize;
/* 0x1C */ u32 mUsedCount;
/* 0x20 */ u32 mTotalUsedSize;
};
struct mDoMain {
static char COPYDATE_STRING[18];
static u32 memMargin;
static u8 mHeapBriefType;
static OSTime sPowerOnTime;
static OSTime sHungUpTime;
static s8 developmentMode;