mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-09 10:54:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_timer / d_bright_check done (#2034)

Browse Source 
* d_bright_check mostly fixed

* d_timer done

* remove asm
This commit is contained in:
TakaRikka
2024-01-17 03:04:43 -08:00
committed by GitHub
parent 6bea5f6fec
commit 2e9a945b7c
51 changed files with 1705 additions and 6121 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/meter/d_meter2_info.h
+11 -1
View File
@@ -150,8 +150,10 @@ public:
void setMsgKeyWaitTimer(s16 i_waitTimer) { mMsgKeyWaitTimer = i_waitTimer; }
u32 getMsgTimeMs() { return mMsgTimeMs; }
void setMsgTimeMs(u32 msgTime) { mMsgTimeMs = msgTime; }
void setTimeMs(s32 i_time) { mTimeMs = i_time; }
u32 getTimeMs() { return mTimeMs; }
u8 getNowCount() { return mNowCount; }
u8 getMaxCount() { return mMaxCount; }
void setScopeZoomPointer(u8 param_0) { mScopeZoomPointer = param_0; }
u8 getItemExplainWindowStatus() { return mItemExplainWindowStatus; }
void setItemExplainWindowStatus(u8 i_value) { mItemExplainWindowStatus = i_value; }
@@ -196,7 +198,7 @@ public:
/* 0x78 */ f32 m2DPosH;
/* 0x7C */ f32 m2DPosV;
/* 0x80 */ f32 unk128;
/* 0x84 */ u32 mTimeMs;
/* 0x84 */ s32 mTimeMs;
/* 0x88 */ u32 mMsgTimeMs;
/* 0x8C */ s32 mMeterString;
/* 0x90 */ u32 mTempBits;
@@ -593,10 +595,18 @@ inline void dMeter2Info_setMsgTimeMs(u32 msgTime) {
g_meter2_info.setMsgTimeMs(msgTime);
}
inline void dMeter2Info_setTimeMs(s32 i_time) {
g_meter2_info.setTimeMs(i_time);
}
inline u8 dMeter2Info_getNowCount() {
return g_meter2_info.getNowCount();
}
inline u8 dMeter2Info_getMaxCount() {
return g_meter2_info.getMaxCount();
}
inline void dMeter2Info_setScopeZoomPointer(u8 param_0) {
g_meter2_info.setScopeZoomPointer(param_0);
}
include/d/meter/d_meter_HIO.h
+24 -62
View File
@@ -438,68 +438,30 @@ public:
/* 0x000 */ // vtable
/* 0x004 */ u8 field_0x4[4];
/* 0x008 */ f32 field_0x8;
/* 0x00C */ f32 mRiverRideTargetCounterSizeY;
/* 0x010 */ f32 field_0x10;
/* 0x014 */ f32 field_0x14;
/* 0x018 */ f32 mRiverRideTargetCounterPosX;
/* 0x01C */ f32 field_0x1c;
/* 0x020 */ f32 field_0x20;
/* 0x024 */ f32 mRiverRideTargetCounterPosY;
/* 0x028 */ f32 field_0x28;
/* 0x02C */ f32 field_0x2c;
/* 0x030 */ f32 mRiverRideTargetCounterAlpha;
/* 0x034 */ f32 field_0x34;
/* 0x038 */ f32 mGoatTimerSizeX;
/* 0x03C */ f32 field_0x3c;
/* 0x040 */ f32 field_0x40;
/* 0x044 */ f32 mGoatTimerSizeY;
/* 0x048 */ f32 field_0x48;
/* 0x04C */ f32 field_0x4c;
/* 0x050 */ f32 mGoatTimerPosX;
/* 0x054 */ f32 field_0x54;
/* 0x058 */ f32 field_0x58;
/* 0x05C */ f32 mGoatTimerPosY;
/* 0x060 */ f32 field_0x60;
/* 0x064 */ f32 field_0x64;
/* 0x068 */ f32 mGoatTimerAlpha;
/* 0x06C */ f32 field_0x6c;
/* 0x070 */ f32 field_0x70;
/* 0x074 */ f32 mGoatCounterSizeX;
/* 0x078 */ f32 mRiverRideCounterSizeX;
/* 0x07C */ f32 mRiderGameCounterSizeX;
/* 0x080 */ f32 mGoatCounterSizeY;
/* 0x084 */ f32 mRiverRideCounterSizeY;
/* 0x088 */ f32 mRiderGameCounterSizeY;
/* 0x08C */ f32 mGoatCounterPosX;
/* 0x090 */ f32 mRiverRideCounterPosX;
/* 0x094 */ f32 mRiderGameCounterPosX;
/* 0x098 */ f32 mGoatCounterPosY;
/* 0x09C */ f32 mRiverRideCounterPosY;
/* 0x0A0 */ f32 mRiderGameCounterPosY;
/* 0x0A4 */ f32 mGoatCounterAlpha;
/* 0x0A8 */ f32 mRiverRideCounterAlpha;
/* 0x0AC */ f32 mRiderGameCounterAlpha;
/* 0x0B0 */ f32 mGoatIconSizeX;
/* 0x0B4 */ f32 mRiverRideTargetIconSizeX;
/* 0x0B8 */ f32 mRiderGameIconSizeX;
/* 0x0BC */ f32 mGoatIconSizeY;
/* 0x0C0 */ f32 mRiverRideTargetIconSizeY;
/* 0x0C4 */ f32 mRiderGameIconSizeY;
/* 0x0C8 */ f32 mGoatIconPosX;
/* 0x0CC */ f32 mRiverRideTargetIconPosX;
/* 0x0D0 */ f32 mRiderGameIconPosX;
/* 0x0D4 */ f32 mGoatIconPosY;
/* 0x0D8 */ f32 mRiverRideTargetIconPosY;
/* 0x0DC */ f32 mRiderGameIconPosY;
/* 0x0E0 */ f32 mGoatIconAlpha;
/* 0x0E4 */ f32 mRiverRideTargetIconAlpha;
/* 0x0E8 */ f32 mRiderGameIconAlpha;
/* 0x0EC */ f32 mGoatTimerSizeX_4x3;
/* 0x0F0 */ f32 mGoatTimerSizeY_4x3;
/* 0x0F4 */ f32 mGoatTimerPosX_4x3;
/* 0x0F8 */ f32 mGoatTimerPosY_4x3;
/* 0x0FC */ f32 mGoatIconPosX_4x3;
/* 0x008 */ f32 field_0x8[3];
/* 0x014 */ f32 field_0x14[3];
/* 0x020 */ f32 field_0x20[3];
/* 0x02C */ f32 field_0x2c[3];
/* 0x038 */ f32 mTimerSizeX[3];
/* 0x044 */ f32 mTimerSizeY[3];
/* 0x050 */ f32 mTimerPosX[3];
/* 0x05C */ f32 mTimerPosY[3];
/* 0x068 */ f32 mTimerAlpha[3];
/* 0x074 */ f32 mCounterSizeX[3];
/* 0x080 */ f32 mCounterSizeY[3];
/* 0x08C */ f32 mCounterPosX[3];
/* 0x098 */ f32 mCounterPosY[3];
/* 0x0A4 */ f32 mCounterAlpha[3];
/* 0x0B0 */ f32 mIconSizeX[3];
/* 0x0BC */ f32 mIconSizeY[3];
/* 0x0C8 */ f32 mIconPosX[3];
/* 0x0D4 */ f32 mIconPosY[3];
/* 0x0E0 */ f32 mIconAlpha[3];
/* 0x0EC */ f32 mTimerSizeX_4x3;
/* 0x0F0 */ f32 mTimerSizeY_4x3;
/* 0x0F4 */ f32 mTimerPosX_4x3;
/* 0x0F8 */ f32 mTimerPosY_4x3;
/* 0x0FC */ f32 mIconPosX_4x3;
/* 0x100 */ f32 mRiverRideIconPosX_4x3;
/* 0x104 */ f32 mRiderGameIconPosX_4x3;
/* 0x108 */ f32 mGetInTextSizeX;