diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..42bace3 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.vs/* +Conv2PSV/bin/* +Conv2PSV/obj/* \ No newline at end of file diff --git a/Conv2PSV/App.config b/Conv2PSV/App.config index 88fa402..5ffd8f8 100644 --- a/Conv2PSV/App.config +++ b/Conv2PSV/App.config @@ -1,6 +1,6 @@ - - - - - - \ No newline at end of file + + + + + + diff --git a/Conv2PSV/Conv2PSV.csproj b/Conv2PSV/Conv2PSV.csproj index 9369cb5..fd2874a 100644 --- a/Conv2PSV/Conv2PSV.csproj +++ b/Conv2PSV/Conv2PSV.csproj @@ -1,59 +1,60 @@ - - - - - Debug - AnyCPU - {08DD69CC-AD7E-4173-BF1C-CD6E0C9C8B8C} - Exe - Conv2PSV - PS12PSV - v4.5.2 - 512 - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - Icon.ico - - - - - - - - - - - - - - - - - - - - - - - + + + + + Debug + AnyCPU + {08DD69CC-AD7E-4173-BF1C-CD6E0C9C8B8C} + Exe + Conv2PSV + PS12PSV + v4.8 + 512 + true + + + + AnyCPU + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + AnyCPU + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + Icon.ico + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Conv2PSV/Conv2PSV.csproj.user b/Conv2PSV/Conv2PSV.csproj.user index 3df7a31..d0705f6 100644 --- a/Conv2PSV/Conv2PSV.csproj.user +++ b/Conv2PSV/Conv2PSV.csproj.user @@ -1,8 +1,10 @@ - - - - BASCUS-94228SPYRO.mcs - false - C:\Users\earsy\Documents\visual studio 2017\Projects\Conv2PSV\Conv2PSV\bin\Debug - + + + + + + false + + + \ No newline at end of file diff --git a/Conv2PSV/Icon.ico b/Conv2PSV/Icon.ico index 30b246c..c7a749e 100644 Binary files a/Conv2PSV/Icon.ico and b/Conv2PSV/Icon.ico differ diff --git a/Conv2PSV/Program.cs b/Conv2PSV/Program.cs index d0f777d..da2bfa4 100644 --- a/Conv2PSV/Program.cs +++ b/Conv2PSV/Program.cs @@ -21,7 +21,7 @@ namespace Conv2PSV } return str; - } + } static void WriteMagic(Stream fs) { @@ -40,7 +40,7 @@ namespace Conv2PSV static String GetTitle(String FileName) { - if (Path.GetExtension(FileName) == ".mcs") + if (Path.GetExtension(FileName).ToLower() == ".mcs" || Path.GetExtension(FileName).ToLower() == ".ps1") { FileStream fs = File.OpenRead(FileName); fs.Seek(0xA, SeekOrigin.Begin); @@ -48,17 +48,17 @@ namespace Conv2PSV fs.Close(); return Name; } - else if(Path.GetExtension(FileName) == ".gme") + else if(Path.GetExtension(FileName).ToLower() == ".mcb" || Path.GetExtension(FileName).ToLower() == ".psx" || Path.GetExtension(FileName).ToLower() == ".mcx" || Path.GetExtension(FileName).ToLower() == ".pda") { FileStream fs = File.OpenRead(FileName); - fs.Seek(0xFCA, SeekOrigin.Begin); + fs.Seek(0x0, SeekOrigin.Begin); String Name = GetString(fs); fs.Close(); return Name; } else { - throw new FileNotFoundException(); + return Path.GetFileNameWithoutExtension(FileName); } } @@ -95,34 +95,52 @@ namespace Conv2PSV return PsvName; } + static int GetScLen(String FilePath) + { + if (Path.GetExtension(FilePath).ToLower() == ".mcs" || Path.GetExtension(FilePath).ToLower() == ".ps1") + { + FileStream MCS = File.OpenRead(FilePath); + int SCLen = Convert.ToInt32(MCS.Length - 0x80); + MCS.Close(); + return SCLen; + } + else if (Path.GetExtension(FilePath).ToLower() == ".mcb" || Path.GetExtension(FilePath).ToLower() == ".psx" || Path.GetExtension(FilePath).ToLower() == ".mcx" || Path.GetExtension(FilePath).ToLower() == ".pda") + { + FileStream PSX = File.OpenRead(FilePath); + int SCLen = Convert.ToInt32(PSX.Length - 0x36); + PSX.Close(); + return SCLen; + } + else + { + FileStream RAW = File.OpenRead(FilePath); + int SCLen = Convert.ToInt32(RAW.Length); + RAW.Close(); + return SCLen; + } + } static void WriteSC(String FilePath, Stream PSV) - { + { Console.WriteLine("Writing SC Image"); - if (Path.GetExtension(FilePath) == ".mcs") + if (Path.GetExtension(FilePath).ToLower() == ".mcs" || Path.GetExtension(FilePath).ToLower() == ".ps1") { FileStream MCS = File.OpenRead(FilePath); - long SCLen = MCS.Length - 0x80; MCS.Seek(0x80, SeekOrigin.Begin); - byte[] SCImage = new Byte[SCLen]; - MCS.Read(SCImage, 0x00, (int)SCLen); - PSV.Write(SCImage, 0x00, (int)SCLen); + MCS.CopyTo(PSV); MCS.Close(); } - else if (Path.GetExtension(FilePath) == ".gme") + else if (Path.GetExtension(FilePath).ToLower() == ".mcb" || Path.GetExtension(FilePath).ToLower() == ".psx" || Path.GetExtension(FilePath).ToLower() == ".mcx" || Path.GetExtension(FilePath).ToLower() == ".pda") { - FileStream GME = File.OpenRead(FilePath); - GME.Seek(0xFC4, SeekOrigin.Begin); - BinaryReader BGME = new BinaryReader(GME); - int SCLen = BGME.ReadInt16(); - GME.Seek(0x2F40, SeekOrigin.Begin); - byte[] SCImage = new Byte[SCLen]; - GME.Read(SCImage, 0x00, SCLen); - PSV.Write(SCImage, 0x00, SCLen); - GME.Close(); + FileStream PSX = File.OpenRead(FilePath); + PSX.Seek(0x36, SeekOrigin.Begin); + PSX.CopyTo(PSV); + PSX.Close(); } else - { - throw new FileNotFoundException(); + { + FileStream RAW = File.OpenRead(FilePath); + RAW.CopyTo(PSV); + RAW.Close(); } } @@ -134,7 +152,7 @@ namespace Conv2PSV Console.WriteLine("Select Save"); OpenFileDialog ofd = new OpenFileDialog(); ofd.InitialDirectory = Directory.GetCurrentDirectory(); - ofd.Filter = "PlayStation One Save Files (*.mcs, *.gme)|*.mcs;*.gme|MemCardREX Single Save (*.mcs)|*.mcs|PlayStation DEXDRIVE (Datel) (*.gme)|*.gme"; + ofd.Filter = "PlayStation One Single Save Files (*.mcs, *.ps1, *.mcb, *.psx, *.mcx, *.mcb, *.mcx *.pda, *.raw)|*.mcs;*.ps1;*.mcb;*.psx;*.mcx;*.pda;*.raw|PSXGameEdit Single Save (*.mcs)|*.mcs|Memory Card Juggler Single Save (*.ps1)|*.ps1|Smart Link Single Save (*.mcb)|*.mcb|Action Replay, Caetla or Game Shark Single Save (*.psx)|*.psx|Datel Single Save (*.mcx, *.pda)|*.mcx;*.pda|RAW Single Save (*, *.raw)|*;*.raw"; DialogResult res = ofd.ShowDialog(); if (res == DialogResult.OK) { @@ -148,7 +166,7 @@ namespace Conv2PSV String SaveTitle = GetTitle(FilePath); Console.Write("PsvName = "); - String PsvName = Path.Combine(Path.GetDirectoryName(FilePath),"PS3","EXPORT","PSV"); + String PsvName = Path.Combine(Path.GetDirectoryName(FilePath), "PS3", "EXPORT", "PSV"); Directory.CreateDirectory(PsvName); PsvName = Path.Combine(PsvName, GetPsvName(SaveTitle)); Console.WriteLine(Path.GetFileName(PsvName)); @@ -157,30 +175,50 @@ namespace Conv2PSV PSV.SetLength(0); BinaryWriter BW = new BinaryWriter(PSV); WriteMagic(PSV); - BW.Write((UInt32)0); + // Write reserved space. + BW.Write((UInt32)0); + BW.Write((UInt64)0x00); - //Am lazy and dont want to implement sonys broken AES-CBC algorythm - //Just do a seed i know the hmac key for - //ps3 wont care. + // Am lazy and dont want to implement sonys broken AES-CBC + // Just do a seed i know the hmac key for + // ps3 wont care. Byte[] StaticSeeed = { 0x42, 0x6C, 0x65, 0x73, 0x73, 0x65, 0x64, 0x20, 0x42, 0x65, 0x20, 0x7E, 0x20, 0x57, 0x69, 0x63, 0x63, 0x61, 0x6E, 0x73 }; - //"Blessed Be ~ Wiccans"(0x14) - Allways nice to add personality to your code where-ever possible. + //"Blessed Be ~ Wiccans" - Allways nice to add personality to your code where-ever possible. PSV.Write(StaticSeeed, 0x00, 0x14); + int SCSize = GetScLen(FilePath); + Console.WriteLine("SC Image Size: " + SCSize.ToString()); PSV.Write(new Byte[0x14], 0x00, 0x14); - Console.WriteLine("Writing Flags... "); - Byte[] Flags = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x84, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x03, 0x90, 0x00, 0x00}; - PSV.Write(Flags, 0x00, 0x34); + Console.WriteLine("Writing Header... "); + BW.Write((UInt32)0x14); // 0x14 - PS1 Save, 0x2C PS2 Save. + BW.Write((UInt32)0x01); // 0x01 - PS1 Save, 0x02 PS2 Save. + BW.Write((UInt32)SCSize); // Fileisze + + BW.Write((UInt32)0x84); // Unknown 2 + BW.Write((UInt32)0x200); // Unknown 4 + + BW.Write((UInt64)0x00); // Reserved 2 + BW.Write((UInt64)0x00); // Reserved 3 + + BW.Write((UInt32)0x2000); // Unknown 5 + BW.Write((UInt32)0x9003); // Unknown 6 + + if (SaveTitle.Length > 20) + SaveTitle = SaveTitle.Substring(0, 20); + int Padding = (0x20 - SaveTitle.Length); - Console.WriteLine("Writing " + SaveTitle + " +" + Padding.ToString()); + Console.WriteLine("Writing " + SaveTitle + " + 0x00*" + Padding.ToString()); WriteString(PSV, SaveTitle); BW.Write(new Byte[Padding], 0x00, Padding); + + Console.WriteLine("Writing SC Image ..."); WriteSC(FilePath, PSV); byte[] Signature = SignatureGen(PSV); - Console.WriteLine("Writing Signature to file..."); + Console.WriteLine("Signing..."); PSV.Seek(0x1C, SeekOrigin.Begin); PSV.Write(Signature, 0x00, 0x14); Console.WriteLine("Done!\n\nBlessed Be ~");