From c2b3932363551b62007ec257c8ce5b49b0c23728 Mon Sep 17 00:00:00 2001
From: Deterous <138427222+Deterous@users.noreply.github.com>
Date: Tue, 14 May 2024 23:34:11 +0900
Subject: [PATCH] Trim PIC for XboxOne/XboxSX (#700)

---
 CHANGELIST.md                                   | 1 +
 MPF.Core/Modules/BaseParameters.cs              | 2 ++
 MPF.Core/Modules/DiscImageCreator/Parameters.cs | 2 ++
 MPF.Core/Modules/Redumper/Parameters.cs         | 2 ++
 4 files changed, 7 insertions(+)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 285d30a3..5470d2af 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -3,6 +3,7 @@
 - Update Redumper to build 325
 - Fix CleanRip not pulling info (Deterous)
 - Fix XboxOne/XboxSX Filename bug (Deterous)
+- Trim PIC for XboxOne/XboxSX (Deterous)
 
 ### 3.1.8 (2024-05-09)
 
diff --git a/MPF.Core/Modules/BaseParameters.cs b/MPF.Core/Modules/BaseParameters.cs
index ea38e8a8..266737e6 100644
--- a/MPF.Core/Modules/BaseParameters.cs
+++ b/MPF.Core/Modules/BaseParameters.cs
@@ -1198,6 +1198,8 @@ namespace MPF.Core.Modules
                 if (trimLength > -1)
                     hex = hex.Substring(0, trimLength);
 
+                // TODO: Check for non-zero values in discarded PIC
+
                 return Regex.Replace(hex, ".{32}", "$0\n", RegexOptions.Compiled);
             }
             catch
diff --git a/MPF.Core/Modules/DiscImageCreator/Parameters.cs b/MPF.Core/Modules/DiscImageCreator/Parameters.cs
index fb9134a1..983d50ac 100644
--- a/MPF.Core/Modules/DiscImageCreator/Parameters.cs
+++ b/MPF.Core/Modules/DiscImageCreator/Parameters.cs
@@ -497,6 +497,8 @@ namespace MPF.Core.Modules.DiscImageCreator
                         int trimLength = -1;
                         switch (this.System)
                         {
+                            case RedumpSystem.MicrosoftXboxOne:
+                            case RedumpSystem.MicrosoftXboxSeriesXS:
                             case RedumpSystem.SonyPlayStation3:
                             case RedumpSystem.SonyPlayStation4:
                             case RedumpSystem.SonyPlayStation5:
diff --git a/MPF.Core/Modules/Redumper/Parameters.cs b/MPF.Core/Modules/Redumper/Parameters.cs
index e3e6f441..3b23daf0 100644
--- a/MPF.Core/Modules/Redumper/Parameters.cs
+++ b/MPF.Core/Modules/Redumper/Parameters.cs
@@ -376,6 +376,8 @@ namespace MPF.Core.Modules.Redumper
                         int trimLength = -1;
                         switch (this.System)
                         {
+                            case RedumpSystem.MicrosoftXboxOne:
+                            case RedumpSystem.MicrosoftXboxSeriesXS:
                             case RedumpSystem.SonyPlayStation3:
                             case RedumpSystem.SonyPlayStation4:
                             case RedumpSystem.SonyPlayStation5: