From 0aae00e75aee1c411b6ed5ffc6ae366a29c58d7b Mon Sep 17 00:00:00 2001
From: LolHacksRule <dantefmele@outlook.com>
Date: Sun, 19 Feb 2023 11:04:58 -0800
Subject: [PATCH] Fix WiiU GFXLibrary, messagetable and DKCTF texture read

Actual commit this time
---
 CScaleformFlashLibrary.bt                     |  21 +-
 MaterialArchive.bt                            | 581 +++++++++---------
 MessageStudioBinaryText.bt => MessageTable.bt |  20 +-
 NTextureFormat.bt                             |   7 +-
 Run.bt                                        |   4 +-
 5 files changed, 343 insertions(+), 290 deletions(-)
 rename MessageStudioBinaryText.bt => MessageTable.bt (92%)

diff --git a/CScaleformFlashLibrary.bt b/CScaleformFlashLibrary.bt
index 9d293ad..47e04b6 100644
--- a/CScaleformFlashLibrary.bt
+++ b/CScaleformFlashLibrary.bt
@@ -15,7 +15,8 @@
 #define _CSCALEFORMFLASHLIBRARY
 
 typedef struct
-{   ChunkDescriptor chunk;
+{   
+    ChunkDescriptor chunk;
     struct CScaleformFlashLibraryChunk
     {
         uint32 referencedTextures;
@@ -24,10 +25,24 @@ typedef struct
             struct ReferencedTxtr
 		    {
 		        GUID texRef;
-                CStringFixed texName;
+                if (ReadByte() == 0)
+                {
+                    CStringFixed texName;
+                }
+                else
+                {
+                    CString texName;
+                }
 		    } rtxtr[referencedTextures] <optimize = false>;
 	    } rtxrs;
-	    CStringFixed theSWFName;
+	    if (ReadByte() == 0)
+        {
+            CStringFixed theSWFName;
+        }
+        else
+        {
+            CString theSWFName;
+        }
 	    FSkip(4); //Skip ahead to see the SWF size
 	    LittleEndian(); //temp swap endian
 	    uint32 swfSize<hidden=true>; //Pull SWF size
diff --git a/MaterialArchive.bt b/MaterialArchive.bt
index a7a1d62..e106813 100644
--- a/MaterialArchive.bt
+++ b/MaterialArchive.bt
@@ -1,274 +1,307 @@
-#ifndef _MATERIALARCHIVE
-#define _MATERIALARCHIVE
-struct SBufferTOCEntry {
-    uint unk1;
-    uint unk2;
-};
-
-struct CPermutation {
-  uint64 unk1;
-  uint64 unk2;
-};
-
-enum <char> EMaterialTechnique {
-    kMT_None = 'x', /* offset 0x10 = 9, offset 0x20 = 0, offset 0x28 = 1, type = 0 */
-    kMT_DepthOnly = 'z',/* offset 0x10 = 15, offset 0x20 = 0, offset 0x28 = 1, type 1  */
-    kMT_DeferredGBuffer = 'g',/* offset 0x10 = 15, offset 0x20 = 0, offset 0x28 = 1, type 2  */
-    kMT_DeferredInstance = 'i',/* offset 0x10 = 16, offset 0x20 = 0, offset 0x28 = 1, type 3  */
-    kMT_ForwardRender = 'f', /* offset 0x10 = 13, offset 0x20 = 0, offset 0x28 = 1, type  4 */
-    kMT_ParticleTechniqueSprite = 's', /* offset 0x10 = 23, offset 0x20 = 0, offset 0x28 = 1, type 5  */
-    kMT_ParticleTechniqueSwoosh = 'w', /* offset 0x10 = 23, offset 0x20 = 0, offset 0x28 = 1, type 6 */
-    kMT_ParticleTechniqueModel = 'm', /* offset 0x10 = 22, offset 0x20 = 0, offset 0x28 = 1, type 7  */
-};
-
-struct CShaderIdentifier {
-    EMaterialTechnique matTechnique;
-    CPermutation perm;
-};
-
-struct SShaderTOCEntry {
-    CShaderIdentifier identifier;
-    uint unk1;
-    uint unk2;
-};
-
-struct SMaterialTOCEntry {
-    GUID guid;
-    uint unk1;
-    uint nameLen;
-    char name[nameLen];
-    ushort unk2;
-    uint shaderEntryCount;
-    SShaderTOCEntry shaderEntries[shaderEntryCount];    
-    SBufferTOCEntry bufferToc;
-};
-
-struct SShaderSource {
-    uchar state;
-    uint strLen;
-    if (strLen)
-        char str[strLen]; 
-    uint dataLen;
-    uchar data[dataLen];
-};
-
-struct CShaderDefines {
-    struct Name {
-        uint str1Len;
-        char str1[str1Len];
-    };
-
-    uint namesCount;
-    if (namesCount)
-        Name names[namesCount] <optimize = false>;
-    uint unk;
-};
-
-struct CShaderVariable {
-
-};
-struct SShaderImportDesc {
-    CShaderIdentifier ident;
-    uint64 shaderID;
-    int vertexProgramIndex;
-    int pixelProgramIndex;
-    int geomProgramIndex;
-    int computeProgramIndex;
-    uint unk;
-    CShaderDefines defines;
-    uint dataSize;
-    union {
-        struct {
-            uint variableCount;
-            CShaderVariable variables[1];
-        } meta;
-        char data[dataSize];
-    } data;
-};
-
-
-struct SExpression {
-    uint unk1;
-    uint unk2;
-};
-
-
-struct CBooleanExpressionEvaluator {
-    uint expressionCount;
-    SExpression expressions[expressionCount];
-};
-
-struct SSimpleFeatureInstanceInternalOptionRequirement {
-    uint unk;
-    CBooleanExpressionEvaluator evaluator;
-};
-
-struct SSimpleFeatureInstanceShaderBinding {
-    CStringFixed name;
-    CStringFixed binding;
-};
-
-struct SSimpleFeatureInstanceInternalOption {
-    uint unk;
-    CShaderDefines shaderDefines;
-    uint bindingCount;
-    if (bindingCount) {
-        SSimpleFeatureInstanceShaderBinding binding[bindingCount] <optimize = false>;
-    }
-};
-
-struct IFeatureInstance;
-struct CFeatureSet {
-    uint count;
-    IFeatureInstance features[count] <optimize = false>;
-    CBooleanExpressionEvaluator evaluator;
-};
-
-struct CSimpleFeatureInstance {
-    FourCC unk1;
-    uint fccCount;
-    uint fccs[fccCount];
-    uint boolExpresionEvalCount;
-    CBooleanExpressionEvaluator evaluators[boolExpresionEvalCount] <optimize = false>;
-    uint internalOptionCount;
-    SSimpleFeatureInstanceInternalOption internalOption[internalOptionCount] <optimize = false>;
-    uint unk;
-    uint unkIntCount;
-    Assert(unkIntCount <= 32);
-    uint unkInts[unkIntCount];
-    uint optionRequirementCount;
-    if (optionRequirementCount)
-        SSimpleFeatureInstanceInternalOptionRequirement optionRequirements[optionRequirementCount] <optimize = false>;
-};
-
-struct SCompositeFeatureInstanceInternalOptionRequirement {
-    uint unk;
-    CBooleanExpressionEvaluator eval;
-};
-
-struct SCompositeFeatureInstanceInternalOption {
-    CStringFixed name;
-    CPermutation perm;
-    CShaderDefines defines;
-};
-
-struct SCompositeFeatureInstanceArgument {
-    CStringFixed name;
-    CBooleanExpressionEvaluator evaluator;
-};
-
-struct CCompositeFeatureInstance {
-    CFeatureSet subSet;
-    uint argumentCount1;
-    if (argumentCount1) {
-        SCompositeFeatureInstanceArgument arguments1[argumentCount1] <optimize = false>;
-    }
-   uint argumentCount2;
-   if (argumentCount2) {
-       SCompositeFeatureInstanceArgument arguments2[argumentCount2] <optimize = false>;
-   }
-
-   uint optionCount;
-   SCompositeFeatureInstanceInternalOption optionRequirements1[optionCount] <optimize = false>;
-    uint optionRequirementsCount;
-   SCompositeFeatureInstanceInternalOptionRequirement optionRequirements2[optionRequirementsCount] <optimize = false>;
-};
-
-struct IFeatureInstance;
-struct CExplicitCompositeFeatureInstance;
-struct CExplicitCompositeFeatureInstance {
-    CCompositeFeatureInstance base;
-    IFeatureInstance sub;
-};
-
-struct IFeatureInstance {
-    uint type;
-    CStringFixed name;
-    uint unk1;
-    uint unk2;
-    switch(type) {
-        case 0:
-            CSimpleFeatureInstance simple <optimize = false>;
-        break;
-        case 1:
-            CCompositeFeatureInstance composite <optimize = false>;
-        break;
-        case 2:
-            CExplicitCompositeFeatureInstance explicitComposite <optimize = false>;
-        break;
-    }
-};
-
-struct SDepthModeState {
-
-};
-
-struct SStencilModeState {
-
-};
-
-struct CGraphicsState {
-    uint flags;
-};
-
-struct SOverrideState {
-    CBooleanExpressionEvaluator evaluator;
-    CGraphicsState state;  
-};
-struct SMaterialImportDesc {
-    GUID guid;
-    uint shaderHash;
-    uint nameLen;
-    char name[nameLen];
-    ushort unk2;
-    uint shaderImportCount;
-    SShaderImportDesc shaderImportDescs[shaderImportCount] <optimize = false>;
-    uint dataSize;
-    union {
-        struct {
-            uchar hasFeatureSet;
-            if (hasFeatureSet) {
-                CFeatureSet featureSet;
-            }
-            CGraphicsState state;
-            uint overrideStateCount;
-            if (overrideStateCount) {
-                SOverrideState overrideStates;
-            }
-        } meta;
-        char data[dataSize];
-    } data;
-};
-
-struct MaterialBackend {
-    ChunkDescriptor chunk;
-    local uint64 start <format=hex, hidden=true> = FTell();
-    uint flags;
-    if (flags != 0) {
-        uint tocSize;
-        uint bufferEntryCount;
-        SBufferTOCEntry bufferEntries[bufferEntryCount];
-        uint materialEntryCount;
-        SMaterialTOCEntry materialEntries[materialEntryCount] <optimize = false>;
-    }
-    
-	uint shaderSourceCount;
-	SShaderSource shaderSources[shaderSourceCount]  <optimize = false>;
-	
-	uint materialImportDescCount;
-	SMaterialImportDesc materialImportDescs[materialImportDescCount] <optimize = false>;
-
-    if ((FTell() - start) != chunk.size) {
-        char data[chunk.size - (FTell() - start)];
-    }
-};
-
-struct MaterialArchive(uint64 size) {
-    local uint64 start <format=hex, hidden=true> = FTell();
-    while (FTell() < start + size) {
-        MaterialBackend backend;
-    }
-};
-
-
-#endif// _MATERIALARCHIVE
+#ifndef _MATERIALARCHIVE
+#define _MATERIALARCHIVE
+struct SBufferTOCEntry {
+    uint align;
+    uint size;
+};
+
+struct CPermutation {
+  uint64 unk1;
+  uint64 unk2;
+};
+
+enum <char> EMaterialTechnique {
+    kMT_None = 'x', /* offset 0x10 = 9, offset 0x20 = 0, offset 0x28 = 1, type = 0 */
+    kMT_DepthOnly = 'z',/* offset 0x10 = 15, offset 0x20 = 0, offset 0x28 = 1, type 1  */
+    kMT_DeferredGBuffer = 'g',/* offset 0x10 = 15, offset 0x20 = 0, offset 0x28 = 1, type 2  */
+    kMT_DeferredInstance = 'i',/* offset 0x10 = 16, offset 0x20 = 0, offset 0x28 = 1, type 3  */
+    kMT_ForwardRender = 'f', /* offset 0x10 = 13, offset 0x20 = 0, offset 0x28 = 1, type  4 */
+    kMT_ParticleTechniqueSprite = 's', /* offset 0x10 = 23, offset 0x20 = 0, offset 0x28 = 1, type 5  */
+    kMT_ParticleTechniqueSwoosh = 'w', /* offset 0x10 = 23, offset 0x20 = 0, offset 0x28 = 1, type 6 */
+    kMT_ParticleTechniqueModel = 'm', /* offset 0x10 = 22, offset 0x20 = 0, offset 0x28 = 1, type 7  */
+};
+
+struct CShaderIdentifier {
+    EMaterialTechnique matTechnique;
+    CPermutation perm;
+};
+
+struct SShaderTOCEntry {
+    CShaderIdentifier identifier;
+    uint unk1;
+    uint unk2;
+};
+
+struct SMaterialTOCEntry {
+    GUID guid;
+    uint unk1;
+    uint nameLen;
+    char name[nameLen];
+    ushort unk2;
+    uint shaderEntryCount;
+    SShaderTOCEntry shaderEntries[shaderEntryCount];    
+    SBufferTOCEntry bufferToc;
+};
+
+struct SShaderSource {
+    uchar state;
+    uint strLen;
+    if (strLen)
+        char str[strLen]; 
+    uint dataLen;
+    uchar data[dataLen];
+};
+
+struct CShaderDefines {
+    struct Name {
+        if (isDKCTF)
+        {
+            CString str1;
+        }
+        else
+        {
+            uint str1Len;
+            char str1[str1Len];
+        }
+    };
+
+    uint namesCount;
+    if (namesCount)
+        Name names[namesCount] <optimize = false>;
+    uint unk;
+};
+
+struct CShaderVariable {
+
+};
+struct SShaderImportDesc {
+    if (!isDKCTF)
+    {
+        CShaderIdentifier ident;
+    }
+    uint64 shaderID;
+    int vertexProgramIndex;
+    if (!isDKCTF)
+    {
+        int pixelProgramIndex;
+    }
+    else
+    {
+        int fragProgramIndex;
+    }
+    int geomProgramIndex;
+    if (!isDKCTF)
+    {
+        int computeProgramIndex;
+    }
+    uint unk;
+    CShaderDefines defines;
+    uint dataSize;
+    union {
+        struct {
+            uint variableCount;
+            CShaderVariable variables[1];
+        } meta;
+        char data[dataSize];
+    } data;
+};
+
+
+struct SExpression {
+    uint unk1;
+    uint unk2;
+};
+
+
+struct CBooleanExpressionEvaluator {
+    uint expressionCount;
+    SExpression expressions[expressionCount];
+};
+
+struct SSimpleFeatureInstanceInternalOptionRequirement {
+    uint unk;
+    CBooleanExpressionEvaluator evaluator;
+};
+
+struct SSimpleFeatureInstanceShaderBinding {
+    CStringFixed name;
+    CStringFixed binding;
+};
+
+struct SSimpleFeatureInstanceInternalOption {
+    uint unk;
+    CShaderDefines shaderDefines;
+    uint bindingCount;
+    if (bindingCount) {
+        SSimpleFeatureInstanceShaderBinding binding[bindingCount] <optimize = false>;
+    }
+};
+
+struct IFeatureInstance;
+struct CFeatureSet {
+    uint count;
+    IFeatureInstance features[count] <optimize = false>;
+    CBooleanExpressionEvaluator evaluator;
+};
+
+struct CSimpleFeatureInstance {
+    FourCC unk1;
+    uint fccCount;
+    uint fccs[fccCount];
+    uint boolExpresionEvalCount;
+    CBooleanExpressionEvaluator evaluators[boolExpresionEvalCount] <optimize = false>;
+    uint internalOptionCount;
+    SSimpleFeatureInstanceInternalOption internalOption[internalOptionCount] <optimize = false>;
+    uint unk;
+    uint unkIntCount;
+    Assert(unkIntCount <= 32);
+    uint unkInts[unkIntCount];
+    uint optionRequirementCount;
+    if (optionRequirementCount)
+        SSimpleFeatureInstanceInternalOptionRequirement optionRequirements[optionRequirementCount] <optimize = false>;
+};
+
+struct SCompositeFeatureInstanceInternalOptionRequirement {
+    uint unk;
+    CBooleanExpressionEvaluator eval;
+};
+
+struct SCompositeFeatureInstanceInternalOption {
+    CStringFixed name;
+    CPermutation perm;
+    CShaderDefines defines;
+};
+
+struct SCompositeFeatureInstanceArgument {
+    CStringFixed name;
+    CBooleanExpressionEvaluator evaluator;
+};
+
+struct CCompositeFeatureInstance {
+    CFeatureSet subSet;
+    uint argumentCount1;
+    if (argumentCount1) {
+        SCompositeFeatureInstanceArgument arguments1[argumentCount1] <optimize = false>;
+    }
+   uint argumentCount2;
+   if (argumentCount2) {
+       SCompositeFeatureInstanceArgument arguments2[argumentCount2] <optimize = false>;
+   }
+
+   uint optionCount;
+   SCompositeFeatureInstanceInternalOption optionRequirements1[optionCount] <optimize = false>;
+    uint optionRequirementsCount;
+   SCompositeFeatureInstanceInternalOptionRequirement optionRequirements2[optionRequirementsCount] <optimize = false>;
+};
+
+struct IFeatureInstance;
+struct CExplicitCompositeFeatureInstance;
+struct CExplicitCompositeFeatureInstance {
+    CCompositeFeatureInstance base;
+    IFeatureInstance sub;
+};
+
+struct IFeatureInstance {
+    uint type;
+    CStringFixed name;
+    uint unk1;
+    uint unk2;
+    switch(type) {
+        case 0:
+            CSimpleFeatureInstance simple <optimize = false>;
+        break;
+        case 1:
+            CCompositeFeatureInstance composite <optimize = false>;
+        break;
+        case 2:
+            CExplicitCompositeFeatureInstance explicitComposite <optimize = false>;
+        break;
+    }
+};
+
+struct SDepthModeState {
+
+};
+
+struct SStencilModeState {
+
+};
+
+struct CGraphicsState {
+    uint flags;
+};
+
+struct SOverrideState {
+    CBooleanExpressionEvaluator evaluator;
+    CGraphicsState state;  
+};
+struct SMaterialImportDesc {
+    if (!isDKCTF)
+    {
+        GUID guid;
+        uint shaderHash;
+        uint nameLen;
+        char name[nameLen];
+    }
+    else
+    {
+        FourCC name;
+    }
+    ushort unk2;
+    uint shaderImportCount;
+    SShaderImportDesc shaderImportDescs[shaderImportCount] <optimize = false>;
+    uint dataSize;
+    union {
+        struct {
+            uchar hasFeatureSet;
+            if (hasFeatureSet) {
+                CFeatureSet featureSet;
+            }
+            CGraphicsState state;
+            uint overrideStateCount;
+            if (overrideStateCount) {
+                SOverrideState overrideStates;
+            }
+        } meta;
+        char data[dataSize];
+    } data;
+};
+
+struct MaterialBackend {
+    ChunkDescriptor chunk;
+    local uint64 start <format=hex, hidden=true> = FTell();
+    uint flags;
+    if (flags != 0) {
+        uint tocSize;
+        uint bufferEntryCount;
+        SBufferTOCEntry bufferEntries[bufferEntryCount];
+        if (!isDKCTF)
+        {
+            uint materialEntryCount;
+            SMaterialTOCEntry materialEntries[materialEntryCount] <optimize = false>;
+        }
+    }
+    
+    if (!isDKCTF)
+    {
+	    uint shaderSourceCount;
+	    SShaderSource shaderSources[shaderSourceCount]  <optimize = false>;
+	}
+
+	uint materialImportDescCount;
+	SMaterialImportDesc materialImportDescs[materialImportDescCount] <optimize = false>;
+
+    if ((FTell() - start) != chunk.size) {
+        char data[chunk.size - (FTell() - start)];
+    }
+};
+
+struct MaterialArchive(uint64 size) {
+    local uint64 start <format=hex, hidden=true> = FTell();
+    while (FTell() < start + size) {
+        MaterialBackend backend;
+    }
+};
+
+
+#endif// _MATERIALARCHIVE
diff --git a/MessageStudioBinaryText.bt b/MessageTable.bt
similarity index 92%
rename from MessageStudioBinaryText.bt
rename to MessageTable.bt
index f5b5871..510f086 100644
--- a/MessageStudioBinaryText.bt
+++ b/MessageTable.bt
@@ -1,18 +1,16 @@
 #ifndef _MESSAGESTUDIOBINARYTEXT
 #define _MESSAGESTUDIOBINARYTEXT
-struct LanguageHeader(string expectedLanguage) {
-    char magic[4];
-    Assert(magic == expectedLanguage);
-    uint fileSize;
-    uint unk[4];
-};
 
 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
+    //Assert(bom == 0xFEFF); // Big-Endian byte order
+    //Let's check
+    if (bom == 0xFFFE && isDKCTF)
+    {
+        LittleEndian();
+    }
     ushort unk1;
     ubyte maybeMajorVersion;
     ubyte maybeMinorVersion;
@@ -20,6 +18,10 @@ struct MSBTHeader {
     ushort unk3;
     uint fileSize;
     byte padding[10]<hidden=true>;
+    if (isDKCTF) //Swap back
+    {
+        BigEndian();
+    }
 };
 
 struct TableHeader(string expectedMagic) {
@@ -126,7 +128,7 @@ struct TextsSection {
 };
 
 struct Language (string expectedLanguage) {
-    LanguageHeader languageHeader(expectedLanguage);
+    ChunkDescriptor languageChunkHeader;
     // Each section here is heavily referenced from https://zeldamods.org/wiki/Msbt
     struct MSBTContents {
         MSBTHeader header;
diff --git a/NTextureFormat.bt b/NTextureFormat.bt
index b1ffa1d..aef51a9 100644
--- a/NTextureFormat.bt
+++ b/NTextureFormat.bt
@@ -2,7 +2,10 @@
 #define _NTEXTUREFORMAT
 struct STextureReadInfo
 {
-    byte index;
+    if (!isDKCTF)
+    {
+        byte index; //MP1R has this byte
+    }
     uint32 offset <format=hex>;
     uint32 size <format=hex>;
 };
@@ -34,7 +37,7 @@ struct STextureMetaData(uint64 fileStart)
     uint32 decompressedSize <format=hex>; // Total size decompressed
     uint32 infoCount;
     if (infoCount != 0) {
-        STextureReadInfo info[infoCount];
+        STextureReadInfo info[infoCount]<optimize=false>; //Do this so isDKCTF doesn't kill 010
     }
     uint32 bufferCount;
     if (bufferCount != 0) {
diff --git a/Run.bt b/Run.bt
index 248ec17..91e7896 100644
--- a/Run.bt
+++ b/Run.bt
@@ -42,9 +42,9 @@ typedef struct {
   local uint64 start<format = hex, hidden = true> = FTell();
   switch (form.id) {
   case "MTRL":
-    if (form.readerVersion == 168) {
+    if (form.readerVersion == 168 || form.readerVersion == 12) {
       byte MTRLRaw[form.size]; // For now
-    } else if (form.readerVersion == 22) {
+    } else if (form.readerVersion == 22 || form.readerVersion == 10) {
       MaterialArchive materialArchive(form.size);
     } else {
       Assert(false, "Invalid version!");