3 files changed, 58 insertions, 9 deletions
diff --git a/include/d/lyt/d_lyt_meter_configuration.h b/include/d/lyt/d_lyt_meter_configuration.h
index 181c0db4..87c29f01 100644
--- a/include/d/lyt/d_lyt_meter_configuration.h
+++ b/include/d/lyt/d_lyt_meter_configuration.h
@@ -12,6 +12,22 @@ public:
         return sInstance;
     }
 
+    f32 getField_0x1CC() const {
+        return field_0x1CC;
+    }
+
+    f32 getField_0x1D0() const {
+        return field_0x1D0;
+    }
+
+    f32 getField_0x1C4() const {
+        return field_0x1C4;
+    }
+
+    s32 getField_0x1C8() const {
+        return field_0x1C8;
+    }
+
     s32 getField_0x1D8() const {
         return field_0x1D8;
     }
diff --git a/include/d/lyt/meter/d_lyt_meter_shield_gauge.h b/include/d/lyt/meter/d_lyt_meter_shield_gauge.h
index 55e87c8f..9e1bf848 100644
--- a/include/d/lyt/meter/d_lyt_meter_shield_gauge.h
+++ b/include/d/lyt/meter/d_lyt_meter_shield_gauge.h
@@ -2,8 +2,8 @@
 #define D_LYT_METER_SHIELD_GAUGE_H
 
 #include "d/lyt/d2d.h"
+#include "nw4r/lyt/lyt_pane.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
 
 class dLytMeterShieldGauge_c : public d2d::dSubPane {
 public:
@@ -11,25 +11,57 @@ 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 ~dLytMeterShieldGauge_c() {}
 
     void setContainerGroup(d2d::AnmGroup_c *g) {
         mpContainerAnmGroup = g;
     }
+
 private:
+    s32 getLytFrameForShield(s32) const;
+    void setLevel(f32 level);
+    f32 calcUpdownRatio(f32) const;
+
     STATE_FUNC_DECLARE(dLytMeterShieldGauge_c, Normal);
     STATE_FUNC_DECLARE(dLytMeterShieldGauge_c, Use);
     STATE_FUNC_DECLARE(dLytMeterShieldGauge_c, ToMax);
 
-    UI_STATE_MGR_DECLARE(dLytMeterShieldGauge_c);
-    d2d::dLytSub mLyt;
-    /* 0x0D8 */ d2d::AnmGroup_c mAnmGroups[8];
-    /* 0x??? */ d2d::AnmGroup_c *mpContainerAnmGroup;
-    /* 0x??? */ u8 padding[0x130C4 - 0x13080];
+    /* 0x008 */ UI_STATE_MGR_DECLARE(dLytMeterShieldGauge_c);
+    /* 0x044 */ d2d::dLytSub mLyt;
+    /* 0x0D8 */ d2d::AnmGroup_c mAnm[8];
+    /* 0x2D8 */ d2d::AnmGroup_c *mpContainerAnmGroup;
+    /* 0x2DC */ nw4r::lyt::Pane *mpOwnerPane;
+    /* 0x2E0 */ f32 field_0x2E0;
+    /* 0x2E4 */ f32 field_0x2E4;
+    /* 0x2E8 */ f32 field_0x2E8;
+    /* 0x2EC */ f32 field_0x2EC;
+    /* 0x2F0 */ f32 field_0x2F0;
+    /* 0x2F4 */ f32 field_0x2F4;
+    /* 0x2F8 */ f32 field_0x2F8;
+    /* 0x2FC */ s32 field_0x2FC;
+    /* 0x300 */ f32 field_0x300;
+    /* 0x304 */ f32 field_0x304;
+    /* 0x308 */ s32 field_0x308;
+    /* 0x30C */ u8 field_0x30C;
+    /* 0x30D */ u8 field_0x30D;
+    /* 0x30E */ u8 field_0x30E;
+    /* 0x310 */ s32 field_0x310;
+    /* 0x314 */ s32 field_0x314;
+    /* 0x318 */ s32 field_0x318;
+    /* 0x31C */ u8 field_0x31C;
+    /* 0x31D */ u8 field_0x31D;
+    /* 0x31E */ u8 field_0x31E;
+    /* 0x31F */ u8 field_0x31F;
 };
 
 #endif
diff --git a/include/toBeSorted/small_sound_mgr.h b/include/toBeSorted/small_sound_mgr.h
index 9c56dab9..06978ad1 100644
--- a/include/toBeSorted/small_sound_mgr.h
+++ b/include/toBeSorted/small_sound_mgr.h
@@ -6472,6 +6472,7 @@ enum WZSound {
 class SmallSoundManager {
 public:
     void playSound(WZSound id);
+    void playSoundWithPitch(WZSound id, f32 pitch);
     void playButtonPressSoundWhenAdvancingTextBoxes(f32);
 
     static SmallSoundManager *GetInstance() {