From d86d7f8949af1e7ef91473f1a7c1bce2ebbb64e1 Mon Sep 17 00:00:00 2001
From: viciious <vluchits@gmail.com>
Date: Mon, 10 Jun 2024 22:21:17 +0300
Subject: [PATCH] [xgmtool] Recognize and don't skip RF4C68 commands

---
 tools/xgmtool/inc/vgmcom.h  | 2 ++
 tools/xgmtool/inc/xgmtool.h | 2 +-
 tools/xgmtool/src/vgm.c     | 2 +-
 tools/xgmtool/src/vgmcom.c  | 5 +++++
 tools/xgmtool/src/xgmtool.c | 6 +++++-
 5 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/tools/xgmtool/inc/vgmcom.h b/tools/xgmtool/inc/vgmcom.h
index 9426cc379..3309251df 100644
--- a/tools/xgmtool/inc/vgmcom.h
+++ b/tools/xgmtool/inc/vgmcom.h
@@ -23,6 +23,7 @@
 #define VGM_LOOP_START          0x30
 #define VGM_LOOP_END            0x31
 
+#define VGM_WRITE_RF5C68        0xB0
 
 typedef struct
 {
@@ -92,6 +93,7 @@ int VGMCommand_getStreamFrenquency(VGMCommand* source);
 int VGMCommand_getStreamSampleAddress(VGMCommand* source);
 int VGMCommand_getStreamSampleSize(VGMCommand* source);
 bool VGMCommand_isSame(VGMCommand* source, VGMCommand* com);
+bool VGMCommand_isRF5C68Control(VGMCommand* source);
 
 bool VGMCommand_contains(LList* commands, VGMCommand* command);
 VGMCommand* VGMCommand_getKeyOnCommand(LList* commands, int channel);
diff --git a/tools/xgmtool/inc/xgmtool.h b/tools/xgmtool/inc/xgmtool.h
index 8a4fffa71..35e6738a0 100644
--- a/tools/xgmtool/inc/xgmtool.h
+++ b/tools/xgmtool/inc/xgmtool.h
@@ -10,6 +10,6 @@ extern bool verbose;
 extern bool sampleIgnore;
 extern bool sampleRateFix;
 extern bool delayKeyOff;
-
+extern bool keepRF5C68Cmds;
 
 #endif // XGMTOOL_H_
diff --git a/tools/xgmtool/src/vgm.c b/tools/xgmtool/src/vgm.c
index 52838632c..07f38bc6b 100644
--- a/tools/xgmtool/src/vgm.c
+++ b/tools/xgmtool/src/vgm.c
@@ -1136,7 +1136,7 @@ void VGM_cleanCommands(VGM* vgm)
             command = com->element;
 
             // keep data block, stream commands and other misc commands
-            if (VGMCommand_isDataBlock(command) || VGMCommand_isStream(command) || VGMCommand_isLoopStart(command) || VGMCommand_isLoopEnd(command))
+            if (VGMCommand_isDataBlock(command) || VGMCommand_isStream(command) || VGMCommand_isLoopStart(command) || VGMCommand_isLoopEnd(command) || (keepRF5C68Cmds && VGMCommand_isRF5C68Control(command)))
             {
                 optimizedCommands = insertAfterLList(optimizedCommands, command);
                 // loop start ? -->
diff --git a/tools/xgmtool/src/vgmcom.c b/tools/xgmtool/src/vgmcom.c
index f0fe39d70..360a4fa24 100644
--- a/tools/xgmtool/src/vgmcom.c
+++ b/tools/xgmtool/src/vgmcom.c
@@ -483,6 +483,11 @@ bool VGMCommand_isSame(VGMCommand* source, VGMCommand* com)
     return !memcmp(&(source->data[source->offset]), &(com->data[com->offset]), source->size);
 }
 
+bool VGMCommand_isRF5C68Control(VGMCommand* source)
+{
+    return source->command == VGM_WRITE_RF5C68;
+}
+
 bool VGMCommand_contains(LList* commands, VGMCommand* command)
 {
     LList* l = commands;
diff --git a/tools/xgmtool/src/xgmtool.c b/tools/xgmtool/src/xgmtool.c
index c15a5341f..64b88da7a 100644
--- a/tools/xgmtool/src/xgmtool.c
+++ b/tools/xgmtool/src/xgmtool.c
@@ -23,7 +23,7 @@ bool verbose;
 bool sampleRateFix;
 bool sampleIgnore;
 bool delayKeyOff;
-
+bool keepRF5C68Cmds;
 
 int main(int argc, char *argv[ ])
 {
@@ -80,6 +80,7 @@ int main(int argc, char *argv[ ])
         printf("-di\tdisable PCM sample auto ignore (it can help when PCM are not properly extracted).\n");
         printf("-dr\tdisable PCM sample rate auto fix (it can help when PCM are not properly extracted).\n");
         printf("-dd\tdisable delayed KEY OFF event when we have KEY ON/OFF in a single frame (it can fix incorrect instrument sound).\n");
+        printf("-r\tkeep RF5C68 register write commands.\n");
 
         exit(1);
     }
@@ -90,6 +91,7 @@ int main(int argc, char *argv[ ])
     sampleIgnore = true;
     sampleRateFix = true;
     delayKeyOff = true;
+    keepRF5C68Cmds = false;
 
     // Open source for binary read (will fail if file does not exist)
     if ((infile = fopen(argv[1], "rb")) == NULL)
@@ -130,6 +132,8 @@ int main(int argc, char *argv[ ])
             sys = SYSTEM_NTSC;
         else if (!strcasecmp(argv[i], "-p"))
             sys = SYSTEM_PAL;
+	else if (!strcasecmp(argv[i], "-r"))
+            keepRF5C68Cmds = true;
         else
             printf("Warning: option %s not recognized (ignored)\n", argv[i]);
     }