diff --git a/SabreTools.DatFiles/DatFile.Splitting.cs b/SabreTools.DatFiles/DatFile.Splitting.cs index 2cc9f8bb..9242565f 100644 --- a/SabreTools.DatFiles/DatFile.Splitting.cs +++ b/SabreTools.DatFiles/DatFile.Splitting.cs @@ -79,12 +79,14 @@ namespace SabreTools.DatFiles /// /// Use romof tags to remove bios items from children /// - /// True if only child Bios sets are touched, false for non-bios sets /// Assumes items are bucketed by - public void RemoveItemsFromRomOfChild(bool bios) + public void RemoveItemsFromRomOfChild() { - RemoveItemsFromRomOfChildImpl(bios); - RemoveItemsFromRomOfChildImplDB(bios); + // TODO: Figure out why the bios flag is needed + RemoveItemsFromRomOfChildImpl(false); + RemoveItemsFromRomOfChildImplDB(false); + RemoveItemsFromRomOfChildImpl(true); + RemoveItemsFromRomOfChildImplDB(true); } /// diff --git a/SabreTools.DatTools/MergeSplit.cs b/SabreTools.DatTools/MergeSplit.cs index c8525568..87c5ad8e 100644 --- a/SabreTools.DatTools/MergeSplit.cs +++ b/SabreTools.DatTools/MergeSplit.cs @@ -127,8 +127,7 @@ namespace SabreTools.DatTools datFile.AddItemsFromChildren(true, false); // Now that we have looped through the cloneof tags, we loop through the romof tags - datFile.RemoveItemsFromRomOfChild(false); - datFile.RemoveItemsFromRomOfChild(true); + datFile.RemoveItemsFromRomOfChild(); // Finally, remove the romof and cloneof tags so it's not picked up by the manager datFile.RemoveMachineRelationshipTags(); @@ -172,8 +171,7 @@ namespace SabreTools.DatTools datFile.AddItemsFromChildren(true, true); // Now that we have looped through the cloneof tags, we loop through the romof tags - datFile.RemoveItemsFromRomOfChild(false); - datFile.RemoveItemsFromRomOfChild(true); + datFile.RemoveItemsFromRomOfChild(); // Finally, remove the romof and cloneof tags so it's not picked up by the manager datFile.RemoveMachineRelationshipTags(); @@ -194,8 +192,7 @@ namespace SabreTools.DatTools datFile.AddItemsFromCloneOfParent(); // Now that we have looped through the cloneof tags, we loop through the romof tags - datFile.RemoveItemsFromRomOfChild(false); - datFile.RemoveItemsFromRomOfChild(true); + datFile.RemoveItemsFromRomOfChild(); // Finally, remove the romof and cloneof tags so it's not picked up by the manager datFile.RemoveMachineRelationshipTags(); @@ -216,8 +213,7 @@ namespace SabreTools.DatTools datFile.RemoveItemsFromCloneOfChild(); // Now that we have looped through the cloneof tags, we loop through the romof tags - datFile.RemoveItemsFromRomOfChild(false); - datFile.RemoveItemsFromRomOfChild(true); + datFile.RemoveItemsFromRomOfChild(); // Finally, remove the romof and cloneof tags so it's not picked up by the manager datFile.RemoveMachineRelationshipTags();