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)

14 files changed, 29 insertions, 706 deletions

diff --git a/src/Game/DLC/CMakeLists.txt b/src/Game/AOC/CMakeLists.txt
index 0b0579b0..20388b21 100644
--- a/src/Game/DLC/CMakeLists.txt
+++ b/src/Game/AOC/CMakeLists.txt
@@ -3,6 +3,4 @@ target_sources(uking PRIVATE
   aocChampionBalladManager.h
   aocHardModeManager.cpp
   aocHardModeManager.h
-  aocManager.cpp
-  aocManager.h
 )
diff --git a/src/Game/DLC/aocChampionBalladManager.cpp b/src/Game/AOC/aocChampionBalladManager.cpp
index 0a0833a0..1600a6f9 100644
--- a/src/Game/DLC/aocChampionBalladManager.cpp
+++ b/src/Game/AOC/aocChampionBalladManager.cpp
@@ -1,6 +1,6 @@
-#include "Game/DLC/aocChampionBalladManager.h"
+#include "Game/AOC/aocChampionBalladManager.h"
 
-namespace uking {
+namespace uking::aoc {
 
 SEAD_SINGLETON_DISPOSER_IMPL(ChampionBalladManager)
 
@@ -29,4 +29,4 @@ s8 ChampionBalladManager::getBlightRematchCount(BlightType blight_type) const {
         return mBlightCounts[u32(blight_type)];
     return 0;
 }
-}  // namespace uking
+}  // namespace uking::aoc
diff --git a/src/Game/DLC/aocChampionBalladManager.h b/src/Game/AOC/aocChampionBalladManager.h
index 22c07b60..4fa8e268 100644
--- a/src/Game/DLC/aocChampionBalladManager.h
+++ b/src/Game/AOC/aocChampionBalladManager.h
@@ -4,7 +4,7 @@
 #include <container/seadSafeArray.h>
 #include <heap/seadDisposer.h>
 
-namespace uking {
+namespace uking::aoc {
 
 enum class BlightType : u32 { Wind, Electric, Fire, Water };
 
@@ -23,4 +23,4 @@ private:
     sead::SafeArray<u8, 4> mBlightCounts;
 };
 
-}  // namespace uking
+}  // namespace uking::aoc
diff --git a/src/Game/DLC/aocHardModeManager.cpp b/src/Game/AOC/aocHardModeManager.cpp
index 9d8faef9..479fef42 100644
--- a/src/Game/DLC/aocHardModeManager.cpp
+++ b/src/Game/AOC/aocHardModeManager.cpp
@@ -1,4 +1,4 @@
-#include "Game/DLC/aocHardModeManager.h"
+#include "Game/AOC/aocHardModeManager.h"
 #include <math/seadMathCalcCommon.h>
 #include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actActorUtil.h"
diff --git a/src/Game/DLC/aocHardModeManager.h b/src/Game/AOC/aocHardModeManager.h
index 375438a2..375438a2 100644
--- a/src/Game/DLC/aocHardModeManager.h
+++ b/src/Game/AOC/aocHardModeManager.h
diff --git a/src/Game/Actor/AI/aiCookPotRoot.cpp b/src/Game/Actor/AI/aiCookPotRoot.cpp
index da09eec4..0482daf6 100644
--- a/src/Game/Actor/AI/aiCookPotRoot.cpp
+++ b/src/Game/Actor/AI/aiCookPotRoot.cpp
@@ -1,5 +1,5 @@
 #include "Game/Actor/AI/aiCookPotRoot.h"
-#include "Game/DLC/aocHardModeManager.h"
+#include "Game/AOC/aocHardModeManager.h"
 #include "Game/UI/uiPauseMenuDataMgr.h"
 #include "KingSystem/ActorSystem/Attention/actAttention.h"
 #include "KingSystem/ActorSystem/actActor.h"
diff --git a/src/Game/Actor/Action/actionCurseRRematchCount.cpp b/src/Game/Actor/Action/actionCurseRRematchCount.cpp
index 2838007a..a1d70ca1 100644
--- a/src/Game/Actor/Action/actionCurseRRematchCount.cpp
+++ b/src/Game/Actor/Action/actionCurseRRematchCount.cpp
@@ -1,5 +1,5 @@
 #include "Game/Actor/Action/actionCurseRRematchCount.h"
