Move code to the TUs that match link order and rename files

Rename classes and files so that they sort where their code is linked,
and move code that is linked inside another TU into that TU's file.

| Old | New | TU start |
|---|---|---|
| ActorAreaInOutSendMessage | AreaInOutSendMessage | 0x710009fa64 |
| AreaTagAction | AreaActionBase | 0x7100e21e64 |
| sndResource.{h,cpp} | sndSound.{h,cpp} | |

| Code | From | To |
|---|---|---|
| SoundMgr | sndMgr.h | sndSound.h |
| PlayReport | PlayReportMgr.cpp | PlayReport.cpp |
| PlayReport::addPlayTimes, addPosition | PlayReportMgr.cpp | ProductReporter.cpp |

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

data/uking_functions.csv

@@ -1503,7 +1503,7 @@ Address,Quality,Size,Name
 0x00000071000541cc,U,000004,ActorObserverBase::m5_null
 0x00000071000541d0,U,000008,ActorObserverBase::m6
 0x00000071000541d8,O,000372,_ZN5uking6action26CollaboShootingStarAreaTag33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE
-0x000000710005434c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action13AreaTagActionEE9isDerivedEPKNS0_9InterfaceE
+0x000000710005434c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action14AreaActionBaseEE9isDerivedEPKNS0_9InterfaceE
 0x00000071000543d8,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN4ksys5world3JobEE9isDerivedEPKNS0_9InterfaceE
 0x0000007100054464,O,000052,_ZN5uking6action26CreateDragonChallengeXLinkC1ERKN4ksys3act2ai10ActionBase7InitArgE
 0x0000007100054498,O,000020,_ZN5uking6action26CreateDragonChallengeXLinkD1Ev
@@ -3269,27 +3269,27 @@ Address,Quality,Size,Name
 0x000000710009f810,O,000372,_ZN5uking6action15AreaFireObserve33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE
 0x000000710009f984,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action15FireObserveBaseEE9isDerivedEPKNS0_9InterfaceE
 0x000000710009fa10,U,000084,AI_ActionInOutSendMessage::ctor
-0x000000710009fa64,W,000200,_ZN5uking6action25ActorAreaInOutSendMessageD1Ev
+0x000000710009fa64,W,000200,_ZN5uking6action20AreaInOutSendMessageD1Ev
 0x000000710009fb2c,U,000008,
-0x000000710009fb34,W,000036,_ZN5uking6action25ActorAreaInOutSendMessageD0Ev
+0x000000710009fb34,W,000036,_ZN5uking6action20AreaInOutSendMessageD0Ev
 0x000000710009fb58,U,000040,_ZThn48_N3agl2fx12OfxLensFlare6PresetD0Ev
-0x000000710009fb80,W,000300,_ZN5uking6action25ActorAreaInOutSendMessage5init_EPN4sead4HeapE
-0x000000710009fcac,W,000132,_ZN5uking6action25ActorAreaInOutSendMessage6enter_EPN4ksys3act2ai15InlineParamPackE
-0x000000710009fd30,O,000004,_ZN5uking6action25ActorAreaInOutSendMessage5calc_Ev
-0x000000710009fd34,W,000148,_ZN5uking6action25ActorAreaInOutSendMessage6leave_Ev
-0x000000710009fdc8,W,000064,_ZN5uking6action25ActorAreaInOutSendMessage11loadParams_Ev
-0x000000710009fe08,U,000112,uking::action::ActorAreaInOutSendMessage::m35
+0x000000710009fb80,W,000300,_ZN5uking6action20AreaInOutSendMessage5init_EPN4sead4HeapE
+0x000000710009fcac,W,000132,_ZN5uking6action20AreaInOutSendMessage6enter_EPN4ksys3act2ai15InlineParamPackE
+0x000000710009fd30,O,000004,_ZN5uking6action20AreaInOutSendMessage5calc_Ev
+0x000000710009fd34,W,000148,_ZN5uking6action20AreaInOutSendMessage6leave_Ev
+0x000000710009fdc8,W,000064,_ZN5uking6action20AreaInOutSendMessage11loadParams_Ev
+0x000000710009fe08,U,000112,uking::action::AreaInOutSendMessage::m35
 0x000000710009fe78,U,000112,
-0x000000710009fee8,U,000200,uking::action::ActorAreaInOutSendMessage::m36
+0x000000710009fee8,U,000200,uking::action::AreaInOutSendMessage::m36
 0x000000710009ffb0,U,000204,
-0x00000071000a007c,U,000692,uking::action::ActorAreaInOutSendMessage::m37
+0x00000071000a007c,U,000692,uking::action::AreaInOutSendMessage::m37
 0x00000071000a0330,U,000008,
-0x00000071000a0338,O,000008,_ZNK5uking6action25ActorAreaInOutSendMessage27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
-0x00000071000a0340,O,000092,_ZNK5uking6action25ActorAreaInOutSendMessage18getRuntimeTypeInfoEv
-0x00000071000a039c,U,000004,uking::action::ActorAreaInOutSendMessage::m32
-0x00000071000a03a0,U,000004,uking::action::ActorAreaInOutSendMessage::m33
-0x00000071000a03a4,U,000008,uking::action::ActorAreaInOutSendMessage::m34
-0x00000071000a03ac,O,000372,_ZN5uking6action25ActorAreaInOutSendMessage33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE
+0x00000071000a0338,O,000008,_ZNK5uking6action20AreaInOutSendMessage27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
+0x00000071000a0340,O,000092,_ZNK5uking6action20AreaInOutSendMessage18getRuntimeTypeInfoEv
+0x00000071000a039c,U,000004,uking::action::AreaInOutSendMessage::m32
+0x00000071000a03a0,U,000004,uking::action::AreaInOutSendMessage::m33
+0x00000071000a03a4,U,000008,uking::action::AreaInOutSendMessage::m34
+0x00000071000a03ac,O,000372,_ZN5uking6action20AreaInOutSendMessage33checkDerivedRuntimeTypeInfoStaticEPKN4sead15RuntimeTypeInfo9InterfaceE
 0x00000071000a0520,U,000292,AI_Action_AreaLocation::ctor
 0x00000071000a0644,W,000104,_ZN5uking6action12AreaLocationD1Ev
 0x00000071000a06ac,U,000068,
