Merge pull request #344 from roblabla/controller-dedicated-file

Move controller functions to dedicated obj file
happyhavoc · Dec 1, 2024 · 11deb75 · 11deb75
2 parents f51afbb + ef219bd
commit 11deb75
Show file tree

Hide file tree

Showing 12 changed files with 469 additions and 437 deletions.
diff --git a/config/ghidra_ns_to_obj.csv b/config/ghidra_ns_to_obj.csv
@@ -3,6 +3,7 @@ AsciiManager,th06::AsciiManager,th06::StageMenu
 BombData,th06::BombData
 BulletManager,th06::BulletManager
 Chain,th06::Chain,th06::ChainElem
+Controller,th06::Controller
 EclManager,th06::EclManager
 EffectManager,th06::EffectManager
 Ending,th06::Ending
@@ -29,7 +30,7 @@ Rng,th06::Rng
 ScreenEffect,th06::ScreenEffect
 SoundPlayer,th06::SoundPlayer
 Stage,th06::Stage,th06::AnmManager::ExecuteAnmIdx
-Supervisor,th06::Supervisor,th06::Controller
+Supervisor,th06::Supervisor
 TextHelper,th06::TextHelper
 utils,th06::utils
 ZunTimer,th06::ZunTimer

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

diff --git a/scripts/configure.py b/scripts/configure.py
@@ -104,7 +104,7 @@ def configure(build_type):
             "GuiImpl",
             "GameManager",
             "Chain",
-            # Controller
+            "Controller",
             "FileSystem",
             "GameErrorContext",
             "Rng",

diff --git a/src/AsciiManager.cpp b/src/AsciiManager.cpp
@@ -3,6 +3,7 @@
 
 #include "AnmManager.hpp"
 #include "ChainPriorities.hpp"
+#include "Controller.hpp"
 #include "GameManager.hpp"
 #include "Gui.hpp"
 #include "Supervisor.hpp"