Merge branch 'master' of https://github.com/KillzXGaming/Switch-Toolbox

File_Format_Library/FileFormats/Archives/NARC.cs

@@ -2,6 +2,7 @@ using Syroot.BinaryData;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Text;
 using Toolbox.Library;
 using Toolbox.Library.IO;
@@ -28,9 +29,7 @@ namespace FirstPlugin {
 
         // private
         private Header header;
-        private BTAF btaf;
+        private byte[] bfntUnk = new byte[] { 0x00, 0x00, 0x01, 0x00 };
-        private BTNF btnf;
-        private GMIF gmif;
 
         private List<FileEntry> files = new List<FileEntry>();
 
@@ -56,35 +55,88 @@ namespace FirstPlugin {
 
         public void Load(Stream stream) {
             using(FileReader reader = new FileReader(stream)) {
+                //DirectoryEntry currentDirEntry = rootDir;
+                string currentDir = string.Empty;
+
                 header = new Header(reader);
 
-                for(uint i = 0; i < header.DataBlocks; i++) {
+                reader.ReadSignature(4, "BTAF");
-                    long PositionBuf = reader.Position;
-                    string cSectionMagic = Encoding.ASCII.GetString(reader.ReadBytes(4)).ToUpperInvariant();
-                    uint cSectionSize = reader.ReadUInt32();
 
-                    switch(cSectionMagic) {
+                // The positions where the sections' reading was left last time.
-                        case "BTAF":
+                long bfatIndex = reader.Position + 8;
-                            btaf = new BTAF(reader);
+                long bfntIndex = reader.Position + reader.ReadUInt32(); // From the BFAT length.
-                            break;
+                long fimgIndex;
-                        case "BTNF":
+
-                            btnf = new BTNF(reader, (uint) btaf.FileDataArray.Length);
+                uint fileCount = reader.ReadUInt32();
-                            break;
+
-                        case "GMIF":
+                uint currentFileOffset;
-                            gmif = new GMIF(reader, btaf);
+                uint currentFileEnd;
-                            break;
+
+                reader.Position = bfntIndex;
+
+                fimgIndex = reader.Position + reader.ReadUInt32() + 4; // Sets FIMG section begining.
+                bfntUnk = reader.ReadBytes(reader.ReadInt32() - 4);
+
+                for(int i = 0; i < fileCount; i++) {
+                    byte nameLength = reader.ReadByte();
+
+                    if(nameLength == 0x00) { // End of the "folder".
+                        List<int> slashIndices = new List<int>();
+                        for(int j = 0; j < currentDir.Length; j++)
+                            if(currentDir[j] == '/')
+                                slashIndices.Add(j);
+
+                        int lastSlash = slashIndices.Last();
+                        slashIndices.Remove(lastSlash);
+                        int slashBeforeLast = slashIndices.Count > 0 ? slashIndices.Last() : 0;
+
+                        currentDir = currentDir.Remove(slashBeforeLast + 1);
+
+                        if(currentDir.Length == 1)
+                            currentDir = string.Empty;
+
+                        i--;
+                        continue;
                     }
 
-                    reader.Position = PositionBuf + cSectionSize;
+                    if(nameLength >= 0x80) { // If it is a "folder".
+                        // Disable file modifications:
+                        CanSave = false;
+                        CanAddFiles = false;
+                        CanRenameFiles = false;
+                        CanReplaceFiles = false;
+                        CanDeleteFiles = false;
+
+                        string dirName = reader.ReadString(nameLength & 0x7F);
+                        currentDir += dirName + "/";
+
+                        reader.Position += 2;
+                        i--;
+                        continue;
                     }
 
-                for(int i = 0; i < btnf.FileNames.Length; i++)
+                    // Read BFAT section:
+                    using(reader.TemporarySeek()) {
+                        reader.Position = bfatIndex;
+
+                        currentFileOffset = reader.ReadUInt32();
+                        currentFileEnd = reader.ReadUInt32();
+
+                        bfatIndex = reader.Position;
+                    }
+
+                    string name = reader.ReadString(nameLength);
+
+                    using(reader.TemporarySeek()) {
+                        reader.Position = fimgIndex + currentFileOffset;
                         files.Add(new FileEntry(this) {
-                        FileName = btnf.FileNames[i],
+                            FileName = currentDir + name,
-                        BlockData = gmif.FilesData[i]
+                            BlockData = reader.ReadBytes((int) (currentFileEnd - currentFileOffset))
                     });
                     }
                 }
+            }
+        }
 
         public class FileEntry : ArchiveFileInfo
         {
@@ -219,7 +271,7 @@ namespace FirstPlugin {
                 writer.Write(header.Version); // Version.
 
                 long headerLengthPorsition = writer.Position;
-                writer.Write(0x00000000); // Skips length writing.
+                writer.Position += 4; // Skips length writing.
 
                 writer.Write(header.HeaderSize); // Header length.
                 writer.Write(header.DataBlocks); // Section count.
@@ -230,21 +282,21 @@ namespace FirstPlugin {
                 writer.Write((uint) files.Count); // File count.
 
                 for(uint i = 0; i < files.Count; i++) // Reads unset bytes per file. (Reserved space for later)
-                    writer.Write((long) 0x0000000000000000);
+                    writer.Position += 8;
 
                 WriteSectionLength(btafPosition);
                 #endregion
 
                 #region BTNF
                 long btnfPosition = WriteSectionHeader("BTNF"); // Header.
-                writer.Write(btnf.Unknown);
+                writer.Write(bfntUnk.Length + 4);
+                writer.Write(bfntUnk);
 
                 foreach(ArchiveFileInfo file in files)
                     writer.Write(file.FileName, BinaryStringFormat.ByteLengthPrefix);
                 writer.Write((byte) 0x00);
 
-                writer.Align(32);
+                writer.Align(128);
-                writer.Position += 8;
 
                 WriteSectionLength(btnfPosition);
                 #endregion
@@ -257,7 +309,7 @@ namespace FirstPlugin {
                     WriteBTAFEntry(); // BTAF offset
                     writer.Write(file.FileData);
                     WriteBTAFEntry(); // BTAF size.
-                    writer.Align(16);
+                    writer.Align(128);
                 }
 
                 WriteSectionLength(gmifPosition);
@@ -270,7 +322,7 @@ namespace FirstPlugin {
                     long startPosition = writer.Position;
                     writer.Write(magic, BinaryStringFormat.NoPrefixOrTermination, Encoding.ASCII); // Magic.
 
-                    writer.Write(0x00000000); // Skips length position.
+                    writer.Position += 4; // Skips length position.
 
                     return startPosition;
                 }
@@ -296,60 +348,5 @@ namespace FirstPlugin {
                 }
             }            
         }
-
-        #region Sections
-        internal class BTAF {
-            public FD[] FileDataArray;
-
-            public BTAF() { }
-            public BTAF(BinaryDataReader reader) {
-                uint numberOfFiles = reader.ReadUInt32();
-                FileDataArray = new FD[numberOfFiles];
-
-                for(ulong i = 0; i < numberOfFiles; i++) {
-                    FileDataArray[i].offset = reader.ReadUInt32();
-                    FileDataArray[i].size = reader.ReadUInt32();
-                }
-            }
-
-            public class FD
-            {
-                public uint offset;
-                public uint size;
-            }
-        }
-
-        internal class BTNF {
-            public string[] FileNames;
-            public ulong Unknown;
-
-            public BTNF() { }
-            public BTNF(BinaryDataReader reader, uint numberOfFiles) {
-                Unknown = reader.ReadUInt64();
-                FileNames = new string[numberOfFiles];
-
-                for(int i = 0; i < numberOfFiles; i++) {
-                    FileNames[i] = reader.ReadString(BinaryStringFormat.ByteLengthPrefix, Encoding.ASCII);
-                }
-            }
-        }
-
-        internal class GMIF {
-            public byte[][] FilesData;
-
-            public GMIF() { }
-            public GMIF(BinaryDataReader reader, BTAF btaf) {
-                FilesData = new byte[btaf.FileDataArray.Length][];
-                long PositionBuf = reader.Position;
-
-                for(int i = 0; i < btaf.FileDataArray.Length; i++) {
-                    reader.Position = PositionBuf + btaf.FileDataArray[i].offset;
-
-                    FilesData[i] = reader.ReadBytes(
-                        (int) (btaf.FileDataArray[i].size - btaf.FileDataArray[i].offset));
-                }
-            }
-        }
-        #endregion
     }
 }

File_Format_Library/FileFormats/Pokemon/GFLX/GFBANIM/GFBANM.cs

@@ -86,6 +86,7 @@ namespace FirstPlugin
                 new FlatBuffers.ByteBuffer(stream.ToBytes()));
 
             AnimationData = new Animation();
+            AnimationData.Name = FileName;
             AnimationData.FrameCount = anim.AnimConfig.Value.KeyFrames;
 
             if (anim.Bones.HasValue) {

Switch_Toolbox_Library/Compression/Formats/LZSS.cs

@@ -22,8 +22,7 @@ namespace Toolbox.Library
         {
             using (var reader = new FileReader(stream, true))
             {
-                hasMagic = reader.CheckSignature(4, "LzS\x01");
+                return reader.CheckSignature(4, "LzS\x01");
-                return hasMagic || Utils.GetExtension(fileName) == ".lzs";
             }
         }