Skip to content

Commit

Permalink
Reorganizing
Browse files Browse the repository at this point in the history
  • Loading branch information
CatmanFan committed Mar 21, 2024
1 parent b8bcefd commit dc2d157
Show file tree
Hide file tree
Showing 27 changed files with 506 additions and 231 deletions.
9 changes: 9 additions & 0 deletions FriishProduce/FriishProduce.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@
<Compile Include="MainForm.Designer.cs">
<DependentUpon>MainForm.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Options_VC_NeoGeo.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\Options_VC_NeoGeo.Designer.cs">
<DependentUpon>Options_VC_NeoGeo.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\Options_VC_PCE.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -282,6 +288,9 @@
<EmbeddedResource Include="Subforms\Options_Flash.resx">
<DependentUpon>Options_Flash.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Options_VC_NeoGeo.resx">
<DependentUpon>Options_VC_NeoGeo.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\Options_VC_PCE.resx">
<DependentUpon>Options_VC_PCE.cs</DependentUpon>
</EmbeddedResource>
Expand Down
8 changes: 6 additions & 2 deletions FriishProduce/InjectorForm.cs
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,7 @@ private void Form_Shown(object sender, EventArgs e)

// Declare WAD metadata modifier
// ********
Creator = new Creator(Console);
Creator = new Creator();
TIDCode = null;

switch (Console)
Expand Down Expand Up @@ -286,6 +286,8 @@ private void Form_Shown(object sender, EventArgs e)
Creator.BannerPlayers = (int)Players.Value;
AddBases();

Tag = null;

if (ROM?.Path != null) LoadROM(ROM.Path, Properties.Settings.Default.AutoLibRetro);
}

Expand Down Expand Up @@ -906,7 +908,7 @@ public void WiiVCInject()
case Console.NeoGeo:
VC = new WiiVC.NeoGeo()
{
BIOSPath = null
BIOSPath = CO?.Settings?.Count > 0 ? CO?.Settings?.ElementAt(0).Value : null
};
break;

Expand Down Expand Up @@ -1268,6 +1270,7 @@ private void UpdateBaseConsole()
break;

case Console.NeoGeo:
if (emuVer >= 1) CO = null;
break;

case Console.MSX:
Expand Down Expand Up @@ -1418,6 +1421,7 @@ private void InjectorsList_SelectedIndexChanged(object sender, EventArgs e)
break;

case Console.NeoGeo:
// CO = new Options_VC_NeoGeo();
break;

case Console.MSX:
Expand Down
Binary file modified FriishProduce/Strings/en.xml
Binary file not shown.
3 changes: 2 additions & 1 deletion FriishProduce/Subforms/About.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion FriishProduce/Subforms/About.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ public About()
this.labelVersion.Text = Updater.GetCurrentVersion();
this.labelCopyright.Text = AssemblyCopyright;
this.labelCompanyName.Text = AssemblyCompany;
this.textBoxDescription.Text = AssemblyDescription;
this.textBoxDescription.Text = AssemblyDescription + Environment.NewLine + Environment.NewLine + this.textBoxDescription.Text;
this.labelTranslation.Text = string.Format("Current language: {0} ({1})", Language.Current.EnglishName, Language.Author());
okButton.Text = Language.Get("B.Close");
}
Expand Down
9 changes: 9 additions & 0 deletions FriishProduce/Subforms/About.resx
Original file line number Diff line number Diff line change
Expand Up @@ -117,4 +117,13 @@
<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>
4 changes: 0 additions & 4 deletions FriishProduce/Subforms/Options_Flash.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using static FriishProduce.Properties.Settings;

namespace FriishProduce
Expand Down
4 changes: 0 additions & 4 deletions FriishProduce/Subforms/Options_VC_N64.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Text;
using System.Windows.Forms;
using static FriishProduce.Properties.Settings;

namespace FriishProduce
Expand Down
5 changes: 2 additions & 3 deletions FriishProduce/Subforms/Options_VC_NES.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 0 additions & 2 deletions FriishProduce/Subforms/Options_VC_NES.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
using System.Drawing;
using System.Drawing.Imaging;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
using static FriishProduce.Properties.Settings;

Expand Down
80 changes: 80 additions & 0 deletions FriishProduce/Subforms/Options_VC_NeoGeo.Designer.cs

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

61 changes: 61 additions & 0 deletions FriishProduce/Subforms/Options_VC_NeoGeo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
using System;
using System.Collections.Generic;
using System.Windows.Forms;

namespace FriishProduce
{
public partial class Options_VC_NeoGeo : ContentOptions
{
public bool IsCD { get; set; }

public Options_VC_NeoGeo()
{
InitializeComponent();

Settings = new Dictionary<string, string>
{
{ "BiosPath", null },
};

// Cosmetic
// *******
if (!DesignMode)
{
Language.Localize(this);
}
}

// ---------------------------------------------------------------------------------------------------------------

protected override void ResetOptions()
{
// Form control
// *******
if (Settings != null)
{
checkBox1.Checked = Settings["BiosPath"] != null;
}
// *******
}

protected override void SaveOptions()
{
}

// ---------------------------------------------------------------------------------------------------------------

private void ToggleSwitchChanged(object sender, EventArgs e)
{
if (sender == checkBox1)
{
if (checkBox1.Checked)
{
if (ImportBIOS.ShowDialog() == DialogResult.OK)
Settings["BiosPath"] = ImportBIOS.FileName;
else checkBox1.Checked = false;
}
else Settings["BiosPath"] = null;
}
}
}
}
Loading

0 comments on commit dc2d157

Please sign in to comment.