d_lyt_meter_heart halfway

4 files changed, 51 insertions, 8 deletions

diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 2adfe26a..692bb763 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -251,6 +251,12 @@ public:
     /* 0x3C8 */ nw4r::g3d::ResFile mSwordRes;
     /* 0x3CC */ u8 _0x3CC[0x5B4 - 0x3CC];
     /* 0x5B4 */ m3d::anmMatClr_c mAnmMatClr;
+    /* 0x5E0 */ u8 _0x5E0[0x4564 - 0x5E0];
+    /* 0x4564 */ f32 field_0x4564;
+
+    f32 getField_0x4564() const {
+        return field_0x4564;
+    }
 
     f32 getAnmMatClrFrame() const {
         return mAnmMatClr.getFrame(0);
@@ -310,6 +316,8 @@ public:
     static s32 getCurrentBugNetType();
 
     static bool isItemRestrictedByBokoBase(ITEM_ID item);
+
+    static u32 getCurrentHealthCapacity();
 };
 
 #endif
diff --git a/include/d/lyt/meter/d_lyt_meter_heart.h b/include/d/lyt/meter/d_lyt_meter_heart.h
index 9fa52725..c1e60d93 100644
--- a/include/d/lyt/meter/d_lyt_meter_heart.h
+++ b/include/d/lyt/meter/d_lyt_meter_heart.h
@@ -2,6 +2,7 @@
 #define D_LYT_METER_HEART_H
 
 #include "d/lyt/d2d.h"
+#include "nw4r/lyt/lyt_pane.h"
 
 class dLytMeterHeart_c : public d2d::dSubPane {
 public:
@@ -9,16 +10,46 @@ public:
     virtual bool build(d2d::ResAccIf_c *resAcc) override;
     virtual bool remove() override;
     virtual bool execute() override;
-    virtual nw4r::lyt::Pane *getPane() override;
-    virtual d2d::LytBase_c *getLyt() override;
-    virtual const char *getName() const override;
+    virtual nw4r::lyt::Pane *getPane() override {
+        return mLyt.getLayout()->GetRootPane();
+    }
+    virtual d2d::LytBase_c *getLyt() override {
+        return &mLyt;
+    }
+    virtual const char *getName() const override {
+        return mLyt.getName();
+    }
 
     virtual ~dLytMeterHeart_c() {}
+
 private:
+    u8 getCurrentHealth() const;
+    u8 getCurrentHealthCapacity() const;
+    void realizeHeartsState();
+    void executeInternal();
+    s32 getNumDisplayedHearts() const;
+    s32 getDisplayedHealthCapacity() const;
 
-    d2d::dLytSub mLyt;
-    /* 0xD8 */ d2d::AnmGroup_c mAnm[26];
-    /* 0x??? */ u8 padding[0x12DA4 - 0x12D24];
+    /* 0x008 */ d2d::dLytSub mLyt;
+    /* 0x09C */ d2d::AnmGroup_c mAnm[26];
+    /* 0x71C */ nw4r::lyt::Pane *mpHeartPanes[20];
+    /* 0x76C */ nw4r::lyt::Pane *mpAlphaPane;
+    /* 0x770 */ nw4r::lyt::Pane *mpMainPane;
+    /* 0x774 */ s32 mCurrentHealth;
+    /* 0x778 */ s32 mCurrentHealthCapacity;
+    /* 0x77C */ s32 mStoredHealth;
+    /* 0x780 */ s32 mStoredHealthCapacity;
+    /* 0x784 */ s32 field_0x784;
+    /* 0x788 */ s32 field_0x788;
+    /* 0x78C */ s32 field_0x78C;
+    /* 0x790 */ s32 field_0x790;
+    /* 0x794 */ u8 field_0x794;
+    /* 0x795 */ u8 field_0x795;
+    /* 0x796 */ u8 field_0x796;
+    /* 0x797 */ u8 field_0x797;
+    /* 0x798 */ u8 field_0x798;
+    /* 0x799 */ u8 field_0x799;
+    /* 0x79A */ u8 field_0x79A;
 };
 
 #endif
diff --git a/include/d/lyt/meter/d_lyt_meter_key.h b/include/d/lyt/meter/d_lyt_meter_key.h
index 57a5c05a..e6f444b2 100644
--- a/include/d/lyt/meter/d_lyt_meter_key.h
+++ b/include/d/lyt/meter/d_lyt_meter_key.h
@@ -26,6 +26,8 @@ private:
     STATE_FUNC_DECLARE(dLytMeterKakeraKey_c, Active);
     STATE_FUNC_DECLARE(dLytMeterKakeraKey_c, Off);
 
+    STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytMeterKakeraKey_c);
+
     /* 0x000 */ UI_STATE_MGR_DECLARE(dLytMeterKakeraKey_c);
     /* 0x03C */ d2d::dLytSub mLyt;
     /* 0x0D0 */ d2d::AnmGroup_c mAnm[8];
@@ -61,6 +63,8 @@ private:
     STATE_FUNC_DECLARE(dLytMeterBossKey_c, Active);
     STATE_FUNC_DECLARE(dLytMeterBossKey_c, Off);
 
+    STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytMeterBossKey_c);
+
     /* 0x004 */ UI_STATE_MGR_DECLARE(dLytMeterBossKey_c);
     /* 0x040 */ d2d::dLytSub mLyt;
     /* 0x0D4 */ d2d::AnmGroup_c mAnm[5];
@@ -94,6 +98,8 @@ private:
     STATE_FUNC_DECLARE(dLytMeterSmallKey_c, Active);
     STATE_FUNC_DECLARE(dLytMeterSmallKey_c, Off);
 
+    STATE_MGR_DEFINE_UTIL_CHANGESTATE(dLytMeterSmallKey_c);
+
     /* 0x004 */ UI_STATE_MGR_DECLARE(dLytMeterSmallKey_c);
     /* 0x040 */ d2d::dLytSub mLyt;
     /* 0x0D4 */ d2d::AnmGroup_c mAnm[5];
diff --git a/include/d/lyt/meter/d_lyt_meter_timer.h b/include/d/lyt/meter/d_lyt_meter_timer.h
index 3630de19..6e4fe817 100644
--- a/include/d/lyt/meter/d_lyt_meter_timer.h
+++ b/include/d/lyt/meter/d_lyt_meter_timer.h
@@ -4,8 +4,6 @@
 #include "d/lyt/d2d.h"
 #include "m/m_color.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
-
 
 class LytMeterTimerPart1_c : public d2d::dSubPane {
 public: