Merge remote-tracking branch 'origin/develop' into merge-develop-rando-sep14

2024-09-14 23:42:02 -04:00
parent 15395defa4 19dc4dc0fa
commit 8bd2f38d22
35 changed files with 840 additions and 837 deletions
--- a/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
+++ b/soh/soh/Enhancements/debugger/debugSaveEditor.cpp
@@ -1777,12 +1777,6 @@ void DrawPlayerTab() {
 }

 void SaveEditorWindow::DrawElement() {
-    ImGui::SetNextWindowSize(ImVec2(520, 600), ImGuiCond_FirstUseEver);
-    if (!ImGui::Begin("Save Editor", &mIsVisible, ImGuiWindowFlags_NoFocusOnAppearing)) {
-        ImGui::End();
-        return;
-    }
-
    if (ImGui::BeginTabBar("SaveContextTabBar", ImGuiTabBarFlags_NoCloseWithMiddleMouseButton)) {
        if (ImGui::BeginTabItem("Info")) {
            DrawInfoTab();
@@ -1816,8 +1810,6 @@ void SaveEditorWindow::DrawElement() {

        ImGui::EndTabBar();
    }
-
-    ImGui::End();
 }

 void SaveEditorWindow::InitElement() {