From c28622f9b06902b06e0ffc61789be0361cb60354 Mon Sep 17 00:00:00 2001
From: Koopa <codingkoopa@gmail.com>
Date: Sun, 28 Feb 2021 01:33:27 -0500
Subject: [PATCH 1/8] =?UTF-8?q?Remove=20'=C3=A9'=20from=20enum=20member=20?=
 =?UTF-8?q?name.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This causes a compile error on my machine with "dotnet build".
---
 pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs b/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs
index 83516191..d33d1fe3 100644
--- a/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs
+++ b/pkNX.Structures/Encounter/Gen8/FlatStatic/EncounterStatic8.cs
@@ -73,7 +73,7 @@ public int[] Moves
         public enum Scenario
         {
             None,
-            Legendary_Pokémon,
+            Legendary_Pokemon,
             _2,
             _3,
             Eternatus,

From 86c480527b0649561892f47b8781f580c6d934c7 Mon Sep 17 00:00:00 2001
From: Koopa <codingkoopa@gmail.com>
Date: Sun, 28 Feb 2021 01:42:19 -0500
Subject: [PATCH 2/8] Upgrade .NET target to 4.6.1.

This will be required for System.Resources.Extensions.
---
 pkNX.Containers/pkNX.Containers.csproj       | 4 ++--
 pkNX.Game/pkNX.Game.csproj                   | 4 ++--
 pkNX.Randomization/pkNX.Randomization.csproj | 2 +-
 pkNX.Sprites/pkNX.Sprites.csproj             | 2 +-
 pkNX.Structures/pkNX.Structures.csproj       | 2 +-
 pkNX.WinForms/pkNX.WinForms.csproj           | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkNX.Containers/pkNX.Containers.csproj b/pkNX.Containers/pkNX.Containers.csproj
index fefc8ef3..04851892 100644
--- a/pkNX.Containers/pkNX.Containers.csproj
+++ b/pkNX.Containers/pkNX.Containers.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <Description>Packing &amp; Unpacking</Description>
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
diff --git a/pkNX.Game/pkNX.Game.csproj b/pkNX.Game/pkNX.Game.csproj
index 53318e09..c02ae8ea 100644
--- a/pkNX.Game/pkNX.Game.csproj
+++ b/pkNX.Game/pkNX.Game.csproj
@@ -1,7 +1,7 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <Description>Game Data Manager</Description>
     <LangVersion>9</LangVersion>
   </PropertyGroup>
diff --git a/pkNX.Randomization/pkNX.Randomization.csproj b/pkNX.Randomization/pkNX.Randomization.csproj
index 2be3af3d..d28f5399 100644
--- a/pkNX.Randomization/pkNX.Randomization.csproj
+++ b/pkNX.Randomization/pkNX.Randomization.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <Description>Randomizer Utility</Description>
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
diff --git a/pkNX.Sprites/pkNX.Sprites.csproj b/pkNX.Sprites/pkNX.Sprites.csproj
index ef61ff68..2e020d60 100644
--- a/pkNX.Sprites/pkNX.Sprites.csproj
+++ b/pkNX.Sprites/pkNX.Sprites.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net5.0;net46</TargetFrameworks>
+    <TargetFrameworks>net5.0;net461</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/pkNX.Structures/pkNX.Structures.csproj b/pkNX.Structures/pkNX.Structures.csproj
index 7fb01a84..29b803a6 100644
--- a/pkNX.Structures/pkNX.Structures.csproj
+++ b/pkNX.Structures/pkNX.Structures.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net46</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net461</TargetFrameworks>
     <Description>Data Structures</Description>
     <LangVersion>9</LangVersion>
   </PropertyGroup>
diff --git a/pkNX.WinForms/pkNX.WinForms.csproj b/pkNX.WinForms/pkNX.WinForms.csproj
index e490bcfd..15da8a06 100644
--- a/pkNX.WinForms/pkNX.WinForms.csproj
+++ b/pkNX.WinForms/pkNX.WinForms.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net46</TargetFrameworks>
+    <TargetFrameworks>net461</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <RootNamespace>pkNX.WinForms</RootNamespace>
     <Company>Project Pokémon</Company>

From 2251c0d966da02226469628d2495f9b3164f0ae3 Mon Sep 17 00:00:00 2001
From: Koopa <codingkoopa@gmail.com>
Date: Sun, 28 Feb 2021 01:44:37 -0500
Subject: [PATCH 3/8] Add references to System.Resources.Extensions.

---
 pkNX.Sprites/pkNX.Sprites.csproj   | 4 ++--
 pkNX.WinForms/pkNX.WinForms.csproj | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkNX.Sprites/pkNX.Sprites.csproj b/pkNX.Sprites/pkNX.Sprites.csproj
index 2e020d60..53f32eed 100644
--- a/pkNX.Sprites/pkNX.Sprites.csproj
+++ b/pkNX.Sprites/pkNX.Sprites.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFrameworks>net5.0;net461</TargetFrameworks>
@@ -11,6 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
+	  <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
       <AutoGen>True</AutoGen>
@@ -27,7 +28,6 @@
 
   <ItemGroup Condition="$(TargetFramework.StartsWith('net5'))">
     <PackageReference Include="System.Drawing.Common" Version="5.0.0" />
-    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/pkNX.WinForms/pkNX.WinForms.csproj b/pkNX.WinForms/pkNX.WinForms.csproj
index 15da8a06..fb81a58b 100644
--- a/pkNX.WinForms/pkNX.WinForms.csproj
+++ b/pkNX.WinForms/pkNX.WinForms.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFrameworks>net461</TargetFrameworks>
@@ -86,4 +86,8 @@
     <None Include="Resources\Flatbuffers\EncounterTrade8Archive.fbs" />
     <None Include="Resources\Flatbuffers\Waza8.fbs" />
   </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
+  </ItemGroup>
 </Project>
\ No newline at end of file

From a8e871da2e208d6674af60b6b7b0db4d90323501 Mon Sep 17 00:00:00 2001
From: Koopa <codingkoopa@gmail.com>
Date: Sun, 28 Feb 2021 01:46:22 -0500
Subject: [PATCH 4/8] Add GenerateResourceUsePreserializedResources.

---
 pkNX.Sprites/pkNX.Sprites.csproj   | 1 +
 pkNX.WinForms/pkNX.WinForms.csproj | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkNX.Sprites/pkNX.Sprites.csproj b/pkNX.Sprites/pkNX.Sprites.csproj
index 53f32eed..37cec757 100644
--- a/pkNX.Sprites/pkNX.Sprites.csproj
+++ b/pkNX.Sprites/pkNX.Sprites.csproj
@@ -4,6 +4,7 @@
     <TargetFrameworks>net5.0;net461</TargetFrameworks>
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/pkNX.WinForms/pkNX.WinForms.csproj b/pkNX.WinForms/pkNX.WinForms.csproj
index fb81a58b..6f086a86 100644
--- a/pkNX.WinForms/pkNX.WinForms.csproj
+++ b/pkNX.WinForms/pkNX.WinForms.csproj
@@ -13,6 +13,7 @@
     <AssemblyName>pkNX</AssemblyName>
     <LangVersion>9</LangVersion>
     <Nullable>enable</Nullable>
+    <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>
 
   <ItemGroup>

From f88ba88102219a09c4e981ee7240e10856a54c11 Mon Sep 17 00:00:00 2001
From: Koopa <codingkoopa@gmail.com>
Date: Sun, 28 Feb 2021 01:49:34 -0500
Subject: [PATCH 5/8] Make resource paths case sensitive.

---
 pkNX.WinForms/Properties/Resources.resx | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkNX.WinForms/Properties/Resources.resx b/pkNX.WinForms/Properties/Resources.resx
index 8ef06502..58c91b39 100644
--- a/pkNX.WinForms/Properties/Resources.resx
+++ b/pkNX.WinForms/Properties/Resources.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -119,10 +119,10 @@
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="BattleTowerPoke8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\battletowerpoke8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\BattleTowerPoke8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="BattleTowerTrainer8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\battletowertrainer8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\BattleTowerTrainer8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="EncounterArchive7b" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Flatbuffers\EncounterArchive7b.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -140,7 +140,7 @@
     <value>..\Resources\Flatbuffers\EncounterStatic8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="EncounterTrade8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\encountertrade8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\EncounterTrade8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="EncounterUnderground8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Flatbuffers\EncounterUnderground8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -149,22 +149,22 @@
     <value>..\Resources\Flatbuffers\flatc.exe;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="NestHoleCrystalEncounter8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\nestholecrystalencounter8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\NestHoleCrystalEncounter8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="NestHoleDistributionEncounter8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\nestholedistributionencounter8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\NestHoleDistributionEncounter8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="NestHoleDistributionReward8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\nestholedistributionreward8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\NestHoleDistributionReward8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="NestHoleLevel8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\nestholelevel8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\NestHoleLevel8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="NestHoleReward8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\nestholereward8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\NestHoleReward8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="PlacementArea8Archive" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\flatbuffers\placementarea8archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>..\Resources\Flatbuffers\PlacementArea8Archive.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="Waza8" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Flatbuffers\Waza8.fbs;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

From 552149774d389021e49f5ce67382a828b8504151 Mon Sep 17 00:00:00 2001
From: Koopa <codingkoopa@gmail.com>
Date: Sun, 28 Feb 2021 01:51:46 -0500
Subject: [PATCH 6/8] Prefer system flatc.

---
 pkNX.WinForms/Dumping/FlatBufferConverter.cs | 23 +++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkNX.WinForms/Dumping/FlatBufferConverter.cs b/pkNX.WinForms/Dumping/FlatBufferConverter.cs
index 03f18793..a7e8c060 100644
--- a/pkNX.WinForms/Dumping/FlatBufferConverter.cs
+++ b/pkNX.WinForms/Dumping/FlatBufferConverter.cs
@@ -1,4 +1,4 @@
-using System.Diagnostics;
+using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;
 using Newtonsoft.Json;
@@ -119,9 +119,20 @@ private static void GenerateBinFrom<T>(T obj)
 
         private static void RunFlatC(string args)
         {
-            var fcp = Path.Combine(FlatPath, "flatc.exe");
-            if (!File.Exists(fcp))
-                File.WriteAllBytes(fcp, Resources.flatc);
+            String fcp = "";
+            // If there's a flatc on the path, prefer it.
+            foreach (var path in Environment.GetEnvironmentVariable("PATH").Split(Path.PathSeparator))
+            {
+                var fullPath = Path.Combine(path, "flatc");
+                if (File.Exists(fullPath))
+                    fcp = fullPath;
+            }
+            if (string.IsNullOrEmpty(fcp))
+            {
+                fcp = Path.Combine(FlatPath, "flatc.exe");
+                if (!File.Exists(fcp))
+                    File.WriteAllBytes(fcp, Resources.flatc);
+            }
 
             using var process = new Process
             {
@@ -130,8 +141,8 @@ private static void RunFlatC(string args)
                     WorkingDirectory = FlatPath,
                     WindowStyle = ProcessWindowStyle.Hidden,
                     CreateNoWindow = true,
-                    FileName = "cmd.exe",
-                    Arguments = $"/C flatc {args} & exit",
+                    FileName = fcp,
+                    Arguments = args,
                 }
             };
             process.Start();

From c5ba9b6b295ad76cc4b64ecb7b373b84fd3908f9 Mon Sep 17 00:00:00 2001
From: Koopa <codingkoopa@gmail.com>
Date: Sun, 28 Feb 2021 01:54:05 -0500
Subject: [PATCH 7/8] Update C# version note.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index aac343e8..2dcae25d 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ pkNX also provides some utility to extract from supported container types, e.g.
 
 pkNX is a Windows Forms application which requires [.NET Framework v4.6](https://www.microsoft.com/en-us/download/details.aspx?id=48137).
 
-The executable can be built with any compiler that supports C# 8.
+The executable can be built with any compiler that supports C# 9.
 
 ## Dependencies
 

From cc71b6357cdb548aa85f89f1e5242ea815a5dfba Mon Sep 17 00:00:00 2001
From: Koopa <codingkoopa@gmail.com>
Date: Sun, 28 Feb 2021 02:10:30 -0500
Subject: [PATCH 8/8] Add System import for String.

---
 pkNX.WinForms/Dumping/FlatBufferConverter.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkNX.WinForms/Dumping/FlatBufferConverter.cs b/pkNX.WinForms/Dumping/FlatBufferConverter.cs
index a7e8c060..ca81f988 100644
--- a/pkNX.WinForms/Dumping/FlatBufferConverter.cs
+++ b/pkNX.WinForms/Dumping/FlatBufferConverter.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Windows.Forms;