@@ -6045,7 +6045,7 @@ Address,Quality,Size,Name
 0x00000071001064b0,O,000092,_ZNK5uking6action25EnemyAreaInOutSendMessage18getRuntimeTypeInfoEv
 0x000000710010650c,U,000008,uking::action::EnemyAreaInOutSendMessage::m38
 0x0000007100106514,U,000008,
-0x000000710010651c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action25ActorAreaInOutSendMessageEE9isDerivedEPKNS0_9InterfaceE
+0x000000710010651c,O,000140,_ZNK4sead15RuntimeTypeInfo6DeriveIN5uking6action20AreaInOutSendMessageEE9isDerivedEPKNS0_9InterfaceE
 0x00000071001065a8,U,000080,AI_Action_EnemyChangeWeapon::ctor
 0x00000071001065f8,O,000020,_ZN5uking6action17EnemyChangeWeaponD1Ev
 0x000000710010660c,O,000052,_ZN5uking6action17EnemyChangeWeaponD0Ev
@@ -77807,13 +77807,13 @@ Address,Quality,Size,Name
 0x0000007100e21ce8,U,000288,Anchor::m2
 0x0000007100e21e08,U,000092,Anchor::m3
 0x0000007100e21e64,U,000088,AI_ActionAreaTag::ctor
-0x0000007100e21ebc,W,000008,_ZN5uking6action13AreaTagAction6enter_EPN4ksys3act2ai15InlineParamPackE
-0x0000007100e21ec4,W,000008,_ZN5uking6action13AreaTagAction5calc_Ev
-0x0000007100e21ecc,U,000008,_ZN5uking6action13AreaTagAction14handleMessage_ERKN4ksys7MessageE
-0x0000007100e21ed4,O,000288,_ZNK5uking6action13AreaTagAction27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
-0x0000007100e21ff4,O,000092,_ZNK5uking6action13AreaTagAction18getRuntimeTypeInfoEv
-0x0000007100e22050,O,000020,_ZN5uking6action13AreaTagActionD1Ev
-0x0000007100e22064,O,000052,_ZN5uking6action13AreaTagActionD0Ev
+0x0000007100e21ebc,W,000008,_ZN5uking6action14AreaActionBase6enter_EPN4ksys3act2ai15InlineParamPackE
+0x0000007100e21ec4,W,000008,_ZN5uking6action14AreaActionBase5calc_Ev
+0x0000007100e21ecc,U,000008,_ZN5uking6action14AreaActionBase14handleMessage_ERKN4ksys7MessageE
+0x0000007100e21ed4,O,000288,_ZNK5uking6action14AreaActionBase27checkDerivedRuntimeTypeInfoEPKN4sead15RuntimeTypeInfo9InterfaceE
+0x0000007100e21ff4,O,000092,_ZNK5uking6action14AreaActionBase18getRuntimeTypeInfoEv
+0x0000007100e22050,O,000020,_ZN5uking6action14AreaActionBaseD1Ev
+0x0000007100e22064,O,000052,_ZN5uking6action14AreaActionBaseD0Ev
 0x0000007100e22098,U,000024,
 0x0000007100e220b0,U,000056,
 0x0000007100e220e8,U,000008,ActorObserver::m15

src/Game/Actor/Action/CMakeLists.txt

@@ -5,8 +5,6 @@ target_sources(uking PRIVATE
   actionActionWithAS.h
   actionActivateAttackSensor.cpp
   actionActivateAttackSensor.h
-  actionActorAreaInOutSendMessage.cpp
-  actionActorAreaInOutSendMessage.h
   actionActorInfoToGameDataFloat.cpp
   actionActorInfoToGameDataFloat.h
   actionActorInfoToGameDataInt.cpp
@@ -149,6 +147,8 @@ target_sources(uking PRIVATE
   actionAreaBottomTag.h
   actionAreaFireObserve.cpp
   actionAreaFireObserve.h
+  actionAreaInOutSendMessage.cpp
+  actionAreaInOutSendMessage.h
   actionAreaLocation.cpp
   actionAreaLocation.h
   actionAreaRoot.cpp

src/Game/Actor/Action/actionActorAreaInOutSendMessage.cpp

@@ -1,29 +0,0 @@
-#include "Game/Actor/Action/actionActorAreaInOutSendMessage.h"
-
-namespace uking::action {
-
-ActorAreaInOutSendMessage::ActorAreaInOutSendMessage(const InitArg& arg) : AreaTagAction(arg) {}
-
-ActorAreaInOutSendMessage::~ActorAreaInOutSendMessage() = default;
-
-bool ActorAreaInOutSendMessage::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
-}
-
-void ActorAreaInOutSendMessage::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
-}
-
-void ActorAreaInOutSendMessage::leave_() {
-    AreaTagAction::leave_();
-}
-
-void ActorAreaInOutSendMessage::loadParams_() {
-    getStaticParam(&mBufferNum_s, "BufferNum");
-}
-
-void ActorAreaInOutSendMessage::calc_() {
-    AreaTagAction::calc_();
-}
-
-}  // namespace uking::action

src/Game/Actor/Action/actionAreaBottomTag.cpp

