mirror of https://github.com/zeldaret/tp.git
fixes
This commit is contained in:
parent
a08f84abd5
commit
ec0a057c82
|
@ -10,7 +10,7 @@
|
||||||
#include "dolphin/gx/GX.h"
|
#include "dolphin/gx/GX.h"
|
||||||
#include "dolphin/types.h"
|
#include "dolphin/types.h"
|
||||||
|
|
||||||
typedef void (*UnkFunc)(void);
|
typedef void (*JFWDisplayUnkFunc)(void);
|
||||||
|
|
||||||
class JFWAlarm : public OSAlarm {
|
class JFWAlarm : public OSAlarm {
|
||||||
public:
|
public:
|
||||||
|
@ -97,7 +97,7 @@ private:
|
||||||
/* 0x38 */ int field_0x38;
|
/* 0x38 */ int field_0x38;
|
||||||
/* 0x3C */ int field_0x3c;
|
/* 0x3C */ int field_0x3c;
|
||||||
/* 0x40 */ bool field_0x40;
|
/* 0x40 */ bool field_0x40;
|
||||||
/* 0x44 */ UnkFunc field_0x44;
|
/* 0x44 */ JFWDisplayUnkFunc field_0x44;
|
||||||
/* 0x48 */ s16 field_0x48;
|
/* 0x48 */ s16 field_0x48;
|
||||||
/* 0x4A */ u8 field_0x4a;
|
/* 0x4A */ u8 field_0x4a;
|
||||||
};
|
};
|
||||||
|
|
|
@ -19,7 +19,7 @@ public:
|
||||||
}
|
}
|
||||||
|
|
||||||
void end() {
|
void end() {
|
||||||
field_0x4 = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 >> 2) / 125000);
|
field_0x4 = ((OSGetTick() - mTick) * 8) / ((*(u32*)0x800000F8 / 4) / 125000);
|
||||||
if (field_0x4 == 0) {
|
if (field_0x4 == 0) {
|
||||||
field_0x4 = 1;
|
field_0x4 = 1;
|
||||||
}
|
}
|
||||||
|
|
|
@ -681,7 +681,7 @@ static void JFWDrawDoneAlarm() {
|
||||||
s32 status = OSDisableInterrupts();
|
s32 status = OSDisableInterrupts();
|
||||||
alarm.createAlarm();
|
alarm.createAlarm();
|
||||||
alarm.appendLink();
|
alarm.appendLink();
|
||||||
OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 >> 2), JFWGXAbortAlarmHandler);
|
OSSetAlarm(&alarm, 0.5 * (*(u32*)0x800000F8 / 4), JFWGXAbortAlarmHandler);
|
||||||
GXDrawDone();
|
GXDrawDone();
|
||||||
alarm.cancelAlarm();
|
alarm.cancelAlarm();
|
||||||
alarm.removeLink();
|
alarm.removeLink();
|
||||||
|
|
Loading…
Reference in New Issue