5 files changed, 40 insertions, 32 deletions
diff --git a/src/KingSystem/System/CMakeLists.txt b/src/KingSystem/System/CMakeLists.txt
index 333d110d..81b08666 100644
--- a/src/KingSystem/System/CMakeLists.txt
+++ b/src/KingSystem/System/CMakeLists.txt
@@ -15,8 +15,6 @@ target_sources(uking PRIVATE
     CoreInfo.h
     CurrentResNameMgr.cpp
     CurrentResNameMgr.h
-    DebugFinder.cpp
-    DebugFinder.h
     DebugMessage.h
     GameConfig.h
     HavokWorkerMgr.cpp
@@ -48,6 +46,8 @@ target_sources(uking PRIVATE
     Revision.h
     StageInfo.cpp
     StageInfo.h
+    StagePreActorCache.cpp
+    StagePreActorCache.h
     StarterPackMgr.cpp
     StarterPackMgr.h
     StringBoard.h
diff --git a/src/KingSystem/System/DebugFinder.cpp b/src/KingSystem/System/DebugFinder.cpp
deleted file mode 100644
index 7e5a1d82..00000000
--- a/src/KingSystem/System/DebugFinder.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "KingSystem/System/DebugFinder.h"
-
-namespace ksys {
-
-SEAD_SINGLETON_DISPOSER_IMPL(DebugFinder)
-
-DebugFinder::DebugFinder() = default;
-
-DebugFinder::~DebugFinder() = default;
-
-}  // namespace ksys
diff --git a/src/KingSystem/System/DebugFinder.h b/src/KingSystem/System/DebugFinder.h
deleted file mode 100644
index 16eb4e4c..00000000
--- a/src/KingSystem/System/DebugFinder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-#include <heap/seadDisposer.h>
-#include <prim/seadSafeString.h>
-
-namespace ksys {
-
-class DebugFinder {
-    SEAD_SINGLETON_DISPOSER(DebugFinder)
-    DebugFinder();
-    virtual ~DebugFinder();
-
-private:
-    sead::FixedSafeString<0x40> unused_1;
-    sead::FixedSafeString<0x100> unused_2;
-    u32 unused_3 = 0;
-};
-
-}  // namespace ksys
diff --git a/src/KingSystem/System/StagePreActorCache.cpp b/src/KingSystem/System/StagePreActorCache.cpp
new file mode 100644
index 00000000..0b4a6484
--- /dev/null
+++ b/src/KingSystem/System/StagePreActorCache.cpp
@@ -0,0 +1,7 @@
+#include "KingSystem/System/StagePreActorCache.h"
+
+namespace ksys {
+
+SEAD_SINGLETON_DISPOSER_IMPL(StagePreActorCache)
+
+}  // namespace ksys
diff --git a/src/KingSystem/System/StagePreActorCache.h b/src/KingSystem/System/StagePreActorCache.h
new file mode 100644
index 00000000..2b9927ff
--- /dev/null
+++ b/src/KingSystem/System/StagePreActorCache.h
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <heap/seadDisposer.h>
+#include <math/seadVector.h>
+
+namespace ksys::gfx {
+class ForestRenderer;
+}
+
+namespace ksys::map {
+class LazyTraverseList;
+}
+
+namespace ksys {
+
+// TODO
+class StagePreActorCache {
+    SEAD_SINGLETON_DISPOSER(StagePreActorCache)
+    StagePreActorCache();
+
+public:
+    map::LazyTraverseList* getObjects() const { return mObjects; }
+    auto* getForestRenderer() { return mForestRenderer; }
+
+private:
+    char _0[0x20];
+    map::LazyTraverseList* mObjects;
+    gfx::ForestRenderer* mForestRenderer;
+};
+
+}  // namespace ksys