@@ -2,26 +2,26 @@
 
 namespace uking::action {
 
-AreaBottomTag::AreaBottomTag(const InitArg& arg) : AreaTagAction(arg) {}
+AreaBottomTag::AreaBottomTag(const InitArg& arg) : AreaActionBase(arg) {}
 
 AreaBottomTag::~AreaBottomTag() = default;
 
 bool AreaBottomTag::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void AreaBottomTag::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void AreaBottomTag::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void AreaBottomTag::loadParams_() {}
 
 void AreaBottomTag::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionAreaBottomTag.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class AreaBottomTag : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(AreaBottomTag, AreaTagAction)
+class AreaBottomTag : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(AreaBottomTag, AreaActionBase)
 public:
     explicit AreaBottomTag(const InitArg& arg);
     ~AreaBottomTag() override;

src/Game/Actor/Action/actionAreaInOutSendMessage.cpp

@@ -0,0 +1,29 @@
+#include "Game/Actor/Action/actionAreaInOutSendMessage.h"
+
+namespace uking::action {
+
+AreaInOutSendMessage::AreaInOutSendMessage(const InitArg& arg) : AreaActionBase(arg) {}
+
+AreaInOutSendMessage::~AreaInOutSendMessage() = default;
+
+bool AreaInOutSendMessage::init_(sead::Heap* heap) {
+    return AreaActionBase::init_(heap);
+}
+
+void AreaInOutSendMessage::enter_(ksys::act::ai::InlineParamPack* params) {
+    AreaActionBase::enter_(params);
+}
+
+void AreaInOutSendMessage::leave_() {
+    AreaActionBase::leave_();
+}
+
+void AreaInOutSendMessage::loadParams_() {
+    getStaticParam(&mBufferNum_s, "BufferNum");
+}
+
+void AreaInOutSendMessage::calc_() {
+    AreaActionBase::calc_();
+}
+
+}  // namespace uking::action

src/Game/Actor/Action/actionAreaInOutSendMessage.h

@@ -1,15 +1,15 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class ActorAreaInOutSendMessage : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(ActorAreaInOutSendMessage, AreaTagAction)
+class AreaInOutSendMessage : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(AreaInOutSendMessage, AreaActionBase)
 public:
-    explicit ActorAreaInOutSendMessage(const InitArg& arg);
-    ~ActorAreaInOutSendMessage() override;
+    explicit AreaInOutSendMessage(const InitArg& arg);
+    ~AreaInOutSendMessage() override;
 
     bool init_(sead::Heap* heap) override;
     void enter_(ksys::act::ai::InlineParamPack* params) override;

src/Game/Actor/Action/actionCollaboShootingStarAreaTag.cpp

@@ -2,20 +2,20 @@
 
 namespace uking::action {
 
-CollaboShootingStarAreaTag::CollaboShootingStarAreaTag(const InitArg& arg) : AreaTagAction(arg) {}
+CollaboShootingStarAreaTag::CollaboShootingStarAreaTag(const InitArg& arg) : AreaActionBase(arg) {}
 
 CollaboShootingStarAreaTag::~CollaboShootingStarAreaTag() = default;
 
 bool CollaboShootingStarAreaTag::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void CollaboShootingStarAreaTag::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void CollaboShootingStarAreaTag::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void CollaboShootingStarAreaTag::loadParams_() {
@@ -23,7 +23,7 @@ void CollaboShootingStarAreaTag::loadParams_() {
 }
 
 void CollaboShootingStarAreaTag::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionCollaboShootingStarAreaTag.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class CollaboShootingStarAreaTag : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(CollaboShootingStarAreaTag, AreaTagAction)
+class CollaboShootingStarAreaTag : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(CollaboShootingStarAreaTag, AreaActionBase)
 public:
     explicit CollaboShootingStarAreaTag(const InitArg& arg);
     ~CollaboShootingStarAreaTag() override;

src/Game/Actor/Action/actionControlBombEffect.cpp

@@ -2,26 +2,26 @@
 
 namespace uking::action {
 
-ControlBombEffect::ControlBombEffect(const InitArg& arg) : AreaTagAction(arg) {}
+ControlBombEffect::ControlBombEffect(const InitArg& arg) : AreaActionBase(arg) {}
 
 ControlBombEffect::~ControlBombEffect() = default;
 
 bool ControlBombEffect::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void ControlBombEffect::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void ControlBombEffect::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void ControlBombEffect::loadParams_() {}
 
 void ControlBombEffect::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionControlBombEffect.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class ControlBombEffect : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(ControlBombEffect, AreaTagAction)
+class ControlBombEffect : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(ControlBombEffect, AreaActionBase)
 public:
     explicit ControlBombEffect(const InitArg& arg);
     ~ControlBombEffect() override;

src/Game/Actor/Action/actionEnemyAreaInOutSendMessage.cpp

@@ -3,29 +3,29 @@
 namespace uking::action {
 
 EnemyAreaInOutSendMessage::EnemyAreaInOutSendMessage(const InitArg& arg)
-    : ActorAreaInOutSendMessage(arg) {}
+    : AreaInOutSendMessage(arg) {}
 
 EnemyAreaInOutSendMessage::~EnemyAreaInOutSendMessage() = default;
 
 bool EnemyAreaInOutSendMessage::init_(sead::Heap* heap) {
-    return ActorAreaInOutSendMessage::init_(heap);
+    return AreaInOutSendMessage::init_(heap);
 }
 
 void EnemyAreaInOutSendMessage::enter_(ksys::act::ai::InlineParamPack* params) {
-    ActorAreaInOutSendMessage::enter_(params);
+    AreaInOutSendMessage::enter_(params);
 }
 
 void EnemyAreaInOutSendMessage::leave_() {
-    ActorAreaInOutSendMessage::leave_();
+    AreaInOutSendMessage::leave_();
 }
 
 void EnemyAreaInOutSendMessage::loadParams_() {
-    ActorAreaInOutSendMessage::loadParams_();
+    AreaInOutSendMessage::loadParams_();
     getStaticParam(&mMessageID_s, "MessageID");
 }
 
 void EnemyAreaInOutSendMessage::calc_() {
-    ActorAreaInOutSendMessage::calc_();
+    AreaInOutSendMessage::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionEnemyAreaInOutSendMessage.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Action/actionActorAreaInOutSendMessage.h"
+#include "Game/Actor/Action/actionAreaInOutSendMessage.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class EnemyAreaInOutSendMessage : public ActorAreaInOutSendMessage {
-    SEAD_RTTI_OVERRIDE(EnemyAreaInOutSendMessage, ActorAreaInOutSendMessage)
+class EnemyAreaInOutSendMessage : public AreaInOutSendMessage {
+    SEAD_RTTI_OVERRIDE(EnemyAreaInOutSendMessage, AreaInOutSendMessage)
 public:
     explicit EnemyAreaInOutSendMessage(const InitArg& arg);
     ~EnemyAreaInOutSendMessage() override;

src/Game/Actor/Action/actionForbidComeback.cpp

@@ -2,26 +2,26 @@
 
 namespace uking::action {
 
-ForbidComeback::ForbidComeback(const InitArg& arg) : AreaTagAction(arg) {}
+ForbidComeback::ForbidComeback(const InitArg& arg) : AreaActionBase(arg) {}
 
 ForbidComeback::~ForbidComeback() = default;
 
 bool ForbidComeback::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void ForbidComeback::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void ForbidComeback::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void ForbidComeback::loadParams_() {}
 
 void ForbidComeback::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionForbidComeback.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class ForbidComeback : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(ForbidComeback, AreaTagAction)
+class ForbidComeback : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(ForbidComeback, AreaActionBase)
 public:
     explicit ForbidComeback(const InitArg& arg);
     ~ForbidComeback() override;

src/Game/Actor/Action/actionPlayerAreaInOutSendMessage.cpp

@@ -3,29 +3,29 @@
 namespace uking::action {
 
 PlayerAreaInOutSendMessage::PlayerAreaInOutSendMessage(const InitArg& arg)
-    : ActorAreaInOutSendMessage(arg) {}
+    : AreaInOutSendMessage(arg) {}
 
 PlayerAreaInOutSendMessage::~PlayerAreaInOutSendMessage() = default;
 
 bool PlayerAreaInOutSendMessage::init_(sead::Heap* heap) {
-    return ActorAreaInOutSendMessage::init_(heap);
+    return AreaInOutSendMessage::init_(heap);
 }
 
 void PlayerAreaInOutSendMessage::enter_(ksys::act::ai::InlineParamPack* params) {
-    ActorAreaInOutSendMessage::enter_(params);
+    AreaInOutSendMessage::enter_(params);
 }
 
 void PlayerAreaInOutSendMessage::leave_() {
-    ActorAreaInOutSendMessage::leave_();
+    AreaInOutSendMessage::leave_();
 }
 
 void PlayerAreaInOutSendMessage::loadParams_() {
-    ActorAreaInOutSendMessage::loadParams_();
+    AreaInOutSendMessage::loadParams_();
     getStaticParam(&mMessageSet_s, "MessageSet");
 }
 
 void PlayerAreaInOutSendMessage::calc_() {
-    ActorAreaInOutSendMessage::calc_();
+    AreaInOutSendMessage::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionPlayerAreaInOutSendMessage.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Action/actionActorAreaInOutSendMessage.h"
+#include "Game/Actor/Action/actionAreaInOutSendMessage.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class PlayerAreaInOutSendMessage : public ActorAreaInOutSendMessage {
-    SEAD_RTTI_OVERRIDE(PlayerAreaInOutSendMessage, ActorAreaInOutSendMessage)
+class PlayerAreaInOutSendMessage : public AreaInOutSendMessage {
+    SEAD_RTTI_OVERRIDE(PlayerAreaInOutSendMessage, AreaInOutSendMessage)
 public:
     explicit PlayerAreaInOutSendMessage(const InitArg& arg);
     ~PlayerAreaInOutSendMessage() override;

src/Game/Actor/Action/actionSandwichDetectionAreaTag.cpp

@@ -2,26 +2,26 @@
 
 namespace uking::action {
 
-SandwichDetectionAreaTag::SandwichDetectionAreaTag(const InitArg& arg) : AreaTagAction(arg) {}
+SandwichDetectionAreaTag::SandwichDetectionAreaTag(const InitArg& arg) : AreaActionBase(arg) {}
 
 SandwichDetectionAreaTag::~SandwichDetectionAreaTag() = default;
 
 bool SandwichDetectionAreaTag::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void SandwichDetectionAreaTag::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void SandwichDetectionAreaTag::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void SandwichDetectionAreaTag::loadParams_() {}
 
 void SandwichDetectionAreaTag::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionSandwichDetectionAreaTag.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class SandwichDetectionAreaTag : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(SandwichDetectionAreaTag, AreaTagAction)
+class SandwichDetectionAreaTag : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(SandwichDetectionAreaTag, AreaActionBase)
 public:
     explicit SandwichDetectionAreaTag(const InitArg& arg);
     ~SandwichDetectionAreaTag() override;

src/Game/Actor/Action/actionSandwichDetectionAreaTagSimple.cpp

@@ -3,26 +3,26 @@
 namespace uking::action {
 
 SandwichDetectionAreaTagSimple::SandwichDetectionAreaTagSimple(const InitArg& arg)
-    : AreaTagAction(arg) {}
+    : AreaActionBase(arg) {}
 
 SandwichDetectionAreaTagSimple::~SandwichDetectionAreaTagSimple() = default;
 
 bool SandwichDetectionAreaTagSimple::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void SandwichDetectionAreaTagSimple::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void SandwichDetectionAreaTagSimple::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void SandwichDetectionAreaTagSimple::loadParams_() {}
 
 void SandwichDetectionAreaTagSimple::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionSandwichDetectionAreaTagSimple.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class SandwichDetectionAreaTagSimple : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(SandwichDetectionAreaTagSimple, AreaTagAction)
+class SandwichDetectionAreaTagSimple : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(SandwichDetectionAreaTagSimple, AreaActionBase)
 public:
     explicit SandwichDetectionAreaTagSimple(const InitArg& arg);
     ~SandwichDetectionAreaTagSimple() override;

src/Game/Actor/Action/actionSetComebackPosition.cpp

@@ -2,20 +2,20 @@
 
 namespace uking::action {
 
-SetComebackPosition::SetComebackPosition(const InitArg& arg) : AreaTagAction(arg) {}
+SetComebackPosition::SetComebackPosition(const InitArg& arg) : AreaActionBase(arg) {}
 
 SetComebackPosition::~SetComebackPosition() = default;
 
 bool SetComebackPosition::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void SetComebackPosition::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void SetComebackPosition::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void SetComebackPosition::loadParams_() {
@@ -23,7 +23,7 @@ void SetComebackPosition::loadParams_() {
 }
 
 void SetComebackPosition::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionSetComebackPosition.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class SetComebackPosition : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(SetComebackPosition, AreaTagAction)
+class SetComebackPosition : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(SetComebackPosition, AreaActionBase)
 public:
     explicit SetComebackPosition(const InitArg& arg);
     ~SetComebackPosition() override;

src/Game/Actor/Action/actionShelterFromRain.cpp

@@ -2,20 +2,20 @@
 
 namespace uking::action {
 
-ShelterFromRain::ShelterFromRain(const InitArg& arg) : AreaTagAction(arg) {}
+ShelterFromRain::ShelterFromRain(const InitArg& arg) : AreaActionBase(arg) {}
 
 ShelterFromRain::~ShelterFromRain() = default;
 
 bool ShelterFromRain::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void ShelterFromRain::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void ShelterFromRain::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void ShelterFromRain::loadParams_() {
@@ -23,7 +23,7 @@ void ShelterFromRain::loadParams_() {
 }
 
 void ShelterFromRain::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Action/actionShelterFromRain.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class ShelterFromRain : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(ShelterFromRain, AreaTagAction)
+class ShelterFromRain : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(ShelterFromRain, AreaActionBase)
 public:
     explicit ShelterFromRain(const InitArg& arg);
     ~ShelterFromRain() override;

src/Game/Actor/Area/Action/CMakeLists.txt

@@ -1,4 +1,6 @@
 target_sources(uking PRIVATE
+  actionAreaActionBase.cpp
+  actionAreaActionBase.h
   actionAreaActorObserve.cpp
   actionAreaActorObserve.h
   actionAreaHorseSpeedLimitAction.cpp
@@ -9,8 +11,6 @@ target_sources(uking PRIVATE
   actionAreaOutRecreateActorAction.h
   actionAreaRecreateActorAction.cpp
   actionAreaRecreateActorAction.h
-  actionAreaTagAction.cpp
-  actionAreaTagAction.h
   actionFireObserveBase.cpp
   actionFireObserveBase.h
   actionOwnedHorseObserveAction.cpp

src/Game/Actor/Area/Action/actionAreaActionBase.cpp

@@ -0,0 +1,17 @@
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
+
+namespace uking::action {
+
+AreaActionBase::AreaActionBase(const InitArg& arg) : ksys::act::ai::Action(arg) {}
+
+AreaActionBase::~AreaActionBase() = default;
+
+void AreaActionBase::enter_(ksys::act::ai::InlineParamPack* params) {
+    ksys::act::ai::Action::enter_(params);
+}
+
+void AreaActionBase::calc_() {
+    ksys::act::ai::Action::calc_();
+}
+
+}  // namespace uking::action

src/Game/Actor/Area/Action/actionAreaActionBase.h

@@ -4,11 +4,11 @@
 
 namespace uking::action {
 
-class AreaTagAction : public ksys::act::ai::Action {
-    SEAD_RTTI_OVERRIDE(AreaTagAction, ksys::act::ai::Action)
+class AreaActionBase : public ksys::act::ai::Action {
+    SEAD_RTTI_OVERRIDE(AreaActionBase, ksys::act::ai::Action)
 public:
-    explicit AreaTagAction(const InitArg& arg);
-    ~AreaTagAction() override;
+    explicit AreaActionBase(const InitArg& arg);
+    ~AreaActionBase() override;
 
     void enter_(ksys::act::ai::InlineParamPack* params) override;
 

src/Game/Actor/Area/Action/actionAreaActorObserve.cpp

@@ -2,12 +2,12 @@
 
 namespace uking::action {
 
-AreaActorObserve::AreaActorObserve(const InitArg& arg) : AreaTagAction(arg) {}
+AreaActorObserve::AreaActorObserve(const InitArg& arg) : AreaActionBase(arg) {}
 
 AreaActorObserve::~AreaActorObserve() = default;
 
 bool AreaActorObserve::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void AreaActorObserve::loadParams_() {

src/Game/Actor/Area/Action/actionAreaActorObserve.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class AreaActorObserve : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(AreaActorObserve, AreaTagAction)
+class AreaActorObserve : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(AreaActorObserve, AreaActionBase)
 public:
     explicit AreaActorObserve(const InitArg& arg);
     ~AreaActorObserve() override;

src/Game/Actor/Area/Action/actionAreaHorseSpeedLimitAction.cpp

@@ -2,12 +2,12 @@
 
 namespace uking::action {
 
-AreaHorseSpeedLimitAction::AreaHorseSpeedLimitAction(const InitArg& arg) : AreaTagAction(arg) {}
+AreaHorseSpeedLimitAction::AreaHorseSpeedLimitAction(const InitArg& arg) : AreaActionBase(arg) {}
 
 AreaHorseSpeedLimitAction::~AreaHorseSpeedLimitAction() = default;
 
 bool AreaHorseSpeedLimitAction::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 }  // namespace uking::action

src/Game/Actor/Area/Action/actionAreaHorseSpeedLimitAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class AreaHorseSpeedLimitAction : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(AreaHorseSpeedLimitAction, AreaTagAction)
+class AreaHorseSpeedLimitAction : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(AreaHorseSpeedLimitAction, AreaActionBase)
 public:
     explicit AreaHorseSpeedLimitAction(const InitArg& arg);
     ~AreaHorseSpeedLimitAction() override;

src/Game/Actor/Area/Action/actionAreaOutRecreateActorAction.cpp

@@ -2,12 +2,12 @@
 
 namespace uking::action {
 
-AreaOutRecreateActorAction::AreaOutRecreateActorAction(const InitArg& arg) : AreaTagAction(arg) {}
+AreaOutRecreateActorAction::AreaOutRecreateActorAction(const InitArg& arg) : AreaActionBase(arg) {}
 
 AreaOutRecreateActorAction::~AreaOutRecreateActorAction() = default;
 
 bool AreaOutRecreateActorAction::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 }  // namespace uking::action

src/Game/Actor/Area/Action/actionAreaOutRecreateActorAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class AreaOutRecreateActorAction : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(AreaOutRecreateActorAction, AreaTagAction)
+class AreaOutRecreateActorAction : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(AreaOutRecreateActorAction, AreaActionBase)
 public:
     explicit AreaOutRecreateActorAction(const InitArg& arg);
     ~AreaOutRecreateActorAction() override;

src/Game/Actor/Area/Action/actionAreaRecreateActorAction.cpp

@@ -2,12 +2,12 @@
 
 namespace uking::action {
 
-AreaRecreateActorAction::AreaRecreateActorAction(const InitArg& arg) : AreaTagAction(arg) {}
+AreaRecreateActorAction::AreaRecreateActorAction(const InitArg& arg) : AreaActionBase(arg) {}
 
 AreaRecreateActorAction::~AreaRecreateActorAction() = default;
 
 bool AreaRecreateActorAction::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 }  // namespace uking::action

src/Game/Actor/Area/Action/actionAreaRecreateActorAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class AreaRecreateActorAction : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(AreaRecreateActorAction, AreaTagAction)
+class AreaRecreateActorAction : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(AreaRecreateActorAction, AreaActionBase)
 public:
     explicit AreaRecreateActorAction(const InitArg& arg);
     ~AreaRecreateActorAction() override;

src/Game/Actor/Area/Action/actionAreaTagAction.cpp

@@ -1,17 +0,0 @@
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
-
-namespace uking::action {
-
-AreaTagAction::AreaTagAction(const InitArg& arg) : ksys::act::ai::Action(arg) {}
-
-AreaTagAction::~AreaTagAction() = default;
-
-void AreaTagAction::enter_(ksys::act::ai::InlineParamPack* params) {
-    ksys::act::ai::Action::enter_(params);
-}
-
-void AreaTagAction::calc_() {
-    ksys::act::ai::Action::calc_();
-}
-
-}  // namespace uking::action

src/Game/Actor/Area/Action/actionOwnedHorseObserveAction.cpp

@@ -2,16 +2,16 @@
 
 namespace uking::action {
 
-OwnedHorseObserveAction::OwnedHorseObserveAction(const InitArg& arg) : AreaTagAction(arg) {}
+OwnedHorseObserveAction::OwnedHorseObserveAction(const InitArg& arg) : AreaActionBase(arg) {}
 
 OwnedHorseObserveAction::~OwnedHorseObserveAction() = default;
 
 bool OwnedHorseObserveAction::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void OwnedHorseObserveAction::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void OwnedHorseObserveAction::loadParams_() {
@@ -19,7 +19,7 @@ void OwnedHorseObserveAction::loadParams_() {
 }
 
 void OwnedHorseObserveAction::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace uking::action

src/Game/Actor/Area/Action/actionOwnedHorseObserveAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace uking::action {
 
-class OwnedHorseObserveAction : public AreaTagAction {
-    SEAD_RTTI_OVERRIDE(OwnedHorseObserveAction, AreaTagAction)
+class OwnedHorseObserveAction : public AreaActionBase {
+    SEAD_RTTI_OVERRIDE(OwnedHorseObserveAction, AreaActionBase)
 public:
     explicit OwnedHorseObserveAction(const InitArg& arg);
     ~OwnedHorseObserveAction() override;

src/KingSystem/Sound/Actor/Action/actionSoundOcclusionTagAction.cpp

@@ -2,20 +2,20 @@
 
 namespace ksys::snd {
 
-SoundOcclusionTagAction::SoundOcclusionTagAction(const InitArg& arg) : AreaTagAction(arg) {}
+SoundOcclusionTagAction::SoundOcclusionTagAction(const InitArg& arg) : AreaActionBase(arg) {}
 
 SoundOcclusionTagAction::~SoundOcclusionTagAction() = default;
 
 bool SoundOcclusionTagAction::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void SoundOcclusionTagAction::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void SoundOcclusionTagAction::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void SoundOcclusionTagAction::loadParams_() {
@@ -23,7 +23,7 @@ void SoundOcclusionTagAction::loadParams_() {
 }
 
 void SoundOcclusionTagAction::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace ksys::snd

src/KingSystem/Sound/Actor/Action/actionSoundOcclusionTagAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace ksys::snd {
 
-class SoundOcclusionTagAction : public uking::action::AreaTagAction {
-    SEAD_RTTI_OVERRIDE(SoundOcclusionTagAction, uking::action::AreaTagAction)
+class SoundOcclusionTagAction : public uking::action::AreaActionBase {
+    SEAD_RTTI_OVERRIDE(SoundOcclusionTagAction, uking::action::AreaActionBase)
 public:
     explicit SoundOcclusionTagAction(const InitArg& arg);
     ~SoundOcclusionTagAction() override;

src/KingSystem/Sound/Actor/Action/actionSoundReverbAreaTagAction.cpp

@@ -2,20 +2,20 @@
 
 namespace ksys::snd {
 
-SoundReverbAreaTagAction::SoundReverbAreaTagAction(const InitArg& arg) : AreaTagAction(arg) {}
+SoundReverbAreaTagAction::SoundReverbAreaTagAction(const InitArg& arg) : AreaActionBase(arg) {}
 
 SoundReverbAreaTagAction::~SoundReverbAreaTagAction() = default;
 
 bool SoundReverbAreaTagAction::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void SoundReverbAreaTagAction::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void SoundReverbAreaTagAction::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void SoundReverbAreaTagAction::loadParams_() {
@@ -28,7 +28,7 @@ void SoundReverbAreaTagAction::loadParams_() {
 }
 
 void SoundReverbAreaTagAction::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace ksys::snd

src/KingSystem/Sound/Actor/Action/actionSoundReverbAreaTagAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace ksys::snd {
 
-class SoundReverbAreaTagAction : public uking::action::AreaTagAction {
-    SEAD_RTTI_OVERRIDE(SoundReverbAreaTagAction, uking::action::AreaTagAction)
+class SoundReverbAreaTagAction : public uking::action::AreaActionBase {
+    SEAD_RTTI_OVERRIDE(SoundReverbAreaTagAction, uking::action::AreaActionBase)
 public:
     explicit SoundReverbAreaTagAction(const InitArg& arg);
     ~SoundReverbAreaTagAction() override;

src/KingSystem/Sound/Actor/Action/actionSoundShieldingAreaTagAction.cpp

@@ -2,20 +2,21 @@
 
 namespace ksys::snd {
 
-SoundShieldingAreaTagAction::SoundShieldingAreaTagAction(const InitArg& arg) : AreaTagAction(arg) {}
+SoundShieldingAreaTagAction::SoundShieldingAreaTagAction(const InitArg& arg)
+    : AreaActionBase(arg) {}
 
 SoundShieldingAreaTagAction::~SoundShieldingAreaTagAction() = default;
 
 bool SoundShieldingAreaTagAction::init_(sead::Heap* heap) {
-    return AreaTagAction::init_(heap);
+    return AreaActionBase::init_(heap);
 }
 
 void SoundShieldingAreaTagAction::enter_(ksys::act::ai::InlineParamPack* params) {
-    AreaTagAction::enter_(params);
+    AreaActionBase::enter_(params);
 }
 
 void SoundShieldingAreaTagAction::leave_() {
-    AreaTagAction::leave_();
+    AreaActionBase::leave_();
 }
 
 void SoundShieldingAreaTagAction::loadParams_() {
@@ -24,7 +25,7 @@ void SoundShieldingAreaTagAction::loadParams_() {
 }
 
 void SoundShieldingAreaTagAction::calc_() {
-    AreaTagAction::calc_();
+    AreaActionBase::calc_();
 }
 
 }  // namespace ksys::snd

src/KingSystem/Sound/Actor/Action/actionSoundShieldingAreaTagAction.h

@@ -1,12 +1,12 @@
 #pragma once
 
-#include "Game/Actor/Area/Action/actionAreaTagAction.h"
+#include "Game/Actor/Area/Action/actionAreaActionBase.h"
 #include "KingSystem/ActorSystem/actAiAction.h"
 
 namespace ksys::snd {
 
-class SoundShieldingAreaTagAction : public uking::action::AreaTagAction {
-    SEAD_RTTI_OVERRIDE(SoundShieldingAreaTagAction, uking::action::AreaTagAction)
+class SoundShieldingAreaTagAction : public uking::action::AreaActionBase {
+    SEAD_RTTI_OVERRIDE(SoundShieldingAreaTagAction, uking::action::AreaActionBase)
 public:
     explicit SoundShieldingAreaTagAction(const InitArg& arg);
     ~SoundShieldingAreaTagAction() override;

src/KingSystem/Sound/CMakeLists.txt

@@ -7,8 +7,6 @@ target_sources(uking PRIVATE
   sndMusicDefinition.h
   sndMusicInfo.cpp
   sndMusicInfo.h
-  sndResource.cpp
-  sndResource.h
-  sndMgr.cpp
-  sndMgr.h
+  sndSound.cpp
+  sndSound.h
 )

src/KingSystem/Sound/sndMgr.cpp

@@ -1 +0,0 @@
-#include "KingSystem/Sound/sndMgr.h"

src/KingSystem/Sound/sndMgr.h

@@ -1,26 +0,0 @@
-#pragma once
-
-#include <basis/seadTypes.h>
-#include <heap/seadDisposer.h>
-
-namespace ksys::snd {
-
-enum class AudioChannelType {
-    Mono = 1,
-    Stereo = 2,
-    _5_1ch = 6,
-    Other = -1  // TODO: does Other have a definite value?
-};
-
-// FIXME: incomplete
-struct SoundMgr {
-    SEAD_SINGLETON_DISPOSER(SoundMgr)
-
-    virtual ~SoundMgr();
-
-public:
-    u8 _28[0x248];
-    AudioChannelType mAudioChannelType;
-};
-
-}  // namespace ksys::snd

src/KingSystem/Sound/sndSound.cpp

@@ -1,4 +1,4 @@
-#include "KingSystem/Sound/sndResource.h"
+#include "KingSystem/Sound/sndSound.h"
 #include <heap/seadDisposer.h>
 #include <heap/seadExpHeap.h>
 #include <heap/seadFrameHeap.h>

src/KingSystem/Sound/sndSound.h

@@ -1,5 +1,6 @@
 #pragma once
 
+#include <basis/seadTypes.h>
 #include <heap/seadDisposer.h>
 #include "KingSystem/Utils/Types.h"
 
@@ -21,4 +22,22 @@ private:
 };
 KSYS_CHECK_SIZE_NX150(SoundResource, 0x40);
 
+enum class AudioChannelType {
+    Mono = 1,
+    Stereo = 2,
+    _5_1ch = 6,
+    Other = -1  // TODO: does Other have a definite value?
+};
+
+// FIXME: incomplete
+struct SoundMgr {
+    SEAD_SINGLETON_DISPOSER(SoundMgr)
+
+    virtual ~SoundMgr();
+
+public:
+    u8 _28[0x248];
+    AudioChannelType mAudioChannelType;
+};
+
 }  // namespace ksys::snd

src/KingSystem/System/CMakeLists.txt

@@ -39,6 +39,7 @@ target_sources(uking PRIVATE
     OverlayArenaSystemS2.h
     Patrol.cpp
     Patrol.h
+    PlayReport.cpp
     PlayReportMgr.cpp
     PlayReportMgr.h
     ProductReporter.cpp

src/KingSystem/System/OverlayArenaSystem.cpp

@@ -4,7 +4,7 @@
 #include <heap/seadHeap.h>
 #include <thread/seadThreadUtil.h>
 #include "KingSystem/Resource/resSystem.h"
-#include "KingSystem/Sound/sndResource.h"
+#include "KingSystem/Sound/sndSound.h"
 #include "KingSystem/System/OverlayArena.h"
 #include "KingSystem/Terrain/teraSystem.h"
 #include "KingSystem/Utils/Thread/Task.h"

src/KingSystem/System/PlayReport.cpp

@@ -0,0 +1,77 @@
+#include <nn/account.h>
+#include <nn/prepo.h>
+#include "KingSystem/System/Account.h"
+#include "KingSystem/System/PlayReportMgr.h"
+#include "KingSystem/System/ProductReporter.h"
+
+namespace ksys {
+
+bool PlayReport::setEventId(sead::BufferedSafeString& event_id) {
+    if (!mHasNinPrepoReport)
+        return false;
+
+    event_id.replaceCharList("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz");
+    return mNinPlayReport->SetEventId(event_id.cstr()).IsSuccess();
+}
+
+[[gnu::noinline]] bool PlayReport::add(const sead::FixedSafeString<48>& key, u32 value) {
+    return mHasNinPrepoReport && mNinPlayReport->Add(key.cstr(), s64(value)).IsSuccess();
+}
+
+[[gnu::noinline]] bool PlayReport::add(const sead::FixedSafeString<48>& key, s32 value) {
+    return mHasNinPrepoReport && mNinPlayReport->Add(key.cstr(), s64(value)).IsSuccess();
+}
+
+[[gnu::noinline]] bool PlayReport::add(const sead::FixedSafeString<48>& key, f32 value) {
+    return mHasNinPrepoReport && mNinPlayReport->Add(key.cstr(), value).IsSuccess();
+}
+
+[[gnu::noinline]] bool PlayReport::add(const sead::FixedSafeString<48>& key,
+                                       const sead::SafeString& value) {
+    return mHasNinPrepoReport && mNinPlayReport->Add(key.cstr(), value.cstr()).IsSuccess();
+}
+
+bool PlayReport::save() {
+    if (!mHasNinPrepoReport)
+        return false;
+
+    nn::account::Uid uid;
+    Account::instance()->getUserId(&uid);
+    if (uid.IsValid()) {
+        static_cast<void>(mNinPlayReport->GetCount());
+        return mNinPlayReport->Save(uid).IsSuccess();
+    }
+    static_cast<void>(ProductReporter::getSomeBool());
+    static_cast<void>(mNinPlayReport->GetCount());
+    return mNinPlayReport->Save().IsSuccess();
+}
+
+void PlayReport::init(s32 num_entries, sead::Heap* heap) {
+    if (mHasNinPrepoReport)
+        return;
+
+    auto* report = new (heap) nn::prepo::PlayReport;
+    const u32 buffer_size = nn::prepo::PlayReport::CalcBufferSize(num_entries);
+    mNinPlayReport = report;
+    if (buffer_size > 0 && mBuffer.tryAllocBuffer(buffer_size, heap)) {
+        mNinPlayReport->SetBuffer(mBuffer.getBufferPtr(), buffer_size);
+        mHasNinPrepoReport = true;
+    }
+}
+
+PlayReport::~PlayReport() {
+    if (!mHasNinPrepoReport)
+        return;
+
+    if (mNinPlayReport) {
+        delete mNinPlayReport;
+        mNinPlayReport = nullptr;
+    }
+
+    if (mHasNinPrepoReport)
+        mBuffer.freeBuffer();
+
+    mHasNinPrepoReport = false;
+}
+
+}  // namespace ksys

src/KingSystem/System/PlayReportMgr.cpp

@@ -1,7 +1,4 @@
 #include "KingSystem/System/PlayReportMgr.h"
-#include <nn/account.h>
-#include <nn/prepo.h>
-#include "KingSystem/System/Account.h"
 #include "KingSystem/System/ProductReporter.h"
 
 namespace ksys {
@@ -47,97 +44,4 @@ void PlayReportMgr::setPlayerTrackReporter30() {
         reporter->_30 = true;
 }
 
-bool PlayReport::setEventId(sead::BufferedSafeString& event_id) {
-    if (!mHasNinPrepoReport)
-        return false;
-
-    event_id.replaceCharList("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz");
-    return mNinPlayReport->SetEventId(event_id.cstr()).IsSuccess();
-}
-
-[[gnu::noinline]] bool PlayReport::add(const sead::FixedSafeString<48>& key, u32 value) {
-    return mHasNinPrepoReport && mNinPlayReport->Add(key.cstr(), s64(value)).IsSuccess();
-}
-
-[[gnu::noinline]] bool PlayReport::add(const sead::FixedSafeString<48>& key, s32 value) {
-    return mHasNinPrepoReport && mNinPlayReport->Add(key.cstr(), s64(value)).IsSuccess();
-}
-
-[[gnu::noinline]] bool PlayReport::add(const sead::FixedSafeString<48>& key, f32 value) {
-    return mHasNinPrepoReport && mNinPlayReport->Add(key.cstr(), value).IsSuccess();
-}
-
-[[gnu::noinline]] bool PlayReport::add(const sead::FixedSafeString<48>& key,
-                                       const sead::SafeString& value) {
-    return mHasNinPrepoReport && mNinPlayReport->Add(key.cstr(), value.cstr()).IsSuccess();
-}
-
-void PlayReport::addPlayTimes() {
-    if (!gdt::Manager::instance())
-        return;
-
-    if (!PlayReportMgr::instance())
-        return;
-
-    if (!PlayReportMgr::instance()->getReporter())
-        return;
-
-    s32 playTime =
-        PlayReportMgr::instance()->getReporter()->getS32(PlayReportKey::PlayReport_PlayTime);
-
-    s32 allPlayTime =
-        PlayReportMgr::instance()->getReporter()->getS32(PlayReportKey::PlayReport_AllPlayTime);
-
-    add(sead::SafeString("PlayTime"), u32(playTime));
-    add(sead::SafeString("AllPlayTime"), u32(allPlayTime));
-}
-
-void PlayReport::addPosition(const sead::Vector2f& position) {
-    add(sead::SafeString("PosX"), position.x);
-    add(sead::SafeString("PosZ"), position.y);
-}
-
-bool PlayReport::save() {
-    if (!mHasNinPrepoReport)
-        return false;
-
-    nn::account::Uid uid;
-    Account::instance()->getUserId(&uid);
-    if (uid.IsValid()) {
-        static_cast<void>(mNinPlayReport->GetCount());
-        return mNinPlayReport->Save(uid).IsSuccess();
-    }
-    static_cast<void>(ProductReporter::getSomeBool());
-    static_cast<void>(mNinPlayReport->GetCount());
-    return mNinPlayReport->Save().IsSuccess();
-}
-
-void PlayReport::init(s32 num_entries, sead::Heap* heap) {
-    if (mHasNinPrepoReport)
-        return;
-
-    auto* report = new (heap) nn::prepo::PlayReport;
-    const u32 buffer_size = nn::prepo::PlayReport::CalcBufferSize(num_entries);
-    mNinPlayReport = report;
-    if (buffer_size > 0 && mBuffer.tryAllocBuffer(buffer_size, heap)) {
-        mNinPlayReport->SetBuffer(mBuffer.getBufferPtr(), buffer_size);
-        mHasNinPrepoReport = true;
-    }
-}
-
-PlayReport::~PlayReport() {
-    if (!mHasNinPrepoReport)
-        return;
-
-    if (mNinPlayReport) {
-        delete mNinPlayReport;
-        mNinPlayReport = nullptr;
-    }
-
-    if (mHasNinPrepoReport)
-        mBuffer.freeBuffer();
-
-    mHasNinPrepoReport = false;
-}
-
 }  // namespace ksys

src/KingSystem/System/ProductReporter.cpp

@@ -9,7 +9,7 @@
 #include "KingSystem/Camera/CameraMgr.h"
 #include "KingSystem/Framework/frmFramework.h"
 #include "KingSystem/Map/mapPlacementMgr.h"
-#include "KingSystem/Sound/sndMgr.h"
+#include "KingSystem/Sound/sndSound.h"
 #include "KingSystem/System/PlayReportMgr.h"
 #include "KingSystem/System/VFR.h"
 
@@ -220,6 +220,31 @@ bool ProductReporter::incrementSceneAndRomWorkTime() {
     return true;
 }
 
+void PlayReport::addPlayTimes() {
+    if (!gdt::Manager::instance())
+        return;
+
+    if (!PlayReportMgr::instance())
+        return;
+
+    if (!PlayReportMgr::instance()->getReporter())
+        return;
+
+    s32 playTime =
+        PlayReportMgr::instance()->getReporter()->getS32(PlayReportKey::PlayReport_PlayTime);
+
+    s32 allPlayTime =
+        PlayReportMgr::instance()->getReporter()->getS32(PlayReportKey::PlayReport_AllPlayTime);
+
+    add(sead::SafeString("PlayTime"), u32(playTime));
+    add(sead::SafeString("AllPlayTime"), u32(allPlayTime));
+}
+
+void PlayReport::addPosition(const sead::Vector2f& position) {
+    add(sead::SafeString("PosX"), position.x);
+    add(sead::SafeString("PosZ"), position.y);
+}
+
 #define PRODUCT_REPORTER_S32_GETTER(NAME, PLAY_REPORT_KEY)                                         \
     s32 ProductReporter::NAME() const {                                                            \
         s32 out = 0;                                                                               \