From 0cc9ebd72409859c7225e542d0c62868a3327ca7 Mon Sep 17 00:00:00 2001
From: YunataSavior <58997725+YunataSavior@users.noreply.github.com>
Date: Sun, 23 Nov 2025 21:10:24 -0800
Subject: [PATCH] Link npc_zra (#2853)

---
 configure.py                  | 2 +-
 include/d/actor/d_a_npc_zra.h | 1 -
 src/d/actor/d_a_npc_zra.cpp   | 6 ++++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/configure.py b/configure.py
index 556b68d43dd..f0cfe240057 100755
--- a/configure.py
+++ b/configure.py
@@ -1961,7 +1961,7 @@ config.libs = [
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zelR"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zelRo"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zelda"),
-    ActorRel(Equivalent, "d_a_npc_zra"), # weak func order
+    ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zra"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zrc"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_npc_zrz"),
     ActorRel(MatchingFor(ALL_GCN), "d_a_obj_Lv5Key"),
diff --git a/include/d/actor/d_a_npc_zra.h b/include/d/actor/d_a_npc_zra.h
index 13418afaccf..d788856671a 100644
--- a/include/d/actor/d_a_npc_zra.h
+++ b/include/d/actor/d_a_npc_zra.h
@@ -22,7 +22,6 @@ public:
     /* 80B78CA0 */ BOOL chkPassedChase(u16, cXyz);
     /* 80B78CFC */ int getDstPosChase(u16, cXyz, cXyz&);
     /* 80B78E08 */ f32 chkPassDst(u16, cXyz);
-    /* 80B7EF88 */ ~daNpc_zrA_Path_c() {}
     int getEndIdx() { return mPathInfo->m_num - 1; }
 };
 
diff --git a/src/d/actor/d_a_npc_zra.cpp b/src/d/actor/d_a_npc_zra.cpp
index 80755dc560e..56b5f8a0c7e 100644
--- a/src/d/actor/d_a_npc_zra.cpp
+++ b/src/d/actor/d_a_npc_zra.cpp
@@ -2327,6 +2327,12 @@ void daNpc_zrA_c::setExpressionTalkAfter() {
     }
 }
 
+// fakematch to get the clib_calctimer functions to appear in the correct order.
+//  Perhaps clever inline keyword usage can fix the problem, but this is easier.
+int dummy_clib_u8(u8* arg) {
+    return cLib_calcTimer<u8>(arg);
+}
+
 /* 80B7EBA0-80B7EC54 006780 00B4+00 1/1 0/0 0/0 .text            setPrtcl__11daNpc_zrA_cFv */
 void daNpc_zrA_c::setPrtcl() {
     u32 flags = 0x40002;