From dedc8f9fa6fe0d946d83050b0d7a74462ce1436c Mon Sep 17 00:00:00 2001
From: Raymonf <raymonf@outlook.com>
Date: Tue, 8 Nov 2022 00:35:12 -0500
Subject: [PATCH] use EnglishMessageUSA instead of JapaneseMessage

---
 WTT/WTT/TableImporter.cs | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/WTT/WTT/TableImporter.cs b/WTT/WTT/TableImporter.cs
index 0c7a8bb..0ddf774 100644
--- a/WTT/WTT/TableImporter.cs
+++ b/WTT/WTT/TableImporter.cs
@@ -74,8 +74,10 @@ public class TableImporter
                 throw new InvalidDataException($"key '{key}' is invalid");
             if (strings.ContainsKey(key))
                 throw new DuplicateKeyException($"duplicate key '{key}' found for file {tomlPath} ({asset.FilePath})");
-            var exists = value.HasKey("JapaneseMessage") && value["JapaneseMessage"].IsString;
-            strings.Add(key, exists ? value["JapaneseMessage"].AsString.Value : null);
+
+            // we now output the boolean false for null values since toml doesn't have null
+            var exists = value.HasKey("EnglishMessageUSA") && value["EnglishMessageUSA"].IsString;
+            strings.Add(key, exists ? value["EnglishMessageUSA"].AsString.Value : null);
         }
     }
 
@@ -94,13 +96,6 @@ public class TableImporter
                 continue;
             }
 
-            // index of JapaneseMessage
-            var jpnIndex = entry.StructType.Value.Value switch
-            {
-                "MessageData" => 0,
-                "CharaMessageData" => 3,
-                _ => throw new Exception($"Unhandled type '{entry.StructType}'")
-            };
             // index of EnglishMessageUSA
             var engIndex = entry.StructType.Value.Value switch
             {
@@ -109,8 +104,7 @@ public class TableImporter
                 _ => throw new Exception($"Unhandled type '{entry.StructType}'")
             };
 
-            // set the string as the english string if it isn't the same as the japanese string
-            if (strings[name] != null && ((FString)entry.Value[jpnIndex].RawValue).Value != strings[name])
+            if (strings[name] != null)
             {
                 entry.Value[engIndex].SetObject(FString.FromString(strings[name]));
             }