jpn/pal fix

This commit is contained in:
Jasper St. Pierre
2023-10-13 19:40:46 -07:00
parent a5641b0ba9
commit fca11f6233
8 changed files with 76 additions and 28 deletions
+6 -2
View File
@@ -417,7 +417,7 @@ public:
/* 0x47EC */ JKRArchive* mpCamResArchive;
/* 0x47F0 */ JKRArchive* mpSwimResArchive;
/* 0x47F4 */ JKRArchive* mpWindResArchive;
#if VERSION != VERSION_JP
#if VERSION != VERSION_JPN
/* 0x47F8 */ JKRArchive* mpEnglishTextArchive;
/* 0x47FC */ JKRArchive* mpHyruleTextArchive;
/* 0x4800 */ u8 mCARDHeap0[0x04];
@@ -565,7 +565,7 @@ public:
/* 0x1D1C1 */ u8 field_0x1d1c1;
};
#if VERSION != VERSION_JP
#if VERSION != VERSION_JPN
STATIC_ASSERT(sizeof(dComIfG_inf_c) == 0x1D1C8);
#endif
@@ -1458,6 +1458,10 @@ inline void dComIfGp_event_offEventFlag(s16 flag) {
g_dComIfG_gameInfo.play.getEvent().offEventFlag(flag);
}
inline void dComIfGp_event_remove() {
g_dComIfG_gameInfo.play.getEvent().remove();
}
inline void dComIfGp_event_reset() {
g_dComIfG_gameInfo.play.getEvent().reset();
}
+1 -1
View File
@@ -17,7 +17,7 @@ struct mDoRstData {
class mDoRst {
public:
#if VERSION != VERSION_JP
#if VERSION != VERSION_JPN
static void set3ButtonResetPort(int port) { mResetData->m3ButtonResetPort = port; }
static void off3ButtonReset() { mResetData->m3ButtonReset = 0; }
static void offResetPrepare() { mResetData->mResetPrepare = 0; }