diff --git a/.vs/Switch_Toolbox/v15/.suo b/.vs/Switch_Toolbox/v15/.suo index 498585f7..d009e0e2 100644 Binary files a/.vs/Switch_Toolbox/v15/.suo and b/.vs/Switch_Toolbox/v15/.suo differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide index 2f557423..453e89e5 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal index a66fce68..77bbe5ee 100644 Binary files a/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal and b/.vs/Switch_Toolbox/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMAA.cs b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMAA.cs index 261b4ba3..5cd6ddc8 100644 --- a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMAA.cs +++ b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FMAA.cs @@ -381,7 +381,7 @@ namespace Bfres.Structs paramInfo.Type = AnimationType.ShaderParam; //There is no better way to determine if the param is a color type afaik - if (anim.Name.Contains(ColorAnimType) || param.Name.Contains("color")) + if (anim.Name.Contains(ColorAnimType) || param.Name.Contains("Color") || param.Name.Contains("color") || param.Name == "multi_tex_reg2") paramInfo.Type = AnimationType.Color; else if (anim.Name.Contains(TextureSrtAnimType)) paramInfo.Type = AnimationType.TexturePattern; diff --git a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FSHU.cs b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FSHU.cs index d452e852..fb89c55b 100644 --- a/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FSHU.cs +++ b/Switch_FileFormatsMain/FileFormats/BFRES/Bfres Structs/SubFiles/FSHU.cs @@ -114,6 +114,9 @@ namespace Bfres.Structs AnimDataOffset = matAnim.Constants[constant].AnimDataOffset, Keys = keyGroup.Keys, }); + + if (paramInfo.Text.Contains("Color") || paramInfo.Text.Contains("color")) + paramInfo.Type = AnimationType.Color; } for (int curve = 0; curve < param.FloatCurveCount + param.IntCurveCount; curve++) diff --git a/Switch_FileFormatsMain/GUI/BFRES/ParamAnim/AnimParamEditor.cs b/Switch_FileFormatsMain/GUI/BFRES/ParamAnim/AnimParamEditor.cs index 9e8f220f..e4f46669 100644 --- a/Switch_FileFormatsMain/GUI/BFRES/ParamAnim/AnimParamEditor.cs +++ b/Switch_FileFormatsMain/GUI/BFRES/ParamAnim/AnimParamEditor.cs @@ -138,7 +138,7 @@ namespace FirstPlugin.Forms { ColumnHeader colorHeader = new ColumnHeader() { Text = "Color" }; - ColumnHeader alphaHeader = new ColumnHeader() { Text = "Color" }; + ColumnHeader alphaHeader = new ColumnHeader() { Text = "Alpha" }; ColumnHeader RHeader = new ColumnHeader() { Text = "R" }; ColumnHeader GHeader = new ColumnHeader() { Text = "G" }; ColumnHeader BHeader = new ColumnHeader() { Text = "B" }; diff --git a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache index 3f0189c9..9cdc1956 100644 Binary files a/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache and b/Switch_FileFormatsMain/obj/Release/DesignTimeResolveAssemblyReferences.cache differ