diff --git a/PS4_PKG_Viewer/Form1.cs b/PS4_PKG_Viewer/Form1.cs index d700e3d..ae6f416 100644 --- a/PS4_PKG_Viewer/Form1.cs +++ b/PS4_PKG_Viewer/Form1.cs @@ -140,7 +140,8 @@ private void openToolStripMenuItem_Click(object sender, EventArgs e) label2.Text = PS4_PKG.PS4_Title; dataGridView3.DataSource = null; label3.Text = PS4_PKG.Content_ID; - lblExtraInfo.Text = "System Version : "+PS4_PKG.Firmware_Version + " (" + PS4_PKG.PKGState.ToString() + ")"; + lblExtraInfo.Text = "System Version : " + PS4_PKG.Firmware_Version + " (" + PS4_PKG.PKGState.ToString() + ") " + PS4_PKG.Region; + this.Text = "PS4 PKG Viewer - PS4 Tools (" + PS4_PKG.PKG_Type.ToString() + ")"; DataTable dttemp = new DataTable(); dttemp.Columns.Add("PARAM"); dttemp.Columns.Add("VALUE"); diff --git a/PS4_PKG_Viewer/bin/Debug/PS4_PKG_Viewer.exe b/PS4_PKG_Viewer/bin/Debug/PS4_PKG_Viewer.exe index b1768b1..6fa0a6e 100644 Binary files a/PS4_PKG_Viewer/bin/Debug/PS4_PKG_Viewer.exe and b/PS4_PKG_Viewer/bin/Debug/PS4_PKG_Viewer.exe differ diff --git a/PS4_PKG_Viewer/bin/Debug/PS4_PKG_Viewer.pdb b/PS4_PKG_Viewer/bin/Debug/PS4_PKG_Viewer.pdb index a60b575..696f0a0 100644 Binary files a/PS4_PKG_Viewer/bin/Debug/PS4_PKG_Viewer.pdb and b/PS4_PKG_Viewer/bin/Debug/PS4_PKG_Viewer.pdb differ diff --git a/PS4_PKG_Viewer/bin/Debug/PS4_Tools.dll b/PS4_PKG_Viewer/bin/Debug/PS4_Tools.dll index bb65dc6..bcc6bad 100644 Binary files a/PS4_PKG_Viewer/bin/Debug/PS4_Tools.dll and b/PS4_PKG_Viewer/bin/Debug/PS4_Tools.dll differ diff --git a/PS4_PKG_Viewer/bin/Debug/PS4_Tools.pdb b/PS4_PKG_Viewer/bin/Debug/PS4_Tools.pdb index 7729504..080e130 100644 Binary files a/PS4_PKG_Viewer/bin/Debug/PS4_Tools.pdb and b/PS4_PKG_Viewer/bin/Debug/PS4_Tools.pdb differ diff --git a/PS4_Tools/Main.cs b/PS4_Tools/Main.cs index 743afc4..d3d28a4 100644 --- a/PS4_Tools/Main.cs +++ b/PS4_Tools/Main.cs @@ -8801,6 +8801,9 @@ public string BuildDate } } + + public string Region { get; set; } + } @@ -9245,7 +9248,7 @@ This will also be used in my other project*/ pkgreturn.Entires = entry; string temp = Encoding.ASCII.GetString(data); - binaryReader.BaseStream.Seek(0x077, SeekOrigin.Begin); + binaryReader.BaseStream.Seek(4L, SeekOrigin.Begin); ushort pkgtype = Util.Utils.ReadUInt16(binaryReader);//custom read offset 119 this will tll us if its debug or retail //from the offset table we need to read the name @@ -9426,8 +9429,46 @@ This will also be used in my other project*/ var item = trpreader.Load(trp_byte, nptitle); pkgreturn.Trophy_File = item; } - pkgreturn.PKGState = (pkgtype == 6666) ? PKG_State.Fake : ((pkgtype == 7747) ? PKG_State.Officail_DP : PKG_State.Official); + bool pkgofficail = false; + pkgofficail = (pkgtype == 33536 | pkgtype == 33024); + + pkgreturn.PKGState = (pkgofficail == false) ? PKG_State.Fake : ((pkgtype == 7747) ? PKG_State.Officail_DP : PKG_State.Official); + + + //Adding region detection here as well for lapy's tools + switch (pkgreturn.Content_ID.ToUpper().Substring(0, 2)) + { + case "UP": + { + pkgreturn.Region = "( US )"; + break; + } + case "EP": + case "IP": + { + pkgreturn.Region = "( EU )"; + break; + } + case "JP": + { + pkgreturn.Region = "( JP )"; + break; + } + case "HP": + case "AP": + { + pkgreturn.Region = "( AS )"; + break; + } + case "KP": + { + pkgreturn.Region = "( KO )"; + break; + } + default: + break; + } } m_loaded = true; return pkgreturn; diff --git a/PS4_Tools/bin/Debug/PS4_Tools.dll b/PS4_Tools/bin/Debug/PS4_Tools.dll index 218d918..bcc6bad 100644 Binary files a/PS4_Tools/bin/Debug/PS4_Tools.dll and b/PS4_Tools/bin/Debug/PS4_Tools.dll differ diff --git a/PS4_Tools/bin/Debug/PS4_Tools.pdb b/PS4_Tools/bin/Debug/PS4_Tools.pdb index f3dc4cc..080e130 100644 Binary files a/PS4_Tools/bin/Debug/PS4_Tools.pdb and b/PS4_Tools/bin/Debug/PS4_Tools.pdb differ