From 1d387b56798efbab828844d9679a7d2d86a38a23 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sat, 31 May 2025 20:19:26 -0700 Subject: [PATCH 1/9] finish cybers bit mapping --- Bit Mappings.md | 88 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 86 insertions(+), 2 deletions(-) diff --git a/Bit Mappings.md b/Bit Mappings.md index 724b55f..9dd3908 100644 --- a/Bit Mappings.md +++ b/Bit Mappings.md @@ -185,7 +185,7 @@ Hand movement was removed during Concept Unification. | Name | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | | --------------------------------- | ------------------ | ------------- | ----------- | ------------ | ------------ | -| Rolfe/Chuck Spot | 124 | 88 | 1-88 | TB1 15-16 H7 | No | +| Rolfe/Chuck E. Spot | 124 | 88 | 1-88 | TB1 15-16 H7 | No | | Dook/Helen Spot | 125 | 86 | 1-86 | TB1 11-12 H7 | No | | Fatz/Munch Spot | 126 | 85 | 1-85 | TB2 9-10 H7 | No | | Beach Bear/Jasper Spot | 127 | 82 | 1-82 | TB2 5-6 H7 | No | @@ -273,7 +273,7 @@ Hand movement was removed during Concept Unification. | Snare Drum Light | 179 | 230 | 2-80 | | | | Kick Drum Light | 180 | 241 | 2-91 | TB1 5-6 H7 | No | -## R12 (Road/1-Stage/2-Stage) +## Cyberamics ### Chuck E. Cheese @@ -339,3 +339,87 @@ Hand movement was removed during Concept Unification. | Eyelids | 6 | 38 | 38 | TB1 11-12 H3 | | Right Arm | 7 | 39 | 39 | TB1 13-14 H3 | | Left Arm | 8 | 40 | 36 | TB1 7-8 H3 | + +### Props + +| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| ------------------------- | ------------------ | ------------- | ------------ | +| Warblettes/Flower Mouth 1 | 41 | 9 | TB2 1-2 H1 | +| Flower Mouth 2 | 42 | 46 | TB2 11-12 H3 | +| Flower Mouth 3 | 43 | 62 | TB2 11-12 H4 | +| Warblettes Body Rock/Wink | 44 | 10 | TB2 3-4 H1 | +| Flag 1 | 45 | 74 | TB2 3-4 H5 | +| Flag 2 | 46 | 75 | TB2 5-6 H5 | +| Flag 3 | 47 | 76 | TB2 7-8 H5 | +| Flag 4 | 48 | 77 | TB2 9-10 H5 | +| Flag 5 | 49 | 78 | TB2 11-12 H5 | + +### Spots + +| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| ----------------------- | ------------------ | ------------- | ------------ | +| Chuck E. Spot | 50 | 104 | TB1 15-16 H7 | +| Helen Spot | 51 | 102 | TB1 11-12 H7 | +| Munch Spot | 52 | 109 | TB2 9-10 H7 | +| Jasper Spot | 53 | 107 | TB2 5-6 H7 | +| Pasqually Spot | 54 | 100 | TB1 7-8 H7 | +| Wink Spot | 55 | 123 | TB2 5-6 H8 | +| Flowers/Warblettes Spot | 56 | 41 | TB2 1-2 H3 | + +### Curtains + +| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| ------------------------ | ------------------ | ------------- | ------------ | +| CEC Stage Curtain Open | 57 | 27 | TB2 5-6 H2 | +| CEC Stage Curtain Close | 58 | 28 | TB2 7-8 H2 | +| Main Stage Curtain Open | 59 | 29 | TB2 9-10 H2 | +| Main Stage Curtain Close | 60 | 30 | TB2 11-12 H2 | +| 1-Stage Curtain Open | 61 | 25 | TB2 1-2 H2 | +| 1-Stage Curtain Close | 62 | 26 | TB2 3-4 H2 | +| Turntable Bot Side | 63 | 57 | TB2 1-2 H4 | +| Turntable Live Side | 64 | 58 | TB2 3-4 H4 | + +### Floods + +| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| ------------------------- | ------------------ | ------------- | ------------ | +| CEC Stage Red Overhead | 65 | 120 | TB1 15-16 H8 | +| CEC Stage Amber Overhead | 66 | 116 | TB1 7-8 H8 | +| CEC Stage Blue Overhead | 67 | 127 | TB2 13-14 H8 | +| Main Stage Red Overhead | 68 | 118 | TB1 11-12 H8 | +| Main Stage Amber Overhead | 69 | 117 | TB1 9-10 H8 | +| Main Stage Blue Overhead | 70 | 119 | TB1 13-14 H8 | + +### Backdrop + +| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| -------------- | ------------------ | ------------- | ---------- | +| Red Backdrop | 71 | 114 | TB1 3-4 H8 | +| Amber Backdrop | 72 | 113 | TB1 1-2 H8 | +| Blue Backdrop | 73 | 115 | TB1 5-6 H8 | + +### Organ + +| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| ----------------- | ------------------ | ------------- | ------------ | +| Organ Face Amber | 74 | 110 | TB2 11-12 H7 | +| Organ Face Blue | 75 | 108 | TB2 7-8 H7 | +| Organ Legs Outer | 76 | 101 | TB1 9-10 H7 | +| Organ Legs Middle | 77 | 106 | TB2 3-4 H7 | +| Organ Legs Inner | 78 | 111 | TB2 13-14 H7 | + +### Special + +| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| -------------------- | ------------------ | ------------- | ------------ | +| CEC Star/Rope Lights | 79 | 103 | TB1 13-14 H7 | +| CEC Sign | 80 | 105 | TB2 1-2 H7 | +| Jukebox Topper | 81 | 125 | TB2 9-10 H8 | +| Fiber Curtain | 82 | 121 | TB2 1-2 H8 | +| Band Sign | 83 | 126 | TB2 11-12 H8 | +| Kick Drum | 84 | 99 | TB1 5-6 H7 | +| Gobo Light | 85 | 124 | TB2 7-8 H8 | +| Helicopter/Gemini | 86 | 122 | TB2 3-4 H8 | +| Live Flood | 87 | 97 | TB1 1-2 H7 | +| Live Strobe | 88 | 98 | TB1 3-4 H7 | + From a79a5e54c536036b0e23a430d379b4f4d5ed4b5b Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sat, 31 May 2025 23:28:23 -0700 Subject: [PATCH 2/9] cybers bit mappings in converter --- Bit Mappings.md | 6 +-- PC2Converter/PC2Converter/MainForm.cs | 60 ++++++++++++++++++++++----- 2 files changed, 53 insertions(+), 13 deletions(-) diff --git a/Bit Mappings.md b/Bit Mappings.md index 9dd3908..b462d38 100644 --- a/Bit Mappings.md +++ b/Bit Mappings.md @@ -17,7 +17,7 @@ This information was sourced from Cheese-E-Pedia, the Showbiz Pizza Cyberstar In | Eyes Right | 7 | 7 | 5 | 1-5 | TB1 9-10 H1 | No | | Head Left | 8 | 8 | 6 | 1-6 | TB1 3-4 H1 | No | | Head Right | 9 | 9 | 7 | 1-7 | TB1 5-6 H1 | No | -| Head Up | 10 | 10 | 8 | 1-8 | TB1 7-8 H1 | Yes | +| Head Up | 10 | 10 | 8 | 1-8 | TB1 7-8 H1 | No | | Left Arm Up | 11 | 11 | 11 | 1-11 | | | | Left Arm Twist | 12 | 12 | 12 | 1-12 | | | | Left Elbow | 13 | 13 | 13 | 1-13 | | | @@ -46,7 +46,7 @@ Earl's movements were removed during Concept Unification. | Eyes Right | 7 | 29 | 184 | 2-34 | TB1 9-10 H5 | No | | Head Left | 8 | 30 | 178 | 2-28 | TB1 3-4 H5 | No | | Head Right | 9 | 31 | 179 | 2-29 | TB1 5-6 H5 | No | -| Head Up | 10 | 32 | 180 | 2-30 | TB1 7-8 H5 | Yes | +| Head Up | 10 | 32 | 180 | 2-30 | TB1 7-8 H5 | No | | Left Arm Up | 11 | 33 | 173 | 2-23 | | | | Left Arm Twist | 12 | 34 | 175 | 2-25 | | | | Left Elbow | 13 | 35 | 174 | 2-24 | | | @@ -92,7 +92,7 @@ No movements were removed during Concept Unification. | Eyes Cross | 4 | 61 | 153 | 2-3 | | | | Head Left | 5 | 62 | 156 | 2-6 | TB1 3-4 H2 & TB1 15-16 H2 | No | | Head Right | 6 | 63 | 157 | 2-7 | TB1 5-6 H2 & TB1 9-10 H2 | No | -| Head Up | 7 | 64 | 158 | 2-8 | TB1 7-8 H2 | Yes | +| Head Up | 7 | 64 | 158 | 2-8 | TB1 7-8 H2 | No | | Right Arm Raise | 8 | 65 | 161 | 2-11 | | | | Right Arm Twist | 9 | 66 | 162 | 2-12 | | | | Right Elbow | 10 | 67 | 163 | 2-13 | TB1 13-14 H2 | No | diff --git a/PC2Converter/PC2Converter/MainForm.cs b/PC2Converter/PC2Converter/MainForm.cs index af76e5d..510ebcc 100644 --- a/PC2Converter/PC2Converter/MainForm.cs +++ b/PC2Converter/PC2Converter/MainForm.cs @@ -32,7 +32,7 @@ namespace PC2Converter string[] CyberCharacters = { "Chuck E.", "Helen/Guest Star", "Munch", "Jasper", "Pasqually" }; string[] StudioCCharacters = { "Chuck E." }; - int[][] SC_CyberBitMapR12 = + int[][] SC_CyberBitMap = { /* chuck */ new int[]{ 1, 2, 3, 4, 8, 5, 6, 7 }, /* helen */ new int[]{ 65, 66, 67, 68, 72, 69, 70, 71 }, @@ -85,9 +85,41 @@ namespace PC2Converter }; int[] CyberRosettaInvertedBits = { 2, 8, 181, 169, 41, 59, 58, 151, 158, 26, 35, 31 }; + int[] FS_CyberBitMap = { + 1, 2, 3, 4, 8, 5, 6, 7, + 65, 66, 67, 68, 72, 69, 70, 71, + 49, 50, 51, 56, 53, 54, 55, 52, + 17, 18, 19, 20, 24, 21, 22, 23, + 33, 34, 35, 40, 37, 38, 39, 36, + 9, 46, 62, 10, 74, 75, 76, 77, 78, + 104, 102, 109, 107, 100, 123, 41, + 27, 28, 29, 30, 25, 26, 57, 58, + 120, 116, 127, 118, 117, 119, + 114, 113, 115, + 110, 108, 101, 106, 111, + 103, 105, 125, 121, 126, 99, 124, 122, 97, 98 + }; + + int[] FS_CyberBitMapRosetta = { + 1, 6, 7, 8, 4, 5, 2, 19, + 185, 178, 179, 180, 183, 184, 181, 169, + 45, 54, 55, 43, 44, 41, 58, 59, + 166, 156, 157, 158, 156, 157, 151, 163, + 30, 25, 21, 28, 29, 26, 31, 35, + 0, 0, 0, 49, 0, 0, 0, 0, 0, + 88, 86, 85, 82, 84, 81, 0, + 93, 94, 91, 92, 91, 92, 0, 0, + 229, 228, 226, 224, 223, 221, + 235, 232, 234, + 67, 68, 71, 72, 73, + 220, 244, 245, 225, 77, 241, 240, 87, 222, 0 + }; + + 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 = 1; public MainForm() @@ -260,6 +292,7 @@ namespace PC2Converter CharacterSelector.Items.Add(s); } CharacterSelector.Enabled = true; + Rosetta = false; FullStage = false; break; case 1: @@ -269,16 +302,19 @@ namespace PC2Converter CharacterSelector.Items.Add(s); } CharacterSelector.Enabled = true; + Rosetta = true; FullStage = false; break; case 2: CharacterSelector.Items.Clear(); CharacterSelector.Enabled = false; + Rosetta = false; FullStage = true; break; case 3: CharacterSelector.Items.Clear(); CharacterSelector.Enabled = false; + Rosetta = true; FullStage = true; break; } @@ -293,11 +329,13 @@ namespace PC2Converter CharacterSelector.Items.Add(s); } CharacterSelector.Enabled = true; + Rosetta = false; FullStage = false; break; case 1: CharacterSelector.Items.Clear(); CharacterSelector.Enabled = false; + Rosetta = false; FullStage = true; break; } @@ -312,11 +350,13 @@ namespace PC2Converter CharacterSelector.Items.Add(s); } CharacterSelector.Enabled = true; + Rosetta = false; FullStage = false; break; case 1: CharacterSelector.Items.Clear(); CharacterSelector.Enabled = false; + Rosetta = false; FullStage = true; break; } @@ -365,12 +405,6 @@ namespace PC2Converter return; } - if (FullStage && (string)OutputTypeSelector.SelectedKey != "UST 256 Bits (Full RAE/3st)") - { - MessageBox.Show("Fatal: Full Stage mode is not supported for cybers and studio c at this time."); - return; - } - SaveFileDialog fileDialog = new SaveFileDialog(); fileDialog.Filters.Add(new FileFilter("UST Files (.ust)", new string[]{".ust"})); fileDialog.Title = "Select Show File."; @@ -440,13 +474,15 @@ namespace PC2Converter break; case "UST 256 Bits (Full Cybers Rosetta)": bitsCount = 256; + targetBits = FS_CyberBitMapRosetta; break; case "UST 8 Bits (Single Bot Cybers)": bitsCount = 8; - targetBits = SC_CyberBitMapR12[Array.IndexOf(CyberCharacters, CharacterSelector.SelectedKey)]; + targetBits = SC_CyberBitMap[Array.IndexOf(CyberCharacters, CharacterSelector.SelectedKey)]; break; case "UST 256 Bits (Full Cybers)": bitsCount = 256; + targetBits = FS_CyberBitMap; break; case "UST 32 Bits (Single Bot Studio C)": bitsCount = 32; @@ -463,15 +499,19 @@ namespace PC2Converter BigInteger frameByte = 0; for (int i = 0; i < targetBits.Length; i++) { - if (bits.Get(targetBits[i])) frameByte += BigInteger.Pow(2, i); + if (Rosetta && CyberRosettaInvertedBits.Contains(targetBits[i])) + { + if (!bits.Get(targetBits[i])) frameByte += BigInteger.Pow(2, i); + } + else { if (bits.Get(targetBits[i])) frameByte += BigInteger.Pow(2, i); } } writeOut.Add(frameByte.ToString($"X{(bitsCount/4).ToString()}")); } + writeOut[0] = (0).ToString($"X{(bitsCount/4).ToString()}"); byte[] audioOut = file.audioData; if ((bool)CompressAudioCheckBox.Checked) { - MessageBox.Show("press ok to start compressing audio"); if (File.Exists("tmp.mp3")) File.Delete("tmp.mp3"); File.WriteAllBytes("tmp.wav", audioOut); Process ffmpegProcess = new Process(); From 91aa378769f5f3c16d059bcf16ba145c3866dcc7 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sat, 31 May 2025 23:28:48 -0700 Subject: [PATCH 3/9] Update MainForm.cs --- PC2Converter/PC2Converter/MainForm.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/PC2Converter/PC2Converter/MainForm.cs b/PC2Converter/PC2Converter/MainForm.cs index 510ebcc..07f6616 100644 --- a/PC2Converter/PC2Converter/MainForm.cs +++ b/PC2Converter/PC2Converter/MainForm.cs @@ -84,7 +84,6 @@ namespace PC2Converter 220, 244, 245, 225, 230, 241 }; - int[] CyberRosettaInvertedBits = { 2, 8, 181, 169, 41, 59, 58, 151, 158, 26, 35, 31 }; int[] FS_CyberBitMap = { 1, 2, 3, 4, 8, 5, 6, 7, 65, 66, 67, 68, 72, 69, 70, 71, From 424d9331cd469742914c5800cb0eb8913b131912 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sun, 1 Jun 2025 13:00:52 -0700 Subject: [PATCH 4/9] studio c --- Bit Mappings.md | 122 +++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 115 insertions(+), 7 deletions(-) diff --git a/Bit Mappings.md b/Bit Mappings.md index b462d38..0dccecc 100644 --- a/Bit Mappings.md +++ b/Bit Mappings.md @@ -342,7 +342,7 @@ Hand movement was removed during Concept Unification. ### Props -| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ------------------------- | ------------------ | ------------- | ------------ | | Warblettes/Flower Mouth 1 | 41 | 9 | TB2 1-2 H1 | | Flower Mouth 2 | 42 | 46 | TB2 11-12 H3 | @@ -356,7 +356,7 @@ Hand movement was removed during Concept Unification. ### Spots -| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ----------------------- | ------------------ | ------------- | ------------ | | Chuck E. Spot | 50 | 104 | TB1 15-16 H7 | | Helen Spot | 51 | 102 | TB1 11-12 H7 | @@ -368,7 +368,7 @@ Hand movement was removed during Concept Unification. ### Curtains -| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ------------------------ | ------------------ | ------------- | ------------ | | CEC Stage Curtain Open | 57 | 27 | TB2 5-6 H2 | | CEC Stage Curtain Close | 58 | 28 | TB2 7-8 H2 | @@ -381,7 +381,7 @@ Hand movement was removed during Concept Unification. ### Floods -| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ------------------------- | ------------------ | ------------- | ------------ | | CEC Stage Red Overhead | 65 | 120 | TB1 15-16 H8 | | CEC Stage Amber Overhead | 66 | 116 | TB1 7-8 H8 | @@ -392,7 +392,7 @@ Hand movement was removed during Concept Unification. ### Backdrop -| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | | -------------- | ------------------ | ------------- | ---------- | | Red Backdrop | 71 | 114 | TB1 3-4 H8 | | Amber Backdrop | 72 | 113 | TB1 1-2 H8 | @@ -400,7 +400,7 @@ Hand movement was removed during Concept Unification. ### Organ -| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ----------------- | ------------------ | ------------- | ------------ | | Organ Face Amber | 74 | 110 | TB2 11-12 H7 | | Organ Face Blue | 75 | 108 | TB2 7-8 H7 | @@ -410,7 +410,7 @@ Hand movement was removed during Concept Unification. ### Special -| Movement Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Name | UST Full Stage Bit | RR Engine Bit | CCS Bit | | -------------------- | ------------------ | ------------- | ------------ | | CEC Star/Rope Lights | 79 | 103 | TB1 13-14 H7 | | CEC Sign | 80 | 105 | TB2 1-2 H7 | @@ -423,3 +423,111 @@ Hand movement was removed during Concept Unification. | Live Flood | 87 | 97 | TB1 1-2 H7 | | Live Strobe | 88 | 98 | TB1 3-4 H7 | +## Studio C + +### Chuck E. + +| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | DTU Bit | 16M | +| ----------------- | ------------------------ | ------------------ | ------------- | ------- | --- | +| Mouth | 1 | 1 | 21 | 1-21 | Yes | +| Nose | 2 | 2 | 28 | 1-28 | No | +| Eyelids Up | 3 | 3 | 25 | 1-25 | No | +| Eyelids Down | 4 | 4 | 24 | 1-24 | Yes | +| Eyes Left | 5 | 5 | 26 | 1-26 | Yes | +| Eyes Right | 6 | 6 | 27 | 1-27 | Yes | +| Eyebrows Up | 7 | 7 | 29 | 1-29 | No | +| Eyebrows Down | 8 | 8 | 30 | 1-30 | No | +| Ears | 9 | 9 | 31 | 1-31 | No | +| Head Turn Left | 10 | 10 | 18 | 1-18 | Yes | +| Head Turn Right | 11 | 11 | 19 | 1-19 | Yes | +| Head Tilt Left | 12 | 12 | 23 | 1-23 | No | +| Head Tilt Right | 13 | 13 | 22 | 1-22 | No | +| Head Up | 14 | 14 | 20 | 1-20 | Yes | +| Left Arm Out | 15 | 15 | 6 | 1-6 | No | +| Left Arm Swing | 16 | 16 | 7 | 1-7 | Yes | +| Left Arm Forward | 17 | 17 | 11 | 1-11 | No | +| Left Elbow | 18 | 18 | 8 | 1-8 | Yes | +| Left Wrist | 19 | 19 | 9 | 1-9 | No | +| Left Hand Wave | 20 | 20 | 10 | 1-10 | Yes | +| Right Arm Out | 21 | 21 | 1 | 1-1 | No | +| Right Arm Swing | 22 | 22 | 2 | 1-2 | Yes | +| Right Arm Forward | 23 | 23 | 17 | 1-17 | No | +| Right Elbow | 24 | 24 | 3 | 1-3 | Yes | +| Right Wrist | 25 | 25 | 4 | 1-4 | No | +| Right Hand Wave | 26 | 26 | 5 | 1-5 | Yes | +| Body Forward | 27 | 27 | 12 | 1-12 | Yes | +| Body Turn Left | 28 | 28 | 16 | 1-16 | Yes | +| Body Turn Right | 29 | 29 | 15 | 1-15 | Yes | +| Body Tilt Left | 30 | 30 | 13 | 1-13 | No | +| Body Tilt Right | 31 | 31 | 14 | 1-14 | No | +| Foot Tap | 32 | 32 | 32 | 1-32 | No | + +### Props + +| Name | UST Full Stage Bit | RR Engine Bit | DTU Bit | +| ------------- | ------------------ | ------------- | ------- | +| Bird Mouth | 33 | 33 | 1-33 | +| Bird Wings | 34 | 36 | 1-36 | +| Bird Bow | 35 | 34 | 1-34 | +| Bird Turn | 36 | 35 | 1-35 | +| Phone Swing | 37 | 40 | 1-40 | +| Clock Forward | 38 | 160 | 2-10 | +| Clock Reverse | 39 | 161 | 2-11 | + +### Spots + +| Name | UST Full Stage Bit | RR Engine Bit | DTU Bit | +| ------------- | ------------------ | ------------- | ------- | +| Chuck E. Spot | 40 | 177 | 2-27 | +| Bird Spot | 41 | 178 | 2-28 | + +### Curtains + +| Name | UST Full Stage Bit | RR Engine Bit | DTU Bit | +| -------------- | ------------------ | ------------- | ------- | +| Curtains Open | 42 | 44 | 1-44 | +| Curtains Close | 43 | 45 | 1-45 | + +### Floods + +| Name | UST Full Stage Bit | RR Engine Bit | DTU Bit | +| ------------------------ | ------------------ | ------------- | ------- | +| CEC Red Floods | 44 | 151 | 2-1 | +| CEC Amber Floods | 45 | 154 | 2-4 | +| CEC Green Floods | 46 | 152 | 2-2 | +| CEC Blue Floods | 47 | 153 | 2-3 | +| Blue Screen Red Floods | 48 | 155 | 2-5 | +| Blue Screen Amber Floods | 49 | 157 | 2-7 | +| Blue Screen Green Floods | 50 | 156 | 2-6 | +| Room Pink Floods | 51 | 181 | 2-31 | +| Room Amber Floods | 52 | 180 | 2-30 | +| Room Blue Floods | 53 | 182 | 2-32 | + +### Monitor + +| Name | UST Full Stage Bit | RR Engine Bit | DTU Bit | +| ------------- | ------------------ | ------------- | ------- | +| Monitor Pink | 54 | 172 | 2-22 | +| Monitor Green | 55 | 174 | 2-24 | +| Monitor Blue | 56 | 173 | 2-23 | +| Monitor Chase | 57 | 171 | 2-21 | + +### Desk + +| Name | UST Full Stage Bit | RR Engine Bit | DTU Bit | +| ----------- | ------------------ | ------------- | ------- | +| Desk Outer | 58 | 166 | 2-16 | +| Desk Middle | 59 | 165 | 2-15 | +| Desk Inner | 60 | 164 | 2-14 | + +### Special + +| Name | UST Full Stage Bit | RR Engine Bit | DTU Bit | +| -------------------- | ------------------ | ------------- | ------- | +| Clock Neon | 61 | 159 | 2-9 | +| City Lights | 62 | 163 | 2-13 | +| Phone Handset Lights | 63 | 167 | 2-17 | +| Phone Dial Lights | 64 | 168 | 2-18 | +| Gemini | 65 | 176 | 2-26 | +| On Air Sign | 66 | 169 | 2-19 | +| Applause Sign | 67 | 170 | 2-20 | From 7896e1d0a3ab4e8d5e68f6b69f027d7423ed5b1e Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sun, 1 Jun 2025 13:04:15 -0700 Subject: [PATCH 5/9] oops --- Bit Mappings.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Bit Mappings.md b/Bit Mappings.md index 0dccecc..c3571f9 100644 --- a/Bit Mappings.md +++ b/Bit Mappings.md @@ -531,3 +531,5 @@ Hand movement was removed during Concept Unification. | Gemini | 65 | 176 | 2-26 | | On Air Sign | 66 | 169 | 2-19 | | Applause Sign | 67 | 170 | 2-20 | +| Strobe | 68 | 162 | 2-12 | +| Live Floods | 69 | 179 | 2-29 | From 4ec6533971b87acc40d837ad79620ae6290b4006 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sun, 1 Jun 2025 13:23:21 -0700 Subject: [PATCH 6/9] add studio c bit maps to converter --- PC2Converter/PC2Converter/MainForm.cs | 50 +++++++++++++++++---------- 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/PC2Converter/PC2Converter/MainForm.cs b/PC2Converter/PC2Converter/MainForm.cs index 07f6616..696c2bf 100644 --- a/PC2Converter/PC2Converter/MainForm.cs +++ b/PC2Converter/PC2Converter/MainForm.cs @@ -63,25 +63,7 @@ namespace PC2Converter int[][] SC_StudioCBitMap = { - /* chuck e. */ new int[]{ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32 } - }; - - int[] FS_RAE3stBitMap = { - 1, 9, 10, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 17, 18, 19, 14, 15, 16, 20, 36, 37, - 185, 176, 177, 181, 182, 183, 184, 178, 179, 180, 173, 175, 174, 168, 170, 169, 186, 187, 188, - 45, 41, 42, 43, 44, 54, 55, 51, 52, 53, 57, 59, 58, 60, 61, 62, - 166, 151, 152, 153, 156, 157, 158, 161, 162, 163, 164, 154, 155, 159, 160, 165, - 30, 23, 24, 26, 27, 28, 29, 25, 21, 22, 33, 35, 34, 31, 32, 63, 64, - 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 189, 190, 194, 211, 212, 213, - 167, 191, 192, 193, 171, 172, 48, - 39, 38, 47, 46, 49, 50, - 88, 86, 85, 82, 242, 84, 83, 81, 238, 239, 240, 87, - 93, 94, 91, 92, 89, 90, - 229, 228, 227, 226, 224, 223, 221, 219, 218, 217, 216, 222, - 235, 232, 231, 234, 236, 237, 233, 242, 243, - 67, 68, 69, 66, 71, 72, 73, - 78, 77, 76, 79, 80, - 220, 244, 245, 225, 230, 241 + /* chuck e. */ new int[]{ 21, 28, 25, 24, 26, 27, 29, 30, 31, 18, 19, 23, 22, 20, 6, 7, 11, 8, 9, 10, 1, 2, 17, 3, 4, 5, 12, 16, 15, 13, 14, 32 } }; int[] FS_CyberBitMap = { @@ -114,6 +96,35 @@ namespace PC2Converter 220, 244, 245, 225, 77, 241, 240, 87, 222, 0 }; + int[] FS_RAE3stBitMap = { + 1, 9, 10, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 17, 18, 19, 14, 15, 16, 20, 36, 37, + 185, 176, 177, 181, 182, 183, 184, 178, 179, 180, 173, 175, 174, 168, 170, 169, 186, 187, 188, + 45, 41, 42, 43, 44, 54, 55, 51, 52, 53, 57, 59, 58, 60, 61, 62, + 166, 151, 152, 153, 156, 157, 158, 161, 162, 163, 164, 154, 155, 159, 160, 165, + 30, 23, 24, 26, 27, 28, 29, 25, 21, 22, 33, 35, 34, 31, 32, 63, 64, + 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 189, 190, 194, 211, 212, 213, + 167, 191, 192, 193, 171, 172, 48, + 39, 38, 47, 46, 49, 50, + 88, 86, 85, 82, 242, 84, 83, 81, 238, 239, 240, 87, + 93, 94, 91, 92, 89, 90, + 229, 228, 227, 226, 224, 223, 221, 219, 218, 217, 216, 222, + 235, 232, 231, 234, 236, 237, 233, 242, 243, + 67, 68, 69, 66, 71, 72, 73, + 78, 77, 76, 79, 80, + 220, 244, 245, 225, 230, 241 + }; + + int[] FS_StudioCBitMap = { + 21, 28, 25, 24, 26, 27, 29, 30, 31, 18, 19, 23, 22, 20, 6, 7, 11, 8, 9, 10, 1, 2, 17, 3, 4, 5, 12, 16, 15, 13, 14, 32, + 33, 36, 34, 35, 40, 160, 161, + 177, 178, + 44, 45, + 151, 154, 152, 153, 155, 157, 156, 181, 180, 182, + 172, 174, 173, 171, + 166, 165, 164, + 159, 163, 167, 168, 176, 169, 170, 162, 179 + }; + 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}; @@ -489,6 +500,7 @@ namespace PC2Converter break; case "UST 256 Bits (Full Studio C)": bitsCount = 256; + targetBits = FS_StudioCBitMap; break; } From 5d216840dbe845f2f3c3b1c579c7b5e6720b216a Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sun, 1 Jun 2025 13:55:57 -0700 Subject: [PATCH 7/9] discontinue single character file format --- Bit Mappings.md | 28 +- Future Goals.md | 7 +- .../PC2Player.Gtk/PC2Player.Gtk.csproj | 0 .../PC2Player.Old}/PC2Player.Gtk/Program.cs | 0 .../PC2Player.Old/PC2Player.Mac}/Icon.icns | Bin .../PC2Player.Old}/PC2Player.Mac/Info.plist | 0 .../PC2Player.Mac/PC2Player.Mac.csproj | 0 .../PC2Player.Old}/PC2Player.Mac/Program.cs | 0 .../PC2Player.Wpf/PC2Player.Wpf.csproj | 0 .../PC2Player.Old}/PC2Player.Wpf/Program.cs | 0 .../PC2Player.Old}/PC2Player/MainForm.cs | 0 .../PC2Player.Old}/PC2Player/PC2Player.csproj | 0 .../USTConverter.Gtk}/Program.cs | 2 +- .../USTConverter.Gtk/USTConverter.Gtk.csproj | 2 +- .../USTConverter.Mac}/Icon.icns | Bin .../USTConverter.Mac}/Info.plist | 6 +- .../USTConverter.Mac}/Program.cs | 2 +- .../USTConverter.Mac/USTConverter.Mac.csproj | 2 +- .../USTConverter.Wpf}/Program.cs | 2 +- .../USTConverter.Wpf/USTConverter.Wpf.csproj | 2 +- .../USTConverter}/MainForm.cs | 246 +++--------------- .../USTConverter}/RSHWFile.cs | 1 - .../USTConverter/USTConverter.csproj | 0 23 files changed, 56 insertions(+), 244 deletions(-) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player.Gtk/PC2Player.Gtk.csproj (100%) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player.Gtk/Program.cs (100%) rename {PC2Converter/PC2Converter.Mac => Legacy Tools/PC2Player.Old/PC2Player.Mac}/Icon.icns (100%) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player.Mac/Info.plist (100%) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player.Mac/PC2Player.Mac.csproj (100%) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player.Mac/Program.cs (100%) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player.Wpf/PC2Player.Wpf.csproj (100%) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player.Wpf/Program.cs (100%) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player/MainForm.cs (100%) rename {PC2Player => Legacy Tools/PC2Player.Old}/PC2Player/PC2Player.csproj (100%) rename {PC2Converter/PC2Converter.Gtk => USTConverter/USTConverter.Gtk}/Program.cs (81%) rename PC2Converter/PC2Converter.Gtk/PC2Converter.Gtk.csproj => USTConverter/USTConverter.Gtk/USTConverter.Gtk.csproj (83%) rename {PC2Player/PC2Player.Mac => USTConverter/USTConverter.Mac}/Icon.icns (100%) rename {PC2Converter/PC2Converter.Mac => USTConverter/USTConverter.Mac}/Info.plist (81%) rename {PC2Converter/PC2Converter.Mac => USTConverter/USTConverter.Mac}/Program.cs (81%) rename PC2Converter/PC2Converter.Mac/PC2Converter.Mac.csproj => USTConverter/USTConverter.Mac/USTConverter.Mac.csproj (84%) rename {PC2Converter/PC2Converter.Wpf => USTConverter/USTConverter.Wpf}/Program.cs (81%) rename PC2Converter/PC2Converter.Wpf/PC2Converter.Wpf.csproj => USTConverter/USTConverter.Wpf/USTConverter.Wpf.csproj (83%) rename {PC2Converter/PC2Converter => USTConverter/USTConverter}/MainForm.cs (53%) rename {PC2Converter/PC2Converter => USTConverter/USTConverter}/RSHWFile.cs (97%) rename PC2Converter/PC2Converter/PC2Converter.csproj => USTConverter/USTConverter/USTConverter.csproj (100%) diff --git a/Bit Mappings.md b/Bit Mappings.md index c3571f9..d1a1a4a 100644 --- a/Bit Mappings.md +++ b/Bit Mappings.md @@ -1,4 +1,4 @@ -# PINKCONNECTION2 Bit Mappings +# UST Bit Mappings This information was sourced from Cheese-E-Pedia, the Showbiz Pizza Cyberstar Install Manual, and the Chuck E. Cheese 2-Stage Install Manual. @@ -6,7 +6,7 @@ This information was sourced from Cheese-E-Pedia, the Showbiz Pizza Cyberstar In ### Rolfe Dewolfe & Earl Schmerle/Chuck E. Cheese -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | | --------------- | ------------------------ | ------------------ | ------------- | ----------- | ------------ | ------------ | | Mouth | 1 | 1 | 1 | 1-1 | TB1 1-2 H1 | No | | Left Ear | 2 | 2 | 9 | 1-9 | | | @@ -35,7 +35,7 @@ Earl's movements were removed during Concept Unification. ### Mitzi Mozzarella/Helen Henny -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | | --------------- | ------------------------ | ------------------ | ------------- | ----------- | ------------ | ------------ | | Mouth | 1 | 23 | 185 | 2-35 | TB1 1-2 H5 | No | | Left Ear | 2 | 24 | 176 | 2-26 | | | @@ -61,7 +61,7 @@ No movements were removed during Concept Unification. ### Fatz Geronimo/Mr. Munch -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | | --------------- | ------------------------ | ------------------ | ------------- | ----------- | ------------ | ------------ | | Mouth | 1 | 42 | 45 | 1-45 | TB1 1-2 H4 | No | | Left Eyelid | 2 | 43 | 41 | 1-41 | TB1 11-12 H4 | Yes | @@ -84,7 +84,7 @@ No movements were removed during Concept Unification. ### Beach Bear/Jasper T. Jowls -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | | --------------- | ------------------------ | ------------------ | ------------- | ----------- | ------------------------- | ------------ | | Mouth | 1 | 58 | 166 | 2-16 | TB1 1-2 H2 | No | | Left Eyelid | 2 | 59 | 151 | 2-1 | TB1 11-12 H2 | Yes | @@ -107,7 +107,7 @@ No movements were removed during Concept Unification. ### Dook Larue/Pasqually -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | R12 Bit | R12 Inverted | | --------------- | ------------------------ | ------------------ | ------------- | ----------- | ------------ | ------------ | | Mouth | 1 | 74 | 30 | 1-30 | TB1 1-2 H3 | No | | Left Ear | 2 | 75 | 23 | 1-23 | | | @@ -131,7 +131,7 @@ Ear movements and Kick Drum were removed during Concept Unification. ### Billy Bob -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | | --------------- | ------------------------ | ------------------ | ------------- | ----------- | | Mouth | 1 | 91 | 196 | 2-46 | | Left Eyelid | 2 | 92 | 197 | 2-47 | @@ -158,7 +158,7 @@ Entire bot was removed during Concept Unification. ### Looney Bird/Pizzacam -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | Greybox Bit | | --------------- | ------------------------ | ------------------ | ------------- | ----------- | | Mouth | 1 | 111 | 167 | 2-17 | | Left Eyelid | 2 | 112 | 191 | 2-41 | @@ -277,7 +277,7 @@ Hand movement was removed during Concept Unification. ### Chuck E. Cheese -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Movement Name | Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ------------- | ------------------------ | ------------------ | ------------- | ------------ | | Mouth | 1 | 1 | 1 | TB1 1-2 H1 | | Head Left | 2 | 2 | 2 | TB1 3-4 H1 | @@ -290,7 +290,7 @@ Hand movement was removed during Concept Unification. ### Helen Henny/Guest Star -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ------------- | ------------------------ | ------------------ | ------------- | ------------ | | Mouth | 1 | 9 | 65 | TB1 1-2 H5 | | Head Left | 2 | 10 | 66 | TB1 3-4 H5 | @@ -303,7 +303,7 @@ Hand movement was removed during Concept Unification. ### Mr. Munch -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ------------- | ------------------------ | ------------------ | ------------- | ------------ | | Mouth | 1 | 17 | 49 | TB1 1-2 H4 | | Head Left | 2 | 18 | 50 | TB1 3-4 H4 | @@ -316,7 +316,7 @@ Hand movement was removed during Concept Unification. ### Jasper T. Jowls -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ------------- | ------------------------ | ------------------ | ------------- | ------------ | | Mouth | 1 | 25 | 17 | TB1 1-2 H2 | | Head Left | 2 | 26 | 18 | TB1 3-4 H2 | @@ -329,7 +329,7 @@ Hand movement was removed during Concept Unification. ### Pasqually -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | CCS Bit | | ------------- | ------------------------ | ------------------ | ------------- | ------------ | | Mouth | 1 | 33 | 33 | TB1 1-2 H3 | | Head Left | 2 | 34 | 34 | TB1 3-4 H3 | @@ -427,7 +427,7 @@ Hand movement was removed during Concept Unification. ### Chuck E. -| Movement Name | UST Single Character Bit | UST Full Stage Bit | RR Engine Bit | DTU Bit | 16M | +| Movement Name | UST Character Bit | UST Full Stage Bit | RR Engine Bit | DTU Bit | 16M | | ----------------- | ------------------------ | ------------------ | ------------- | ------- | --- | | Mouth | 1 | 1 | 21 | 1-21 | Yes | | Nose | 2 | 2 | 28 | 1-28 | No | diff --git a/Future Goals.md b/Future Goals.md index 30f46c1..de584cb 100644 --- a/Future Goals.md +++ b/Future Goals.md @@ -1,18 +1,15 @@ # Future Goals -## PC2Converter +## USTConverter - .SHW (ProgramBlue) input format - .3ST/.R12/.C&R (APS) input format - Biphase (Pianocorder and Cyberstar) from tape input format - Studio C from Floppy Disk input format - - UST Full Stage to Single Character Stripper ## PC2Player - - ~~make the program~~ done!! - - fix memory leak issue - - make audio player work on windows + - burn the damn thing to the ground and start over ## Firmwares diff --git a/PC2Player/PC2Player.Gtk/PC2Player.Gtk.csproj b/Legacy Tools/PC2Player.Old/PC2Player.Gtk/PC2Player.Gtk.csproj similarity index 100% rename from PC2Player/PC2Player.Gtk/PC2Player.Gtk.csproj rename to Legacy Tools/PC2Player.Old/PC2Player.Gtk/PC2Player.Gtk.csproj diff --git a/PC2Player/PC2Player.Gtk/Program.cs b/Legacy Tools/PC2Player.Old/PC2Player.Gtk/Program.cs similarity index 100% rename from PC2Player/PC2Player.Gtk/Program.cs rename to Legacy Tools/PC2Player.Old/PC2Player.Gtk/Program.cs diff --git a/PC2Converter/PC2Converter.Mac/Icon.icns b/Legacy Tools/PC2Player.Old/PC2Player.Mac/Icon.icns similarity index 100% rename from PC2Converter/PC2Converter.Mac/Icon.icns rename to Legacy Tools/PC2Player.Old/PC2Player.Mac/Icon.icns diff --git a/PC2Player/PC2Player.Mac/Info.plist b/Legacy Tools/PC2Player.Old/PC2Player.Mac/Info.plist similarity index 100% rename from PC2Player/PC2Player.Mac/Info.plist rename to Legacy Tools/PC2Player.Old/PC2Player.Mac/Info.plist diff --git a/PC2Player/PC2Player.Mac/PC2Player.Mac.csproj b/Legacy Tools/PC2Player.Old/PC2Player.Mac/PC2Player.Mac.csproj similarity index 100% rename from PC2Player/PC2Player.Mac/PC2Player.Mac.csproj rename to Legacy Tools/PC2Player.Old/PC2Player.Mac/PC2Player.Mac.csproj diff --git a/PC2Player/PC2Player.Mac/Program.cs b/Legacy Tools/PC2Player.Old/PC2Player.Mac/Program.cs similarity index 100% rename from PC2Player/PC2Player.Mac/Program.cs rename to Legacy Tools/PC2Player.Old/PC2Player.Mac/Program.cs diff --git a/PC2Player/PC2Player.Wpf/PC2Player.Wpf.csproj b/Legacy Tools/PC2Player.Old/PC2Player.Wpf/PC2Player.Wpf.csproj similarity index 100% rename from PC2Player/PC2Player.Wpf/PC2Player.Wpf.csproj rename to Legacy Tools/PC2Player.Old/PC2Player.Wpf/PC2Player.Wpf.csproj diff --git a/PC2Player/PC2Player.Wpf/Program.cs b/Legacy Tools/PC2Player.Old/PC2Player.Wpf/Program.cs similarity index 100% rename from PC2Player/PC2Player.Wpf/Program.cs rename to Legacy Tools/PC2Player.Old/PC2Player.Wpf/Program.cs diff --git a/PC2Player/PC2Player/MainForm.cs b/Legacy Tools/PC2Player.Old/PC2Player/MainForm.cs similarity index 100% rename from PC2Player/PC2Player/MainForm.cs rename to Legacy Tools/PC2Player.Old/PC2Player/MainForm.cs diff --git a/PC2Player/PC2Player/PC2Player.csproj b/Legacy Tools/PC2Player.Old/PC2Player/PC2Player.csproj similarity index 100% rename from PC2Player/PC2Player/PC2Player.csproj rename to Legacy Tools/PC2Player.Old/PC2Player/PC2Player.csproj diff --git a/PC2Converter/PC2Converter.Gtk/Program.cs b/USTConverter/USTConverter.Gtk/Program.cs similarity index 81% rename from PC2Converter/PC2Converter.Gtk/Program.cs rename to USTConverter/USTConverter.Gtk/Program.cs index 3297df7..1d1b0b0 100644 --- a/PC2Converter/PC2Converter.Gtk/Program.cs +++ b/USTConverter/USTConverter.Gtk/Program.cs @@ -1,7 +1,7 @@ using System; using Eto.Forms; -namespace PC2Converter.Gtk +namespace USTConverter.Gtk { class Program { diff --git a/PC2Converter/PC2Converter.Gtk/PC2Converter.Gtk.csproj b/USTConverter/USTConverter.Gtk/USTConverter.Gtk.csproj similarity index 83% rename from PC2Converter/PC2Converter.Gtk/PC2Converter.Gtk.csproj rename to USTConverter/USTConverter.Gtk/USTConverter.Gtk.csproj index 7e86dbd..3832d00 100644 --- a/PC2Converter/PC2Converter.Gtk/PC2Converter.Gtk.csproj +++ b/USTConverter/USTConverter.Gtk/USTConverter.Gtk.csproj @@ -7,7 +7,7 @@ - + diff --git a/PC2Player/PC2Player.Mac/Icon.icns b/USTConverter/USTConverter.Mac/Icon.icns similarity index 100% rename from PC2Player/PC2Player.Mac/Icon.icns rename to USTConverter/USTConverter.Mac/Icon.icns diff --git a/PC2Converter/PC2Converter.Mac/Info.plist b/USTConverter/USTConverter.Mac/Info.plist similarity index 81% rename from PC2Converter/PC2Converter.Mac/Info.plist rename to USTConverter/USTConverter.Mac/Info.plist index 6157797..667bce4 100644 --- a/PC2Converter/PC2Converter.Mac/Info.plist +++ b/USTConverter/USTConverter.Mac/Info.plist @@ -3,11 +3,11 @@ CFBundleName - PC2Converter + USTConverter CFBundleIdentifier - com.example.PC2Converter + me.kawaiizenbo.USTConverter CFBundleShortVersionString - 1.0 + 1.3 LSMinimumSystemVersion 10.15 CFBundleDevelopmentRegion diff --git a/PC2Converter/PC2Converter.Mac/Program.cs b/USTConverter/USTConverter.Mac/Program.cs similarity index 81% rename from PC2Converter/PC2Converter.Mac/Program.cs rename to USTConverter/USTConverter.Mac/Program.cs index 973dc3d..089435e 100644 --- a/PC2Converter/PC2Converter.Mac/Program.cs +++ b/USTConverter/USTConverter.Mac/Program.cs @@ -1,7 +1,7 @@ using System; using Eto.Forms; -namespace PC2Converter.Mac +namespace USTConverter.Mac { class Program { diff --git a/PC2Converter/PC2Converter.Mac/PC2Converter.Mac.csproj b/USTConverter/USTConverter.Mac/USTConverter.Mac.csproj similarity index 84% rename from PC2Converter/PC2Converter.Mac/PC2Converter.Mac.csproj rename to USTConverter/USTConverter.Mac/USTConverter.Mac.csproj index 437ecec..2f87570 100644 --- a/PC2Converter/PC2Converter.Mac/PC2Converter.Mac.csproj +++ b/USTConverter/USTConverter.Mac/USTConverter.Mac.csproj @@ -8,7 +8,7 @@ - + diff --git a/PC2Converter/PC2Converter.Wpf/Program.cs b/USTConverter/USTConverter.Wpf/Program.cs similarity index 81% rename from PC2Converter/PC2Converter.Wpf/Program.cs rename to USTConverter/USTConverter.Wpf/Program.cs index 8a370b0..df54590 100644 --- a/PC2Converter/PC2Converter.Wpf/Program.cs +++ b/USTConverter/USTConverter.Wpf/Program.cs @@ -1,7 +1,7 @@ using System; using Eto.Forms; -namespace PC2Converter.Wpf +namespace USTConverter.Wpf { class Program { diff --git a/PC2Converter/PC2Converter.Wpf/PC2Converter.Wpf.csproj b/USTConverter/USTConverter.Wpf/USTConverter.Wpf.csproj similarity index 83% rename from PC2Converter/PC2Converter.Wpf/PC2Converter.Wpf.csproj rename to USTConverter/USTConverter.Wpf/USTConverter.Wpf.csproj index 32ab58c..89efd4b 100644 --- a/PC2Converter/PC2Converter.Wpf/PC2Converter.Wpf.csproj +++ b/USTConverter/USTConverter.Wpf/USTConverter.Wpf.csproj @@ -7,7 +7,7 @@ - + diff --git a/PC2Converter/PC2Converter/MainForm.cs b/USTConverter/USTConverter/MainForm.cs similarity index 53% rename from PC2Converter/PC2Converter/MainForm.cs rename to USTConverter/USTConverter/MainForm.cs index 696c2bf..9ef6e9e 100644 --- a/PC2Converter/PC2Converter/MainForm.cs +++ b/USTConverter/USTConverter/MainForm.cs @@ -1,19 +1,17 @@ -using System; using System.Collections; using System.Diagnostics; -using System.Numerics; using System.IO; +using System.Numerics; using Eto.Forms; using Eto.Drawing; -namespace PC2Converter +namespace USTConverter { public partial class MainForm : Form { DropDown InputTypeSelector = new DropDown(); DropDown OutputTypeSelector = new DropDown(); - DropDown CharacterSelector = new DropDown(); TextBox FilePathTextBox = new TextBox(); Button BrowseFileButton = new Button { Text = "Browse", Width = 100 }; Button ConvertButton = new Button { Text = "Convert", Width = 100 }; @@ -24,49 +22,12 @@ namespace PC2Converter "3ST File (APS)", "ROA/R12/C&R File (APS)"*/ }; - string[] RAE3stOutputTypes = { "UST 32 Bits (Single Bot RAE/3st)", "UST 8 Bits (Single Bot Cybers Rosetta)", "UST 256 Bits (Full RAE/3st)" , "UST 256 Bits (Full Cybers Rosetta)" }; - string[] CyberOutputTypes = { "UST 8 Bits (Single Bot Cybers)", "UST 256 Bits (Full Cybers)" }; - string[] StudioCOutputTypes = { "UST 32 Bits (Single Bot Studio C)", "UST 256 Bits (Full Studio C)" }; + string[] RAE3stOutputTypes = { "UST (Rock-afire Explosion/3-Stage)" , "UST (Cyberamics Rosetta)" }; + string[] CyberOutputTypes = { "UST (Cyberamics)" }; + string[] StudioCOutputTypes = { "UST (Studio C)" }; - string[] RAE3stCharacters = { "Rolfe/Chuck E.", "Mitzi/Helen", "Fatz/Munch", "Beach Bear/Jasper", "Dook/Pasqually", "Billy Bob", "Looney Bird/PizzaCam"}; - string[] CyberCharacters = { "Chuck E.", "Helen/Guest Star", "Munch", "Jasper", "Pasqually" }; - string[] StudioCCharacters = { "Chuck E." }; - int[][] SC_CyberBitMap = - { - /* chuck */ new int[]{ 1, 2, 3, 4, 8, 5, 6, 7 }, - /* helen */ new int[]{ 65, 66, 67, 68, 72, 69, 70, 71 }, - /* munch */ new int[]{ 49, 50, 51, 56, 53, 54, 55, 52 }, - /* jasper */ new int[]{ 17, 18, 19, 20, 24, 21, 22, 23 }, - /* pasqually */ new int[]{ 33, 34, 35, 40, 37, 38, 39, 36 } - }; - - int[][] SC_CyberBitMapRosetta = - { - /* chuck */ new int[]{ 1, 6, 7, 8, 4, 5, 2, 19 }, - /* helen */ new int[]{ 185, 178, 179, 180, 183, 184, 181, 169 }, - /* munch */ new int[]{ 45, 54, 55, 43, 44, 41, 58, 59 }, - /* jasper */ new int[]{ 166, 156, 157, 158, 156, 157, 151, 163 }, - /* pasqually */ new int[]{ 30, 25, 21, 28, 29, 26, 31, 35 } - }; - - int[][] SC_RAE3stBitMap = - { - /* rolfe/chuck */ new int[]{ 1, 9, 10, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 17, 18, 19, 14, 15, 16, 20, 36, 37 }, - /* mitzi/helen */ new int[]{ 185, 176, 177, 181, 182, 183, 184, 178, 179, 180, 173, 175, 174, 168, 170, 169, 186, 187, 188 }, - /* fatz/munch */ new int[]{ 45, 41, 42, 43, 44, 54, 55, 51, 52, 53, 57, 59, 58, 60, 61, 62 }, - /* beach bear/jasper */ new int[]{ 166, 151, 152, 153, 156, 157, 158, 161, 162, 163, 164, 154, 155, 159, 160, 165 }, - /* dook/pasqually */ new int[]{ 30, 23, 24, 26, 27, 28, 29, 25, 21, 22, 33, 35, 34, 31, 32, 63, 64 }, - /* billy bob */ new int[]{ 196, 197, 198, 199, 200, 201, 202, 203, 204, 205, 206, 207, 208, 209, 189, 190, 194, 211, 212, 213 }, - /* looney/pizzacam */ new int[]{ 167, 191, 192, 193, 171, 172, 48 } - }; - - int[][] SC_StudioCBitMap = - { - /* chuck e. */ new int[]{ 21, 28, 25, 24, 26, 27, 29, 30, 31, 18, 19, 23, 22, 20, 6, 7, 11, 8, 9, 10, 1, 2, 17, 3, 4, 5, 12, 16, 15, 13, 14, 32 } - }; - - int[] FS_CyberBitMap = { + int[] CyberBitMap = { 1, 2, 3, 4, 8, 5, 6, 7, 65, 66, 67, 68, 72, 69, 70, 71, 49, 50, 51, 56, 53, 54, 55, 52, @@ -81,7 +42,7 @@ namespace PC2Converter 103, 105, 125, 121, 126, 99, 124, 122, 97, 98 }; - int[] FS_CyberBitMapRosetta = { + int[] CyberBitMapRosetta = { 1, 6, 7, 8, 4, 5, 2, 19, 185, 178, 179, 180, 183, 184, 181, 169, 45, 54, 55, 43, 44, 41, 58, 59, @@ -96,7 +57,7 @@ namespace PC2Converter 220, 244, 245, 225, 77, 241, 240, 87, 222, 0 }; - int[] FS_RAE3stBitMap = { + int[] RAE3stBitMap = { 1, 9, 10, 2, 3, 4, 5, 6, 7, 8, 11, 12, 13, 17, 18, 19, 14, 15, 16, 20, 36, 37, 185, 176, 177, 181, 182, 183, 184, 178, 179, 180, 173, 175, 174, 168, 170, 169, 186, 187, 188, 45, 41, 42, 43, 44, 54, 55, 51, 52, 53, 57, 59, 58, 60, 61, 62, @@ -114,7 +75,7 @@ namespace PC2Converter 220, 244, 245, 225, 230, 241 }; - int[] FS_StudioCBitMap = { + int[] StudioCBitMap = { 21, 28, 25, 24, 26, 27, 29, 30, 31, 18, 19, 23, 22, 20, 6, 7, 11, 8, 9, 10, 1, 2, 17, 3, 4, 5, 12, 16, 15, 13, 14, 32, 33, 36, 34, 35, 40, 160, 161, 177, 178, @@ -130,12 +91,12 @@ namespace PC2Converter bool FullStage = false; bool Rosetta = false; - const int USTVersion = 1; + const int USTVersion = 2; public MainForm() { - Title = "PinkConnection2 Showtape Converter"; - Size = new Size(512, 384); + Title = "UST Showtape Converter"; + Size = new Size(500, 300); Maximizable = false; Resizable = false; @@ -143,7 +104,6 @@ namespace PC2Converter ConvertButton.Command = new Command((sender, e) => { Event_ConvertFileButton(); }); InputTypeSelector.SelectedValueChanged += (sender, e) => Event_ChangeInputType(); - OutputTypeSelector.SelectedValueChanged += (sender, e) => Event_ChangeOutputType(); foreach (string s in InputTypes) { @@ -173,14 +133,6 @@ namespace PC2Converter layout.BeginHorizontal(); layout.Add(OutputTypeSelector, true); layout.EndHorizontal(); - - layout.BeginHorizontal(); - layout.Add(new Label { Text = "Character" }); - layout.EndHorizontal(); - - layout.BeginHorizontal(); - layout.Add(CharacterSelector, true); - layout.EndHorizontal(); layout.EndVertical(); layout.BeginVertical(); @@ -209,51 +161,24 @@ namespace PC2Converter return layout; } - string MakeHeader(string showName, string outputType, string character) + string MakeHeader(string showName, string outputType) { string headerOut = $"UST,{USTVersion.ToString()},{showName.Replace(",", "_").Replace(";", "_")},"; - bool fullStage = false; switch (outputType) { - case "UST 32 Bits (Single Bot RAE/3st)": - headerOut += "32,"; - headerOut += "Rockafire Explosion/3-Stage (Single Character),"; + case "UST (Rock-afire Explosion/3-Stage)": + headerOut += "Rockafire Explosion/3-Stage;"; break; - case "UST 8 Bits (Single Bot Cybers Rosetta)": - headerOut += "8,"; - headerOut += "Cyberamics (Single Character),"; + case "UST (Cyberamics Rosetta)": + headerOut += "Cyberamics;"; break; - case "UST 256 Bits (Full RAE/3st)": - headerOut += "256,"; - headerOut += "Rockafire Explosion/3-Stage (Full Stage),"; - fullStage = true; + case "UST (Cyberamics)": + headerOut += "Cyberamics;"; break; - case "UST 256 Bits (Full Cybers Rosetta)": - headerOut += "256,"; - headerOut += "Cyberamics (Full Stage),"; - fullStage = true; - break; - case "UST 8 Bits (Single Bot Cybers)": - headerOut += "8,"; - headerOut += "Cyberamics (Single Character),"; - break; - case "UST 256 Bits (Full Cybers)": - headerOut += "256,"; - headerOut += "Cyberamics (Full Stage),"; - fullStage = true; - break; - case "UST 32 Bits (Single Bot Studio C)": - headerOut += "32,"; - headerOut += "Studio C (Single Character),"; - break; - case "UST 256 Bits (Full Studio C)": - headerOut += "256,"; - headerOut += "Studio C (Full Stage),"; - fullStage = true; + case "UST (Studio C)": + headerOut += "Studio C;"; break; } - if (fullStage) headerOut += "All,"; - else headerOut += character + ";"; return headerOut; } @@ -263,7 +188,6 @@ namespace PC2Converter { case 0: OutputTypeSelector.Items.Clear(); - CharacterSelector.Items.Clear(); foreach (string s in RAE3stOutputTypes) { OutputTypeSelector.Items.Add(s); @@ -271,7 +195,6 @@ namespace PC2Converter break; case 1: OutputTypeSelector.Items.Clear(); - CharacterSelector.Items.Clear(); foreach (string s in CyberOutputTypes) { OutputTypeSelector.Items.Add(s); @@ -279,7 +202,6 @@ namespace PC2Converter break; case 2: OutputTypeSelector.Items.Clear(); - CharacterSelector.Items.Clear(); foreach (string s in StudioCOutputTypes) { OutputTypeSelector.Items.Add(s); @@ -288,92 +210,6 @@ namespace PC2Converter } } - void Event_ChangeOutputType() - { - switch(InputTypeSelector.SelectedIndex) - { - case 0: - switch(OutputTypeSelector.SelectedIndex) - { - case 0: - CharacterSelector.Items.Clear(); - foreach (string s in RAE3stCharacters) - { - CharacterSelector.Items.Add(s); - } - CharacterSelector.Enabled = true; - Rosetta = false; - FullStage = false; - break; - case 1: - CharacterSelector.Items.Clear(); - foreach (string s in CyberCharacters) - { - CharacterSelector.Items.Add(s); - } - CharacterSelector.Enabled = true; - Rosetta = true; - FullStage = false; - break; - case 2: - CharacterSelector.Items.Clear(); - CharacterSelector.Enabled = false; - Rosetta = false; - FullStage = true; - break; - case 3: - CharacterSelector.Items.Clear(); - CharacterSelector.Enabled = false; - Rosetta = true; - FullStage = true; - break; - } - break; - case 1: - switch(OutputTypeSelector.SelectedIndex) - { - case 0: - CharacterSelector.Items.Clear(); - foreach (string s in CyberCharacters) - { - CharacterSelector.Items.Add(s); - } - CharacterSelector.Enabled = true; - Rosetta = false; - FullStage = false; - break; - case 1: - CharacterSelector.Items.Clear(); - CharacterSelector.Enabled = false; - Rosetta = false; - FullStage = true; - break; - } - break; - case 2: - switch(OutputTypeSelector.SelectedIndex) - { - case 0: - CharacterSelector.Items.Clear(); - foreach (string s in StudioCCharacters) - { - CharacterSelector.Items.Add(s); - } - CharacterSelector.Enabled = true; - Rosetta = false; - FullStage = false; - break; - case 1: - CharacterSelector.Items.Clear(); - CharacterSelector.Enabled = false; - Rosetta = false; - FullStage = true; - break; - } - break; - } - } - void Event_BrowseFileButton() { OpenFileDialog fileDialog = new OpenFileDialog(); @@ -399,11 +235,6 @@ namespace PC2Converter MessageBox.Show("Fatal: You must select an output type."); return; } - if (CharacterSelector.SelectedIndex == -1 && !FullStage) - { - MessageBox.Show("Fatal: You must select a character."); - return; - } if (FilePathTextBox.Text.Trim() == "") { MessageBox.Show("Fatal: You must select an input file."); @@ -470,37 +301,22 @@ namespace PC2Converter int[] targetBits = { 0 }; switch (outputType) { - case "UST 32 Bits (Single Bot RAE/3st)": - bitsCount = 32; - targetBits = SC_RAE3stBitMap[Array.IndexOf(RAE3stCharacters, CharacterSelector.SelectedKey)]; - break; - case "UST 8 Bits (Single Bot Cybers Rosetta)": - bitsCount = 8; - targetBits = SC_CyberBitMapRosetta[Array.IndexOf(CyberCharacters, CharacterSelector.SelectedKey)]; - break; - case "UST 256 Bits (Full RAE/3st)": + case "UST (Rock-afire Explosion/3-Stage)": bitsCount = 256; - targetBits = FS_RAE3stBitMap; + targetBits = RAE3stBitMap; break; - case "UST 256 Bits (Full Cybers Rosetta)": + case "UST (Cyberamics Rosetta)": bitsCount = 256; - targetBits = FS_CyberBitMapRosetta; + targetBits = CyberBitMapRosetta; + Rosetta = true; break; - case "UST 8 Bits (Single Bot Cybers)": - bitsCount = 8; - targetBits = SC_CyberBitMap[Array.IndexOf(CyberCharacters, CharacterSelector.SelectedKey)]; - break; - case "UST 256 Bits (Full Cybers)": + case "UST (Cyberamics)": bitsCount = 256; - targetBits = FS_CyberBitMap; + targetBits = CyberBitMap; break; - case "UST 32 Bits (Single Bot Studio C)": - bitsCount = 32; - targetBits = SC_StudioCBitMap[Array.IndexOf(StudioCCharacters, CharacterSelector.SelectedKey)]; - break; - case "UST 256 Bits (Full Studio C)": + case "UST (Studio C)": bitsCount = 256; - targetBits = FS_StudioCBitMap; + targetBits = StudioCBitMap; break; } @@ -535,7 +351,7 @@ namespace PC2Converter File.Delete("tmp.mp3"); } - File.WriteAllText(outFilePath, MakeHeader(Path.GetFileNameWithoutExtension(outFilePath), outputType, CharacterSelector.SelectedKey)+String.Join(",", writeOut.ToArray())+";"+Convert.ToBase64String(audioOut)); + File.WriteAllText(outFilePath, MakeHeader(Path.GetFileNameWithoutExtension(outFilePath), outputType)+String.Join(",", writeOut.ToArray())+";"+Convert.ToBase64String(audioOut)); } MessageBox.Show("Conversion complete!"); } diff --git a/PC2Converter/PC2Converter/RSHWFile.cs b/USTConverter/USTConverter/RSHWFile.cs similarity index 97% rename from PC2Converter/PC2Converter/RSHWFile.cs rename to USTConverter/USTConverter/RSHWFile.cs index d155ddf..8e09a5f 100644 --- a/PC2Converter/PC2Converter/RSHWFile.cs +++ b/USTConverter/USTConverter/RSHWFile.cs @@ -1,4 +1,3 @@ -using System.IO; using System.Reflection; using System.Runtime.Serialization.Formatters.Binary; diff --git a/PC2Converter/PC2Converter/PC2Converter.csproj b/USTConverter/USTConverter/USTConverter.csproj similarity index 100% rename from PC2Converter/PC2Converter/PC2Converter.csproj rename to USTConverter/USTConverter/USTConverter.csproj From d44ae827573e6c8e0d748ce226457420f5a4754c Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sun, 1 Jun 2025 14:00:22 -0700 Subject: [PATCH 8/9] 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) From b9fd99de54fd638ec517bde04be6062a9c11c903 Mon Sep 17 00:00:00 2001 From: Persephone Bubblegum-Holiday Date: Sun, 1 Jun 2025 14:10:28 -0700 Subject: [PATCH 9/9] Update MainForm.cs --- USTConverter/USTConverter/MainForm.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/USTConverter/USTConverter/MainForm.cs b/USTConverter/USTConverter/MainForm.cs index bc73a1b..66a1bd5 100644 --- a/USTConverter/USTConverter/MainForm.cs +++ b/USTConverter/USTConverter/MainForm.cs @@ -15,7 +15,7 @@ namespace USTConverter TextBox FilePathTextBox = new TextBox(); Button BrowseFileButton = new Button { Text = "Browse", Width = 100 }; Button ConvertButton = new Button { Text = "Convert", Width = 100 }; - CheckBox CompressAudioCheckBox = new CheckBox { Text = "Compress Audio", Width = 100 }; + CheckBox CompressAudioCheckBox = new CheckBox { Text = "Compress Audio" }; string[] InputTypes = { "RSHW File (RR Engine)", "CSHW File (RR Engine)", "SSHW File (RR Engine)"/*,