A start

2 files changed, 21 insertions, 12 deletions

diff --git a/include/d/lyt/meter/d_lyt_meter.h b/include/d/lyt/meter/d_lyt_meter.h
index 972144d7..d5eebc37 100644
--- a/include/d/lyt/meter/d_lyt_meter.h
+++ b/include/d/lyt/meter/d_lyt_meter.h
@@ -91,7 +91,7 @@ public:
 
     bool isNotSilentRealmOrLoftwing();
 
-    bool fn_800C9F70();
+    bool shouldHideLytClef();
     bool fn_800C9FE0();
     bool isPopupOpen();
 
@@ -102,7 +102,7 @@ public:
     void fn_800D5630();
     bool isInModeMap();
     bool isInModePause();
-    bool fn_800D56B0();
+    bool shouldBeHiddenGeneral();
     void checkPaneVisibility();
     bool execute();
 
@@ -198,7 +198,7 @@ private:
     /* 0x13772 */ bool field_0x13772;
     /* 0x13773 */ bool field_0x13773;
     /* 0x13774 */ bool mHelpOpen;
-    /* 0x13775 */ bool field_0x13775;
+    /* 0x13775 */ bool mIsCollectingTadtoneScroll;
     /* 0x13776 */ bool mTimerVisible;
     /* 0x13777 */ bool mBirdGaugeVisible;
     /* 0x13778 */ bool mSkyGaugeVisible;
@@ -310,8 +310,8 @@ public:
         mMain.mHelpOpen = val;
     }
 
-    void setMeterField_0x13775(bool val) {
-        mMain.field_0x13775 = val;
+    void setIsCollectingTadtoneScroll(bool val) {
+        mMain.mIsCollectingTadtoneScroll = val;
     }
 
     bool getMeterField_0x1377F() const {
@@ -334,6 +334,12 @@ public:
         mFlags = 0xFFFFFFFF;
     }
 
+    static void setGanbariClefRelated(bool arg) {
+        if (sInstance != nullptr) {
+            sInstance->mMain.mGanbariGauge.setClefRelated(arg);
+        }
+    }
+
     static dLytMeterCrossBtn_c::CrossIcon_e getCrossIconDown() {
         if (sInstance != nullptr) {
             return sInstance->mMain.mCrossBtn.getIconDown();
@@ -452,9 +458,9 @@ public:
         }
     }
 
-    static bool getfn_800C9F70() {
+    static bool shouldHideLytClef() {
         if (sInstance != nullptr) {
-            return sInstance->mMain.fn_800C9F70();
+            return sInstance->mMain.shouldHideLytClef();
         } else {
             return false;
         }
diff --git a/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h b/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h
index 2356a36f..4140f60d 100644
--- a/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h
+++ b/include/d/lyt/meter/d_lyt_meter_ganbari_gauge.h
@@ -35,6 +35,10 @@ public:
         mStaminaPercent = value;
     }
 
+    void setClefRelated(bool v) {
+        mClefRelated = v;
+    }
+
     void setField_0x539(bool v) {
         field_0x539 = v;
     }
@@ -87,12 +91,11 @@ private:
     /* 0x548 */ s32 field_0x548;
     /* 0x54C */ f32 field_0x54C;
     /* 0x550 */ f32 field_0x550;
-
     /* 0x554 */ f32 field_0x554;
-    u8 field_0x558;
-    u8 field_0x559;
-    bool field_0x55A;
-    u8 field_0x55B;
+    /* 0x558 */ u8 field_0x558;
+    /* 0x559 */ bool mClefRelated;
+    /* 0x55A */ bool field_0x55A;
+    /* 0x55B */ u8 field_0x55B;
 };
 
 STATIC_ASSERT(sizeof(dLytMeterGanbariGauge_c) == 0x55C);