Merge pull request #346 from roblabla/gui-reorder

Reorder functions in GUI
happyhavoc · Dec 1, 2024 · 0e3e58c · 0e3e58c
2 parents 4c827f7 + af18a46
commit 0e3e58c
Show file tree

Hide file tree

Showing 8 changed files with 665 additions and 685 deletions.
diff --git a/config/ghidra_ns_to_obj.csv b/config/ghidra_ns_to_obj.csv
@@ -14,8 +14,7 @@ FileSystem,th06::FileSystem
 GameErrorContext,th06::GameErrorContext
 GameManager,th06::GameManager
 GameWindow,th06::GameWindow
-Gui,th06::Gui
-GuiImpl,th06::GuiImpl
+Gui,th06::Gui,th06::GuiImpl
 IPbg3Parser,th06::IPbg3Parser
 ItemManager,th06::ItemManager
 MainMenu,th06::MainMenu

diff --git a/objdiff.json b/objdiff.json
@@ -154,14 +154,6 @@
 
             "reverse_fn_order": false
         },
-        {
-            "name": "GuiImpl",
-
-            "target_path": "build/objdiff/orig/GuiImpl.obj",
-            "base_path": "build/objdiff/reimpl/GuiImpl.obj",
-
-            "reverse_fn_order": false
-        },
         {
             "name": "IPbg3Parser",
 

diff --git a/scripts/configure.py b/scripts/configure.py
@@ -101,7 +101,6 @@ def configure(build_type):
             "EnemyManager",
             "BulletManager",
             "Gui",
-            "GuiImpl",
             "GameManager",
             "Chain",
             "Controller",