From 8eca2642b01591ccbfbee98e66181d8ad5982cd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Tue, 13 Oct 2026 10:39:03 +0200
Subject: [PATCH 1/5] ksys, uking: move four definitions to match link order

calc_ goes before leave_ in ForceSetCameraPos and InWaterSelForkASPlay,
and RailRoute's dtor goes after getCheckPointName (an unnamed row
there is likely its D0).

BaseProcJobHandler's ctor is linked right before BaseProc's ctor, so it
moves into actBaseProc.cpp, and the class moves into actBaseProc.h so
that its declaration stays with its definition.

(AI assisted using Claude Opus 5.5)
---
 .../Actor/Action/actionForceSetCameraPos.cpp  |  8 +--
 .../Action/actionInWaterSelForkASPlay.cpp     |  8 +--
 src/KingSystem/ActorSystem/CMakeLists.txt     |  2 -
 src/KingSystem/ActorSystem/actActor.h         |  1 -
 src/KingSystem/ActorSystem/actBaseProc.cpp    |  3 +-
 src/KingSystem/ActorSystem/actBaseProc.h      | 43 ++++++++++++++++
 .../ActorSystem/actBaseProcJobHandler.cpp     |  8 ---
 .../ActorSystem/actBaseProcJobHandler.h       | 51 -------------------
 src/KingSystem/ActorSystem/actBaseProcMgr.cpp |  2 +-
 src/KingSystem/Map/mapRail.cpp                |  4 +-
 10 files changed, 56 insertions(+), 74 deletions(-)
 delete mode 100644 src/KingSystem/ActorSystem/actBaseProcJobHandler.cpp
 delete mode 100644 src/KingSystem/ActorSystem/actBaseProcJobHandler.h

diff --git a/src/Game/Actor/Action/actionForceSetCameraPos.cpp b/src/Game/Actor/Action/actionForceSetCameraPos.cpp
index ade0b7de..61e5b345 100644
--- a/src/Game/Actor/Action/actionForceSetCameraPos.cpp
+++ b/src/Game/Actor/Action/actionForceSetCameraPos.cpp
@@ -14,14 +14,14 @@ void ForceSetCameraPos::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Action::enter_(params);
 }
 
+void ForceSetCameraPos::calc_() {
+    ksys::act::ai::Action::calc_();
+}
+
 void ForceSetCameraPos::leave_() {
     ksys::act::ai::Action::leave_();
 }
 
 void ForceSetCameraPos::loadParams_() {}
 
-void ForceSetCameraPos::calc_() {
-    ksys::act::ai::Action::calc_();
-}
-
 }  // namespace uking::action
diff --git a/src/Game/Actor/Action/actionInWaterSelForkASPlay.cpp b/src/Game/Actor/Action/actionInWaterSelForkASPlay.cpp
index 7296f05c..791ff4f1 100644
--- a/src/Game/Actor/Action/actionInWaterSelForkASPlay.cpp
+++ b/src/Game/Actor/Action/actionInWaterSelForkASPlay.cpp
@@ -14,6 +14,10 @@ void InWaterSelForkASPlay::enter_(ksys::act::ai::InlineParamPack* params) {
     ksys::act::ai::Action::enter_(params);
 }
 
+void InWaterSelForkASPlay::calc_() {
+    ksys::act::ai::Action::calc_();
+}
+
 void InWaterSelForkASPlay::leave_() {
     ksys::act::ai::Action::leave_();
 }
@@ -28,8 +32,4 @@ void InWaterSelForkASPlay::loadParams_() {
     getStaticParam(&mASName_s, "ASName");
 }
 
-void InWaterSelForkASPlay::calc_() {
-    ksys::act::ai::Action::calc_();
-}
-
 }  // namespace uking::action
