From 45ef136620f01b87ef5acda30014f5a00f40d053 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 20 Apr 2016 12:31:51 -0700
Subject: [PATCH] We aren't just diffdats amymore

---
 MergeDAT/MergeDAT.cs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/MergeDAT/MergeDAT.cs b/MergeDAT/MergeDAT.cs
index 67e32e52..00bd3283 100644
--- a/MergeDAT/MergeDAT.cs
+++ b/MergeDAT/MergeDAT.cs
@@ -112,7 +112,14 @@ namespace SabreTools
 				A = RomManipulation.Merge(A);
 			}
 
-			Output.WriteToDat("diffdat", "diffdat", "", "", "DiffDat", "SabreTools", false, !RomManipulation.IsXmlDat(inputs[0]), "", A, logger);
+			if (diff)
+			{
+				Output.WriteToDat("diffdat" + (merge ? "-merged" : ""), "diffdat" + (merge ? "-merged" : ""), "", "", "DiffDat", "SabreTools", false, !RomManipulation.IsXmlDat(inputs[0]), "", A, logger);
+			}
+			else
+			{
+				Output.WriteToDat("combinedat" + (merge ? "-merged" : ""), "combinedat" + (merge ? "-merged" : ""), "", "", "", "SabreTools", false, !RomManipulation.IsXmlDat(inputs[0]), "", A, logger);
+			}
 		}
 	}
 }