From 4eaca6a17a5365ede6487f3e101f2457a814f391 Mon Sep 17 00:00:00 2001
From: LolHacksRule <dantefmele@outlook.com>
Date: Sun, 19 Feb 2023 12:12:44 -0800
Subject: [PATCH] Fix DKCTF NS messagetable from archive

---
 CPakFile.bt     | 2 +-
 MessageTable.bt | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/CPakFile.bt b/CPakFile.bt
index 7774c20..220af53 100644
--- a/CPakFile.bt
+++ b/CPakFile.bt
@@ -43,7 +43,7 @@ string AssetDirectoryEntryName(AssetDirectoryEntry& entry)
 {
     if (isDKCTF) {
         // Read the chunk ver and subver from form descriptor
-        return Str("%s v%d.%d %s", entry.type, entry.data.form.versionA, entry.data.form.versionB, GUIDToString(entry.id));
+        return Str("%s v%d.%d %s", entry.type, entry.data.form.readerVersion, entry.data.form.writerVersion, GUIDToString(entry.id));
     } else {
         return Str("%s v%d.%d %s", entry.type, entry.versionA, entry.versionB, GUIDToString(entry.id));
     }
diff --git a/MessageTable.bt b/MessageTable.bt
index 510f086..cfc4624 100644
--- a/MessageTable.bt
+++ b/MessageTable.bt
@@ -18,10 +18,6 @@ struct MSBTHeader {
     ushort unk3;
     uint fileSize;
     byte padding[10]<hidden=true>;
-    if (isDKCTF) //Swap back
-    {
-        BigEndian();
-    }
 };
 
 struct TableHeader(string expectedMagic) {
@@ -135,6 +131,10 @@ struct Language (string expectedLanguage) {
         LabelsSection labels;
         AttributesSection attributes;
         TextsSection texts;
+        if (isDKCTF) //Swap back
+        {
+            BigEndian();
+        }
     } contents;
 };