aoc: Manager is ksys, the DLC managers stay game-side

aoc::Manager is created during engine start-up and called by gdt, map
and StarterPackMgr; only game code uses HardModeManager and
ChampionBalladManager.

(AI assisted using Claude Fable 5.1 and Claude Opus 5.5)

2 files changed, 9 insertions, 9 deletions

diff --git a/src/KingSystem/Map/mapLazyTraverseList.cpp b/src/KingSystem/Map/mapLazyTraverseList.cpp
index a87d2b94..985628e1 100644
--- a/src/KingSystem/Map/mapLazyTraverseList.cpp
+++ b/src/KingSystem/Map/mapLazyTraverseList.cpp
@@ -1,6 +1,6 @@
 #include "KingSystem/Map/mapLazyTraverseList.h"
 
-#include "Game/DLC/aocManager.h"
+#include "KingSystem/AOC/aocManager.h"
 #include "KingSystem/GameData/gdtManager.h"
 
 namespace ksys::map {
@@ -10,9 +10,9 @@ LazyTraverseList::LazyTraverseList(sead::Heap* heap) {
     sead::SafeString path = "Map/MainField/LazyTraverseList.mubin";
     ksys::res::LoadRequest request;
 
-    if (uking::aoc::Manager::instance())
-        uking::aoc::Manager::instance()->getFileDeviceForMap(&request.mAocFileDevice,
-                                                             &request.mPackHandle, path);
+    if (aoc::Manager::instance())
+        aoc::Manager::instance()->getFileDeviceForMap(&request.mAocFileDevice, &request.mPackHandle,
+                                                      path);
 
     handle.load(path, &request);
 
diff --git a/src/KingSystem/Map/mapPlacementMap.cpp b/src/KingSystem/Map/mapPlacementMap.cpp
index e9bf6765..05461527 100644
--- a/src/KingSystem/Map/mapPlacementMap.cpp
+++ b/src/KingSystem/Map/mapPlacementMap.cpp
@@ -1,7 +1,7 @@
 #include "KingSystem/Map/mapPlacementMap.h"
 #include <prim/seadScopedLock.h>
 #include <thread/seadReadWriteLock.h>
-#include "Game/DLC/aocManager.h"
+#include "KingSystem/AOC/aocManager.h"
 #include "KingSystem/Map/mapObject.h"
 #include "KingSystem/Physics/StaticCompound/physStaticCompound.h"
 #include "KingSystem/Physics/StaticCompound/physStaticCompoundRigidBodyGroup.h"
@@ -201,8 +201,8 @@ bool PlacementMap::loadDynamicMap() {
     } else {
         path.append("_Dynamic_NoGrudgeMerge.mubin");
     }
-    if (uking::aoc::Manager::instance()) {
-        arg.mAocFileDevice = uking::aoc::Manager::instance()->getFileDeviceForMapFile(path);
+    if (aoc::Manager::instance()) {
+        arg.mAocFileDevice = aoc::Manager::instance()->getFileDeviceForMapFile(path);
     }
     return mDynamicMubinRes.requestLoad(path, &arg, 0);
 }
@@ -288,8 +288,8 @@ bool PlacementMap::loadStaticCompound(int hksc_idx, bool auto_gen_mu, bool req_a
             path.format("Physics/StaticCompound/%s-%d.hksc", mFolderAndFile.cstr(), hksc_idx);
         }
     }
-    if (uking::aoc::Manager::instance()) {
-        arg.mAocFileDevice = uking::aoc::Manager::instance()->getFileDeviceForStaticCompound(path);
+    if (aoc::Manager::instance()) {
+        arg.mAocFileDevice = aoc::Manager::instance()->getFileDeviceForStaticCompound(path);
     }
 
     return mRes[hksc_idx].mRes.requestLoad(path, &arg, 0);