From 6fc301f49f3094334e9a3efbb456f205a886a450 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 13 May 2025 11:42:22 -0400 Subject: [PATCH] Tweak the check for offset roms --- SabreTools.DatFiles/DatFile.FromMetadata.cs | 32 ++------------------- 1 file changed, 2 insertions(+), 30 deletions(-) diff --git a/SabreTools.DatFiles/DatFile.FromMetadata.cs b/SabreTools.DatFiles/DatFile.FromMetadata.cs index c4e01aa3..c585ee52 100644 --- a/SabreTools.DatFiles/DatFile.FromMetadata.cs +++ b/SabreTools.DatFiles/DatFile.FromMetadata.cs @@ -1013,8 +1013,8 @@ namespace SabreTools.DatFiles addRoms.Add(romItem); } - // If there is only one item and the sizes don't match - if (addRoms.Count == 1) + // If there is only one item left, check sizes + if (roms.Length > 1 && addRoms.Count == 1) { long? dataAreaSize = dataAreaItem.GetInt64FieldValue(Models.Metadata.DataArea.SizeKey); long? romSize = addRoms[0].GetInt64FieldValue(Models.Metadata.Rom.SizeKey); @@ -1423,34 +1423,6 @@ namespace SabreTools.DatFiles } } - /// - /// Get a numeric value from a string that's possibly hex - /// - private static long? ParseAsPossibleHex(string? numeric) - { - // If the value is null - if (string.IsNullOrEmpty(numeric)) - return null; - - try - { - // Get the value from the string - if (!long.TryParse(numeric, out long value)) - { - if (!numeric!.StartsWith("0x", StringComparison.OrdinalIgnoreCase)) - return null; - - value = long.Parse(numeric.Substring(2), NumberStyles.HexNumber); - } - - return value; - } - catch - { - return null; - } - } - #endregion } } \ No newline at end of file