-#include "Game/DLC/aocChampionBalladManager.h"
+#include "Game/AOC/aocChampionBalladManager.h"
 #include "KingSystem/GameData/gdtManager.h"
 
 namespace uking::action {
@@ -19,12 +19,12 @@ void CurseRRematchCount::loadParams_() {
 }
 
 bool CurseRRematchCount::oneShot_() {
-    auto* manager = ChampionBalladManager::instance();
+    auto* manager = aoc::ChampionBalladManager::instance();
     if (!manager)
         return false;
 
-    auto blight = BlightType(*mCurseRType_d);
-    if (blight > BlightType::Water)
+    auto blight = aoc::BlightType(*mCurseRType_d);
+    if (blight > aoc::BlightType::Water)
         return false;
 
     if (*mRematchCount_d == 0)
diff --git a/src/Game/Actor/Damage/dmgDamageManagerBase.cpp b/src/Game/Actor/Damage/dmgDamageManagerBase.cpp
index b99cac50..08557ba6 100644
--- a/src/Game/Actor/Damage/dmgDamageManagerBase.cpp
+++ b/src/Game/Actor/Damage/dmgDamageManagerBase.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Damage/dmgDamageManagerBase.h"
+#include "Game/AOC/aocHardModeManager.h"
 #include "Game/Actor/Damage/dmgDamageCallback.h"
-#include "Game/DLC/aocHardModeManager.h"
 #include "KingSystem/ActorSystem/actActor.h"
 #include "KingSystem/ActorSystem/actActorConstDataAccess.h"
 #include "KingSystem/ActorSystem/actActorParam.h"
diff --git a/src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp b/src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp
index 57f4377d..c66c959a 100644
--- a/src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp
+++ b/src/Game/Actor/Query/queryCheckCurseRRetryEverOnce.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryCheckCurseRRetryEverOnce.h"
 #include <evfl/Query.h>
-#include "Game/DLC/aocChampionBalladManager.h"
+#include "Game/AOC/aocChampionBalladManager.h"
 
 namespace uking::query {
 
@@ -10,12 +10,12 @@ CheckCurseRRetryEverOnce::CheckCurseRRetryEverOnce(const InitArg& arg)
 CheckCurseRRetryEverOnce::~CheckCurseRRetryEverOnce() = default;
 
 int CheckCurseRRetryEverOnce::doQuery() {
-    auto* manager = ChampionBalladManager::instance();
+    auto* manager = aoc::ChampionBalladManager::instance();
     if (!manager)
         return 0;
 
-    auto blight = BlightType(*mCurseRType);
-    if (blight <= BlightType::Water)
+    auto blight = aoc::BlightType(*mCurseRType);
+    if (blight <= aoc::BlightType::Water)
         return manager->getBlightRematchCount(blight) > 0;
     return 0;
 }
diff --git a/src/Game/CMakeLists.txt b/src/Game/CMakeLists.txt
index 702f626f..e7a19dc2 100644
--- a/src/Game/CMakeLists.txt
+++ b/src/Game/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(Actor)
+add_subdirectory(AOC)
 add_subdirectory(AutoPlacement)
 add_subdirectory(Cooking)
-add_subdirectory(DLC)
 add_subdirectory(Scene)
 add_subdirectory(UI)
 
diff --git a/src/Game/DLC/aocManager.cpp b/src/Game/DLC/aocManager.cpp
deleted file mode 100644
index bb7ca50c..00000000
--- a/src/Game/DLC/aocManager.cpp
+++ /dev/null
@@ -1,546 +0,0 @@
-#include "Game/DLC/aocManager.h"
-#include <container/seadBuffer.h>
-#include <filedevice/seadFileDeviceMgr.h>
-#include <prim/seadStringBuilder.h>
-#include <resource/seadSharcArchiveRes.h>
-#include "KingSystem/Resource/resLoadRequest.h"
-#include "KingSystem/Resource/resResourceMgrTask.h"
-#include "KingSystem/Utils/InitTimeInfo.h"
-#include "KingSystem/Utils/SafeDelete.h"
-
-#ifdef NNSDK
-#include <filedevice/nin/seadNinAocFileDeviceNin.h>
-#include <nn/aoc.h>
-#include <nn/fs.h>
-#include <prim/seadStringUtil.h>
-#endif
-
-namespace uking::aoc {
-
-namespace {
-
-struct DungeonInfo {
-    int number;
-    sead::SafeString flag;
-};
-
-ksys::util::InitConstants sInitConstants;
-DungeonInfo sDungeonInfoData[] = {
-    {120, "Defeat_OneHitDungeon001"},
-    {121, "BalladOfHeroGerudo_AppearDungeon03"},
-    {122, "Defeat_OneHitDungeon002"},
-    {123, "Defeat_OneHitDungeon003"},
-    {124, "BalladOfHeroZora_AppearDungeon01"},
-    {125, "BalladOfHeroZora_AppearDungeon02"},
-    {126, "BalladOfHeroZora_AppearDungeon03"},
-    {127, "BalladOfHeroRito_TargetHittingSuccess"},
-    {128, "BalladOfHeroRito_AppearDungeon03"},
-    {129, "BalladOfHeroRito_AppearDungeon02"},
-    {130, "BalladOfHeroGoron_FirstKillGolemR"},
-    {131, "BalladOfHeroGoron_AppearDungeon01"},
-    {132, "BalladOfHeroGoron_AppearDungeon03"},
-    {133, "BalladOfHeroGerudo_AppearDungeon02"},
-    {134, "BalladOfHeroGerudo_AppearDungeon01"},
-    {135, "Defeat_OneHitDungeon004"},
-};
-sead::Buffer<DungeonInfo> sDungeonInfo{sDungeonInfoData};
-constexpr int NumDungeons = 16;
-
-}  // namespace
-
-SEAD_SINGLETON_DISPOSER_IMPL(Manager)
-
-Manager::Manager() : mVersionFile(), mGdtReinitSlot{this, &Manager::onGdtReinit} {
-    resetFlags();
-}
-
-Manager::~Manager() {
-    if (auto* gdm = ksys::gdt::Manager::instance())
-        gdm->removeReinitCallback(mGdtReinitSlot);
-
-    mAocMainFieldPackPrefix.deregister();
-    mAocPackPrefix.deregister();
-    mVersionFileDevPrefix.deregister();
-
-    if (mFileDevice) {
-        sead::FileDeviceMgr::instance()->unmount("aoc");
-        ksys::util::safeDelete(mFileDevice);
-    }
-
-#ifdef NNSDK
-    if (mAocFsCache) {
-        nn::fs::Unmount("aoc");
-        ksys::util::safeDelete(mAocFsCache);
-    }
-#endif
-}
-
-void Manager::resetFlags() {
-    mFlagAocVerAtLastPlay = ksys::gdt::InvalidHandle;
-    mFlagLatestAocVerPlayed = ksys::gdt::InvalidHandle;
-    mFlagHasAocVer1 = ksys::gdt::InvalidHandle;
-    mFlagHasAocVer2 = ksys::gdt::InvalidHandle;
-    mFlagHasAocVer3 = ksys::gdt::InvalidHandle;
-}
-
-void Manager::init(sead::Heap* heap) {
-#ifdef NNSDK
-    std::array<int, 2> dlc_info;
-    if (nn::aoc::ListAddOnContent(dlc_info.data(), 0, dlc_info.size()) == dlc_info.size() &&
-        (dlc_info[0] == 1 || dlc_info[1] == 1)) {
-        size_t cache_size = 0;
-        nn::fs::QueryMountAddOnContentCacheSize(&cache_size, 1);
-        const size_t cache_size_ = cache_size;
-        mAocFsCache = static_cast<u8*>(heap->tryAlloc(cache_size_, sizeof(void*)));
-
-        nn::fs::MountAddOnContent("aoc", 1, mAocFsCache, cache_size);
-
-        mFileDevice = new (heap) sead::NinAocFileDevice("aoc");
-        sead::FileDeviceMgr::instance()->mount(mFileDevice, "aoc");
-        loadVersionFile();
-    }
-#endif
-}
-
-void Manager::loadVersionFile() {
-    if (!mFileDevice)
-        return;
-
-    mVersionFileDevPrefix.registerPrefix("Aoc/0010/", mFileDevice, false);
-
-    ksys::res::LoadRequest req;
-    req.mRequester = "aocManager";
-    req._26 = false;
-    req.mAocFileDevice = mFileDevice;
-    const sead::SafeString path = "System/AocVersion.txt";
-    mVersionFile.file_handle.requestLoad(path, &req);
-}
-
-void Manager::loadAocMainFieldPack(ksys::OverlayArena* arena) {
-    if (!hasAoc3())
-        return;
-
-    auto* device = mFileDevice;
-    if (!device)
-        return;
-
-    ksys::res::LoadRequest req;
-    req.mRequester = "aocManager";
-    req._8 = true;
-    req._26 = false;
-    req.mAocFileDevice = device;
-    req.mArena = arena;
-    mAocMainFieldPack.requestLoad("Pack/AocMainField.pack", &req);
-}
-
-void Manager::registerAocMainFieldPack() {
-    mAocMainFieldPack.waitForReady();
-    mAocMainFieldPack.parseResource(nullptr);
-    if (mAocMainFieldPack.isSuccess())
-        mAocMainFieldPackPrefix.registerPrefix("Aoc/0010/", mAocMainFieldPack.getResource(), false);
-}
-
-void Manager::unloadAocMainFieldPack() {
-    mAocMainFieldPackPrefix.deregister();
-    mAocMainFieldPack.requestUnload();
-}
-
-sead::FileDevice* Manager::getFileDeviceForMapFile(const sead::SafeString& path) const {
-    if (!hasAoc2())
-        return nullptr;
-
-    auto* device = mFileDevice;
-
-    if (aocPackHasFile(path))
-        return nullptr;
-
-    if (path.startsWith("Map/MainField/"))
-        return device;
-
-    if (hasAoc3() && path.startsWith("Map/MainFieldDungeon/"))
-        return device;
-
-    if (isAocFile(path, "Map/", "Map/AocField/", "Map/MainFieldDungeon/", "Map/CDungeon/"))
-        return device;
-
-    return nullptr;
-}
-
-bool Manager::getFileDeviceForMap(sead::FileDevice** p_file_device, ksys::res::Handle** p_handle,
-                                  const sead::SafeString& path) {
-    if (!hasAoc2())
-        return false;
-
-    auto* device = mFileDevice;
-
-    if (path.startsWith("Map/MainField/")) {
-        if (mAocMainFieldPack.isSuccess())
-            *p_handle = &mAocMainFieldPack;
-        else
-            *p_file_device = device;
-        return true;
-    }
-
-    if (aocPackHasFile(path))
-        return false;
-
-    if (hasAoc3() && path.startsWith("Map/MainFieldDungeon/")) {
-        *p_file_device = device;
-        return true;
-    }
-
-    if (isAocFile(path, "Map/", "Map/AocField/", "Map/MainFieldDungeon/", "Map/CDungeon/")) {
-        *p_file_device = device;
-        return true;
-    }
-
-    return false;
-}
-
-sead::FileDevice* Manager::getFileDeviceForStaticCompound(const sead::SafeString& path) const {
-    if (!hasAoc2())
-        return nullptr;
-
-    auto* device = mFileDevice;
-
-    if (aocPackHasFile(path))
-        return nullptr;
-
-    if (isAocFile(path, "Physics/StaticCompound/", "Physics/StaticCompound/AocField/",
-                  "Physics/StaticCompound/MainFieldDungeon/", "Physics/StaticCompound/CDungeon/")) {
-        return device;
-    }
-
-    return nullptr;
-}
-
-sead::FileDevice* Manager::getFileDeviceForTeraMesh(const sead::SafeString& path) const {
-    if (!hasAoc2())
-        return nullptr;
-
-    if (path.startsWith("Physics/TeraMeshRigidBody/AocField/"))
-        return mFileDevice;
-
-    return nullptr;
-}
-
-sead::FileDevice* Manager::getFileDeviceForNavMesh(const sead::SafeString& path) const {
-    if (!hasAoc2())
-        return nullptr;
-
-    auto* device = mFileDevice;
-
-    if (aocPackHasFile(path))
-        return nullptr;
-
-    if (isAocFile(path, "NavMesh/", "NavMesh/AocField/", "NavMesh/MainFieldDungeon/",
-                  "NavMesh/CDungeon/")) {
-        return device;
-    }
-
-    return nullptr;
-}
-
-sead::FileDevice* Manager::getFileDeviceForTerrain(const sead::SafeString& path) const {
-    if (!hasAoc2())
-        return nullptr;
-
-    if (path.startsWith("Terrain/A/AocField"))
-        return mFileDevice;
-
-    return nullptr;
-}
-
-sead::FileDevice* Manager::getFileDeviceForGame(const sead::SafeString& path) const {
-    if (!hasAoc2())
-        return nullptr;
-
-    if (path.startsWith("Game/AocField/"))
-        return mFileDevice;
-
-    return nullptr;
-}
-
-sead::FileDevice* Manager::getFileDeviceForUI(const sead::SafeString& path) const {
-    if (!hasAoc3())
-        return nullptr;
-
-    if (path.startsWith("UI/StaffRollDLC/"))
-        return mFileDevice;
-
-    return nullptr;
-}
-
-bool Manager::isAocFile(const sead::SafeString& path, const sead::SafeString& dir,
-                        const sead::SafeString& dir_aoc_field,
-                        const sead::SafeString& dir_main_field_dungeon,
-                        const sead::SafeString& dir_cdungeon) const {
-    if (!path.startsWith(dir))
-        return false;
-
-    if (path.startsWith(dir_aoc_field))
-        return true;
-
-    if (path.startsWith(dir_main_field_dungeon)) {
-        const auto rel_path = path.getPart(dir_main_field_dungeon.calcLength());
-        if (rel_path.startsWith("RemainsElectric"))
-            return false;
-        if (rel_path.startsWith("RemainsFire"))
-            return false;
-        if (rel_path.startsWith("RemainsWater"))
-            return false;
-        if (rel_path.startsWith("RemainsWind"))
-            return false;
-        return true;
-    }
-
-    if (path.startsWith(dir_cdungeon)) {
-        const auto rel_path = path.getPart(dir_cdungeon.calcLength());
-        return isAocDungeon(rel_path);
-    }
-
-    return false;
-}
-
-static bool isAocDungeonNumber(const sead::SafeString& number) {
-    int num;
-    sead::FixedSafeString<4> buffer;
-    buffer.copy(number, 3);
-    return sead::StringUtil::tryParseS32(&num, buffer, sead::StringUtil::CardinalNumber::Base10) &&
-           num >= 120;
-}
-
-bool Manager::isAocDungeon(const sead::SafeString& map_name) {
-    if (!map_name.startsWith("Dungeon"))
-        return true;
-    const auto number = map_name.getPart(sead::SafeString("Dungeon").calcLength());
-    return isAocDungeonNumber(number);
-}
-
-bool Manager::isAocMap(const sead::SafeString& map_type, const sead::SafeString& map_name) {
-    if (isAocField(map_type))
-        return true;
-
-    if (map_type == "MainFieldDungeon") {
-        if (map_name == "RemainsElectric")
-            return false;
-        if (map_name == "RemainsFire")
-            return false;
-        if (map_name == "RemainsWater")
-            return false;
-        if (map_name == "RemainsWind")
-            return false;
-        return true;
-    }
-
-    if (map_type == "CDungeon")
-        return isAocDungeon(map_name);
-
-    return false;
-}
-
-bool Manager::isAocField(const sead::SafeString& map_type) {
-    return map_type == "AocField";
-}
-
-sead::FileDevice* Manager::getFileDeviceForDungeonPack(const sead::SafeString& path) const {
-    if (!hasAoc3())
-        return nullptr;
-
-    auto* device = mFileDevice;
-
-    const sead::SafeString prefix = "Pack/";
-    const auto prefix_len = prefix.calcLength();
-
-    if (!path.startsWith(prefix))
-        return nullptr;
-
-    const auto rel_path = path.getPart(prefix_len);
-
-    if (rel_path.startsWith("Dungeon") && !isAocDungeon(rel_path))
-        device = nullptr;
-
-    return device;
-}
-
-void Manager::registerAocPack(ksys::res::Handle* pack) {
-    mAocPack = pack;
-    if (pack) {
-        mAocPackPrefix.registerPrefix("Aoc/0010/", pack->getResource(), true);
-    } else {
-        mAocPackPrefix.deregister();
-    }
-}
-
-bool Manager::aocPackHasFile(const sead::SafeString& path) const {
-    if (!mAocPack)
-        return false;
-
-    const auto* res = sead::DynamicCast<sead::SharcArchiveRes>(mAocPack->getResource());
-    if (!res)
-        return false;
-
-    sead::FixedStringBuilder<0x81> builder;
-    builder.copy(path.cstr());
-    ksys::res::ResourceMgrTask::instance()->addSExtensionPrefix(builder);
-    return res->isExistFile(builder);
-}
-
-bool Manager::changeMoviePath(sead::BufferedSafeString& path) const {
-    if (!hasAoc3())
-        return false;
-
-    const sead::SafeString prefix = "Movie/";
-    const auto prefix_len = prefix.calcLength();
-    if (!path.startsWith(prefix))
-        return false;
-
-    const auto rel_path = path.getPart(prefix_len);
-    if (!rel_path.startsWith("Demo6"))
-        return false;
-
-    path.prepend("aoc://");
-    return true;
-}
-
-bool Manager::parseVersion() {
-    if (!mVersionFile.readVersion())
-        return false;
-
-    if (mVersionFile.string.isEmpty()) {
-        mVersion = 0;
-        return true;
-    }
-
-    {
-        const int dot_index = mVersionFile.string.findIndex(".");
-        const int minor_index = dot_index + 1;
-        if (dot_index <= 0 || minor_index >= mVersionFile.string.calcLength()) {
-            mVersionFile.string.clear();
-            mVersion = 0;
-            return true;
-        }
-
-        u32 major, minor;
-        const auto parse = [&] {
-            sead::FixedSafeString<16> major_str;
-            major_str.copy(mVersionFile.string, dot_index);
-
-            constexpr auto base = sead::StringUtil::CardinalNumber::Base10;
-            if (!sead::StringUtil::tryParseU32(&major, major_str, base))
-                return false;
-
-            const auto minor_str = mVersionFile.string.getPart(minor_index);
-            if (!sead::StringUtil::tryParseU32(&minor, minor_str, base))
-                return false;
-
-            return true;
-        };
-
-        if (!parse()) {
-            mVersionFile.string.clear();
-            mVersion = 0;
-            return true;
-        }
-
-        mVersion = (major << 8) + minor;
-    }
-
-    checkVersion();
-    return true;
-}
-
-// NON_MATCHING: stack and duplicated branch -- volatile variables are painful
-void Manager::checkVersion() {
-    if (mVersion == 0)
-        return;
-
-    const auto fail = [this](VersionError error) {
-        mVersionFlags.setBit(error);
-        mVersion = 0;
-    };
-
-    if (mVersion < 0x300) {
-        fail(VersionError::TooOld);
-    } else if (mVersion >= 0x400) {
-        fail(VersionError::TooNew);
-    }
-
-    mVersionFlags.isOnBit(VersionError(VersionError::TooOld));
-    mVersionFlags.isOnBit(VersionError(VersionError::TooNew));
-}
-
-bool Manager::VersionFile::readVersion() {
-    if (!file_handle.requestedLoad())
-        return true;
-
-    if (file_handle.isSuccess()) {
-        auto* res = sead::DynamicCast<sead::DirectResource>(file_handle.getResource());
-        string.copy(reinterpret_cast<const char*>(res->getRawData()), res->getRawSize());
-    } else {
-        if (!file_handle.checkLoadStatus())
-            return false;
-        string.clear();
-    }
-
-    file_handle.requestUnload();
-    return true;
-}
-
-void Manager::initGameData() {
-    reinitFlags();
-    ksys::gdt::Manager::instance()->addReinitCallback(mGdtReinitSlot);
-}
-
-static const sead::SafeString& getDungeonFlag(int number) {
-    for (auto it = sDungeonInfo.begin(); it != sDungeonInfo.end(); ++it) {
-        if (it->number == number)
-            return it->flag;
-    }
-    return sead::SafeString::cEmptyString;
-}
-
-void Manager::reinitFlags() {
-    mFlagAocVerAtLastPlay = ksys::gdt::Manager::instance()->getS32Handle("AoCVerAtLastPlay");
-    mFlagLatestAocVerPlayed = ksys::gdt::Manager::instance()->getS32Handle("LatestAoCVerPlayed");
-    mFlagHasAocVer1 =
-        ksys::gdt::Manager::instance()->getBoolHandle(GameDataFlag::text(GameDataFlag::HasAoCVer1));
-    mFlagHasAocVer2 =
-        ksys::gdt::Manager::instance()->getBoolHandle(GameDataFlag::text(GameDataFlag::HasAoCVer2));
-    mFlagHasAocVer3 =
-        ksys::gdt::Manager::instance()->getBoolHandle(GameDataFlag::text(GameDataFlag::HasAoCVer3));
-
-    for (int i = 0; i < mDLCPositions.size(); ++i) {
-        ksys::gdt::FlagHandle handle = ksys::gdt::InvalidHandle;
-
-        if (i < NumDungeons) {
-            if (mDLCPositions[i].flag_handle == ksys::gdt::InvalidHandle)
-                continue;
-
-            handle = ksys::gdt::Manager::instance()->getBoolHandle(getDungeonFlag(i + 120));
-        }
-
-        mDLCPositions[i].flag_handle = handle;
-    }
-}
-
-void Manager::setGameDataFlags() const {
-    ksys::gdt::Manager::instance()->setS32(mVersion, mFlagAocVerAtLastPlay);
-
-    s32 latest_ver;
-    if (ksys::gdt::Manager::instance()->getS32(mFlagLatestAocVerPlayed, &latest_ver)) {
-        if (u32(latest_ver) < mVersion)
-            ksys::gdt::Manager::instance()->setS32(mVersion, mFlagLatestAocVerPlayed);
-    }
-
-    const auto ver = mVersion;
-    ksys::gdt::Manager::instance()->setBool(ver >= 0x100, mFlagHasAocVer1);
-    ksys::gdt::Manager::instance()->setBool(ver >= 0x200, mFlagHasAocVer2);
-    ksys::gdt::Manager::instance()->setBool(ver >= 0x300, mFlagHasAocVer3);
-}
-
-void Manager::onGdtReinit(ksys::gdt::Manager::ReinitEvent* event) {
-    reinitFlags();
-}
-
-}  // namespace uking::aoc
diff --git a/src/Game/DLC/aocManager.h b/src/Game/DLC/aocManager.h
deleted file mode 100644
index 9dd19636..00000000
--- a/src/Game/DLC/aocManager.h
+++ /dev/null
@@ -1,132 +0,0 @@
-#pragma once
-
-#include <container/seadSafeArray.h>
-#include <heap/seadDisposer.h>
-#include <math/seadVector.h>
-#include <prim/seadBitFlag.h>
-#include <prim/seadEnum.h>
-#include <prim/seadSafeString.h>
-#include "KingSystem/GameData/gdtManager.h"
-#include "KingSystem/Resource/resHandle.h"
-#include "KingSystem/Resource/resResourceMgrTask.h"
-#include "KingSystem/Utils/Types.h"
-
-namespace ksys {
-class OverlayArena;
-}
-
-namespace sead {
-class FileDevice;
-}
-
-namespace uking::aoc {
-
-// TODO
-class Manager {
-    SEAD_SINGLETON_DISPOSER(Manager)
-    Manager();
-    ~Manager();
-
-public:
-    void init(sead::Heap* heap);
-
-    u32 getVersion() const { return mVersion; }
-
-    /// @return Whether the Master Trials DLC is supported.
-    bool hasAoc2() const { return mVersion >= 0x200; }
-
-    /// @return Whether the Champion's Ballad DLC is supported.
-    bool hasAoc3() const { return mVersion >= 0x300; }
-
-    void loadAocMainFieldPack(ksys::OverlayArena* arena);
-    void registerAocMainFieldPack();
-    void unloadAocMainFieldPack();
-
-    sead::FileDevice* getFileDeviceForMapFile(const sead::SafeString& path) const;
-    bool getFileDeviceForMap(sead::FileDevice** p_file_device, ksys::res::Handle** p_handle,
-                             const sead::SafeString& path);
-    sead::FileDevice* getFileDeviceForStaticCompound(const sead::SafeString& path) const;
-    sead::FileDevice* getFileDeviceForTeraMesh(const sead::SafeString& path) const;
-    sead::FileDevice* getFileDeviceForNavMesh(const sead::SafeString& path) const;
-    sead::FileDevice* getFileDeviceForTerrain(const sead::SafeString& path) const;
-    sead::FileDevice* getFileDeviceForGame(const sead::SafeString& path) const;
-    sead::FileDevice* getFileDeviceForUI(const sead::SafeString& path) const;
-
-    bool isAocFile(const sead::SafeString& path, const sead::SafeString& dir,
-                   const sead::SafeString& dir_aoc_field,
-                   const sead::SafeString& dir_main_field_dungeon,
-                   const sead::SafeString& dir_cdungeon) const;
-    static bool isAocDungeon(const sead::SafeString& map_name);
-    static bool isAocMap(const sead::SafeString& map_type, const sead::SafeString& map_name);
-    static bool isAocField(const sead::SafeString& map_type);
-
-    sead::FileDevice* getFileDeviceForDungeonPack(const sead::SafeString& path) const;
-    void registerAocPack(ksys::res::Handle* pack);
-    bool aocPackHasFile(const sead::SafeString& path) const;
-
-    bool changeMoviePath(sead::BufferedSafeString& path) const;
-
-    void parseAocMainFieldStaticInfo(const al::ByamlIter& iter);
-    // TODO: figure out what this does
-    bool getSomePos(sead::Vector3f* translate, u32* p_mask, u32* mask);
-
-    bool parseVersion();
-    void setGameDataFlags() const;
-
-private:
-    SEAD_ENUM(GameDataFlag, AoCVerAtLastPlay ,LatestAoCVerPlayed ,HasAoCVer1 ,HasAoCVer2 ,HasAoCVer3)
-    SEAD_ENUM(VersionError, TooNew, TooOld)
-
-    struct DLCPosition {
-        sead::Vector3f translate = sead::Vector3f::zero;
-        sead::Vector3f rotate = sead::Vector3f::zero;
-        sead::Vector3f translate2 = sead::Vector3f::zero;
-        float scale = 0.0;
-        ksys::gdt::FlagHandle flag_handle = ksys::gdt::InvalidHandle;
-    };
-    KSYS_CHECK_SIZE_NX150(DLCPosition, 0x2c);
-
-    struct VersionFile {
-        bool readVersion();
-
-        ksys::res::Handle file_handle;
-        sead::FixedSafeString<16> string;
-    };
-    KSYS_CHECK_SIZE_NX150(VersionFile, 0x78);
-
-    void loadVersionFile();
-    void checkVersion();
-
-    void resetFlags();
-    void initGameData();
-    void reinitFlags();
-    void onGdtReinit(ksys::gdt::Manager::ReinitEvent* event);
-
-    sead::FileDevice* mFileDevice{};
-
-    ksys::res::FileDevicePrefix mVersionFileDevPrefix;
-    VersionFile mVersionFile{};
-    u32 mVersion{};
-
-    ksys::res::Handle mAocMainFieldPack;
-    ksys::res::FileDevicePrefix mAocMainFieldPackPrefix;
-    ksys::res::Handle* mAocPack{};
-    ksys::res::FileDevicePrefix mAocPackPrefix;
-
-    sead::SafeArray<DLCPosition, 20> mDLCPositions;
-
-    ksys::gdt::FlagHandle mFlagAocVerAtLastPlay{};
-    ksys::gdt::FlagHandle mFlagLatestAocVerPlayed{};
-    ksys::gdt::FlagHandle mFlagHasAocVer1{};
-    ksys::gdt::FlagHandle mFlagHasAocVer2{};
-    ksys::gdt::FlagHandle mFlagHasAocVer3{};
-    ksys::gdt::Manager::ReinitSignal::Slot mGdtReinitSlot;
-
-    sead::BitFlag8 mVersionFlags{};
-#ifdef NNSDK
-    u8* mAocFsCache{};
-#endif
-};
-KSYS_CHECK_SIZE_NX150(Manager, 0x598);
-
-}  // namespace uking::aoc
diff --git a/src/Game/UI/uiPauseMenuDataMgr.cpp b/src/Game/UI/uiPauseMenuDataMgr.cpp
index 53a87310..ec352d31 100644
--- a/src/Game/UI/uiPauseMenuDataMgr.cpp
+++ b/src/Game/UI/uiPauseMenuDataMgr.cpp
@@ -10,10 +10,10 @@
 #include "Game/Actor/actPlayerCreateUtils.h"
 #include "Game/Actor/actWeapon.h"
 #include "Game/Cooking/cookManager.h"
-#include "Game/DLC/aocManager.h"
 #include "Game/Scene/gameScene.h"
 #include "Game/UI/uiUtils.h"
 #include "Game/gameItemUtils.h"
+#include "KingSystem/AOC/aocManager.h"
 #include "KingSystem/ActorSystem/actActorConstDataAccess.h"
 #include "KingSystem/ActorSystem/actActorHeapUtil.h"
 #include "KingSystem/ActorSystem/actActorUtil.h"
@@ -450,7 +450,7 @@ void PauseMenuDataMgr::doLoadFromGameData() {
     }
 
     // Add the Travel Medallion (Obj_WarpDLC) to the inventory if it is missing for some reason
-    if (aoc::Manager::instance()->hasAoc2() &&
+    if (ksys::aoc::Manager::instance()->hasAoc2() &&
         !(found_travel_medallion | !gdt::getFlag_IsGet_Obj_WarpDLC())) {
         addToPouch(sValues.Obj_WarpDLC.cstr(), PouchItemType::KeyItem, lists, 1, false, nullptr,
                    true);
@@ -986,12 +986,12 @@ void PauseMenuDataMgr::doAddToPouch(PouchItemType type, const sead::SafeString&
     }
 
     if (item_name_to_add == sValues.Obj_WarpDLC) {
-        if (!aoc::Manager::instance()->hasAoc2()) {
+        if (!ksys::aoc::Manager::instance()->hasAoc2()) {
             return;
         }
     }
 
-    if (!aoc::Manager::instance()->hasAoc3()) {
+    if (!ksys::aoc::Manager::instance()->hasAoc3()) {
         if (item_name_to_add == sValues.Obj_DLC_HeroSoul_Zora) {
             item_name_to_add = sValues.Obj_HeroSoul_Zora;
         } else if (item_name_to_add == sValues.Obj_DLC_HeroSoul_Rito) {
@@ -2621,23 +2621,26 @@ bool PauseMenuDataMgr::isHeroSoulEnabled(const sead::SafeString& name) const {
 
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
 bool PauseMenuDataMgr::hasRitoSoulPlus() const {
-    return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Rito() && aoc::Manager::instance()->hasAoc3();
+    return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Rito() &&
+           ksys::aoc::Manager::instance()->hasAoc3();
 }
 
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
 bool PauseMenuDataMgr::hasGoronSoulPlus() const {
-    return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Goron() && aoc::Manager::instance()->hasAoc3();
+    return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Goron() &&
+           ksys::aoc::Manager::instance()->hasAoc3();
 }
 
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
 bool PauseMenuDataMgr::hasGerudoSoulPlus() const {
     return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Gerudo() &&
-           aoc::Manager::instance()->hasAoc3();
+           ksys::aoc::Manager::instance()->hasAoc3();
 }
 
 // NOLINTNEXTLINE(readability-convert-member-functions-to-static)
 bool PauseMenuDataMgr::hasZoraSoulPlus() const {
-    return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Zora() && aoc::Manager::instance()->hasAoc3();
+    return ksys::gdt::getFlag_IsGet_Obj_DLC_HeroSoul_Zora() &&
+           ksys::aoc::Manager::instance()->hasAoc3();
 }
 
 int PauseMenuDataMgr::countItemsWithCategoryByType(PouchCategory category) const {
diff --git a/src/Game/UI/uiUtils.cpp b/src/Game/UI/uiUtils.cpp
index 06462c7b..3d4e4979 100644
--- a/src/Game/UI/uiUtils.cpp
+++ b/src/Game/UI/uiUtils.cpp
@@ -1,8 +1,8 @@
 #include "Game/UI/uiUtils.h"
+#include "Game/AOC/aocHardModeManager.h"
 #include "Game/Actor/Damage/dmgInfoManager.h"
 #include "Game/Actor/actPlayerCreateMgr.h"
 #include "Game/Actor/actWeapon.h"
-#include "Game/DLC/aocHardModeManager.h"
 #include "Game/UI/uiPauseMenuDataMgr.h"
 #include "KingSystem/ActorSystem/actInfoCommon.h"
 #include "KingSystem/ActorSystem/actInfoData.h"