From d44ae827573e6c8e0d748ce226457420f5a4754c Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sun, 1 Jun 2025 14:00:22 -0700 Subject: [PATCH] further clean up stuff --- USTConverter/USTConverter/MainForm.cs | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/USTConverter/USTConverter/MainForm.cs b/USTConverter/USTConverter/MainForm.cs index 9ef6e9e..bc73a1b 100644 --- a/USTConverter/USTConverter/MainForm.cs +++ b/USTConverter/USTConverter/MainForm.cs @@ -89,7 +89,6 @@ namespace USTConverter int[] CyberRosettaInvertedBits = { 2, 181, 41, 59, 58, 151, 163, 26, 35, 31 }; int[] RAE3stAPSDescrambleTable = { 10, 11, 0, 1, 2, 3, 4, 12, 13, 5, 6, 7, 8, 9, 14, 15}; - bool FullStage = false; bool Rosetta = false; const int USTVersion = 2; @@ -248,7 +247,7 @@ namespace USTConverter SaveFileDialog fileDialog = new SaveFileDialog(); fileDialog.Filters.Add(new FileFilter("UST Files (.ust)", new string[]{".ust"})); - fileDialog.Title = "Select Show File."; + fileDialog.Title = "Select Output File."; fileDialog.ShowDialog(this); if (fileDialog.FileName.Trim() == "") return; string outFilePath = fileDialog.FileName; @@ -297,25 +296,20 @@ namespace USTConverter } // pick which target bits to use and how many bytes the output should be - int bitsCount = 0; int[] targetBits = { 0 }; switch (outputType) { case "UST (Rock-afire Explosion/3-Stage)": - bitsCount = 256; targetBits = RAE3stBitMap; break; case "UST (Cyberamics Rosetta)": - bitsCount = 256; targetBits = CyberBitMapRosetta; Rosetta = true; break; case "UST (Cyberamics)": - bitsCount = 256; targetBits = CyberBitMap; break; case "UST (Studio C)": - bitsCount = 256; targetBits = StudioCBitMap; break; } @@ -332,9 +326,9 @@ namespace USTConverter } else { if (bits.Get(targetBits[i])) frameByte += BigInteger.Pow(2, i); } } - writeOut.Add(frameByte.ToString($"X{(bitsCount/4).ToString()}")); + writeOut.Add(frameByte.ToString($"X{(64).ToString()}")); } - writeOut[0] = (0).ToString($"X{(bitsCount/4).ToString()}"); + writeOut[0] = (0).ToString($"X{(64).ToString()}"); byte[] audioOut = file.audioData; if ((bool)CompressAudioCheckBox.Checked)