Pre-release fixes #1

CatmanFan · Mar 22, 2024 · 7e2b2e7 · 7e2b2e7
1 parent 6021aba
commit 7e2b2e7
Show file tree

Hide file tree

Showing 27 changed files with 1,382 additions and 516 deletions.
diff --git a/FriishProduce/App.config b/FriishProduce/App.config
@@ -55,6 +55,18 @@
             <setting name="Default_NeoGeo_BIOS" serializeAs="String">
                 <value>VC2</value>
             </setting>
+            <setting name="Default_SEGA_6B" serializeAs="String">
+                <value>1</value>
+            </setting>
+            <setting name="Default_NES_Palette" serializeAs="String">
+                <value>0</value>
+            </setting>
+            <setting name="Default_NES_UsePaletteForBanner" serializeAs="String">
+                <value>False</value>
+            </setting>
+            <setting name="Default_SEGA_SRAM" serializeAs="String">
+                <value>1</value>
+            </setting>
         </FriishProduce.Properties.Settings>
     </userSettings>
   <runtime>

diff --git a/FriishProduce/InjectorForm.resx b/FriishProduce/InjectorForm.resx
@@ -1399,7 +1399,7 @@
     <value>False</value>
   </data>
   <data name="groupBox5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>517, 257</value>
+    <value>654, 257</value>
   </data>
   <data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
     <value>451, 105</value>
@@ -1696,7 +1696,7 @@
     <value>NoControl</value>
   </data>
   <data name="pictureBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>975, 264</value>
+    <value>517, 264</value>
   </data>
   <data name="pictureBox2.Size" type="System.Drawing.Size, System.Drawing">
     <value>130, 96</value>

diff --git a/FriishProduce/LanguageXMLEditor.Designer.cs b/FriishProduce/LanguageXMLEditor.Designer.cs
diff --git a/FriishProduce/LanguageXMLEditor.cs b/FriishProduce/LanguageXMLEditor.cs
@@ -86,6 +86,10 @@ private void button1_Click(object sender, EventArgs e)
 
             button1.Enabled = comboBox1.Enabled = false;
             button5.Enabled = button4.Enabled = button3.Enabled = button2.Enabled = true;
+
+            dataGridView1.Rows[0].Selected = true;
+            dataGridView1.Columns[3].Selected = true;
+            textBox1.Text = dataGridView1.Rows[0].Cells[2].Value.ToString();
         }
 
         private void button2_Click(object sender, EventArgs e)
@@ -186,7 +190,12 @@ private void UpdateList()
 
         private void dataGridView1_RowEnter(object sender, DataGridViewCellEventArgs e)
         {
-            try { textBox1.Text = null; textBox1.Text = dataGridView1.Rows[e.RowIndex].Cells[2].Value.ToString(); } catch { }
+            try
+            {
+                textBox1.Text = null;
+                textBox1.Text = dataGridView1.SelectedCells.Count == 1 || dataGridView1.SelectedRows.Count == 1 ? dataGridView1.Rows[e.RowIndex].Cells[2].Value.ToString() : null;
+            }
+            catch { }
         }
 
         private void dataGridView1_KeyDown(object sender, KeyEventArgs e)

diff --git a/FriishProduce/MainForm.Designer.cs b/FriishProduce/MainForm.Designer.cs
diff --git a/FriishProduce/MainForm.resx b/FriishProduce/MainForm.resx
@@ -167,37 +167,6 @@
   <data name="MenuStrip.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8pt</value>
   </data>
-  <data name="MenuStrip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="MenuStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>1, 0, 1, 0</value>
-  </data>
-  <data name="MenuStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1119, 20</value>
-  </data>
-  <data name="MenuStrip.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip.Name" xml:space="preserve">
-    <value>MenuStrip</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;MenuStrip.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="MenuItem_File.Size" type="System.Drawing.Size, System.Drawing">
-    <value>35, 20</value>
-  </data>
-  <data name="MenuItem_File.Text" xml:space="preserve">
-    <value>File</value>
-  </data>
   <data name="NewProject.Size" type="System.Drawing.Size, System.Drawing">
     <value>113, 22</value>
   </data>
@@ -222,11 +191,11 @@
   <data name="MenuItem_Exit.Text" xml:space="preserve">
     <value>Exit</value>
   </data>
-  <data name="MenuItem_Project.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 20</value>
+  <data name="MenuItem_File.Size" type="System.Drawing.Size, System.Drawing">
+    <value>35, 20</value>
   </data>
-  <data name="MenuItem_Project.Text" xml:space="preserve">
-    <value>Project</value>
+  <data name="MenuItem_File.Text" xml:space="preserve">
+    <value>File</value>
   </data>
   <data name="OpenROM.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
@@ -276,11 +245,11 @@
   <data name="CloseTab.Size" type="System.Drawing.Size, System.Drawing">
     <value>67, 22</value>
   </data>
-  <data name="MenuItem_Help.Size" type="System.Drawing.Size, System.Drawing">
-    <value>40, 20</value>
+  <data name="MenuItem_Project.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 20</value>
   </data>
