From 70728ce493405b8d51eb95d70f5fcfd9dfacd522 Mon Sep 17 00:00:00 2001
From: phacoxcll <36426650+phacoxcll@users.noreply.github.com>
Date: Mon, 2 Dec 2019 14:36:18 -0600
Subject: [PATCH] Update files for version 1.8

---
 64Inject/64Inject.csproj            |  27 +---
 64Inject/64Injector.cs              | 215 +++++++++++++---------------
 64Inject/Properties/AssemblyInfo.cs |   4 +-
 64Inject/RomN64.cs                  | 139 +++++++++---------
 64Inject/Security.cs                |   7 +
 64Inject/VCN64.cs                   | 100 +++++++++----
 64Inject/VCN64ConfigFile.cs         |   8 +-
 7 files changed, 256 insertions(+), 244 deletions(-)

diff --git a/64Inject/64Inject.csproj b/64Inject/64Inject.csproj
index b445ada..716dfc5 100644
--- a/64Inject/64Inject.csproj
+++ b/64Inject/64Inject.csproj
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.6\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.6\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" />
-  <Import Project="..\packages\Microsoft.NetFramework.Analyzers.2.9.6\build\Microsoft.NetFramework.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.6\build\Microsoft.NetFramework.Analyzers.props')" />
-  <Import Project="..\packages\Microsoft.NetCore.Analyzers.2.9.6\build\Microsoft.NetCore.Analyzers.props" Condition="Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.6\build\Microsoft.NetCore.Analyzers.props')" />
-  <Import Project="..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props" Condition="Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props')" />
-  <Import Project="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props" Condition="Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" />
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -303,17 +299,6 @@
   <ItemGroup>
     <Content Include="Icon.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\analyzers\dotnet\cs\Microsoft.CodeAnalysis.VersionCheckAnalyzer.resources.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\analyzers\dotnet\Microsoft.CodeAnalysis.VersionCheckAnalyzer.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\analyzers\dotnet\cs\Humanizer.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeQuality.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.CodeQuality.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.NetCore.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.NetCore.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.NetCore.CSharp.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.NetFramework.Analyzers.dll" />
-    <Analyzer Include="..\packages\Microsoft.NetFramework.Analyzers.2.9.6\analyzers\dotnet\cs\Microsoft.NetFramework.CSharp.Analyzers.dll" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
@@ -325,14 +310,4 @@
   <PropertyGroup>
     <PreBuildEvent>"C:\Users\Alberto\source\repos\64Inject\64Inject\CllAssemblyVersion.exe" assemblyInfo "$(ProjectDir)Properties\AssemblyInfo.cs" projectPath "$(ProjectPath)" config "$(ConfigurationName)" platform "$(PlatformName)" title "$(SolutionName)" format "major.minor.build.revision" replaceIn "$(ProjectDir)64Injector.cs"</PreBuildEvent>
   </PropertyGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>Este proyecto hace referencia a los paquetes NuGet que faltan en este equipo. Use la restauración de paquetes NuGet para descargarlos. Para obtener más información, consulte http://go.microsoft.com/fwlink/?LinkID=322105. El archivo que falta es {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.VersionCheckAnalyzer.2.9.6\build\Microsoft.CodeAnalysis.VersionCheckAnalyzer.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeQuality.Analyzers.2.9.6\build\Microsoft.CodeQuality.Analyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.NetCore.Analyzers.2.9.6\build\Microsoft.NetCore.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetCore.Analyzers.2.9.6\build\Microsoft.NetCore.Analyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.NetFramework.Analyzers.2.9.6\build\Microsoft.NetFramework.Analyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.NetFramework.Analyzers.2.9.6\build\Microsoft.NetFramework.Analyzers.props'))" />
-    <Error Condition="!Exists('..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.6\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.CodeAnalysis.FxCopAnalyzers.2.9.6\build\Microsoft.CodeAnalysis.FxCopAnalyzers.props'))" />
-  </Target>
 </Project>
