claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Promote new flag to --dat-X instead

Browse Source 
This change also introduces a few fixes to merging flags in general, as things like device non-merged were being converted/handled strangely.
This commit is contained in:
Matt Nadareski
2023-04-19 12:04:25 -04:00
parent 542075a651
commit f6360492a4
9 changed files with 100 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
SabreTools.Core/Tools/Converters.cs
View File

@@ -1267,9 +1267,15 @@ namespace SabreTools.Core.Tools
{
"split" => MergingFlag.Split,
"merged" => MergingFlag.Merged,
"fullmerged" => MergingFlag.FullMerged,
"nonmerged" => MergingFlag.NonMerged,
"unmerged" => MergingFlag.NonMerged,
"full" => MergingFlag.Full,
"full" => MergingFlag.FullNonMerged,
"fullnonmerged" => MergingFlag.FullNonMerged,
"fullunmerged" => MergingFlag.FullNonMerged,
"device" => MergingFlag.DeviceNonMerged,
"devicenonmerged" => MergingFlag.DeviceNonMerged,
"deviceunmerged" => MergingFlag.DeviceNonMerged,
"none" => MergingFlag.None,
_ => MergingFlag.None,
};
@@ -1710,9 +1716,10 @@ namespace SabreTools.Core.Tools
{
MergingFlag.Split => "split",
MergingFlag.Merged => "merged",
MergingFlag.FullMerged => "fullmerged",
MergingFlag.NonMerged => romCenter ? "unmerged" : "nonmerged",
MergingFlag.Full => "full",
MergingFlag.Device => "device",
MergingFlag.FullNonMerged => "full",
MergingFlag.DeviceNonMerged => "device",
_ => null,
};
}