diff --git a/BrawlboxHelper/BrawlboxHelper.dll b/BrawlboxHelper/BrawlboxHelper.dll index 7fed3a8c..a0a78e03 100644 Binary files a/BrawlboxHelper/BrawlboxHelper.dll and b/BrawlboxHelper/BrawlboxHelper.dll differ diff --git a/BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll b/BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll index d8c7c0b5..038acd50 100644 Binary files a/BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll and b/BrawlboxHelper/Syroot.NintenTools.NSW.Bfres.dll differ diff --git a/Switch_Toolbox_Library/FileFormats/DDS.cs b/Switch_Toolbox_Library/FileFormats/DDS.cs index ff352417..2da8bf62 100644 --- a/Switch_Toolbox_Library/FileFormats/DDS.cs +++ b/Switch_Toolbox_Library/FileFormats/DDS.cs @@ -581,6 +581,19 @@ namespace Toolbox.Library } reader.TemporarySeek((int)(4 + header.size + DX10HeaderSize), SeekOrigin.Begin); + var UbiExtraData = reader.ReadUInt16(); + reader.TemporarySeek(-2, SeekOrigin.Current); + if (UbiExtraData == 12816 || UbiExtraData == 1331 && IsDX10) //me when ubisoft | for some reason theres some extra data on some mario rabbids textures god knows what it is + { + if (header.width == 1024 && header.height == 1024) + { + reader.TemporarySeek((int)(4 + 30 + header.size + DX10HeaderSize), SeekOrigin.Begin); + } + if (header.width == 512 && header.height == 512) + { + reader.TemporarySeek((int)(4 + 26 + header.size + DX10HeaderSize), SeekOrigin.Begin); + } + } bdata = reader.ReadBytes((int)(reader.BaseStream.Length - reader.BaseStream.Position)); Format = GetFormat();