From 295c17e7363232cf55a9cb000ecc77b00c73a472 Mon Sep 17 00:00:00 2001
From: YunataSavior <58997725+YunataSavior@users.noreply.github.com>
Date: Sun, 16 Nov 2025 12:27:51 -0800
Subject: [PATCH] Link clerkb and clerkt (#2811)

---
 configure.py                     |  4 ++--
 include/d/actor/d_a_npc_clerkb.h |  4 +---
 include/d/actor/d_a_npc_clerkt.h | 10 +++++-----
 src/d/actor/d_a_npc_clerkb.cpp   |  4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/configure.py b/configure.py
index bc4481d3ac..1b51cef154 100755
--- a/configure.py
+++ b/configure.py
@@ -1850,8 +1850,8 @@ config.libs = [
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_chat", extra_cflags=[DANPCF_C_HACK]),
     ActorRel(NonMatching, "d_a_npc_chin"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_clerka"),
-    ActorRel(Equivalent, "d_a_npc_clerkb"),
-    ActorRel(Equivalent, "d_a_npc_clerkt"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_npc_clerkb"),
+    ActorRel(MatchingFor("GZ2E01"), "d_a_npc_clerkt"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_coach"),
     ActorRel(MatchingFor("GZ2E01", "GZ2P01", "GZ2J01"), "d_a_npc_df"),
     ActorRel(NonMatching, "d_a_npc_doc"),
diff --git a/include/d/actor/d_a_npc_clerkb.h b/include/d/actor/d_a_npc_clerkb.h
index c6e8744b74..ecfbd011ca 100644
--- a/include/d/actor/d_a_npc_clerkb.h
+++ b/include/d/actor/d_a_npc_clerkb.h
@@ -149,9 +149,7 @@ private:
     /* 0x10D8 */ daNpcT_ActorMngr_c mActorMngr[1];
     /* 0x10E0 */ actionFunc mNextAction;
     /* 0x10EC */ actionFunc mAction;
-    /* 0x10F8 */ u8 field_0x10f8[0x10fa - 0x10f8];
-    /* 0x10FA */ s16 field_0x10fa;
-    /* 0x10FC */ u8 field_0x10fc[0x1100 - 0x10fc];
+    /* 0x10F8 */ csXyz field_0x10f8;
     /* 0x1100 */ int mShopProcess;
     /* 0x1104 */ int field_0x1104;
     /* 0x1108 */ f32 field_0x1108;
diff --git a/include/d/actor/d_a_npc_clerkt.h b/include/d/actor/d_a_npc_clerkt.h
index d90b2137d2..8f7031deb9 100644
--- a/include/d/actor/d_a_npc_clerkt.h
+++ b/include/d/actor/d_a_npc_clerkt.h
@@ -80,11 +80,11 @@ public:
     /* 8099B4DC */ int tend(void*);
     /* 8099B60C */ int talk(void*);
     /* 8099B804 */ int shop(void*);
-    /* 8099BCE8 */ void setParam();
-    /* 8099BE48 */ void setAfterTalkMotion();
-    /* 8099BEA8 */ void beforeMove();
-    /* 8099BF20 */ void setAttnPos();
-    /* 8099C1A0 */ void setCollision();
+    /* 8099BCE8 */ inline void setParam();
+    /* 8099BE48 */ inline void setAfterTalkMotion();
+    /* 8099BEA8 */ inline void beforeMove();
+    /* 8099BF20 */ inline void setAttnPos();
+    /* 8099C1A0 */ inline void setCollision();
     /* 8099CF9C */ daNpcClerkT_c(
         daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
         daNpcT_motionAnmData_c const* i_motionAnmData,
diff --git a/src/d/actor/d_a_npc_clerkb.cpp b/src/d/actor/d_a_npc_clerkb.cpp
index 3e33bbdc4d..30bf44cbe4 100644
--- a/src/d/actor/d_a_npc_clerkb.cpp
+++ b/src/d/actor/d_a_npc_clerkb.cpp
@@ -464,7 +464,7 @@ void daNpc_clerkB_c::afterJntAnm(int param_1) {
         mDoMtx_stack_c::ZrotM(mStagger.getAngleX(0));
     }
     if (param_1 == 9) {
-        mDoMtx_stack_c::XrotM(field_0x10fa);
+        mDoMtx_stack_c::XrotM(field_0x10f8.y);
     }
 }
 
@@ -626,7 +626,7 @@ void daNpc_clerkB_c::setAttnPos() {
     cXyz cStack_3c(-30.0f, 15.0f, 0.0f);
     cXyz cStack_48(0.0f, 15.0f, 0.0f);
 
-    field_0x10fa += cM_deg2s(6.0);
+    field_0x10f8.y += cM_deg2s(6.0);
     mStagger.calc(FALSE);
     mBpkAnm2.play();
     f32 rad = cM_s2rad((s16)(mCurAngle.y - field_0xd7e.y));