diff --git a/include/JSystem/JFramework/JFWDisplay.h b/include/JSystem/JFramework/JFWDisplay.h index ec61c69e860..925954c2458 100644 --- a/include/JSystem/JFramework/JFWDisplay.h +++ b/include/JSystem/JFramework/JFWDisplay.h @@ -10,7 +10,7 @@ #include "dolphin/gx/GX.h" #include "dolphin/types.h" -typedef void (*UnkFunc)(void); +typedef void (*JFWDisplayUnkFunc)(void); class JFWAlarm : public OSAlarm { public: @@ -97,7 +97,7 @@ private: /* 0x38 */ int field_0x38; /* 0x3C */ int field_0x3c; /* 0x40 */ bool field_0x40; - /* 0x44 */ UnkFunc field_0x44; + /* 0x44 */ JFWDisplayUnkFunc field_0x44; /* 0x48 */ s16 field_0x48; /* 0x4A */ u8 field_0x4a; }; diff --git a/include/JSystem/JUtility/JUTProcBar.h b/include/JSystem/JUtility/JUTProcBar.h index 79e3b3538d7..d3028409276 100644 --- a/include/JSystem/JUtility/JUTProcBar.h +++ b/include/JSystem/JUtility/JUTProcBar.h @@ -19,7 +19,7 @@ public: } void end() { - field_0x4 = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 >> 2) / 125000); + field_0x4 = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 / 4) / 125000); if (field_0x4 == 0) { field_0x4 = 1; } diff --git a/libs/JSystem/JFramework/JFWDisplay.cpp b/libs/JSystem/JFramework/JFWDisplay.cpp index 149572c9439..b169903d44c 100644 --- a/libs/JSystem/JFramework/JFWDisplay.cpp +++ b/libs/JSystem/JFramework/JFWDisplay.cpp @@ -681,7 +681,7 @@ static void JFWDrawDoneAlarm() { s32 status = OSDisableInterrupts(); alarm.createAlarm(); alarm.appendLink(); - OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 >> 2), JFWGXAbortAlarmHandler); + OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 / 4), JFWGXAbortAlarmHandler); GXDrawDone(); alarm.cancelAlarm(); alarm.removeLink();