Skip to content

Commit

Permalink
Integrate SuperrSonic's sns_boost, other interface updates and some f…
Browse files Browse the repository at this point in the history 
…ixes
  • Loading branch information
@CatmanFan
CatmanFan committed Dec 25, 2024
1 parent bcca0db commit a442d28
Show file tree
Hide file tree
Showing 40 changed files with 1,335 additions and 967 deletions.
21 changes: 21 additions & 0 deletions FriishProduce/App.config
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<configuration>
<configSections>
<sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<section name="FriishProduce.Options.VC_SNES" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="FriishProduce.Options.BIOSFILES" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="FriishProduce.Options.VC_N64" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
<section name="FriishProduce.Options.VC_PCE" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
Expand All @@ -17,6 +18,26 @@
<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8" />
</startup>
<userSettings>
<FriishProduce.Options.VC_SNES>
<setting name="patch_volume" serializeAs="String">
<value>False</value>
</setting>
<setting name="patch_nodark" serializeAs="String">
<value>False</value>
</setting>
<setting name="patch_nocc" serializeAs="String">
<value>False</value>
</setting>
<setting name="patch_nosuspend" serializeAs="String">
<value>False</value>
</setting>
<setting name="patch_nosave" serializeAs="String">
<value>False</value>
</setting>
<setting name="patch_widescreen" serializeAs="String">
<value>False</value>
</setting>
</FriishProduce.Options.VC_SNES>
<FriishProduce.Options.BIOSFILES>
<setting name="psx" serializeAs="String">
<value />
Expand Down
20 changes: 20 additions & 0 deletions FriishProduce/FileDatas/Apps.Designer.cs
View file

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

6 changes: 6 additions & 0 deletions FriishProduce/FileDatas/Apps.resx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,12 @@
<data name="romc0" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\apps\romc0.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="sns_boost" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\apps\sns_boost.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="wwcxtool" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\apps\wwcxtool.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="xdelta3" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\apps\xdelta3.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
Expand Down
20 changes: 20 additions & 0 deletions FriishProduce/FriishProduce.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,11 @@
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>VC_SEGA.settings</DependentUpon>
</Compile>
<Compile Include="Options\VC_SNES.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<DependentUpon>VC_SNES.settings</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
Expand All @@ -233,6 +238,12 @@
<Compile Include="Subforms\BannerOptions.Designer.cs">
<DependentUpon>BannerOptions.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\ContentOptions\Options_VC_SNES.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Subforms\ContentOptions\Options_VC_SNES.Designer.cs">
<DependentUpon>Options_VC_SNES.cs</DependentUpon>
</Compile>
<Compile Include="Subforms\ControllerMapping.cs">
<SubType>Form</SubType>
</Compile>
Expand Down Expand Up @@ -445,6 +456,9 @@
<DependentUpon>SettingsForm.cs</DependentUpon>
<SubType>Designer</SubType>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\ContentOptions\Options_VC_SNES.resx">
<DependentUpon>Options_VC_SNES.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Subforms\ControllerMapping.resx">
<DependentUpon>ControllerMapping.cs</DependentUpon>
</EmbeddedResource>
Expand Down Expand Up @@ -517,6 +531,10 @@
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>VC_SEGA.Designer.cs</LastGenOutput>
</None>
<None Include="Options\VC_SNES.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>VC_SNES.Designer.cs</LastGenOutput>
</None>
<None Include="Resources\banners\c64_eu.app" />
<None Include="Resources\banners\c64_us.app" />
<None Include="Resources\banners\flash.app" />
Expand Down Expand Up @@ -584,6 +602,8 @@
</ItemGroup>
<ItemGroup>
<Content Include="icon.ico" />
<None Include="Resources\apps\wwcxtool.exe" />
<None Include="Resources\apps\sns_boost.exe" />
<None Include="Resources\loading.gif" />
<None Include="Resources\page_white_zip.png" />
<None Include="Resources\page_white_flash.png" />
Expand Down
6 changes: 3 additions & 3 deletions FriishProduce/MainForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -562,8 +562,8 @@ private void ExtractWAD_Click(object sender, EventArgs e)
File.WriteAllBytes(Paths.WorkingFolder + "html.arc", u8.Data[u8.GetNodeIndex(item)]);
Utils.Run
(
Paths.Tools + "wwcxtool.exe",
Paths.WorkingFolder,
FileDatas.Apps.wwcxtool,
"wwcxtool.exe",
"/u html.arc html.dec"
);
if (!File.Exists(Paths.WorkingFolder + "html.dec")) throw new Exception(Program.Lang.Msg(2, true));
Expand Down Expand Up @@ -606,7 +606,7 @@ private void ExtractWAD_Click(object sender, EventArgs e)
goto End;
}

