From 0d79ebd5cc2b0dae2fd33e6f906d3ce3120255b9 Mon Sep 17 00:00:00 2001 From: PurpleHato Date: Fri, 15 Jul 2022 21:01:50 +0200 Subject: [PATCH 1/5] ADD: Dapd on "current Dpad equip --- soh/soh/Enhancements/debugger/debugSaveEditor.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 60c3e6c4e3c..98ee8c22c7b 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1561,6 +1561,14 @@ void DrawPlayerTab() { ImGui::InputScalar("C Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[2], &one, NULL); ImGui::SameLine(); ImGui::InputScalar("C Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[3], &one, NULL); + ImGui::NewLine(); + ImGui::Text("Current Dpad Equips"); + ImGui::InputScalar("Dpad Up", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); + ImGui::SameLine(); + ImGui::InputScalar("Dpad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL); + ImGui::InputScalar("Dpad Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[6], &one, NULL); + ImGui::SameLine(); + ImGui::InputScalar("Dpad Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[7], &one, NULL); }); } else { From edc7c22f462d8206c478ec0eec987936abf8ee3b Mon Sep 17 00:00:00 2001 From: PurpleHato Date: Fri, 15 Jul 2022 21:03:20 +0200 Subject: [PATCH 2/5] TWEAK: Spelling --- soh/soh/Enhancements/debugger/debugSaveEditor.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 98ee8c22c7b..4d8791abebc 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1563,12 +1563,13 @@ void DrawPlayerTab() { ImGui::InputScalar("C Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[3], &one, NULL); ImGui::NewLine(); ImGui::Text("Current Dpad Equips"); - ImGui::InputScalar("Dpad Up", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); + ImGui::InputScalar("D-pad Up", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); ImGui::SameLine(); - ImGui::InputScalar("Dpad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL); - ImGui::InputScalar("Dpad Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[6], &one, NULL); + ImGui::InputScalar("D-pad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL); + // Intentionnal to not put everything on the same line, else it's taking too much for lower resolution. + ImGui::InputScalar("D-pad Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[6], &one, NULL); ImGui::SameLine(); - ImGui::InputScalar("Dpad Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[7], &one, NULL); + ImGui::InputScalar("D-pad Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[7], &one, NULL); }); } else { From f7a7481e2f9c295bbf16a64161131b543f25d549 Mon Sep 17 00:00:00 2001 From: PurpleHato Date: Fri, 15 Jul 2022 21:06:05 +0200 Subject: [PATCH 3/5] TWEAK: Shows it only if gDpadEquips is enable --- .../Enhancements/debugger/debugSaveEditor.cpp | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 4d8791abebc..dee5d88db47 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1561,15 +1561,18 @@ void DrawPlayerTab() { ImGui::InputScalar("C Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[2], &one, NULL); ImGui::SameLine(); ImGui::InputScalar("C Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[3], &one, NULL); - ImGui::NewLine(); - ImGui::Text("Current Dpad Equips"); - ImGui::InputScalar("D-pad Up", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); - ImGui::SameLine(); - ImGui::InputScalar("D-pad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL); - // Intentionnal to not put everything on the same line, else it's taking too much for lower resolution. - ImGui::InputScalar("D-pad Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[6], &one, NULL); - ImGui::SameLine(); - ImGui::InputScalar("D-pad Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[7], &one, NULL); + + if (CVar_GetS32("gDpadEquips", 0)) { + ImGui::NewLine(); + ImGui::Text("Current Dpad Equips"); + ImGui::InputScalar("D-pad Up", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); + ImGui::SameLine(); + ImGui::InputScalar("D-pad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL); + // Intentionnal to not put everything on the same line, else it's taking too much for lower resolution. + ImGui::InputScalar("D-pad Left", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[6], &one, NULL); + ImGui::SameLine(); + ImGui::InputScalar("D-pad Right", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[7], &one, NULL); + } }); } else { From 1b769bb37f2544f5f072196c39f8a200837e82d0 Mon Sep 17 00:00:00 2001 From: PurpleHato Date: Fri, 15 Jul 2022 21:35:43 +0200 Subject: [PATCH 4/5] TWEAK: Forgot one "D-pad" --- soh/soh/Enhancements/debugger/debugSaveEditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index dee5d88db47..529705708d6 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1564,7 +1564,7 @@ void DrawPlayerTab() { if (CVar_GetS32("gDpadEquips", 0)) { ImGui::NewLine(); - ImGui::Text("Current Dpad Equips"); + ImGui::Text("Current D-pad Equips"); ImGui::InputScalar("D-pad Up", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); ImGui::SameLine(); ImGui::InputScalar("D-pad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL); From 9149947703a7f021ae04c149b2443e9e6126edd9 Mon Sep 17 00:00:00 2001 From: PurpleHato Date: Fri, 15 Jul 2022 21:41:45 +0200 Subject: [PATCH 5/5] TWEAK: Spacing --- soh/soh/Enhancements/debugger/debugSaveEditor.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp index 529705708d6..f31a5e42ad4 100644 --- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp +++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp @@ -1565,7 +1565,7 @@ void DrawPlayerTab() { if (CVar_GetS32("gDpadEquips", 0)) { ImGui::NewLine(); ImGui::Text("Current D-pad Equips"); - ImGui::InputScalar("D-pad Up", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); + ImGui::InputScalar("D-pad Up ", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[4], &one, NULL); // Two spaces at the end for aligning, not elegant but it's working ImGui::SameLine(); ImGui::InputScalar("D-pad Down", ImGuiDataType_U8, &gSaveContext.equips.buttonItems[5], &one, NULL); // Intentionnal to not put everything on the same line, else it's taking too much for lower resolution.