From f4c5573b81b03f45116d297969eff68d1a1328b7 Mon Sep 17 00:00:00 2001
From: LolHacksRule <dantefmele@outlook.com>
Date: Tue, 14 Feb 2023 19:55:38 -0800
Subject: [PATCH 1/5] Fix it for DKCTF

---
 CFormDescriptor.bt         | 13 +++++++++
 CGraphicsModel.bt          | 57 +++++++++++++++++++++++++++++---------
 CPakFile.bt                | 27 ++++++++++++------
 Common.bt                  |  2 +-
 Footer.bt                  |  2 +-
 MessageStudioBinaryText.bt | 11 +++++---
 Meta.bt                    |  4 +--
 NTextureFormat.bt          | 48 +++++++++++++++++++++-----------
 Run.bt                     | 17 ++++++++++--
 9 files changed, 133 insertions(+), 48 deletions(-)

diff --git a/CFormDescriptor.bt b/CFormDescriptor.bt
index d156fed..8f5759c 100644
--- a/CFormDescriptor.bt
+++ b/CFormDescriptor.bt
@@ -1,6 +1,19 @@
 typedef struct
 {
     FourCC type;
+    //So this is a check for DKCTF (Big Endian), basically 0x04 should be 0, if that's true, assume DKCTF, strange for DKCTF on NS was in BE, I'll prob fix this memory usage later
+    uint32 checkForDKCTF;
+    FSkip(-4);
+    if (checkForDKCTF == 0)
+    {
+        isDKCTF = 1;
+        AssetDirEntryChunkSz = 36;
+        BigEndian();
+    }
+    else
+    {
+        AssetDirEntryChunkSz = 52;
+    }
     uint64 size <format=hex>;
     uint64 unk1;
     FourCC id;
diff --git a/CGraphicsModel.bt b/CGraphicsModel.bt
index c2c320b..a691a22 100644
--- a/CGraphicsModel.bt
+++ b/CGraphicsModel.bt
@@ -27,16 +27,30 @@ struct CustomDataLoader {
 };
 
 struct ModelHeader {
-  uint unk1;
+  if (isDKCTF == 1)
+  {
+    uint opaqueMeshes;
+    uint onePassTransMeshes;
+    uint TwoPassTransMeshes;
+    uint oneBitMeshes;
+    uint additiveMeshes;
+  }
+  else
+  {
+    uint unk1;
+  }
   CAABox bounds;
   uint dataSourceCount;
   local int i;
   for (i = 0; i < dataSourceCount; ++i) {
     DataSourceLoader dataSource;
   }
-  uchar unk2;
-  if (unk2) {
-    CustomDataLoader customData;
+  if (isDKCTF != 1)
+  {
+    uchar unk2;
+    if (unk2) {
+      CustomDataLoader customData;
+    }
   }
 };
 
@@ -273,15 +287,29 @@ string CMaterialDataRead(CMaterialData &mat)
 typedef struct {
   CStringFixed name;
   GUID shaderID;
-  GUID guid2; //unsure
-  uint unk1;
-  uint unk2;
-  //material type list (can be 0)
-  uint typeCount;
+  if (isDKCTF == 1)
+  {
+    local uint typeCount <hidden=true> = 1; //Hack it to 1
+  }
+  else
+  {
+    GUID guid2; //unsure
+    uint unk1;
+    uint unk2;
+    //material type list (can be 0)
+    uint typeCount;
+  }
   uint types[typeCount];
-  //material data types (with extra value)
-  uint renderTypeCount;
-  MaterialRenderTypes renderTypes[renderTypeCount];
+  if (isDKCTF == 1)
+  {
+    uint flags;
+  }
+  else
+  {
+    //material data types (with extra value)
+    uint renderTypeCount;
+    MaterialRenderTypes renderTypes[renderTypeCount];
+  }
   //material data types
   uint dataCount;
   MaterialType dataTypes2[dataCount];
@@ -313,7 +341,10 @@ typedef struct {
     ModelHeader header;
     break;
   case "MTRL":
-    uint unk;
+    if (isDKCTF != 1)
+    {
+        uint unk;
+    }
     uint numMaterials;
     CMaterialCache materials[numMaterials]<optimize = false>;
     break;
diff --git a/CPakFile.bt b/CPakFile.bt
index 59e8059..082b801 100644
--- a/CPakFile.bt
+++ b/CPakFile.bt
@@ -5,15 +5,24 @@ typedef struct
 {
     FourCC type;
     GUID id;
-    uint32 versionA;
-    uint32 versionB;
+    if (isDKCTF == 0)
+    {
+        uint32 versionA;
+        uint32 versionB;
+    }
     uint64 offset;
-    uint64 decompressedSize;
+    if (isDKCTF == 0)
+    {
+        uint64 decompressedSize;
+    }
+    else
+    {
+        local uint decompressedSize <hidden=true> = 0; //hack
+    }
     uint64 size;
-
     local uint64 pos <format=hex, hidden=true> = FTell();
     FSeek(offset);
-    if (size == decompressedSize) {
+    if (size == decompressedSize || isDKCTF == 1) {
         File data <size=size>;
     } else {
 		enum <uint32> CompressionType
@@ -27,8 +36,8 @@ typedef struct
     }
     FSeek(pos);
 } AssetDirectoryEntry <
-    size=52, // Parse on-demand
-    name=(Str("%s v%d %s", this.type, this.versionA, GUIDToString(this.id))),
+    size=AssetDirEntryChunkSz, // Parse on-demand
+    name=(Str("%s v%d.%d %s", this.type, data.form.versionA, data.form.versionB, GUIDToString(this.id))), //Read the chunk ver and subver from form descriptor
     comment=(SizeComment(size))
 >;
 
@@ -40,10 +49,12 @@ typedef struct
     // Find the FourCC for the asset ID
     // Assumes TOCC chunk 0 is ADIR
     local FourCC type <hidden=true>;
+    local uint64 fileOffset <hidden=true>;
     local uint32 i <hidden=true>;
     for (i = 0; i < pak.chunk[0].count; i++) {
         if (pak.chunk[0].entry[i].id == id) {
             type = pak.chunk[0].entry[i].type;
+            fileOffset = pak.chunk[0].entry[i].offset;
             break;
         }
     }
@@ -51,7 +62,7 @@ typedef struct
     local uint64 pos <format=hex, hidden=true> = FTell();
     FSeek(start + offset);
     uint32 size;
-    Meta data(type, size);
+    Meta data(type, size, fileOffset);
     FSeek(pos);
 } MetaEntry <
     size=20, // Parse on-demand
diff --git a/Common.bt b/Common.bt
index 0e55682..ece3d66 100644
--- a/Common.bt
+++ b/Common.bt
@@ -19,7 +19,7 @@ string StringReadFixed(CStringFixed &str)
     return str.text;
 }
 
-typedef char FourCC[4];
+typedef char FourCC[4]<fgcolor=cLtGreen>;
 
 FourCC FourCCInt(uint32 in)
 {
diff --git a/Footer.bt b/Footer.bt
index 30adc57..64862b8 100644
--- a/Footer.bt
+++ b/Footer.bt
@@ -15,7 +15,7 @@ typedef struct(FourCC type)
             AssetInfo info;
             break;
         case "META":
-            Meta meta(type, chunk.size);
+            Meta meta(type, chunk.size, 0);
             break;
         case "NAME":
             char name[chunk.size];
diff --git a/MessageStudioBinaryText.bt b/MessageStudioBinaryText.bt
index fb9f821..654b8a3 100644
--- a/MessageStudioBinaryText.bt
+++ b/MessageStudioBinaryText.bt
@@ -154,8 +154,11 @@ struct MessageStudioBinaryText
     Language eu_italian("EUIT");
     Language eu_dutch("EUDU");
     Language jp_japanese("JPJP");
-    Language ko_korean("KOKO");
-    Language ch_traditionalchinese("CHTC");
-    Language ch_simplifiedchinese("CHSC");
-    Language us_spanish("USSP");
+    if (isDKCTF != 1)
+    {
+        Language ko_korean("KOKO");
+        Language ch_traditionalchinese("CHTC");
+        Language ch_simplifiedchinese("CHSC");
+        Language us_spanish("USSP");
+    }
 };
\ No newline at end of file
diff --git a/Meta.bt b/Meta.bt
index bfe824e..7ea21e3 100644
--- a/Meta.bt
+++ b/Meta.bt
@@ -1,10 +1,10 @@
-typedef struct(FourCC type, uint64 size)
+typedef struct(FourCC type, uint64 size, uint64 fileStart)
 {
   local uint64 start <format=hex, hidden=true> = FTell();
   switch (type)
   {
       case "TXTR":
-          STextureMetaData meta;
+          STextureMetaData meta(fileStart);
           break;
       default:
           byte data[size];
diff --git a/NTextureFormat.bt b/NTextureFormat.bt
index d456429..80fcab2 100644
--- a/NTextureFormat.bt
+++ b/NTextureFormat.bt
@@ -1,17 +1,24 @@
 struct STextureReadInfo
 {
-    byte BufferIndex;
-    uint32 StartOffset; //Start buffer offset
-    uint32 EndOffset; //End buffer offset
+    byte index;
+    uint32 offset <format=hex>;
+    uint32 size <format=hex>;
 };
 
-struct STextureCompressedBufferInfo
+struct STextureCompressedBufferInfo(uint64 fileStart)
 {
-    uint32 Index;
-    uint32 Offset; //Offset shift
-    uint32 CompressedSize; //Buffer size
-    uint32 DestOffset; //Output offset when decompressed
-    uint32 DestSize; //Output size when decompressed
+    uint32 index;
+    uint32 offset <format=hex>; // Relative offset into associated STextureReadInfo
+    uint32 size <format=hex>; // Buffer size
+    uint32 destOffset <format=hex>; // Output offset when decompressed
+    uint32 destSize <format=hex>; // Output size when decompressed
+
+    // Compressed data
+    local uint64 pos <format=hex, hidden=true> = FTell();
+    FSeek(fileStart + info[index].offset + offset);
+    uint32 compressionMode;
+    byte data[size - 4] <bgcolor=cLtRed>;
+    FSeek(pos);
 };
 
 struct STextureMetaData
@@ -80,8 +87,11 @@ struct STextureSamplerData
     ETextureMipFilter mipFilter;
     ETextureWrap wrapX;
     ETextureWrap wrapY;
-    ETextureWrap wrapZ;
-    ETextureAnisotropicRatio aniso;
+    if (isDKCTF == 0)
+    {
+        ETextureWrap wrapZ;
+        ETextureAnisotropicRatio aniso;
+    }
 };
 
 enum <uint32> ETextureType
@@ -200,11 +210,11 @@ struct STextureHeader
     ETextureFormat format;
     uint32 width;
     uint32 height;
-    uint32 depth;
-    uint32 unk; // tile mode?
-    uint32 unk; // swizzle?
+    uint32 layers;
+    uint32 tileMode; // ?
+    uint32 swizzle; // ?
     uint32 mips;
-    uint32 mipSizes[mips];
+    uint32 mipSizes[mips] <format=hex>;
     STextureSamplerData samplerData;
 };
 
@@ -218,7 +228,13 @@ typedef struct
             STextureHeader header;
             break;
         case "GPU ":
-            byte data[chunk.size];
+            LittleEndian();
+            uint32 compressionType;
+            if (isDKCTF == 1)
+            {
+                BigEndian();
+            }
+            byte data[chunk.size-4];
             break;
     }
     FSeek(start + chunk.size);
diff --git a/Run.bt b/Run.bt
index 7a1dc91..ff91332 100644
--- a/Run.bt
+++ b/Run.bt
@@ -13,10 +13,17 @@
 #include "CPakFile.bt"
 #include "MessageStudioBinaryText.bt"
 #include "MaterialArchive.bt"
+//#include "CRuleSet.bt"
 
 // Custom footer
 #include "Footer.bt"
 
+
+local uint isDKCTF <hidden=true> = 0;
+local uint AssetDirEntryChunkSz <hidden=true> = 0;
+
+//Mod by LolHacksRule, added support for DKCTF (older Big Endian) formats
+
 typedef struct
 {
     FormDescriptor form;
@@ -24,7 +31,8 @@ typedef struct
     switch (form.id)
     {
         case "MTRL":
-            MaterialArchive materialArchive(form.size);
+            byte MTRLRaw [form.size]; //For now
+            //MaterialArchive materialArchive(form.size);
             break;
         case "CHPR":
             FCharInf charInfo;
@@ -42,13 +50,16 @@ typedef struct
         case "TXTR":
             NTextureFormat texture(form.size);
             break;
+        /*case "RULE":
+            CRuleSet rulesetconfig(form.size);
+            break;*/
     }
     FSeek(start + form.size);
-} File <open=true, bgcolor=cGreen>;
+} File <open=true, bgcolor=cSilver>;
 
 // Template start
 LittleEndian();
-File file <bgcolor=cYellow, name=(Str("%s v%d file", form.id, form.versionA))>;
+File file <bgcolor=cGray, name=(Str("%s v%d file", form.id, form.versionA))>;
 
 // Custom footer for extracted files
 if (ReadString(FTell(), 4) == "RFRM")

From c4990d5375037f278b4b9d7daa5c5b93770bb27b Mon Sep 17 00:00:00 2001
From: LolHacksRule <dantefmele@outlook.com>
Date: Tue, 14 Feb 2023 20:02:17 -0800
Subject: [PATCH 2/5] Test commit from repo name change

---
 Run.bt | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Run.bt b/Run.bt
index ff91332..2b53d49 100644
--- a/Run.bt
+++ b/Run.bt
@@ -52,6 +52,12 @@ typedef struct
             break;
         /*case "RULE":
             CRuleSet rulesetconfig(form.size);
+            break;
+        case "GFXL":
+            CScaleformFlashLibrary scaleformflashlibrary(form.size);
+            break;
+        case "GFXL":
+            CFlashMovieResource flashmobieresource(form.size);
             break;*/
     }
     FSeek(start + form.size);

