diff --git a/DATabase/Import.cs b/DATabase/Import.cs
index 9311350a..2059696c 100644
--- a/DATabase/Import.cs
+++ b/DATabase/Import.cs
@@ -24,9 +24,10 @@ namespace SabreTools
private static string _maybeIntroPattern = @"(.*?) \[T-En\].*\((\d{8})\)\.dat$";
private static string _noIntroPattern = @"^(.*?) \((\d{8}-\d{6})_CM\)\.dat$";
private static string _noIntroNumberedPattern = @"(.*? - .*?) \(\d.*?_CM\).dat";
- private static string _noIntroSpecialPattern = @"(.*? - .*?) \((\d{8})\)\.dat";
- private static string _nonGoodPattern = @"(NonGood.*?)( .*)?.dat";
- private static string _redumpPattern = @"^(.*?) \((\d{8} \d{2}-\d{2}-\d{2})\)\.dat$";
+ private static string _noIntroSpecialPattern = @"(.*? - .*?) \((\d{8})\)\.dat";
+ private static string _nonGoodPattern = @"^(NonGood.*?)( .*?)?.xml";
+ private static string _nonGoodSpecialPattern = @"^(NonGood.*?)( .*)?.dat";
+ private static string _redumpPattern = @"^(.*?) \((\d{8} \d{2}-\d{2}-\d{2})\)\.dat$";
private static string _redumpBiosPattern = @"^(.*?) \(\d+\) \((\d{4}-\d{2}-\d{2})\)\.dat$";
private static string _tosecPattern = @"^(.*?) - .* \(TOSEC-v(\d{4}-\d{2}-\d{2})_CM\)\.dat$";
private static string _tosecSpecialPatternA = @"^(.*? - .*?) - .* \(TOSEC-v(\d{4}-\d{2}-\d{2})_CM\)\.dat$";
@@ -102,8 +103,13 @@ namespace SabreTools
{
fileinfo = Regex.Match(filename, _nonGoodPattern).Groups;
type = DatType.NonGood;
- }
- else if (Regex.IsMatch(filename, _maybeIntroPattern))
+ }
+ else if (Regex.IsMatch(filename, _nonGoodSpecialPattern))
+ {
+ fileinfo = Regex.Match(filename, _nonGoodSpecialPattern).Groups;
+ type = DatType.NonGood;
+ }
+ else if (Regex.IsMatch(filename, _maybeIntroPattern))
{
fileinfo = Regex.Match(filename, _maybeIntroPattern).Groups;
type = DatType.MaybeIntro;
diff --git a/DATabase/Mappings/NonGood.xml b/DATabase/Mappings/NonGood.xml
index 451ce265..40fcfa33 100644
--- a/DATabase/Mappings/NonGood.xml
+++ b/DATabase/Mappings/NonGood.xml
@@ -15,6 +15,7 @@
+
@@ -23,6 +24,7 @@
+