[xgmtool] Recognize and don't skip RF4C68 commands

Stephane-D · Jun 10, 2024 · f701a0e · f701a0e
1 parent 1655e92
commit f701a0e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 1 deletion.
diff --git 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/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) || VGMCommand_isRF5C68Control(command))
             {
                 optimizedCommands = insertAfterLList(optimizedCommands, command);
                 // loop start ? -->

diff --git 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;