Fix beat/melody var names

include/JAZelAudio/JAIZelInst.h

@@ -24,8 +24,8 @@ public:
     void melodyPlay(s32);
     void melodyStop();
 
-    u8 getBeat() { return mMelodyNum; }
-    f32 getBeatFrames() { return field_0x30; }
+    u8 getBeat() { return mBeat; }
+    f32 getBeatFrames() { return mBeatFrames; }
 
 public:
     /* 0x00 */ int field_0x0;
@@ -35,12 +35,12 @@ public:
     /* 0x14 */ int field_0x14;
     /* 0x18 */ u8 field_0x18[0x1e - 0x18];
     /* 0x1E */ u8 field_0x1e;
-    /* 0x1F */ u8 mMelodyNum;
+    /* 0x1F */ u8 mBeat;
     /* 0x20 */ f32 field_0x20;
     /* 0x24 */ f32 field_0x24;
     /* 0x28 */ f32 field_0x28;
     /* 0x2C */ f32 field_0x2c;
-    /* 0x30 */ f32 field_0x30;
+    /* 0x30 */ f32 mBeatFrames;
     /* 0x34 */ u8 field_0x34;
     /* 0x38 */ int field_0x38;
     /* 0x3C */ int field_0x3c;

include/d/actor/d_a_obj_mknjd.h

@@ -27,7 +27,7 @@ namespace daObjMknjD {
         void anmAtr(u16) {}
         u32 getMsg() {
             if (m0500 == 0) {
-                dComIfGp_setMelodyNum(mTactMode);
+                dComIfGp_setMelodyNum(mMelodyNum);
                 return 0x05B3;
             }
             else {
@@ -84,7 +84,7 @@ namespace daObjMknjD {
         /* 0x04E0 */ s16 mErrorEventIdx;
         /* 0x04E2 */ s16 mLessonEventIdx;
         /* 0x04E4 */ s8 mActionIdx;
-        /* 0x04E5 */ u8 mTactMode;
+        /* 0x04E5 */ u8 mMelodyNum;
         /* 0x04E6 */ u8 mGiveItemNo;
         /* 0x04E8 */ cXyz mGoalPos;
         /* 0x04F4 */ u32 mMsgNo;

include/d/actor/d_a_player.h

@@ -148,7 +148,7 @@ public:
         daPyRFlg0_UNK80000              = 0x00080000,
         daPyRFlg0_POISON_CURSE          = 0x00100000,
         daPyRFlg0_GRAB_PUT_START        = 0x00400000,
-        daPyRFlg0_TACT_INPUT              = 0x01000000,
+        daPyRFlg0_TACT_INPUT            = 0x01000000,
         daPyRFlg0_FAIRY_USE             = 0x02000000,
         daPyRFlg0_UNK8000000            = 0x08000000,
         daPyRFlg0_UNK10000000           = 0x10000000,

include/d/d_metronome.h

@@ -62,7 +62,7 @@ public:
     /* 0xE18 */ s32 mNote[7];
     /* 0xE34 */ s32 mCurTimer;
     /* 0xE38 */ u8 field_0xE38;
-    /* 0xE39 */ u8 mMelodyNum;
+    /* 0xE39 */ u8 mBeat;
     /* 0xE3A */ u8 mAction;
     /* 0xE3B */ u8 mbOpen;
 };