diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs index 883d4ae3..f150c5ac 100644 --- a/DATabase/MergeDiff.cs +++ b/DATabase/MergeDiff.cs @@ -75,9 +75,9 @@ namespace SabreTools public bool Process() { // Check if there are enough inputs - if (_inputs.Count < 2) + if ((!_ad && _inputs.Count < 1) || (_ad && _inputs.Count < 2)) { - _logger.Warning("At least 2 inputs are required!"); + _logger.Warning("At least " + (_ad ? "2" : "1") + " input(s) are required!"); return false; } @@ -144,7 +144,7 @@ namespace SabreTools } // Sort the file by names for ease - RomManipulation.Sort(A, false); + RomManipulation.Sort(A, true); // Now write the file out Output.WriteToDat(_name, _desc, _version, _date, _cat, _author, _forceunpack, _old, "", A, _logger); diff --git a/SabreHelper/Build.cs b/SabreHelper/Build.cs index 5d0ec908..9e6d2a07 100644 --- a/SabreHelper/Build.cs +++ b/SabreHelper/Build.cs @@ -117,7 +117,7 @@ Options: -l, --log Enable logging of program output -lso, --list-sources List all sources (id <= name) -lsy, --list-systems List all systems (id <= name) - -m, --merge Merge two or more DATs + -m, --merge Merge one or more DATs -ad, --all-diff Enable output of all diff variants (2 DATs only) -di, --diff Switch to diffdat mode -dd, --dedup Enable deduping in the created DAT