Delta time meters

include/d/actor/d_a_balloon_2D.h

@@ -72,7 +72,7 @@ public:
     struct ScoreCount {
         cXyz field_0x0;
         u16 field_0xc;
-        u8 field_0xe;
+        DUSK_IF_ELSE(f32, u8) field_0xe;
         u8 field_0xf;
     };
 

include/d/d_meter_button.h

@@ -255,7 +255,7 @@ public:
     /* 0x4B2 */ u16 mMsgID;
     /* 0x4B4 */ s16 field_0x4b4;
     /* 0x4B6 */ s16 field_0x4b6;
-    /* 0x4B8 */ s16 field_0x4b8[2];
+    /* 0x4B8 */ DUSK_IF_ELSE(f32, s16) field_0x4b8[2];
     /* 0x4BC */ u8 field_0x4bc[2];
     /* 0x4BE */ u8 field_0x4be[2];
     /* 0x4C0 */ bool mPlayedButtonSound[BUTTON_NUM];
@@ -344,10 +344,8 @@ public:
     /* 0x624 */ f32 mMidonaPosX;
     /* 0x628 */ f32 mMidonaPosY;
     /* 0x62C */ f32 mMidonaScale;
-
-#ifdef TARGET_PC
-    bool mWasListen[2];
-    bool mWasRepeat[2];
+#if TARGET_PC
+    u16 mBlinkButton = 0;
 #endif
 };
 

include/d/d_meter_map.h

@@ -4,6 +4,10 @@
 #include "d/d_map_path_dmap.h"
 #include "JSystem/JHostIO/JORReflexible.h"
 
+#if TARGET_PC
+#include "global.h"
+#endif
+
 class J2DPicture;
 class dMap_c;
 class dMap_HIO_c;
@@ -111,13 +115,16 @@ public:
     /* 0x1C */ f32 mDrawPosY;
     /* 0x20 */ f32 mSizeW;
     /* 0x24 */ f32 mSizeH;
-    /* 0x28 */ s16 mSlidePositionOffset;
+    /* 0x28 */ DUSK_IF_ELSE(f32, s16) mSlidePositionOffset;
     /* 0x2A */ u8 field_0x2a;
     /* 0x2B */ u8 field_0x2b;
     /* 0x2C */ u8 mMapAlpha;
     /* 0x2D */ u8 mMapIsInside;
     /* 0x2E */ u8 field_0x2e;
     /* 0x30 */ int field_0x30;
+#if TARGET_PC
+    f32 mSlidePositionOffsetTarget;
+#endif
 };
 
 #endif /* D_METER_D_METER_MAP_H */

include/d/d_meter_string.h

@@ -17,7 +17,12 @@ public:
     virtual int _execute(u32);
     virtual int _delete();
 
-    f32 acc(s16 param_0, s16 param_1, s16 param_2) {
+    f32 acc(DUSK_IF_ELSE(f32, s16) param_0, DUSK_IF_ELSE(f32, s16) param_1, DUSK_IF_ELSE(f32, s16) param_2) {
+#if TARGET_PC
+        if (param_0 == param_2) {
+            return 1.0f;
+        }
+#endif
         return ((f32)(param_1 - param_2) * (f32)(param_1 - param_2)) / ((f32)(param_0 - param_2) * (f32)(param_0 - param_2));
     }
 

include/d/d_timer.h

@@ -57,6 +57,9 @@ public:
 #endif
     void drawPikari(int);
 
+#if TARGET_PC
+    void presentAnims();
+#endif
     virtual void draw();
     virtual ~dDlst_TimerScrnDraw_c();
 
@@ -68,10 +71,15 @@ public:
     void resetCowID() { mCowID = 0; }
     bool isVisible() { return mTimerVisible; }
 
-    f32 acc(s16 param_0, s16 param_1, s16 param_2) {
+    f32 acc(DUSK_IF_ELSE(f32, s16) param_0, DUSK_IF_ELSE(f32, s16) param_1, DUSK_IF_ELSE(f32, s16) param_2) {
+#if TARGET_PC
+        if (param_0 == param_2) {
+            return 1.0f;
+        }
+#endif
         return ((f32)(param_1 - param_2) * (f32)(param_1 - param_2)) / ((f32)(param_0 - param_2) * (f32)(param_0 - param_2));
     }
-    
+
     void setTimerTrans(f32 x, f32 y) {
         mTimerTransX = x;
         mTimerTransY = y;
@@ -103,7 +111,7 @@ public:
     /* 0x3CC */ int field_0x3CC;
     /* 0x3D0 */ int field_0x3D0;
     /* 0x3D4 */ int field_0x3D4;
-    /* 0x3D8 */ int field_0x3D8;
+    /* 0x3D8 */ DUSK_IF_ELSE(f32, int) field_0x3D8;
     /* 0x3DC */ u8 mCowID;
     /* 0x3DD */ u8 mHIOType;
     /* 0x3DE */ u8 field_0x3DE;
@@ -111,6 +119,12 @@ public:
     /* 0x3E0 */ u8 field_0x3E0;
     /* 0x3E1 */ u8 mTimerVisible;
     /* 0x3E2 */ u8 field_0x3e2;
+#if TARGET_PC
+    bool mPresentStep = false;
+    bool mPresentOpening = false;
+    bool mPresentClosing = false;
+    bool mPresentTimerSlide = false;
+#endif
 };
 
 class dTimer_c : public msg_class {