mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-09-06 18:51:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_seafightgame, m_Do_machine_exception, m_Do_reset, m_Do_DVDError OK (#41)

Browse Source 
* m_Do_machine_exception OK

* m_Do_Reset OK

* m_Do_DVDError OK

* some fixes for JP

* JP OK again

* d_seafightgame OK

* cleanup m_Do_Reset a bit
This commit is contained in:
TakaRikka
2023-09-16 13:46:37 -07:00
committed by GitHub
parent f00e07e4c4
commit 00fe8a0873
13 changed files with 515 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/m_Do/m_Do_DVDError.h
+8
View File
@@ -0,0 +1,8 @@
#ifndef M_DO_M_DO_DVD_ERROR_H
#define M_DO_M_DO_DVD_ERROR_H
#include "dolphin/types.h"
void mDoDvdErr_ThdCleanup();
#endif /* M_DO_M_DO_DVD_ERROR_H */
include/m_Do/m_Do_Reset.h
+22 -22
View File
@@ -13,22 +13,11 @@ struct mDoRstData {
/* 0x04 */ int mResetPrepare;
/* 0x08 */ int m3ButtonReset;
/* 0x0C */ int m3ButtonResetPort;
/* 0x10 */ bool mShutdown;
/* 0x11 */ bool mReturnToMenu;
/* 0x12 */ u8 mLogoScnFlag;
/* 0x13 */ u8 mProgSeqFlag;
/* 0x14 */ u8 mProgChgFlag;
/* 0x15 */ u8 mWarningDispFlag;
}; // Size = 0x18
}; // Size = 0x10
class mDoRst {
public:
static void offReturnToMenu() { mResetData->mReturnToMenu = false; }
static void offShutdown() { mResetData->mShutdown = false; }
static void setWarningDispFlag(u8 flag) { mResetData->mWarningDispFlag = flag; }
static void setProgChgFlag(u8 flag) { mResetData->mProgChgFlag = flag; }
static void setProgSeqFlag(u8 flag) { mResetData->mProgSeqFlag = flag; }
static void setLogoScnFlag(u8 flag) { mResetData->mLogoScnFlag = flag; }
#if VERSION != VERSION_JP
static void set3ButtonResetPort(int port) { mResetData->m3ButtonResetPort = port; }
static void off3ButtonReset() { mResetData->m3ButtonReset = 0; }
static void offResetPrepare() { mResetData->mResetPrepare = 0; }
@@ -36,24 +25,35 @@ public:
mResetData->mReset = 0;
mResetData->mResetPrepare = 0;
}
static u8 getLogoScnFlag() { return mResetData->mLogoScnFlag; }
static u8 getProgSeqFlag() { return mResetData->mProgSeqFlag; }
static u8 getWarningDispFlag() { return mResetData->mWarningDispFlag; }
static BOOL isReturnToMenu() { return mResetData->mReturnToMenu; }
static BOOL isShutdown() { return mResetData->mShutdown; }
static int isReset() { return mResetData->mReset; }
static int get3ButtonResetPort() { return mResetData->m3ButtonResetPort; }
static int is3ButtonReset() { return mResetData->m3ButtonReset; }
static void onReset() { mResetData->mReset = 1; }
static void onReturnToMenu() { mResetData->mReturnToMenu = true; }
static void on3ButtonReset() { mResetData->m3ButtonReset = 1; }
static void onShutdown() { mResetData->mShutdown = true; }
static mDoRstData* getResetData();
static mDoRstData* i_getResetData() { return mResetData; }
static mDoRstData* getResetData() { return mResetData; }
static void setResetData(mDoRstData* rstData) { mResetData = rstData; }
static mDoRstData* mResetData;
#else
static void set3ButtonResetPort(int port) { m3ButtonResetPort = port; }
static void off3ButtonReset() { m3ButtonResetFlag = 0; }
static void offResetPrepare() { mResetPrepare = 0; }
static void offReset() {
mResetFlag = 0;
mResetPrepare = 0;
}
static int isReset() { return mResetFlag; }
static int get3ButtonResetPort() { return m3ButtonResetPort; }
static int is3ButtonReset() { return m3ButtonResetFlag; }
static void onReset() { mResetFlag = 1; }
static void on3ButtonReset() { m3ButtonResetFlag = 1; }
static int mResetPrepare;
static int mResetFlag;
static int m3ButtonResetFlag;
static int m3ButtonResetPort;
#endif
};
extern bool mDoDvdErr_initialized;
include/m_Do/m_Do_audio.h
+1
View File
@@ -16,6 +16,7 @@ public:
static void offResetFlag() { mResetFlag = false; }
static bool isInitFlag() { return mInitFlag; }
static void offInitFlag() { mInitFlag = false; }
static bool isBgmSet() { return mBgmSet; }
static void offBgmSet() { mBgmSet = false; }
include/m_Do/m_Do_machine_exception.h
+16
View File
@@ -0,0 +1,16 @@
#ifndef M_DO_M_DO_MACHINE_EXCEPTION_H
#define M_DO_M_DO_MACHINE_EXCEPTION_H
#include "dolphin/types.h"
class JUTConsole;
void print_f(char const*, ...);
void print(char const*);
void dispHeapInfo();
void dispGameInfo();
void dispDateInfo();
void dispConsoleToTerminal();
void exception_addition(JUTConsole* pConsole);
#endif /* M_DO_M_DO_MACHINE_EXCEPTION_H */