From e4df0fb5c4ba9843ff9b6981cb9e36ac59a5b826 Mon Sep 17 00:00:00 2001
From: LolHacksRule <dantefmele@outlook.com>
Date: Tue, 14 Feb 2023 20:37:16 -0800
Subject: [PATCH 3/5] Commit changes for broken ATR1 MessageTable for DKCTF

---
 CFormDescriptor.bt         | 24 ++++++++++++++----------
 CGraphicsModel.bt          |  4 ++--
 MessageStudioBinaryText.bt | 36 +++++++++++++++++++++++++-----------
 Run.bt                     |  2 +-
 4 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/CFormDescriptor.bt b/CFormDescriptor.bt
index 8f5759c..3915d66 100644
--- a/CFormDescriptor.bt
+++ b/CFormDescriptor.bt
@@ -2,17 +2,21 @@ typedef struct
 {
     FourCC type;
     //So this is a check for DKCTF (Big Endian), basically 0x04 should be 0, if that's true, assume DKCTF, strange for DKCTF on NS was in BE, I'll prob fix this memory usage later
-    uint32 checkForDKCTF;
-    FSkip(-4);
-    if (checkForDKCTF == 0)
+    if (isDKCTF == -1) //Like this
     {
-        isDKCTF = 1;
-        AssetDirEntryChunkSz = 36;
-        BigEndian();
-    }
-    else
-    {
-        AssetDirEntryChunkSz = 52;
+        uint32 checkForDKCTF;
+        FSkip(-4);
+        if (checkForDKCTF == 0)
+        {
+            isDKCTF = 1;
+            AssetDirEntryChunkSz = 36;
+            BigEndian();
+        }
+        else
+        {
+            isDKCTF = 0;
+            AssetDirEntryChunkSz = 52;
+        }
     }
     uint64 size <format=hex>;
     uint64 unk1;
diff --git a/CGraphicsModel.bt b/CGraphicsModel.bt
index a691a22..47674a0 100644
--- a/CGraphicsModel.bt
+++ b/CGraphicsModel.bt
@@ -45,7 +45,7 @@ struct ModelHeader {
   for (i = 0; i < dataSourceCount; ++i) {
     DataSourceLoader dataSource;
   }
-  if (isDKCTF != 1)
+  if (isDKCTF == 0)
   {
     uchar unk2;
     if (unk2) {
@@ -341,7 +341,7 @@ typedef struct {
     ModelHeader header;
     break;
   case "MTRL":
-    if (isDKCTF != 1)
+    if (isDKCTF == 0)
     {
         uint unk;
     }
diff --git a/MessageStudioBinaryText.bt b/MessageStudioBinaryText.bt
index 654b8a3..72af162 100644
--- a/MessageStudioBinaryText.bt
+++ b/MessageStudioBinaryText.bt
@@ -9,6 +9,7 @@ struct MSBTHeader {
     char magic[8];
     Assert(magic == "MsgStdBn");
     ushort bom <format=hex>;
+    //Todo add a meaningful check for endian, this works for LE/DKCTF NS/MP1R for now
     Assert(bom == 0xFEFF); // Big-Endian byte order
     ushort unk1;
     ubyte maybeMajorVersion;
@@ -71,11 +72,14 @@ struct AttributesSection {
     local int64 tableStart = FTell();
     uint offsetCount;
     uint entrySize; // should always be 4
-    uint offset[offsetCount];
-    local uint i;
-    for (i = 0; i < offsetCount; i++) {
-        Assert(FTell() == tableStart + offset[i]);
-        AttributeEntry attribute<optimize=false,read=AttributeEntryRead>;
+    if (isDKCTF == 0)
+    {
+        uint offset[offsetCount];
+        local uint i;
+        for (i = 0; i < offsetCount; i++) {
+            Assert(FTell() == tableStart + offset[i]);
+            AttributeEntry attribute<optimize=false,read=AttributeEntryRead>;
+        }
     }
     while (ReadUByte(FTell()) == 0xAB) {
         byte padding<hidden=true>;
@@ -144,21 +148,31 @@ struct Language (string expectedLanguage) {
 };
 
 struct MessageStudioBinaryText
-{
+{   
     Language us_english("USEN");
+    if (isDKCTF == 1)
+    {
+        Language us_french("USFR");
+        Language us_spanish("USSP");
+    }
     Language eu_english("EUEN");
     Language eu_french("EUFR");
-    Language us_french("USFR");
+    if (isDKCTF == 0)
+    {
+        Language us_french("USFR");
+    }
     Language eu_spanish("EUSP");
     Language eu_german("EUGE");
     Language eu_italian("EUIT");
-    Language eu_dutch("EUDU");
+    if (isDKCTF == 0)
+    {
+        Language eu_dutch("EUDU");
+    }
     Language jp_japanese("JPJP");
-    if (isDKCTF != 1)
+    if (isDKCTF == 0)
     {
         Language ko_korean("KOKO");
         Language ch_traditionalchinese("CHTC");
-        Language ch_simplifiedchinese("CHSC");
-        Language us_spanish("USSP");
+        Language ch_simplifiedchinese("CHSC"); 
     }
 };
\ No newline at end of file
diff --git a/Run.bt b/Run.bt
index 2b53d49..c132ec7 100644
--- a/Run.bt
+++ b/Run.bt
@@ -19,7 +19,7 @@
 #include "Footer.bt"
 
 
-local uint isDKCTF <hidden=true> = 0;
+local uint isDKCTF <hidden=true> = -1;
 local uint AssetDirEntryChunkSz <hidden=true> = 0;
 
 //Mod by LolHacksRule, added support for DKCTF (older Big Endian) formats

From 6b84105ddf1a86f3f9049f9bbf0eb86f9c11fbb5 Mon Sep 17 00:00:00 2001
From: LolHacksRule <dantefmele@outlook.com>
Date: Tue, 14 Feb 2023 21:11:00 -0800
Subject: [PATCH 4/5] Support GFXL from DKCTF

---
 CScaleformFlashLibrary.bt | 35 +++++++++++++++++++++++++++++++++++
 Run.bt                    |  9 +++++----
 2 files changed, 40 insertions(+), 4 deletions(-)
 create mode 100644 CScaleformFlashLibrary.bt

diff --git a/CScaleformFlashLibrary.bt b/CScaleformFlashLibrary.bt
new file mode 100644
index 0000000..17e260e
--- /dev/null
+++ b/CScaleformFlashLibrary.bt
@@ -0,0 +1,35 @@
+//------------------------------------------------
+//--- 010 Editor v13.0.1 Binary Template
+//
+//      File: 
+//   Authors: 
+//   Version: 
+//   Purpose: 
+//  Category: 
+// File Mask: 
+//  ID Bytes: 
+//   History: 
+//------------------------------------------------
+
+typedef struct
+{   ChunkDescriptor chunk;
+    struct CScaleformFlashLibraryChunk
+    {
+        uint32 referencedTextures;
+	    struct ReferencedTxtrs
+	    {
+            struct ReferencedTxtr
+		    {
+		        GUID texRef;
+                CStringFixed texName;
+		    } rtxtr[referencedTextures] <optimize = false>;
+	    } rtxrs;
+	    CStringFixed theSWFName;
+	    FSkip(4); //Skip ahead to see the SWF size
+	    LittleEndian(); //temp swap endian
+	    uint32 swfSize<hidden=true>; //Pull SWF size
+	    BigEndian(); //temp swap endian
+	    FSkip(-8); //Go back to GFX
+	    byte theGFXFile[swfSize]; //History
+    } GFXLChunk;
+} CScaleformFlashLibrary;
\ No newline at end of file
diff --git a/Run.bt b/Run.bt
index c132ec7..494523c 100644
--- a/Run.bt
+++ b/Run.bt
@@ -14,6 +14,7 @@
 #include "MessageStudioBinaryText.bt"
 #include "MaterialArchive.bt"
 //#include "CRuleSet.bt"
+#include "CScaleformFlashLibrary.bt"
 
 // Custom footer
 #include "Footer.bt"
@@ -52,12 +53,12 @@ typedef struct
             break;
         /*case "RULE":
             CRuleSet rulesetconfig(form.size);
-            break;
+            break;*/
         case "GFXL":
-            CScaleformFlashLibrary scaleformflashlibrary(form.size);
+            CScaleformFlashLibrary scaleformflashlibrary;
             break;
-        case "GFXL":
-            CFlashMovieResource flashmobieresource(form.size);
+        /*case "GFX ":
+            CFlashMovieResource flashmovieresource(form.size);
             break;*/
     }
     FSeek(start + form.size);

From 7b26c2ba12f34821a39017a99cfeb18f7c8a5075 Mon Sep 17 00:00:00 2001
From: LolHacksRule <dantefmele@outlook.com>
Date: Tue, 14 Feb 2023 21:14:03 -0800
Subject: [PATCH 5/5] Update Common.bt

---
 Common.bt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Common.bt b/Common.bt
index ece3d66..a8ed03d 100644
--- a/Common.bt
+++ b/Common.bt
@@ -19,7 +19,7 @@ string StringReadFixed(CStringFixed &str)
     return str.text;
 }
 
-typedef char FourCC[4]<fgcolor=cLtGreen>;
+typedef char FourCC[4] <fgcolor=cLtGreen>;
 
 FourCC FourCCInt(uint32 in)
 {