Other major updates and cleanup, try porting CCF tools to C# (experim…

…ental) (!!)
CatmanFan · Mar 19, 2024 · 3a155cd · 3a155cd
1 parent 4bdf2b1
commit 3a155cd
Show file tree

Hide file tree

Showing 28 changed files with 1,806 additions and 736 deletions.
diff --git a/FriishProduce/FriishProduce.csproj b/FriishProduce/FriishProduce.csproj
@@ -120,6 +120,9 @@
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
+    <Reference Include="ToggleSwitch">
+      <HintPath>D:\Homebrew\3DS\nsui-beta28\ToggleSwitch.dll</HintPath>
+    </Reference>
     <Reference Include="UIAutomationClient" />
     <Reference Include="WindowsBase" />
   </ItemGroup>
@@ -136,6 +139,12 @@
     <Compile Include="MainForm.Designer.cs">
       <DependentUpon>MainForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Subforms\Options_VC_PCE.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Subforms\Options_VC_PCE.Designer.cs">
+      <DependentUpon>Options_VC_PCE.cs</DependentUpon>
+    </Compile>
     <Compile Include="Subforms\Options_Flash.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -273,6 +282,9 @@
     <EmbeddedResource Include="Subforms\Options_Flash.resx">
       <DependentUpon>Options_Flash.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Subforms\Options_VC_PCE.resx">
+      <DependentUpon>Options_VC_PCE.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Subforms\Options_VC_SEGA.resx">
       <DependentUpon>Options_VC_SEGA.cs</DependentUpon>
     </EmbeddedResource>

diff --git a/FriishProduce/InjectorForm.Designer.cs b/FriishProduce/InjectorForm.Designer.cs
diff --git a/FriishProduce/InjectorForm.cs b/FriishProduce/InjectorForm.cs
@@ -66,7 +66,7 @@ public void RefreshForm()
             label7.Text = label5.Text;
             CustomManual.Text = Language.Get("CustomManual");
             BrowsePatch.Filter = Language.Get("Filter.Patch");
-            label16.Text = Language.Get("None");
+            label16.Text = Language.Get("NotSupported");
 
             // Change title text to untitled string
             Untitled = string.Format(Language.Get("Untitled"), Language.Get(Enum.GetName(typeof(Console), Console), "Platforms"));
@@ -85,8 +85,7 @@ public void RefreshForm()
             imageintpl.SelectedIndex = Properties.Settings.Default.ImageInterpolation;
             FStorage_USB.Checked = Properties.Settings.Default.Default_Forwarders_FilesStorage.ToLower().Contains("usb");
             FStorage_SD.Checked = !FStorage_USB.Checked;
-            FNANDLoader_vWii.Checked = Properties.Settings.Default.Default_Forwarders_Mode.ToLower().Contains("vwii");
-            FNANDLoader_Wii.Checked = !FNANDLoader_vWii.Checked;
+            toggleSwitch1.Checked = Properties.Settings.Default.Default_Forwarders_Mode.ToLower().Contains("vwii");
 
             // Regions lists
             RegionsList.Items.Clear();
@@ -344,7 +343,7 @@ protected virtual void SetROMDataText()
 
         private void RandomTID() => TitleID.Text = Creator.TitleID = TIDCode != null ? TIDCode + GenerateTitleID().Substring(0, 3) : GenerateTitleID();
 
-        public string GetName() => $"[{Console}] {TitleID.Text.ToUpper()} - {ChannelTitle.Text}";
+        public string GetName() => ROM?.Path != null ? Path.GetFileNameWithoutExtension(ROM?.Path) + $" [{TitleID.Text.ToUpper()}]" : $"{Console} - {ChannelTitle.Text} [{TitleID.Text.ToUpper()}]";
 
         private void isClosing(object sender, FormClosingEventArgs e)
         {
@@ -673,8 +672,8 @@ public void LoadROM(string ROMpath, bool UseLibRetro = true)
             groupBox3.Enabled =
             groupBox4.Enabled =
             groupBox5.Enabled =
-            groupBox6.Enabled = true;
-            groupBox7.Enabled = Console == Console.Flash;
+            groupBox6.Enabled =
+            groupBox7.Enabled = true;
 
             RandomTID();
             UpdateBaseForm();
@@ -843,7 +842,7 @@ public void ForwarderCreator()
             // Actually inject everything
             // *******
             f.CreateZIP(Path.Combine(Path.GetDirectoryName(Creator.Out), Path.GetFileNameWithoutExtension(Creator.Out) + $" ({f.Storage}).zip"));
-            OutWAD = f.CreateWAD(OutWAD, FNANDLoader_vWii.Checked);
+            OutWAD = f.CreateWAD(OutWAD, toggleSwitch1.Checked);
         }
 
         public void FlashInject()
@@ -1226,15 +1225,22 @@ private void UpdateBaseGeneral(int index)
                     SaveDataTitle.Clear();
 
             End:
-            UpdateBaseConsole(index);
+            UpdateBaseConsole();
             pictureBox1.Image = Preview.Banner(Console, BannerTitle.Text, (int)ReleaseYear.Value, (int)Players.Value, Img?.VCPic, (int)Creator.OrigRegion);
         }
 
         /// <summary>
         /// Changes injector settings based on selected base/console
         /// </summary>
-        private void UpdateBaseConsole(int emuVer)
+        private void UpdateBaseConsole()
         {
+            int emuVer = 0;
+
+            if (Database != null)
+                foreach (var Entry in Database)
+                    if (Entry.TitleID.ToUpper() == baseID.Text.ToUpper())
+                        emuVer = Entry.Emulator;
+
             // ******************
             // CONSOLE-SPECIFIC
             // ******************
@@ -1403,6 +1409,7 @@ private void InjectorsList_SelectedIndexChanged(object sender, EventArgs e)
                         break;
 
                     case Console.PCE:
+                        CO = new Options_VC_PCE();
                         break;
 
                     case Console.NeoGeo:
@@ -1413,7 +1420,9 @@ private void InjectorsList_SelectedIndexChanged(object sender, EventArgs e)
 
                     case Console.C64:
                         break;
-                };
+                }
+
+                UpdateBaseConsole();
             }
 
             else if (Console == Console.Flash)
@@ -1437,5 +1446,10 @@ private void RegionsList_SelectedIndexChanged(object sender, EventArgs e)
         {
             if (groupBox4.Enabled) CheckExport();
         }
+
+        private void ToggleSwitchChanged(object sender, EventArgs e)
+        {
+            if (sender == toggleSwitch1) toggleSwitchL1.Text = toggleSwitch1.Checked ? "vWii (Wii U)" : "Wii";
+        }
     }
 }