The task and thread families are plain ksys::

They link in the same block as the plain-ksys:: Message family.
getItemValue and applyScreenFade sit in engine UI TUs, hence ksys::ui.

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

4 files changed, 10 insertions, 11 deletions

diff --git a/src/KingSystem/System/OverlayArenaSystem.cpp b/src/KingSystem/System/OverlayArenaSystem.cpp
index bafb705a..82a59aaf 100644
--- a/src/KingSystem/System/OverlayArenaSystem.cpp
+++ b/src/KingSystem/System/OverlayArenaSystem.cpp
@@ -66,12 +66,12 @@ void OverlayArenaSystem::destroyHeaps() {
 bool OverlayArenaSystem::init(const InitArg& arg, sead::Heap* heap) {
     mSystemPauseMgr = arg.system_pause_mgr;
 
-    mPrepareThread = new (heap) util::TaskThread(
+    mPrepareThread = new (heap) TaskThread(
         "OverlayArena Prepare", heap, sead::ThreadUtil::ConvertPrioritySeadToPlatform(17),
         sead::MessageQueue::BlockType::Blocking, 0x7fffffff, 0x14000, 32);
 
     {
-        util::TaskThread::InitArg arg_;
+        TaskThread::InitArg arg_;
         arg_.batch_size = 0;
         arg_.queue = nullptr;
         arg_.num_lanes = 1;
@@ -84,8 +84,8 @@ bool OverlayArenaSystem::init(const InitArg& arg, sead::Heap* heap) {
     mDelegate = {this, &OverlayArenaSystem::delegatedFunction};
 
     {
-        mTask = new (heap) util::Task(heap);
-        util::TaskDelegateSetter setter;
+        mTask = new (heap) Task(heap);
+        TaskDelegateSetter setter;
         mTask->setDelegate(setter);
     }
 
diff --git a/src/KingSystem/System/OverlayArenaSystem.h b/src/KingSystem/System/OverlayArenaSystem.h
index a0a3cd71..3350c390 100644
--- a/src/KingSystem/System/OverlayArenaSystem.h
+++ b/src/KingSystem/System/OverlayArenaSystem.h
@@ -17,11 +17,8 @@ class SZSDecompressor;
 
 namespace ksys {
 
-namespace util {
 class Task;
 class TaskThread;
-}  // namespace util
-
 class OverlayArena;
 
 class ISystemPauseMgr {
@@ -116,14 +113,14 @@ private:
     ISystemPauseMgr* mSystemPauseMgr = nullptr;
     OverlayArenaSystemS1 mS1;
     u32 _b8 = 0;
-    util::TaskThread* mPrepareThread = nullptr;
-    util::Task* mTask = nullptr;
+    TaskThread* mPrepareThread = nullptr;
+    Task* mTask = nullptr;
     sead::DelegateR<OverlayArenaSystem, bool> mDelegate;
     OverlayArenaSystemS2 mS2;
     sead::Atomic<u32> _130 = 0;
     sead::Atomic<u32> _134 = 0;
     res::Handle mResHandle;
-    util::Event mEvent;
+    Event mEvent;
 };
 KSYS_CHECK_SIZE_NX150(OverlayArenaSystem, 0x1c8);
 
diff --git a/src/KingSystem/System/ProductReporter.cpp b/src/KingSystem/System/ProductReporter.cpp
index 827f01fa..4812734a 100644
--- a/src/KingSystem/System/ProductReporter.cpp
+++ b/src/KingSystem/System/ProductReporter.cpp
@@ -7,7 +7,7 @@
 #include <nn/oe.h>
 
 #include "KingSystem/Camera/CameraMgr.h"
-#include "KingSystem/Framework/Framework.h"
+#include "KingSystem/Framework/frmFramework.h"
 #include "KingSystem/Map/mapPlacementMgr.h"
 #include "KingSystem/Sound/sndMgr.h"
 #include "KingSystem/System/PlayReportMgr.h"
diff --git a/src/KingSystem/System/UIGlue.h b/src/KingSystem/System/UIGlue.h
index d07da634..4dffe1b3 100644
--- a/src/KingSystem/System/UIGlue.h
+++ b/src/KingSystem/System/UIGlue.h
@@ -5,7 +5,9 @@
 namespace ksys::ui {
 
 int getPorchNum(const sead::SafeString& name);
+int getItemValue(const sead::SafeString& name);
 void initRupeeCounter();
 bool isRupeeCounterActive();
+void applyScreenFade(float progress);
 
 }  // namespace ksys::ui