diff --git a/sphaira/include/app.hpp b/sphaira/include/app.hpp index 0fcca07..5bfd9ce 100644 --- a/sphaira/include/app.hpp +++ b/sphaira/include/app.hpp @@ -263,6 +263,7 @@ public: option::OptionBool m_dump_app_folder{"dump", "app_folder", true}; option::OptionBool m_dump_append_folder_with_xci{"dump", "append_folder_with_xci", true}; option::OptionBool m_dump_trim_xci{"dump", "trim_xci", false}; + option::OptionBool m_dump_label_trim_xci{"dump", "label_trim_xci", false}; option::OptionBool m_dump_usb_transfer_stream{"dump", "usb_transfer_stream", true}; // todo: move this into it's own menu diff --git a/sphaira/source/app.cpp b/sphaira/source/app.cpp index e4893b2..081290b 100644 --- a/sphaira/source/app.cpp +++ b/sphaira/source/app.cpp @@ -1739,6 +1739,10 @@ void App::DisplayDumpOptions(bool left_side) { App::GetApp()->m_dump_trim_xci.Set(enable); })); + options->Add(std::make_shared("Label trimmed XCI"_i18n, App::GetApp()->m_dump_label_trim_xci.Get(), [](bool& enable){ + App::GetApp()->m_dump_label_trim_xci.Set(enable); + })); + options->Add(std::make_shared("Multi-threaded USB transfer"_i18n, App::GetApp()->m_dump_usb_transfer_stream.Get(), [](bool& enable){ App::GetApp()->m_dump_usb_transfer_stream.Set(enable); })); diff --git a/sphaira/source/ui/menus/gc_menu.cpp b/sphaira/source/ui/menus/gc_menu.cpp index 3fb6136..007e4d5 100644 --- a/sphaira/source/ui/menus/gc_menu.cpp +++ b/sphaira/source/ui/menus/gc_menu.cpp @@ -102,8 +102,12 @@ struct DebugEventInfo { auto GetDumpTypeStr(u8 type) -> const char* { switch (type) { + case DumpFileType_TrimmedXCI: + if (App::GetApp()->m_dump_label_trim_xci.Get()) { + return " (trimmed).xci"; + } [[fallthrough]]; + case DumpFileType_XCI: return ".xci"; - case DumpFileType_TrimmedXCI: return " (trimmed).xci"; case DumpFileType_Set: return " (Card ID Set).bin"; case DumpFileType_UID: return " (Card UID).bin"; case DumpFileType_Cert: return " (Certificate).bin"; @@ -664,9 +668,9 @@ Result Menu::GcMount() { }, true)); }; - add("Dump XCI"_i18n, DumpFileFlag_XCI); add("Dump All"_i18n, DumpFileFlag_All); add("Dump All Bins"_i18n, DumpFileFlag_AllBin); + add("Dump XCI"_i18n, DumpFileFlag_XCI); add("Dump Card ID Set"_i18n, DumpFileFlag_Set); add("Dump Card UID"_i18n, DumpFileFlag_UID); add("Dump Certificate"_i18n, DumpFileFlag_Cert);