diff --git a/src/KingSystem/ActorSystem/CMakeLists.txt b/src/KingSystem/ActorSystem/CMakeLists.txt
index e0b70bfd..71080f19 100644
--- a/src/KingSystem/ActorSystem/CMakeLists.txt
+++ b/src/KingSystem/ActorSystem/CMakeLists.txt
@@ -77,8 +77,6 @@ target_sources(uking PRIVATE
     actBaseProcInitializer.h
     actBaseProcJob.cpp
     actBaseProcJob.h
-    actBaseProcJobHandler.cpp
-    actBaseProcJobHandler.h
     actBaseProcJobQue.cpp
     actBaseProcJobQue.h
     actBaseProcLink.cpp
diff --git a/src/KingSystem/ActorSystem/actActor.h b/src/KingSystem/ActorSystem/actActor.h
index 2749d091..dcd0515d 100644
--- a/src/KingSystem/ActorSystem/actActor.h
+++ b/src/KingSystem/ActorSystem/actActor.h
@@ -11,7 +11,6 @@
 #include <xlink2/xlink2Handle.h>
 #include "KingSystem/ActorSystem/actActorEditorNode.h"
 #include "KingSystem/ActorSystem/actBaseProc.h"
-#include "KingSystem/ActorSystem/actBaseProcJobHandler.h"
 #include "KingSystem/ActorSystem/actBaseProcLink.h"
 #include "KingSystem/ActorSystem/actPhysicsConstraints.h"
 #include "KingSystem/ActorSystem/actPhysicsUserTag.h"
diff --git a/src/KingSystem/ActorSystem/actBaseProc.cpp b/src/KingSystem/ActorSystem/actBaseProc.cpp
index cce31c21..97b1b5b1 100644
--- a/src/KingSystem/ActorSystem/actBaseProc.cpp
+++ b/src/KingSystem/ActorSystem/actBaseProc.cpp
@@ -3,7 +3,6 @@
 #include <time/seadTickSpan.h>
 #include "KingSystem/ActorSystem/actBaseProcAccessor.h"
 #include "KingSystem/ActorSystem/actBaseProcHandle.h"
-#include "KingSystem/ActorSystem/actBaseProcJobHandler.h"
 #include "KingSystem/ActorSystem/actBaseProcLink.h"
 #include "KingSystem/ActorSystem/actBaseProcMgr.h"
 #include "KingSystem/Terrain/teraSystem.h"
@@ -13,6 +12,8 @@ namespace ksys::act {
 
 static util::InitTimeInfo sInfo;
 
+BaseProcJobHandler::BaseProcJobHandler(BaseProc* proc) : mLink(proc, proc->getPriority()) {}
+
 BaseProc::BaseProc(const CreateArg& arg)
     : mName(arg.actor_name), mPriority(arg.class_info->priority) {
     BaseProcMgr* mgr = BaseProcMgr::instance();
diff --git a/src/KingSystem/ActorSystem/actBaseProc.h b/src/KingSystem/ActorSystem/actBaseProc.h
index 48c99176..7e76335f 100644
--- a/src/KingSystem/ActorSystem/actBaseProc.h
+++ b/src/KingSystem/ActorSystem/actBaseProc.h
@@ -5,6 +5,7 @@
 #include <container/seadSafeArray.h>
 #include <math/seadMathCalcCommon.h>
 #include <prim/seadBitFlag.h>
+#include <prim/seadDelegate.h>
 #include <prim/seadRuntimeTypeInfo.h>
 #include <prim/seadSafeString.h>
 #include <prim/seadTypedBitFlag.h>
@@ -332,4 +333,46 @@ private:
 };
 KSYS_CHECK_SIZE_NX150(BaseProc, 0x180);
 
+class BaseProcJobHandler {
+public:
+    explicit BaseProcJobHandler(BaseProc* proc);
+    virtual ~BaseProcJobHandler() = default;
+    virtual void invoke() = 0;
+    virtual void invokeSpecial() {}
+
+    BaseProcJobLink& getLink() { return mLink; }
+    const BaseProcJobLink& getLink() const { return mLink; }
+
+protected:
+    BaseProcJobLink mLink;
+};
+KSYS_CHECK_SIZE_NX150(BaseProcJobHandler, 0x30);
+
+/// For binding actor member functions.
+template <typename T>
+class BaseProcJobHandlerT : public BaseProcJobHandler {
+public:
+    BaseProcJobHandlerT(T* proc, void (T::*fn)()) : BaseProcJobHandler(proc), mDelegate(proc, fn) {}
+
+    void invoke() override { mDelegate.invoke(); }
+
+private:
+    sead::Delegate<T> mDelegate;
+};
+
+/// For binding two actor member functions.
+template <typename T>
+class BaseProcJobHandlerDualT : public BaseProcJobHandler {
+public:
+    BaseProcJobHandlerDualT(T* proc, void (T::*fn)(), void (T::*fn_special)())
+        : BaseProcJobHandler(proc), mDelegate(proc, fn), mDelegateSpecial(proc, fn_special) {}
+
+    void invoke() override { mDelegate.invoke(); }
+    void invokeSpecial() override { mDelegateSpecial.invoke(); }
+
+private:
+    sead::Delegate<T> mDelegate;
+    sead::Delegate<T> mDelegateSpecial;
+};
+
 }  // namespace ksys::act
diff --git a/src/KingSystem/ActorSystem/actBaseProcJobHandler.cpp b/src/KingSystem/ActorSystem/actBaseProcJobHandler.cpp
deleted file mode 100644
index b74fcb1f..00000000
--- a/src/KingSystem/ActorSystem/actBaseProcJobHandler.cpp
+++ /dev/null
@@ -1,8 +0,0 @@
-#include "KingSystem/ActorSystem/actBaseProcJobHandler.h"
-#include "KingSystem/ActorSystem/actBaseProc.h"
-
-namespace ksys::act {
-
-BaseProcJobHandler::BaseProcJobHandler(BaseProc* proc) : mLink(proc, proc->getPriority()) {}
-
-}  // namespace ksys::act
diff --git a/src/KingSystem/ActorSystem/actBaseProcJobHandler.h b/src/KingSystem/ActorSystem/actBaseProcJobHandler.h
deleted file mode 100644
index 4ba4c1d4..00000000
--- a/src/KingSystem/ActorSystem/actBaseProcJobHandler.h
+++ /dev/null
@@ -1,51 +0,0 @@
-#pragma once
-
-#include <prim/seadDelegate.h>
-#include "KingSystem/ActorSystem/actBaseProcJob.h"
-#include "KingSystem/Utils/Types.h"
-
-namespace ksys::act {
-
-class BaseProcJobHandler {
-public:
-    explicit BaseProcJobHandler(BaseProc* proc);
-    virtual ~BaseProcJobHandler() = default;
-    virtual void invoke() = 0;
-    virtual void invokeSpecial() {}
-
-    BaseProcJobLink& getLink() { return mLink; }
-    const BaseProcJobLink& getLink() const { return mLink; }
-
-protected:
-    BaseProcJobLink mLink;
-};
-KSYS_CHECK_SIZE_NX150(BaseProcJobHandler, 0x30);
-
-/// For binding actor member functions.
-template <typename T>
-class BaseProcJobHandlerT : public BaseProcJobHandler {
-public:
-    BaseProcJobHandlerT(T* proc, void (T::*fn)()) : BaseProcJobHandler(proc), mDelegate(proc, fn) {}
-
-    void invoke() override { mDelegate.invoke(); }
-
-private:
-    sead::Delegate<T> mDelegate;
-};
-
-/// For binding two actor member functions.
-template <typename T>
-class BaseProcJobHandlerDualT : public BaseProcJobHandler {
-public:
-    BaseProcJobHandlerDualT(T* proc, void (T::*fn)(), void (T::*fn_special)())
-        : BaseProcJobHandler(proc), mDelegate(proc, fn), mDelegateSpecial(proc, fn_special) {}
-
-    void invoke() override { mDelegate.invoke(); }
-    void invokeSpecial() override { mDelegateSpecial.invoke(); }
-
-private:
-    sead::Delegate<T> mDelegate;
-    sead::Delegate<T> mDelegateSpecial;
-};
-
-}  // namespace ksys::act
diff --git a/src/KingSystem/ActorSystem/actBaseProcMgr.cpp b/src/KingSystem/ActorSystem/actBaseProcMgr.cpp
index 7d9b3120..73502ab7 100644
--- a/src/KingSystem/ActorSystem/actBaseProcMgr.cpp
+++ b/src/KingSystem/ActorSystem/actBaseProcMgr.cpp
@@ -3,10 +3,10 @@
 #include <prim/seadScopedLock.h>
 #include <thread/seadThread.h>
 #include "KingSystem/ActorSystem/actActorSystem.h"
+#include "KingSystem/ActorSystem/actBaseProc.h"
 #include "KingSystem/ActorSystem/actBaseProcDeleter.h"
 #include "KingSystem/ActorSystem/actBaseProcHeapMgr.h"
 #include "KingSystem/ActorSystem/actBaseProcInitializer.h"
-#include "KingSystem/ActorSystem/actBaseProcJobHandler.h"
 #include "KingSystem/ActorSystem/actBaseProcJobQue.h"
 #include "KingSystem/ActorSystem/actBaseProcLink.h"
 
diff --git a/src/KingSystem/Map/mapRail.cpp b/src/KingSystem/Map/mapRail.cpp
index 2ddf960c..b279c3c1 100644
--- a/src/KingSystem/Map/mapRail.cpp
+++ b/src/KingSystem/Map/mapRail.cpp
@@ -226,8 +226,6 @@ RailRoute::RailRoute() {
     mFlags.set(Flag::Walkable);
 }
 
-RailRoute::~RailRoute() = default;
-
 bool RailRoute::isRenderEnabled() const {
     return mFlags.isOn(Flag::RenderEnabled);
 }
@@ -252,6 +250,8 @@ const char* RailRoute::getCheckPointName(s32 idx) const {
     return static_cast<RailRoutePoint*>(mRailPoints[idx])->mCheckPointName;
 }
 
+RailRoute::~RailRoute() = default;
+
 bool RailRoute::parse(MubinIter* iter) {
     int success = Rail::parse(iter);
 

From 13861707e3a5e2b50870460f50769b9056e871ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Thu, 15 Oct 2026 22:56:21 +0100
Subject: [PATCH 2/5] ksys/act: make calcHash a free function in
 actAwarenessMiscUtils

calcHash is linked between AwarenessInstance's sinit and the next one,
together with two AwarenessSourcePool helpers and the job queue
functions of Awareness::Unk1, so it's a shared helper rather than an
Awareness member, declared in the new file's own header.
actAwareness.cpp calls this 4-byte function out of line, so it's likely
not defined there. The file name sorts between actAwarenessInstance and
the sensor files, which is where it is linked.

(AI assisted using Claude Opus 5.5)
---
 data/uking_functions.csv                               |  2 +-
 src/KingSystem/ActorSystem/Awareness/actAwareness.cpp  |  4 ----
 src/KingSystem/ActorSystem/Awareness/actAwareness.h    |  2 --
 .../ActorSystem/Awareness/actAwarenessDefs.cpp         |  6 +++---
 .../ActorSystem/Awareness/actAwarenessMiscUtils.cpp    | 10 ++++++++++
 .../ActorSystem/Awareness/actAwarenessMiscUtils.h      | 10 ++++++++++
 src/KingSystem/ActorSystem/CMakeLists.txt              |  2 ++
 7 files changed, 26 insertions(+), 10 deletions(-)
 create mode 100644 src/KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.cpp
 create mode 100644 src/KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.h

diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index 1374716d..895c5109 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -75237,7 +75237,7 @@ Address,Quality,Size,Name
 0x0000007100d7ee8c,U,000076,
 0x0000007100d7eed8,U,000016,
 0x0000007100d7eee8,U,000128,
-0x0000007100d7ef68,O,000004,_ZN4ksys3act9Awareness8calcHashERKN4sead14SafeStringBaseIcEE
+0x0000007100d7ef68,O,000004,_ZN4ksys3act17calcAwarenessHashERKN4sead14SafeStringBaseIcEE
 0x0000007100d7ef6c,U,000116,
 0x0000007100d7efe0,U,000036,_ZN4ksys3act9Awareness4Unk18finalizeEv
 0x0000007100d7f004,U,000040,
diff --git a/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp b/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp
index a06e3e67..4d4e8d67 100644
--- a/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp
+++ b/src/KingSystem/ActorSystem/Awareness/actAwareness.cpp
@@ -231,10 +231,6 @@ void Awareness::calc() {
     resetFlag(Flag::_0);
 }
 
-u32 Awareness::calcHash(const sead::SafeString& key) {
-    return agl::utl::ParameterBase::calcHash(key);
-}
-
 void Awareness::Links2::calc() {
     count = 0;
 }
diff --git a/src/KingSystem/ActorSystem/Awareness/actAwareness.h b/src/KingSystem/ActorSystem/Awareness/actAwareness.h
index 5b13c5ef..970ec635 100644
--- a/src/KingSystem/ActorSystem/Awareness/actAwareness.h
+++ b/src/KingSystem/ActorSystem/Awareness/actAwareness.h
@@ -35,8 +35,6 @@ public:
     void setEventActive(bool active);
     void calc();
 
-    static u32 calcHash(const sead::SafeString& key);
-
 private:
     friend class AwarenessInstance;
 
diff --git a/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp b/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp
index 8c13c6fc..d3f969c8 100644
--- a/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp
+++ b/src/KingSystem/ActorSystem/Awareness/actAwarenessDefs.cpp
@@ -1,7 +1,7 @@
 #include "KingSystem/ActorSystem/Awareness/actAwarenessDefs.h"
 #include <container/seadSafeArray.h>
 #include <utility/aglParameter.h>
-#include "KingSystem/ActorSystem/Awareness/actAwareness.h"
+#include "KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.h"
 
 namespace ksys::act {
 
@@ -29,7 +29,7 @@ sead::SafeArray<const char*, 23> sAwarenessSensorTypes = sead::toArray({
 
 u32 getAwarenessTerrorFlags(u32 hash) {
     for (u32 i = 0; i < u32(sAwarenessTerrorTypes.size()); ++i) {
-        if (Awareness::calcHash(sAwarenessTerrorTypes(i)) == hash)
+        if (calcAwarenessHash(sAwarenessTerrorTypes(i)) == hash)
             return 1 << i;
     }
 
@@ -39,7 +39,7 @@ u32 getAwarenessTerrorFlags(u32 hash) {
 
 u32 getAwarenessSensorFlags(u32 hash) {
     for (u32 i = 0; i < u32(sAwarenessSensorTypes.size()); ++i) {
-        if (Awareness::calcHash(sAwarenessSensorTypes(i)) == hash)
+        if (calcAwarenessHash(sAwarenessSensorTypes(i)) == hash)
             return 1 << i;
     }
     return 0xffffffff;
diff --git a/src/KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.cpp b/src/KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.cpp
new file mode 100644
index 00000000..b4be0548
--- /dev/null
+++ b/src/KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.cpp
@@ -0,0 +1,10 @@
+#include "KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.h"
+#include <utility/aglParameter.h>
+
+namespace ksys::act {
+
+u32 calcAwarenessHash(const sead::SafeString& key) {
+    return agl::utl::ParameterBase::calcHash(key);
+}
+
+}  // namespace ksys::act
diff --git a/src/KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.h b/src/KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.h
new file mode 100644
index 00000000..486bb8c0
--- /dev/null
+++ b/src/KingSystem/ActorSystem/Awareness/actAwarenessMiscUtils.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#include <basis/seadTypes.h>
+#include <prim/seadSafeString.h>
+
+namespace ksys::act {
+
+u32 calcAwarenessHash(const sead::SafeString& key);
+
+}  // namespace ksys::act
diff --git a/src/KingSystem/ActorSystem/CMakeLists.txt b/src/KingSystem/ActorSystem/CMakeLists.txt
index 71080f19..5d9be875 100644
--- a/src/KingSystem/ActorSystem/CMakeLists.txt
+++ b/src/KingSystem/ActorSystem/CMakeLists.txt
@@ -11,6 +11,8 @@ target_sources(uking PRIVATE
     Awareness/actAwarenessDefs.h
     Awareness/actAwarenessInstance.cpp
     Awareness/actAwarenessInstance.h
+    Awareness/actAwarenessMiscUtils.cpp
+    Awareness/actAwarenessMiscUtils.h
 
 
     Profiles/actRopeBase.cpp

From 65ea3f7cddc8f87213bea3d3d8c9497d89aee5c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Thu, 15 Oct 2026 22:56:22 +0100
Subject: [PATCH 3/5] uking/scene: move the map getters to uking::StageInfo

They're linked before gameStageInfo.cpp's sinit with no other sinit
in between, so they belong to gameStageInfo, not gameScene, and become
StageInfo statics declared in gameStageInfo.h. Their GameScene owner
was a guess.

(AI assisted using Claude Opus 5.5)
---
 data/uking_functions.csv                              | 4 ++--
 src/Game/Actor/Damage/actDamageInfoMgr.cpp            | 4 ++--
 src/Game/Actor/Query/queryIsCurrentMainFieldStage.cpp | 4 ++--
 src/Game/Scene/gameScene.cpp                          | 9 ---------
 src/Game/Scene/gameScene.h                            | 6 ------
 src/Game/Scene/gameStageInfo.cpp                      | 9 +++++++++
 src/Game/Scene/gameStageInfo.h                        | 6 ++++++
 7 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/data/uking_functions.csv b/data/uking_functions.csv
index 895c5109..d30583e7 100644
--- a/data/uking_functions.csv
+++ b/data/uking_functions.csv
@@ -49623,8 +49623,8 @@ Address,Quality,Size,Name
 0x00000071007cbea4,U,000004,nullsub_2444
 0x00000071007cbea8,U,000004,j__ZdlPv_353
 0x00000071007cbeac,U,000440,StageFactory::create
-0x00000071007cc064,O,000020,_ZN5uking9GameScene17getCurrentMapTypeEv
-0x00000071007cc078,O,000020,_ZN5uking9GameScene17getCurrentMapNameEv
+0x00000071007cc064,O,000020,_ZN5uking9StageInfo17getCurrentMapTypeEv
+0x00000071007cc078,O,000020,_ZN5uking9StageInfo17getCurrentMapNameEv
 0x00000071007cc08c,U,000012,getPSavePosAngleForStageGen
 0x00000071007cc098,U,000012,getPSavePosForStageGen
 0x00000071007cc0a4,U,003264,genStageUpdateMapTypeFlags
diff --git a/src/Game/Actor/Damage/actDamageInfoMgr.cpp b/src/Game/Actor/Damage/actDamageInfoMgr.cpp
index e794326a..a1cafc92 100644
--- a/src/Game/Actor/Damage/actDamageInfoMgr.cpp
+++ b/src/Game/Actor/Damage/actDamageInfoMgr.cpp
@@ -1,5 +1,5 @@
 #include "Game/Actor/Damage/actDamageInfoMgr.h"
-#include "Game/Scene/gameScene.h"
+#include "Game/Scene/gameStageInfo.h"
 #include "KingSystem/ActorSystem/actGlobalParameter.h"
 #include "KingSystem/GameData/gdtCommonFlagsUtils.h"
 #include "KingSystem/Resource/GeneralParamList/resGParamListObjectGlobal.h"
@@ -49,7 +49,7 @@ bool DamageInfoMgr::isTrueFormMasterSword() const {
     if (ksys::gdt::getFlag_LastBossGanonBeastGenerateFlag())
         return true;
 
-    const sead::SafeString& map = GameScene::getCurrentMapName();
+    const sead::SafeString& map = StageInfo::getCurrentMapName();
 
     if (!ksys::gdt::getFlag_Die_PGanonElectric() && map == "RemainsElectric")
         return true;
diff --git a/src/Game/Actor/Query/queryIsCurrentMainFieldStage.cpp b/src/Game/Actor/Query/queryIsCurrentMainFieldStage.cpp
index 84b765b4..0554b268 100644
--- a/src/Game/Actor/Query/queryIsCurrentMainFieldStage.cpp
+++ b/src/Game/Actor/Query/queryIsCurrentMainFieldStage.cpp
@@ -1,6 +1,6 @@
 #include "Game/Actor/Query/queryIsCurrentMainFieldStage.h"
 #include <evfl/Query.h>
-#include "Game/Scene/gameScene.h"
+#include "Game/Scene/gameStageInfo.h"
 
 namespace uking::query {
 
@@ -9,7 +9,7 @@ IsCurrentMainFieldStage::IsCurrentMainFieldStage(const InitArg& arg) : ksys::act
 IsCurrentMainFieldStage::~IsCurrentMainFieldStage() = default;
 
 int IsCurrentMainFieldStage::doQuery() {
-    return GameScene::getCurrentMapType() == "MainField";
+    return StageInfo::getCurrentMapType() == "MainField";
 }
 
 void IsCurrentMainFieldStage::loadParams(const evfl::QueryArg& arg) {}
diff --git a/src/Game/Scene/gameScene.cpp b/src/Game/Scene/gameScene.cpp
index 59152afe..013dc668 100644
--- a/src/Game/Scene/gameScene.cpp
+++ b/src/Game/Scene/gameScene.cpp
@@ -1,16 +1,7 @@
 #include "Game/Scene/gameScene.h"
-#include "KingSystem/System/StageInfo.h"
 
 namespace uking {
 
 bool GameScene::sIsOpenWorldDemo{};
 
-const sead::SafeString& GameScene::getCurrentMapType() {
-    return ksys::StageInfo::getCurrentMapType();
-}
-
-const sead::SafeString& GameScene::getCurrentMapName() {
-    return ksys::StageInfo::getCurrentMapName();
-}
-
 }  // namespace uking
diff --git a/src/Game/Scene/gameScene.h b/src/Game/Scene/gameScene.h
index 4a492877..055097db 100644
--- a/src/Game/Scene/gameScene.h
+++ b/src/Game/Scene/gameScene.h
@@ -9,12 +9,6 @@ class GameScene {
 public:
     static bool isOpenWorldDemo() { return sIsOpenWorldDemo; }
 
-    /// Get the current map type (e.g. MainFieldDungeon)
-    static const sead::SafeString& getCurrentMapType();
-
-    /// Get the current map name (e.g. RemainsWind, FinalTrial, ...)
-    static const sead::SafeString& getCurrentMapName();
-
 private:
     static bool sIsOpenWorldDemo;
 };
diff --git a/src/Game/Scene/gameStageInfo.cpp b/src/Game/Scene/gameStageInfo.cpp
index dc80d025..fae5d276 100644
--- a/src/Game/Scene/gameStageInfo.cpp
+++ b/src/Game/Scene/gameStageInfo.cpp
@@ -1,4 +1,5 @@
 #include "Game/Scene/gameStageInfo.h"
+#include "KingSystem/System/StageInfo.h"
 #include "KingSystem/Utils/InitTimeInfo.h"
 
 namespace uking {
@@ -7,4 +8,12 @@ static ksys::util::InitConstants sConstants;
 sead::FixedSafeString<256> StageInfo::sStr;
 StageInfo StageInfo::sInfo;
 
+const sead::SafeString& StageInfo::getCurrentMapType() {
+    return ksys::StageInfo::getCurrentMapType();
+}
+
+const sead::SafeString& StageInfo::getCurrentMapName() {
+    return ksys::StageInfo::getCurrentMapName();
+}
+
 }  // namespace uking
diff --git a/src/Game/Scene/gameStageInfo.h b/src/Game/Scene/gameStageInfo.h
index d149bffd..5c359047 100644
--- a/src/Game/Scene/gameStageInfo.h
+++ b/src/Game/Scene/gameStageInfo.h
@@ -28,6 +28,12 @@ public:
     static bool isAocField() { return sInfo.mIsAocField; }
     static bool isMainField() { return sInfo.mIsMainField; }
 
+    /// Get the current map type (e.g. MainFieldDungeon)
+    static const sead::SafeString& getCurrentMapType();
+
+    /// Get the current map name (e.g. RemainsWind, FinalTrial, ...)
+    static const sead::SafeString& getCurrentMapName();
+
     static sead::FixedSafeString<256> sStr;
 
 private:

From 7286390beae272d1f8201e45ecf725d75241a84d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Fri, 16 Oct 2026 18:51:17 +0300
Subject: [PATCH 4/5] ksys/phys: rename physStaticCompoundUtil to physUtil

Most of these helpers have nothing to do with StaticCompound: they look
up material masks and collision filter info from shapes and collidables.
physUtil also fits the link order, between physUserTag and physWorld,
and it's what the function groups already call this block.

(AI assisted using Claude Opus 5.5)
---
 src/KingSystem/Physics/CMakeLists.txt                         | 4 ++--
 .../Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp      | 2 +-
 .../Physics/RigidBody/physRigidBodyFromResource.cpp           | 2 +-
 src/KingSystem/Physics/System/physRayCast.cpp                 | 2 +-
 src/KingSystem/Physics/System/physStaticCompoundUtil.cpp      | 1 -
 src/KingSystem/Physics/System/physUtil.cpp                    | 1 +
 .../Physics/System/{physStaticCompoundUtil.h => physUtil.h}   | 0
 7 files changed, 6 insertions(+), 6 deletions(-)
 delete mode 100644 src/KingSystem/Physics/System/physStaticCompoundUtil.cpp
 create mode 100644 src/KingSystem/Physics/System/physUtil.cpp
 rename src/KingSystem/Physics/System/{physStaticCompoundUtil.h => physUtil.h} (100%)

diff --git a/src/KingSystem/Physics/CMakeLists.txt b/src/KingSystem/Physics/CMakeLists.txt
index 9f9b7656..03102915 100644
--- a/src/KingSystem/Physics/CMakeLists.txt
+++ b/src/KingSystem/Physics/CMakeLists.txt
@@ -176,14 +176,14 @@ target_sources(uking PRIVATE
     System/physStaticCompoundMgr.h
     System/physStaticCompoundRigidBodyGroup.cpp
     System/physStaticCompoundRigidBodyGroup.h
-    System/physStaticCompoundUtil.cpp
-    System/physStaticCompoundUtil.h
     System/physSystem.cpp
     System/physSystem.h
     System/physSystemData.cpp
     System/physSystemData.h
     System/physUserTag.cpp
     System/physUserTag.h
+    System/physUtil.cpp
+    System/physUtil.h
 
     physConversions.h
     physDefines.cpp
diff --git a/src/KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp b/src/KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp
index 9e55c51d..6e018cda 100644
--- a/src/KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp
+++ b/src/KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.cpp
@@ -1,7 +1,7 @@
 #include "KingSystem/Physics/RigidBody/TeraMesh/physTeraMeshRigidBody.h"
 #include <Havok/Physics2012/Dynamics/Entity/hkpRigidBody.h>
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physStaticCompoundUtil.h"
+#include "KingSystem/Physics/System/physUtil.h"
 
 namespace ksys::phys {
 
diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
index 6e4384d1..fe64a482 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyFromResource.cpp
@@ -5,7 +5,7 @@
 #include <Havok/Physics2012/Utilities/Dynamics/ScaleSystem/hkpSystemScalingUtility.h>
 #include <math/seadMathCalcCommon.h>
 #include "KingSystem/Physics/RigidBody/physRigidBodyParam.h"
-#include "KingSystem/Physics/System/physStaticCompoundUtil.h"
+#include "KingSystem/Physics/System/physUtil.h"
 #include "KingSystem/Physics/physConversions.h"
 #include "KingSystem/Physics/physMaterialMask.h"
 
diff --git a/src/KingSystem/Physics/System/physRayCast.cpp b/src/KingSystem/Physics/System/physRayCast.cpp
index e7f8f9b9..e55c092e 100644
--- a/src/KingSystem/Physics/System/physRayCast.cpp
+++ b/src/KingSystem/Physics/System/physRayCast.cpp
@@ -17,8 +17,8 @@
 #include "KingSystem/Physics/System/physEntityContactListener.h"
 #include "KingSystem/Physics/System/physGroupFilter.h"
 #include "KingSystem/Physics/System/physPhantom.h"
-#include "KingSystem/Physics/System/physStaticCompoundUtil.h"
 #include "KingSystem/Physics/System/physSystem.h"
+#include "KingSystem/Physics/System/physUtil.h"
 #include "KingSystem/Physics/physConversions.h"
 #include "KingSystem/Physics/physLayerMaskBuilder.h"
 
diff --git a/src/KingSystem/Physics/System/physStaticCompoundUtil.cpp b/src/KingSystem/Physics/System/physStaticCompoundUtil.cpp
deleted file mode 100644
index 3216d4bf..00000000
--- a/src/KingSystem/Physics/System/physStaticCompoundUtil.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "KingSystem/Physics/System/physStaticCompoundUtil.h"
diff --git a/src/KingSystem/Physics/System/physUtil.cpp b/src/KingSystem/Physics/System/physUtil.cpp
new file mode 100644
index 00000000..95e685be
--- /dev/null
+++ b/src/KingSystem/Physics/System/physUtil.cpp
@@ -0,0 +1 @@
+#include "KingSystem/Physics/System/physUtil.h"
diff --git a/src/KingSystem/Physics/System/physStaticCompoundUtil.h b/src/KingSystem/Physics/System/physUtil.h
similarity index 100%
rename from src/KingSystem/Physics/System/physStaticCompoundUtil.h
rename to src/KingSystem/Physics/System/physUtil.h

From ef164cc8aac3a4d1729d3cbf722dec9b30a0c147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Lam?= <leo@leolam.fr>
Date: Fri, 16 Oct 2026 00:18:41 +0100
Subject: [PATCH 5/5] ksys/phys: move motionTypeFromText to physUtil

motionTypeFromText isn't part of physDefines: its "Keyframed" string
(only used there) sits between the StaticCompound and PlayReport strings
in .rodata, far from physDefines' enum text, and the function is linked
right after the contact listener's inline virtuals, so it most likely
starts a new TU at 0x7100fd069c.

Nothing separates it from getMaterialMaskFromShape and the other helpers
in physUtil, so it goes in the same file and its declaration moves to
physUtil.h. That part is a guess: neither function has data that would
show a boundary.

(AI assisted using Claude Opus 5.5)
---
 .../Physics/RigidBody/physRigidBodyParam.cpp  |  1 +
 src/KingSystem/Physics/System/physUtil.cpp    | 24 +++++++++++++++++++
 src/KingSystem/Physics/System/physUtil.h      |  5 ++++
 src/KingSystem/Physics/physDefines.cpp        | 19 ---------------
 src/KingSystem/Physics/physDefines.h          |  2 --
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/KingSystem/Physics/RigidBody/physRigidBodyParam.cpp b/src/KingSystem/Physics/RigidBody/physRigidBodyParam.cpp
index 73021829..ffca4698 100644
--- a/src/KingSystem/Physics/RigidBody/physRigidBodyParam.cpp
+++ b/src/KingSystem/Physics/RigidBody/physRigidBodyParam.cpp
@@ -19,6 +19,7 @@
 #include "KingSystem/Physics/RigidBody/physRigidBodyPolytope.h"
 #include "KingSystem/Physics/RigidBody/physRigidBodySphere.h"
 #include "KingSystem/Physics/System/physEntityGroupFilter.h"
+#include "KingSystem/Physics/System/physUtil.h"
 #include "KingSystem/Utils/SafeDelete.h"
 
 namespace ksys::phys {
diff --git a/src/KingSystem/Physics/System/physUtil.cpp b/src/KingSystem/Physics/System/physUtil.cpp
index 95e685be..d5ed8af5 100644
--- a/src/KingSystem/Physics/System/physUtil.cpp
+++ b/src/KingSystem/Physics/System/physUtil.cpp
@@ -1 +1,25 @@
 #include "KingSystem/Physics/System/physUtil.h"
+#include "KingSystem/Physics/physDefines.h"
+
+namespace ksys::phys {
+
+MotionType motionTypeFromText(const sead::SafeString& text) {
+    static constexpr const char* texts[] = {
+        "Dynamic",
+        "Fixed",
+        "Keyframed",
+    };
+    static_assert(int(MotionType::Dynamic) == 0);
+    static_assert(int(MotionType::Fixed) == 1);
+    static_assert(int(MotionType::Keyframed) == 2);
+
+    int type = 0;
+    for (const char* type_text : texts) {
+        if (text == type_text)
+            return static_cast<MotionType>(type);
+        ++type;
+    }
+    return MotionType::Unknown;
+}
+
+}  // namespace ksys::phys
diff --git a/src/KingSystem/Physics/System/physUtil.h b/src/KingSystem/Physics/System/physUtil.h
index 976a6889..94d56ee6 100644
--- a/src/KingSystem/Physics/System/physUtil.h
+++ b/src/KingSystem/Physics/System/physUtil.h
@@ -2,6 +2,7 @@
 
 #include <basis/seadTypes.h>
 #include <math/seadVector.h>
+#include <prim/seadSafeString.h>
 
 class hkpCollidable;
 class hkpShape;
@@ -14,6 +15,10 @@ namespace ksys::phys {
 
 class StaticCompoundRigidBodyGroup;
 struct RigidBodyCollisionMasks;
+enum class MotionType;
+
+// 0x0000007100fd069c
+MotionType motionTypeFromText(const sead::SafeString& text);
 
 // 0x0000007100fd0810
 u32 getMaterialMaskFromShape(const hkpShape& shape, const u32* shape_key,
diff --git a/src/KingSystem/Physics/physDefines.cpp b/src/KingSystem/Physics/physDefines.cpp
index 079b5c72..06938e95 100644
--- a/src/KingSystem/Physics/physDefines.cpp
+++ b/src/KingSystem/Physics/physDefines.cpp
@@ -84,23 +84,4 @@ WallCode wallCodeFromText(const sead::SafeString& text) {
     return 0;
 }
 
-MotionType motionTypeFromText(const sead::SafeString& text) {
-    static constexpr const char* texts[] = {
-        "Dynamic",
-        "Fixed",
-        "Keyframed",
-    };
-    static_assert(int(MotionType::Dynamic) == 0);
-    static_assert(int(MotionType::Fixed) == 1);
-    static_assert(int(MotionType::Keyframed) == 2);
-
-    int type = 0;
-    for (const char* type_text : texts) {
-        if (text == type_text)
-            return static_cast<MotionType>(type);
-        ++type;
-    }
-    return MotionType::Unknown;
-}
-
 }  // namespace ksys::phys
diff --git a/src/KingSystem/Physics/physDefines.h b/src/KingSystem/Physics/physDefines.h
index a7bd1464..3625d1b3 100644
--- a/src/KingSystem/Physics/physDefines.h
+++ b/src/KingSystem/Physics/physDefines.h
@@ -401,6 +401,4 @@ FloorCode floorCodeFromText(const sead::SafeString& text);
 const char* wallCodeToText(WallCode code);
 WallCode wallCodeFromText(const sead::SafeString& text);
 
-MotionType motionTypeFromText(const sead::SafeString& text);
-
 }  // namespace ksys::phys