-  <data name="MenuItem_Help.Text" xml:space="preserve">
-    <value>Help</value>
+  <data name="MenuItem_Project.Text" xml:space="preserve">
+    <value>Project</value>
   </data>
   <data name="MenuItem_Tutorial.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
@@ -318,6 +287,37 @@
   <data name="MenuItem_About.Text" xml:space="preserve">
     <value>About</value>
   </data>
+  <data name="MenuItem_Help.Size" type="System.Drawing.Size, System.Drawing">
+    <value>40, 20</value>
+  </data>
+  <data name="MenuItem_Help.Text" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="MenuStrip.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="MenuStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>1, 0, 1, 0</value>
+  </data>
+  <data name="MenuStrip.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1119, 20</value>
+  </data>
+  <data name="MenuStrip.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip.Name" xml:space="preserve">
+    <value>MenuStrip</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip.Type" xml:space="preserve">
+    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;MenuStrip.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
   <data name="Welcome_DoNotShow.FlatStyle" type="System.Windows.Forms.FlatStyle, System.Windows.Forms">
     <value>Flat</value>
   </data>
@@ -358,7 +358,7 @@
     <value>Arial, 12pt, style=Bold</value>
   </data>
   <data name="PointToTutorial.Location" type="System.Drawing.Point, System.Drawing">
-    <value>1074, 2</value>
+    <value>1074, 3</value>
   </data>
   <data name="PointToTutorial.Size" type="System.Drawing.Size, System.Drawing">
     <value>21, 19</value>
@@ -452,30 +452,6 @@ Before getting started, please be sure to familiarise yourself with this program
   <data name="ToolStrip.Font" type="System.Drawing.Font, System.Drawing">
     <value>Tahoma, 8pt</value>
   </data>
-  <data name="ToolStrip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 20</value>
-  </data>
-  <data name="ToolStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
-    <value>0, 0, 0, 0</value>
-  </data>
-  <data name="ToolStrip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1119, 25</value>
-  </data>
-  <data name="ToolStrip.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;ToolStrip.Name" xml:space="preserve">
-    <value>ToolStrip</value>
-  </data>
-  <data name="&gt;&gt;ToolStrip.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;ToolStrip.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;ToolStrip.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
   <data name="ToolStrip_OpenROM.Enabled" type="System.Boolean, mscorlib">
     <value>False</value>
   </data>
@@ -554,6 +530,30 @@ Before getting started, please be sure to familiarise yourself with this program
   <data name="ToolStrip_Tutorial.Size" type="System.Drawing.Size, System.Drawing">
     <value>23, 22</value>
   </data>
+  <data name="ToolStrip.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 20</value>
+  </data>
+  <data name="ToolStrip.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>0, 0, 0, 0</value>
+  </data>
+  <data name="ToolStrip.Size" type="System.Drawing.Size, System.Drawing">
+    <value>1119, 25</value>
+  </data>
+  <data name="ToolStrip.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;ToolStrip.Name" xml:space="preserve">
+    <value>ToolStrip</value>
+  </data>
+  <data name="&gt;&gt;ToolStrip.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;ToolStrip.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;ToolStrip.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>

diff --git a/FriishProduce/Properties/Settings.Designer.cs b/FriishProduce/Properties/Settings.Designer.cs
diff --git a/FriishProduce/Properties/Settings.settings b/FriishProduce/Properties/Settings.settings
@@ -47,5 +47,17 @@
     <Setting Name="Default_NeoGeo_BIOS" Type="System.String" Scope="User">
       <Value Profile="(Default)">VC2</Value>
     </Setting>
+    <Setting Name="Default_SEGA_6B" Type="System.String" Scope="User">
+      <Value Profile="(Default)">1</Value>
+    </Setting>
+    <Setting Name="Default_NES_Palette" Type="System.Int32" Scope="User">
+      <Value Profile="(Default)">0</Value>
+    </Setting>
+    <Setting Name="Default_NES_UsePaletteForBanner" Type="System.Boolean" Scope="User">
+      <Value Profile="(Default)">False</Value>
+    </Setting>
+    <Setting Name="Default_SEGA_SRAM" Type="System.String" Scope="User">
+      <Value Profile="(Default)">1</Value>
+    </Setting>
   </Settings>
 </SettingsFile>
diff --git a/FriishProduce/Strings/en.xml b/FriishProduce/Strings/en.xml
diff --git a/FriishProduce/Subforms/About.Designer.cs b/FriishProduce/Subforms/About.Designer.cs
diff --git a/FriishProduce/Subforms/About.resx b/FriishProduce/Subforms/About.resx
@@ -117,13 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="textBoxDescription.Text" xml:space="preserve">
-    <value>I would like to thank the following people:
-
-- SuperrSonic for reverse-engineering much of Wii software and official emulator code, and in particular, his fork of RetroArch Wii.
-- saulfabreg for archiving several tools and aiding in research &amp; documentation.
-- sr_corsario for his work in disclosing NEO-GEO ROM injection methods.
-- Larsenv for his astounding work in the Wii homebrew community, and for originally disclosing a method for Flash WAD injection.
-- And of course, the team at the 0RANGECHiCKEN release group, including lolsjoel, and the late G0dLiKe, without whose work this project would not have been possible.</value>
-  </data>
 </root>