several d_meter matches

.clangd

@@ -10,7 +10,7 @@ CompileFlags:
     "-Wsometimes-uninitialized",
     "-Wlogical-op-parentheses",
     "-Wbitwise-op-parentheses",
-    # "-Wunused-variable",
+    "-Wunused-variable",
     # "-Wunused-but-set-variable",
     "-Wunused-parameter",
     "-Wunused-but-set-parameter",

include/d/d_meter.h

@@ -731,7 +731,9 @@ public:
     /* 0x3025 */ s8 field_0x3025;
     /* 0x3026 */ u8 field_0x3026;
     /* 0x3027 */ u8 field_0x3027;
+#if VERSION > VERSION_DEMO
     /* 0x3028 */ u8 field_0x3028;
+#endif
     /* 0x3029 */ u8 field_0x3029;
     /* 0x302A */ u8 field_0x302a;
     /* 0x302B */ u8 field_0x302b[0x302C - 0x302B];

include/d/d_metronome.h

@@ -29,6 +29,8 @@ public:
 
 class dMetronome_c : public dDlst_base_c {
 public:
+    ~dMetronome_c() {}
+
     void screenSet();
     void metronomeMove();
     void melodyInit(u8);
@@ -43,8 +45,8 @@ public:
     void _delete();
     void _move();
     void _draw();
-    BOOL _open();
-    BOOL _close();
+    bool _open();
+    bool _close();
     void draw() { return _draw(); };
 
 public:

src/d/d_metronome.cpp

@@ -574,7 +574,7 @@ void dMetronome_c::_draw() {
 }
 
 /* 802233E4-80223478       .text _open__12dMetronome_cFv */
-BOOL dMetronome_c::_open() {
+bool dMetronome_c::_open() {
     if (!mbOpen) {
         for (s32 i = 0; i < 21; i++) {
             fopMsgM_setInitAlpha(&pane_timing[i]);
@@ -588,11 +588,11 @@ BOOL dMetronome_c::_open() {
         melodyInit(mBeat);
     }
     mbOpen = true;
-    return TRUE;
+    return true;
 }
 
 /* 80223478-80223534       .text _close__12dMetronome_cFv */
-BOOL dMetronome_c::_close() {
+bool dMetronome_c::_close() {
     mbOpen = false;
     if (!mbOpen) {  // nice bug
         for (s32 i = 0; i < 7; i++) {
@@ -611,5 +611,5 @@ BOOL dMetronome_c::_close() {
         fopMsgM_setNowAlphaZero(&pane_echo);
     }
 
-    return TRUE;
+    return true;
 }