\ No newline at end of file
diff --git a/64Inject/64Injector.cs b/64Inject/64Injector.cs
index 7437e38..4af112e 100644
--- a/64Inject/64Injector.cs
+++ b/64Inject/64Injector.cs
@@ -9,7 +9,7 @@ namespace _64Inject
 {
     public class _64Injector
     {
-        public const string Release = "1.7 debug"; //CllVersionReplace "major.minor stability"
+        public const string Release = "1.8 debug"; //CllVersionReplace "major.minor stability"
 
         public string BasePath;
         public string ShortName;
@@ -84,37 +84,25 @@ public string TitleId
         {
             get
             {
-                ulong crc;
+                if (BaseIsLoaded && RomIsLoaded)
+                {
+                    uint crc = Rom.HashCRC16;
 
-                if (BaseIsLoaded)
-                    crc = _base.HashCRC32;
-                else
-                    crc = Cll.Security.ComputeCRC32(new byte[] { }, 0, 0);
+                    if (IniIsLoaded)
+                        crc += Ini.HashCRC16;
+                    else
+                        crc += Cll.Security.ComputeCRC16_ARC(new byte[] { }, 0, 0);
+                    crc >>= 1;
 
-                if (RomIsLoaded)
-                    crc += Rom.HashCRC32;                    
-                else
-                    crc += Cll.Security.ComputeCRC32(new byte[] { }, 0, 0);
-                crc >>= 1;
+                    int flags = _base.Index;
+                    flags |= DarkFilter ? 0x80 : 0;
+                    flags |= Widescreen ? 0x40 : 0;
+                    flags |= Scale != 1.0F ? 0x20 : 0;
 
-                if (IniIsLoaded)
-                    crc += Ini.HashCRC32;
+                    return "0005000064" + crc.ToString("X4") + ((byte)(flags)).ToString("X2");
+                }
                 else
-                    crc += Cll.Security.ComputeCRC32(new byte[] { }, 0, 0);
-                crc >>= 1;
-
-                byte[] b = BitConverter.GetBytes((uint)crc);
-                UInt16 id = (UInt16)((((b[3] << 8) + (b[2])) + ((b[1] << 8) + (b[0]))) >> 1);
-
-                int flags = 0;
-                flags |= DarkFilter ? 0x80 : 0;
-                flags |= Widescreen ? 0x40 : 0;
-                flags |= Scale != 1.0F ? 0x20 : 0;
-                flags |= IconImg.IsDefault ? 0 : 0x10;
-                flags |= BootTvImg.IsDefault ? 0 : 8;
-                flags |= BootDrcImg.IsDefault ? 0 : 4;                
-
-                return "0005000064" + id.ToString("X4") + ((byte)(flags)).ToString("X2");
+                    return "";
             }
         }
         
@@ -149,7 +137,13 @@ public bool Inject()
         {
             _base = GetLoadedBase();
             bool _continue = BaseIsLoaded;
-            Cll.Log.WriteLine("The base is ready: " + _continue.ToString());
+            if (_continue)
+            {
+                Cll.Log.WriteLine("Base info:");
+                Cll.Log.WriteLine(_base.ToString());
+            }
+            else
+                Cll.Log.WriteLine("The base is not loaded.");
 
             if (_continue)
                 _continue = InjectGameLayout();
@@ -417,8 +411,30 @@ private bool InjectMeta()
                 XmlNode meta_product_code = xmlMeta.SelectSingleNode("menu/product_code");
                 XmlNode meta_title_id = xmlMeta.SelectSingleNode("menu/title_id");
                 XmlNode meta_group_id = xmlMeta.SelectSingleNode("menu/group_id");
+                XmlNode meta_longname_ja = xmlMeta.SelectSingleNode("menu/longname_ja");
                 XmlNode meta_longname_en = xmlMeta.SelectSingleNode("menu/longname_en");
+                XmlNode meta_longname_fr = xmlMeta.SelectSingleNode("menu/longname_fr");
+                XmlNode meta_longname_de = xmlMeta.SelectSingleNode("menu/longname_de");
+                XmlNode meta_longname_it = xmlMeta.SelectSingleNode("menu/longname_it");
+                XmlNode meta_longname_es = xmlMeta.SelectSingleNode("menu/longname_es");
+                XmlNode meta_longname_zhs = xmlMeta.SelectSingleNode("menu/longname_zhs");
+                XmlNode meta_longname_ko = xmlMeta.SelectSingleNode("menu/longname_ko");
+                XmlNode meta_longname_nl = xmlMeta.SelectSingleNode("menu/longname_nl");
+                XmlNode meta_longname_pt = xmlMeta.SelectSingleNode("menu/longname_pt");
+                XmlNode meta_longname_ru = xmlMeta.SelectSingleNode("menu/longname_ru");
+                XmlNode meta_longname_zht = xmlMeta.SelectSingleNode("menu/longname_zht");
+                XmlNode meta_shortname_ja = xmlMeta.SelectSingleNode("menu/shortname_ja");
                 XmlNode meta_shortname_en = xmlMeta.SelectSingleNode("menu/shortname_en");
+                XmlNode meta_shortname_fr = xmlMeta.SelectSingleNode("menu/shortname_fr");
+                XmlNode meta_shortname_de = xmlMeta.SelectSingleNode("menu/shortname_de");
+                XmlNode meta_shortname_it = xmlMeta.SelectSingleNode("menu/shortname_it");
+                XmlNode meta_shortname_es = xmlMeta.SelectSingleNode("menu/shortname_es");
+                XmlNode meta_shortname_zhs = xmlMeta.SelectSingleNode("menu/shortname_zhs");
+                XmlNode meta_shortname_ko = xmlMeta.SelectSingleNode("menu/shortname_ko");
+                XmlNode meta_shortname_nl = xmlMeta.SelectSingleNode("menu/shortname_nl");
+                XmlNode meta_shortname_pt = xmlMeta.SelectSingleNode("menu/shortname_pt");
+                XmlNode meta_shortname_ru = xmlMeta.SelectSingleNode("menu/shortname_ru");
+                XmlNode meta_shortname_zht = xmlMeta.SelectSingleNode("menu/shortname_zht");
 
                 app_title_id.InnerText = titleId;
                 app_group_id.InnerText = "0000" + id[5].ToString("X2") + id[6].ToString("X2");
@@ -426,8 +442,30 @@ private bool InjectMeta()
                 meta_product_code.InnerText = "WUP-N-" + Rom.ProductCode;
                 meta_title_id.InnerText = titleId;
                 meta_group_id.InnerText = "0000" + id[5].ToString("X2") + id[6].ToString("X2");
+                meta_longname_ja.InnerText = LongName;
                 meta_longname_en.InnerText = LongName;
+                meta_longname_fr.InnerText = LongName;
+                meta_longname_de.InnerText = LongName;
+                meta_longname_it.InnerText = LongName;
+                meta_longname_es.InnerText = LongName;
+                meta_longname_zhs.InnerText = LongName;
+                meta_longname_ko.InnerText = LongName;
+                meta_longname_nl.InnerText = LongName;
+                meta_longname_pt.InnerText = LongName;
+                meta_longname_ru.InnerText = LongName;
+                meta_longname_zht.InnerText = LongName;
+                meta_shortname_ja.InnerText = ShortName;
                 meta_shortname_en.InnerText = ShortName;
+                meta_shortname_fr.InnerText = ShortName;
+                meta_shortname_de.InnerText = ShortName;
+                meta_shortname_it.InnerText = ShortName;
+                meta_shortname_es.InnerText = ShortName;
+                meta_shortname_zhs.InnerText = ShortName;
+                meta_shortname_ko.InnerText = ShortName;
+                meta_shortname_nl.InnerText = ShortName;
+                meta_shortname_pt.InnerText = ShortName;
+                meta_shortname_ru.InnerText = ShortName;
+                meta_shortname_zht.InnerText = ShortName;
 
                 XmlWriter app = XmlWriter.Create("base\\code\\app.xml", xmlSettings);
                 XmlWriter meta = XmlWriter.Create("base\\meta\\meta.xml", xmlSettings);
@@ -463,11 +501,15 @@ private bool InjectIni()
                 Cll.Log.WriteLine("Injecting INI data.");
                 if (!IniIsLoaded)                    
                 {
+                    Cll.Log.WriteLine("Injecting an empty INI.");
                     File.Create("base\\content\\config\\U" + Rom.ProductCodeVersion + ".z64.ini").Close();
-                    Cll.Log.WriteLine("An empty INI injected.");
+                    Cll.Log.WriteLine("In: \"base\\content\\config\\U" + Rom.ProductCodeVersion + ".z64.ini\"");
+                    Cll.Log.WriteLine("INI injected.");
                 }
                 else if (VCN64ConfigFile.Copy(IniPath, "base\\content\\config\\U" + Rom.ProductCodeVersion + ".z64.ini"))
                 {
+                    Cll.Log.WriteLine("CRC16: " + Ini.HashCRC16.ToString("X4"));
+                    Cll.Log.WriteLine("In: \"base\\content\\config\\U" + Rom.ProductCodeVersion + ".z64.ini\"");
                     Cll.Log.WriteLine("Injected INI.");
                 }
                 else
@@ -498,6 +540,8 @@ private bool InjectRom()
                 Cll.Log.WriteLine("Injecting ROM.");
                 if (RomN64.ToBigEndian(RomPath, "base\\content\\rom\\U" + Rom.ProductCodeVersion + ".z64"))
                 {
+                    Cll.Log.WriteLine("CRC16: " + Rom.HashCRC16.ToString("X4"));
+                    Cll.Log.WriteLine("In: \"base\\content\\rom\\U" + Rom.ProductCodeVersion + ".z64\"");
                     Cll.Log.WriteLine("Injected ROM.");
                 }
                 else
@@ -543,22 +587,6 @@ public bool LoadBase(string path)
             return BaseIsLoaded;
         }
 
-        /*public bool LoadIni(string filename)
-        {
-            FileStream fs = File.Open(filename, FileMode.Open);
-            _ini = new byte[fs.Length];
-            fs.Read(_ini, 0, _ini.Length);
-            fs.Close();
-
-            if (Useful.IsUTF8(_ini))
-                return true;
-            else
-            {
-                _ini = null;
-                return false;
-            }
-        }*/
-
         private VCN64 GetLoadedBase()
         {
             if (IsValidBase("base"))
@@ -567,58 +595,35 @@ private VCN64 GetLoadedBase()
                 uint hash = Cll.Security.ComputeCRC32(fs);
                 fs.Close();
 
-                if (hash == VCN64.DonkeyKong64U.HashCRC32)
-                    return VCN64.DonkeyKong64U;
-                else if (hash == VCN64.DonkeyKong64J.HashCRC32)
-                    return VCN64.DonkeyKong64J;
-                else if (hash == VCN64.Ocarina.HashCRC32)
-                    return VCN64.Ocarina;
-                else if (hash == VCN64.PaperMario.HashCRC32)
-                    return VCN64.PaperMario;
-                else if (hash == VCN64.Kirby64J.HashCRC32)
-                    return VCN64.Kirby64J;
-                else if (hash == VCN64.Kirby64U.HashCRC32)
-                    return VCN64.Kirby64U;
-                else if (hash == VCN64.MarioTennisJ.HashCRC32)
-                    return VCN64.MarioTennisJ;
-                else if (hash == VCN64.MarioTennisU.HashCRC32)
-                    return VCN64.MarioTennisU;
-                else if (hash == VCN64.MarioGolfJ.HashCRC32)
-                    return VCN64.MarioGolfJ;
-                else if (hash == VCN64.MarioGolfU.HashCRC32)
-                    return VCN64.MarioGolfU;
-                else if (hash == VCN64.StarFox64.HashCRC32)
-                    return VCN64.StarFox64;
-                else if (hash == VCN64.SinAndP.HashCRC32)
-                    return VCN64.SinAndP;
-                else if (hash == VCN64.MarioKart64.HashCRC32)
-                    return VCN64.MarioKart64;
-                else if (hash == VCN64.YoshiStory.HashCRC32)
-                    return VCN64.YoshiStory;
-                else if (hash == VCN64.WaveRace64J.HashCRC32)
-                    return VCN64.WaveRace64J;
-                else if (hash == VCN64.WaveRace64U.HashCRC32)
-                    return VCN64.WaveRace64U;
-                else if (hash == VCN64.MajoraJ.HashCRC32)
-                    return VCN64.MajoraJ;
-                else if (hash == VCN64.MajoraU.HashCRC32)
-                    return VCN64.MajoraU;
-                else if (hash == VCN64.PokemonSnap.HashCRC32)
-                    return VCN64.PokemonSnap;
-                else if (hash == VCN64.MarioParty2.HashCRC32)
-                    return VCN64.MarioParty2;
-                else if (hash == VCN64.CustomRoboV2.HashCRC32)
-                    return VCN64.CustomRoboV2;
-                else if (hash == VCN64.OgreBattle64.HashCRC32)
-                    return VCN64.OgreBattle64;
-                else if (hash == VCN64.Excitebike64.HashCRC32)
-                    return VCN64.Excitebike64;
-                else if (hash == VCN64.FZeroX.HashCRC32)
-                    return VCN64.FZeroX;
-                else
+                switch (hash)
                 {
-                    Cll.Log.WriteLine("The base is valid but was not defined in the program code.");
-                    return new VCN64(hash, "", "**Unidentified**");
+                    case 0xFB245F10: return VCN64.Title01;
+                    case 0x8EF60284: return VCN64.Title02;
+                    case 0xF042E451: return VCN64.Title03;
+                    case 0xAE933905: return VCN64.Title04;
+                    case 0xCEB7A833: return VCN64.Title05;
+                    case 0x7EB7B97D: return VCN64.Title06;
+                    case 0x17BCC968: return VCN64.Title07;
+                    case 0x05F20995: return VCN64.Title08;
+                    case 0x8D3C196C: return VCN64.Title09;
+                    case 0x307DCE21: return VCN64.Title10;
+                    case 0xF41BC127: return VCN64.Title11;
+                    case 0x36C0456E: return VCN64.Title12;
+                    case 0x5559F831: return VCN64.Title13;
+                    case 0xD554D2E4: return VCN64.Title14;
+                    case 0x04F7D67F: return VCN64.Title15;
+                    case 0xC376B949: return VCN64.Title16;
+                    case 0xEE8855FF: return VCN64.Title17;
+                    case 0x71FC1731: return VCN64.Title18;
+                    case 0x967E7DF0: return VCN64.Title19;
+                    case 0xBE3CEC5F: return VCN64.Title20;
+                    case 0x89F2BC09: return VCN64.Title21;
+                    case 0xFED1FB48: return VCN64.Title22;
+                    case 0x724C4F5D: return VCN64.Title23;
+                    case 0x2AF3C23B: return VCN64.Title24;
+                    default:
+                        Cll.Log.WriteLine("The base is valid but was not defined in the program code.");
+                        return new VCN64(hash);
                 }
             }
             else
@@ -720,22 +725,6 @@ private bool IsValidEncryptedBase(string path)
             }
         }
 