else throw new Exception(Program.Lang.Msg(15, true));
else throw new Exception(Program.Lang.Msg(16, true));
}

catch (Exception ex) { error = ex; goto Failed; }
Expand Down
98 changes: 98 additions & 0 deletions FriishProduce/Options/VC_SNES.Designer.cs
View file

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

24 changes: 24 additions & 0 deletions FriishProduce/Options/VC_SNES.settings
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version='1.0' encoding='utf-8'?>
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="FriishProduce.Options" GeneratedClassName="VC_SNES">
<Profiles />
<Settings>
<Setting Name="patch_volume" Type="System.String" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="patch_nodark" Type="System.String" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="patch_nocc" Type="System.String" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="patch_nosuspend" Type="System.String" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="patch_nosave" Type="System.String" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
<Setting Name="patch_widescreen" Type="System.String" Scope="User">
<Value Profile="(Default)">False</Value>
</Setting>
</Settings>
</SettingsFile>
7 changes: 4 additions & 3 deletions FriishProduce/ProjectForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ private void Form_Shown(object sender, EventArgs e)
// ********
if (loadProject)
foreach (var item in new string[] { project.ROM, project.Patch, project.BaseFile, project.Sound })
if (!File.Exists(item) && !string.IsNullOrWhiteSpace(item)) MessageBox.Show(string.Format(Program.Lang.Msg(10, true), Path.GetFileName(item)));
if (!File.Exists(item) && !string.IsNullOrWhiteSpace(item)) MessageBox.Show(string.Format(Program.Lang.Msg(11, true), Path.GetFileName(item)));
project = null;
}

Expand Down Expand Up @@ -1556,7 +1556,7 @@ private void saveToWAD(object sender, System.ComponentModel.DoWorkEventArgs e)
for (int i = 0; i < entry.Regions.Count; i++)
if (entry.GetUpperID(i) == baseID.Text.ToUpper()) outWad = entry.GetWAD(i);
if (outWad == null || outWad?.NumOfContents <= 1)
throw new Exception(Program.Lang.Msg(8, true));
throw new Exception(Program.Lang.Msg(9, true));

// -----------------------------------------------
progress.step += 1;
Expand Down Expand Up @@ -1684,7 +1684,7 @@ private void saveToWAD(object sender, System.ComponentModel.DoWorkEventArgs e)
// Check new WAD file
// *******
if (File.Exists(targetFile) && File.ReadAllBytes(targetFile).Length > 10) error = null;
else throw new Exception(Program.Lang.Msg(6, true));
else throw new Exception(Program.Lang.Msg(7, true));
}

catch (Exception ex)
Expand Down Expand Up @@ -2146,6 +2146,7 @@ private void resetContentOptions()
break;

case Platform.SNES:
contentOptionsForm = new Options_VC_SNES();
break;

case Platform.N64:
Expand Down
Binary file added FriishProduce/Resources/apps/sns_boost.exe
View file
Binary file not shown.
0 ...ce/bin/Debug/resources/tools/wwcxtool.exe → FriishProduce/Resources/apps/wwcxtool.exe
View file
File renamed without changes.
Loading

0 comments on commit a442d28

Please sign in to comment.