-        public bool IsValidCode(string code)
-        {
-            if (code.Length == 4)
-            {
-                foreach (char c in code)
-                {
-                    if ((c < 'A' || c > 'Z') && (c < '0' || c > '9'))
-                        return false;
-                }
-            }
-            else
-                return false;
-
-            return true;
-        }
-
         #endregion
     }
 }
diff --git a/64Inject/Properties/AssemblyInfo.cs b/64Inject/Properties/AssemblyInfo.cs
index 57054f3..3083718 100644
--- a/64Inject/Properties/AssemblyInfo.cs
+++ b/64Inject/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Puede especificar todos los valores o establecer como predeterminados los números de versión de compilación y de revisión 
 // mediante el asterisco ('*'), como se muestra a continuación:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.7.76.0")]
-[assembly: AssemblyFileVersion("1.7.76.0")]
+[assembly: AssemblyVersion("1.8.3.0")]
+[assembly: AssemblyFileVersion("1.8.3.0")]
diff --git a/64Inject/RomN64.cs b/64Inject/RomN64.cs
index 111dc0c..40f0809 100644
--- a/64Inject/RomN64.cs
+++ b/64Inject/RomN64.cs
@@ -6,7 +6,7 @@ namespace _64Inject
 {
     public class RomN64
     {
-        public enum Endian
+        public enum Subformat
         {
             BigEndian,
             LittleEndian,
@@ -14,17 +14,18 @@ public enum Endian
             Indeterminate
         }
 
-        public int Size
+        public Subformat Endianness
         { private set; get; }
-        public Endian Endianness
+
+        public int Size
         { private set; get; }
         public string Title
         { private set; get; }
         public char FormatCode
         { private set; get; }
-        public string Id
+        public string ShortId
         { private set; get; }
-        public char ContryCode
+        public char RegionCode
         { private set; get; }
         public byte Version
         { private set; get; }
@@ -32,12 +33,12 @@ public byte Version
         public char Revision
         { get { return Version == 0? ' ' :(char)(Version + 0x40); } }
         public string ProductCode
-        { get { return (FormatCode + Id + ContryCode).ToUpper(); } }
+        { get { return (FormatCode + ShortId + RegionCode).ToUpper(); } }
         public string ProductCodeVersion
         { get { return ProductCode + Version.ToString("X"); } }
         public bool IsValid
         { private set; get; }
-        public uint HashCRC32
+        public ushort HashCRC16
         { private set; get; }
 
         public RomN64(string filename)
@@ -45,15 +46,15 @@ public RomN64(string filename)
             Size = 0;
             Title = "";
             FormatCode = '?';
-            Id = "??";
-            ContryCode = '?';
+            ShortId = "??";
+            RegionCode = '?';
             Version = 0;
             IsValid = false;
-            HashCRC32 = 0;
+            HashCRC16 = 0;
 
             try
             {
-                Cll.Log.WriteLine("Validating ROM.");
+                Cll.Log.WriteLine("Validating N64 ROM.");
 
                 byte[] header = new byte[0x40];
                 FileStream fs = File.Open(filename, FileMode.Open);
@@ -61,72 +62,74 @@ public RomN64(string filename)
                 fs.Read(header, 0, 0x40);
                 fs.Close();
 
-                if (Size > 0xFFF)
+                Endianness = GetFormat(header);
+
+                if (Endianness != Subformat.Indeterminate && Size % 4 == 0)
                 {
-                    if (header[0] == 0x80 &&
-                        header[1] == 0x37 &&
-                        header[2] == 0x12 &&
-                        header[3] == 0x40)
-                        Endianness = Endian.BigEndian;
-                    else if (header[0] == 0x37 &&
-                        header[1] == 0x80 &&
-                        header[2] == 0x40 &&
-                        header[3] == 0x12)
-                        Endianness = Endian.ByteSwapped;
-                    else if (header[0] == 0x40 &&
-                        header[1] == 0x12 &&
-                        header[2] == 0x37 &&
-                        header[3] == 0x80)
-                        Endianness = Endian.LittleEndian;
-                    else
-                        Endianness = Endian.Indeterminate;
-
-                    if (Endianness != Endian.Indeterminate && Size % 4 == 0)
-                    {
-                        IsValid = true;
-
-                        byte formatCode;
-                        byte[] id = new byte[2];
-                        byte contryCode;
-
-                        header = ToBigEndian(header, Endianness);
-
-                        formatCode = header[0x3B];
-                        id[0] = header[0x3C];
-                        id[1] = header[0x3D];
-                        contryCode = header[0x3E];
-                        Version = header[0x3F];
-                        FormatCode = (char)formatCode;
-                        Id = Encoding.ASCII.GetString(id);
-                        ContryCode = (char)contryCode;
-
-                        byte[] titleBytes = new byte[20];
-                        Array.Copy(header, 0x20, titleBytes, 0, 20);
-                        int count = 20;
-                        while (titleBytes[--count] == 0x20 && count > 0) ;
-                        Title = Encoding.ASCII.GetString(titleBytes, 0, count + 1);
-
-                        fs = File.Open(filename, FileMode.Open);
-                        HashCRC32 = Cll.Security.ComputeCRC32(fs);
-                        fs.Close();
-
-                        Cll.Log.WriteLine("The ROM is valid and its metadata has been loaded.");
-                    }
-                    else
-                        Cll.Log.WriteLine("It was not possible to determine the ROM format.");
+                    byte uniqueCode;
+                    byte[] shortTitle = new byte[2];
+                    byte region;
+
+                    header = ToBigEndian(header, Endianness);
+
+                    uniqueCode = header[0x3B];
+                    shortTitle[0] = header[0x3C];
+                    shortTitle[1] = header[0x3D];
+                    region = header[0x3E];
+                    Version = header[0x3F];
+                    FormatCode = (char)uniqueCode;
+                    ShortId = Encoding.ASCII.GetString(shortTitle);
+                    RegionCode = (char)region;
+
+                    byte[] titleBytes = new byte[20];
+                    Array.Copy(header, 0x20, titleBytes, 0, 20);
+                    int count = 20;
+                    while (titleBytes[--count] == 0x20 && count > 0) ;
+                    Title = Encoding.ASCII.GetString(titleBytes, 0, count + 1);
+
+                    fs = File.Open(filename, FileMode.Open);
+                    //Size = (int)fs.Length;
+                    HashCRC16 = Cll.Security.ComputeCRC16(fs);
+                    fs.Close();
+
+                    IsValid = true;
+                    Cll.Log.WriteLine("The N64 ROM is valid and its metadata has been loaded.");
                 }
                 else
                 {
                     Size = 0;
-                    Cll.Log.WriteLine("The ROM is too small to be valid.");
+                    Cll.Log.WriteLine("It was not possible to determine the N64 ROM format.");
                 }
             }
             catch
             {
-                Cll.Log.WriteLine("Error reading ROM.");
+                Cll.Log.WriteLine("Error reading N64 ROM.");
             }
         }
 
+        private static Subformat GetFormat(byte[] header)
+        {
+            Subformat format = Subformat.Indeterminate;
+
+            if (header[0] == 0x80 &&
+                header[1] == 0x37 &&
+                header[2] == 0x12 &&
+                header[3] == 0x40)
+                format = Subformat.BigEndian;
+            else if (header[0] == 0x37 &&
+                header[1] == 0x80 &&
+                header[2] == 0x40 &&
+                header[3] == 0x12)
+                format = Subformat.ByteSwapped;
+            else if (header[0] == 0x40 &&
+                header[1] == 0x12 &&
+                header[2] == 0x37 &&
+                header[3] == 0x80)
+                format = Subformat.LittleEndian;
+
+            return format;
+        }
+        
         public static bool ToBigEndian(string source, string destination)
         {
             RomN64 rom = new RomN64(source);
@@ -152,14 +155,14 @@ public static bool ToBigEndian(string source, string destination)
             return false;
         }
 
-        private static byte[] ToBigEndian(byte[] array, Endian endianness)
+        private static byte[] ToBigEndian(byte[] array, Subformat endianness)
         {
             if (array.Length % 4 != 0)
                 throw new Exception("ToBigEndian: Invalid array length.");
 
             byte[] bigEndian = new byte[4];
 
-            if (endianness == Endian.ByteSwapped)
+            if (endianness == Subformat.ByteSwapped)
             {
                 for (int i = 0; i < array.Length / 4; i++)
                 {
@@ -174,7 +177,7 @@ private static byte[] ToBigEndian(byte[] array, Endian endianness)
                     array[(i * 4) + 3] = bigEndian[3];
                 }
             }
-            else if (endianness == Endian.LittleEndian)
+            else if (endianness == Subformat.LittleEndian)
             {
                 for (int i = 0; i < array.Length / 4; i++)
                 {
diff --git a/64Inject/Security.cs b/64Inject/Security.cs
index b8341e0..7e3d18c 100644
--- a/64Inject/Security.cs
+++ b/64Inject/Security.cs
@@ -179,5 +179,12 @@ public static uint ComputeCRC32(Stream source)
             source.Read(array, 0, array.Length);
             return ComputeCRC32(array, 0, array.Length);
         }
+
+        public static ushort ComputeCRC16(Stream source)
+        {
+            byte[] array = new byte[source.Length];
+            source.Read(array, 0, array.Length);
+            return ComputeCRC16_ARC(array, 0, array.Length);
+        }
     }
 }
diff --git a/64Inject/VCN64.cs b/64Inject/VCN64.cs
index c66a844..c9f595f 100644
--- a/64Inject/VCN64.cs
+++ b/64Inject/VCN64.cs
@@ -1,47 +1,85 @@
-
+using System;
+
 namespace _64Inject
 {
     public class VCN64
     {
-        public readonly uint HashCRC32;
+        public readonly int Index;
+        public readonly uint Hash;
+        public readonly DateTime Date;
         public readonly string Title;
-        public readonly string Info;
+        public readonly int SVN;
 
-        public VCN64(uint hashCRC32, string info, string title)
+        public VCN64(int index, uint hash, DateTime date, string title, int svn)
         {
-            HashCRC32 = hashCRC32;
+            Index = index;
+            Hash = hash;
+            Date = date;
             Title = title;
-            Info = info;
+            SVN = svn;
+        }
+
+        public VCN64(uint hash)
+        {
+            Index = 0;
+            Hash = hash;
+            Date = new DateTime();
+            Title = "Unknown";
+            SVN = 0;
         }
 
         public override string ToString()
         {
-            return Title + "\nCRC32: " + HashCRC32.ToString("X8") + " " + Info;
+            return "Hash: " + Hash.ToString("X8") + ", SVN: " + SVN.ToString() + " TIME: " + Date.ToString("yyyy/MM/dd hh:mm:ss") + " \nTitle: " + Title;
         }
 
-        public static readonly VCN64 DonkeyKong64U  = new VCN64(0xFB245F10, "SVN: 1680 TIME: 2015/01/20 14:12:06", "Super Mario 64 (USA/EUR/JPN)/Donkey Kong 64 (USA/EUR)");
-        public static readonly VCN64 DonkeyKong64J  = new VCN64(0x8EF60284, "SVN: 1690 TIME: 2015/01/27 16:08:00", "Donkey Kong 64 (JPN)");
-        public static readonly VCN64 Ocarina        = new VCN64(0xF042E451, "SVN: 1696 TIME: 2015/01/30 10:49:22", "The Legend of Zelda: Ocarina of Time (USA/EUR/JPN)");
-        public static readonly VCN64 PaperMario     = new VCN64(0xAE933905, "SVN: 1743 TIME: 2015/03/05 15:06:57", "Paper Mario (USA/EUR/JPN)");
-        public static readonly VCN64 Kirby64J       = new VCN64(0xCEB7A833, "SVN: 1778 TIME: 2015/03/19 16:15:32", "Kirby 64: The Crystal Shards (JPN)");
-        public static readonly VCN64 Kirby64U       = new VCN64(0x7EB7B97D, "SVN: 1790 TIME: 2015/03/24 13:46:36", "Kirby 64: The Crystal Shards (USA/EUR)");
-        public static readonly VCN64 MarioTennisJ   = new VCN64(0x17BCC968, "SVN: 1897 TIME: 2015/05/12 17:32:21", "Mario Tennis (JPN)/1080º Snowboarding (JPN)");
-        public static readonly VCN64 MarioTennisU   = new VCN64(0x05F20995, "SVN: 1918 TIME: 2015/05/20 14:34:00", "Mario Tennis (USA/EUR)/1080º Snowboarding (USA/EUR)");
-        public static readonly VCN64 MarioGolfJ     = new VCN64(0x8D3C196C, "SVN: 1946 TIME: 2015/06/09 11:00:28", "Mario Golf (JPN)");
-        public static readonly VCN64 MarioGolfU     = new VCN64(0x307DCE21, "SVN: 1955 TIME: 2015/06/16 16:09:03", "Mario Golf (USA/EUR)");
-        public static readonly VCN64 StarFox64      = new VCN64(0xF41BC127, "SVN: 1970 TIME: 2015/06/30 14:07:35", "Star Fox 64 (USA/EUR/JPN)");
-        public static readonly VCN64 SinAndP        = new VCN64(0x36C0456E, "SVN: 1991 TIME: 2015/07/16 09:20:39", "Sin and Punishment (USA/EUR/JPN)");
-        public static readonly VCN64 MarioKart64    = new VCN64(0x5559F831, "SVN: 2043 TIME: 2015/08/18 10:07:52", "Mario Kart 64 (USA/EUR/JPN)");
-        public static readonly VCN64 YoshiStory     = new VCN64(0xD554D2E4, "SVN: 2079 TIME: 2015/09/15 16:19:11", "Yoshi's Story (USA/EUR/JPN)");
-        public static readonly VCN64 WaveRace64J    = new VCN64(0x04F7D67F, "SVN: 2109 TIME: 2015/10/22 10:15:03", "Wave Race 64 (JPN)");
-        public static readonly VCN64 WaveRace64U    = new VCN64(0xC376B949, "SVN: 2136 TIME: 2015/11/18 12:41:26", "Wave Race 64 (USA/EUR)");
-        public static readonly VCN64 MajoraJ        = new VCN64(0xEE8855FF, "SVN: 2170 TIME: 2015/12/16 16:01:23", "The Legend of Zelda: Majora's Mask (JPN)");
-        public static readonly VCN64 MajoraU        = new VCN64(0x71FC1731, "SVN: 2190 TIME: 2016/01/05 16:50:14", "The Legend of Zelda: Majora's Mask (USA/EUR)");
-        public static readonly VCN64 PokemonSnap    = new VCN64(0x967E7DF0, "SVN: 2195 TIME: 2016/01/08 09:42:51", "Pokémon Snap (USA/EUR/JPN)");
-        public static readonly VCN64 MarioParty2    = new VCN64(0xBE3CEC5F, "SVN: 2234 TIME: 2016/02/02 10:56:10", "Mario Party 2 (USA/EUR/JPN)");
-        public static readonly VCN64 CustomRoboV2   = new VCN64(0x89F2BC09, "SVN: 2244 TIME: 2016/02/26 09:03:55", "Custom Robo V2 (JPN)");
-        public static readonly VCN64 OgreBattle64   = new VCN64(0xFED1FB48, "SVN: 2395 TIME: 2016/08/30 13:57:02", "Ogre Battle 64: Person of Lordly Caliber (USA/EUR/JPN)");
-        public static readonly VCN64 Excitebike64   = new VCN64(0x724C4F5D, "SVN: 2404 TIME: 2016/09/14 13:42:00", "Excitebike 64 (USA/EUR/JPN)");
-        public static readonly VCN64 FZeroX         = new VCN64(0x2AF3C23B, "SVN: 2428 TIME: 2016/11/18 11:44:39", "F-Zero X (USA/EUR/JPN)/Bomberman 64 (USA/EUR/JPN)/Harvest Moon 64 (USA/EUR/JPN)");
+        /// <summary>Donkey Kong 64 (USA/EUR)/Super Mario 64 (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title01 = new VCN64(01, 0xFB245F10, new DateTime(2015, 1, 20, 14, 12, 6), "Super Mario 64 (USA/EUR/JPN)/Donkey Kong 64 (USA/EUR)", 1680);
+        /// <summary>Donkey Kong 64 (JPN)</summary>
+        public static readonly VCN64 Title02 = new VCN64(02, 0x8EF60284, new DateTime(2015, 1, 27, 16, 8, 0), "Donkey Kong 64 (JPN)", 1690);
+        /// <summary>The Legend of Zelda: Ocarina of Time (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title03 = new VCN64(03, 0xF042E451, new DateTime(2015, 1, 30, 10, 49, 22), "The Legend of Zelda: Ocarina of Time (USA/EUR/JPN)", 1696);
+        /// <summary>Paper Mario (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title04 = new VCN64(04, 0xAE933905, new DateTime(2015, 3, 5, 15, 6, 57), "Paper Mario (USA/EUR/JPN)", 1743);
+        /// <summary>Kirby 64: The Crystal Shards (JPN)</summary>
+        public static readonly VCN64 Title05 = new VCN64(05, 0xCEB7A833, new DateTime(2015, 3, 19, 16, 15, 32), "Kirby 64: The Crystal Shards (JPN)", 1778);
+        /// <summary>Kirby 64: The Crystal Shards (USA/EUR)</summary>
+        public static readonly VCN64 Title06 = new VCN64(06, 0x7EB7B97D, new DateTime(2015, 3, 24, 13, 46, 36), "Kirby 64: The Crystal Shards (USA/EUR)", 1790);
+        /// <summary>Mario Tennis (JPN)/1080º Snowboarding (JPN)</summary>
+        public static readonly VCN64 Title07 = new VCN64(07, 0x17BCC968, new DateTime(2015, 5, 12, 17, 32, 21), "Mario Tennis (JPN)/1080º Snowboarding (JPN)", 1897);
+        /// <summary>Mario Tennis (USA/EUR)/1080º Snowboarding (USA/EUR)</summary>
+        public static readonly VCN64 Title08 = new VCN64(08, 0x05F20995, new DateTime(2015, 5, 20, 14, 34, 0), "Mario Tennis (USA/EUR)/1080º Snowboarding (USA/EUR)", 1918);
+        /// <summary>Mario Golf (JPN)</summary>
+        public static readonly VCN64 Title09 = new VCN64(09, 0x8D3C196C, new DateTime(2015, 6, 9, 11, 0, 28), "Mario Golf (JPN)", 1946);
+        /// <summary>Mario Golf (USA/EUR)</summary>
+        public static readonly VCN64 Title10 = new VCN64(10, 0x307DCE21, new DateTime(2015, 6, 16, 16, 9, 3), "Mario Golf (USA/EUR)", 1955);
+        /// <summary>Star Fox 64 (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title11 = new VCN64(11, 0xF41BC127, new DateTime(2015, 6, 30, 14, 7, 35), "Star Fox 64 (USA/EUR/JPN)", 1970);
+        /// <summary>Sin and Punishment (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title12 = new VCN64(12, 0x36C0456E, new DateTime(2015, 7, 16, 9, 20, 39), "Sin and Punishment (USA/EUR/JPN)", 1991);
+        /// <summary>Mario Kart 64 (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title13 = new VCN64(13, 0x5559F831, new DateTime(2015, 8, 18, 10, 7, 52), "Mario Kart 64 (USA/EUR/JPN)", 2043);
+        /// <summary>Yoshi's Story (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title14 = new VCN64(14, 0xD554D2E4, new DateTime(2015, 9, 15, 16, 19, 11), "Yoshi's Story (USA/EUR/JPN)", 2079);
+        /// <summary>Wave Race 64 (JPN)</summary>
+        public static readonly VCN64 Title15 = new VCN64(15, 0x04F7D67F, new DateTime(2015, 10, 22, 10, 15, 3), "Wave Race 64 (JPN)", 2109);
+        /// <summary>Wave Race 64 (USA/EUR)</summary>
+        public static readonly VCN64 Title16 = new VCN64(16, 0xC376B949, new DateTime(2015, 11, 18, 12, 41, 26), "Wave Race 64 (USA/EUR)", 2136);
+        /// <summary>The Legend of Zelda: Majora's Mask (JPN)</summary>
+        public static readonly VCN64 Title17 = new VCN64(17, 0xEE8855FF, new DateTime(2015, 12, 16, 16, 1, 23), "The Legend of Zelda: Majora's Mask (JPN)", 2170);
+        /// <summary>The Legend of Zelda: Majora's Mask (USA/EUR)</summary>
+        public static readonly VCN64 Title18 = new VCN64(18, 0x71FC1731, new DateTime(2016, 1, 5, 16, 50, 14), "The Legend of Zelda: Majora's Mask (USA/EUR)", 2190);
+        /// <summary>Pokémon Snap (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title19 = new VCN64(19, 0x967E7DF0, new DateTime(2016, 1, 8, 9, 42, 51), "Pokémon Snap (USA/EUR/JPN)", 2195);
+        /// <summary>Mario Party 2 (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title20 = new VCN64(20, 0xBE3CEC5F, new DateTime(2016, 2, 2, 10, 56, 10), "Mario Party 2 (USA/EUR/JPN)", 2234);
+        /// <summary>Custom Robo V2 (JPN)</summary>
+        public static readonly VCN64 Title21 = new VCN64(21, 0x89F2BC09, new DateTime(2016, 2, 26, 9, 3, 55), "Custom Robo V2 (JPN)", 2244);
+        /// <summary>Ogre Battle 64: Person of Lordly Caliber (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title22 = new VCN64(22, 0xFED1FB48, new DateTime(2016, 8, 30, 13, 57, 2), "Ogre Battle 64: Person of Lordly Caliber (USA/EUR/JPN)", 2395);
+        /// <summary>Excitebike 64 (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title23 = new VCN64(23, 0x724C4F5D, new DateTime(2016, 9, 14, 13, 42, 0), "Excitebike 64 (USA/EUR/JPN)", 2404);
+        /// <summary>F-Zero X (USA/EUR/JPN)/Bomberman 64 (USA/EUR/JPN)/Harvest Moon 64 (USA/EUR/JPN)</summary>
+        public static readonly VCN64 Title24 = new VCN64(24, 0x2AF3C23B, new DateTime(2016, 11, 18, 11, 44, 39), "F-Zero X (USA/EUR/JPN)/Bomberman 64 (USA/EUR/JPN)/Harvest Moon 64 (USA/EUR/JPN)", 2428);
     }
 }
diff --git a/64Inject/VCN64ConfigFile.cs b/64Inject/VCN64ConfigFile.cs
index ed7db33..e07bed3 100644
--- a/64Inject/VCN64ConfigFile.cs
+++ b/64Inject/VCN64ConfigFile.cs
@@ -7,13 +7,13 @@ public class VCN64ConfigFile
     {
         public bool IsValid
         { private set; get; }
-        public uint HashCRC32
+        public ushort HashCRC16
         { private set; get; }
 
         public VCN64ConfigFile(string filename)
         {
             IsValid = false;
-            HashCRC32 = 0;
+            HashCRC16 = 0;
 
             try
             {
@@ -30,13 +30,13 @@ public VCN64ConfigFile(string filename)
                 try
                 {
                     FileStream fs = File.Open(filename, FileMode.Open);
-                    HashCRC32 = Cll.Security.ComputeCRC32(fs);
+                    HashCRC16 = Cll.Security.ComputeCRC16(fs);
                     fs.Close();
                     Cll.Log.WriteLine("The configuration file is valid and its metadata has been loaded.");
                 }
                 catch
                 {
-                    HashCRC32 = 0;
+                    HashCRC16 = 0;
                     Cll.Log.WriteLine("Error reading \"" + filename + "\".");
                 }
             }