From fea7ebb5c8ef576bd7bee495f7f3aa61f0d10a82 Mon Sep 17 00:00:00 2001
From: elijah-thomas774 <elijahthomas774@gmail.com>
Date: Thu, 14 Nov 2024 22:41:18 -0500
Subject: [PATCH] fix dAcNpcSltk_c::executeState_Wait regswap

---
 include/d/a/d_a_player.h            | 3 +++
 src/REL/d/a/npc/d_a_npc_saltalk.cpp | 5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/include/d/a/d_a_player.h b/include/d/a/d_a_player.h
index 22036a63..a82fb862 100644
--- a/include/d/a/d_a_player.h
+++ b/include/d/a/d_a_player.h
@@ -253,5 +253,8 @@ public:
         return (mActionFlagsCont & mask) != 0;
     }
 
+    static const dAcPy_c *GetLink() {
+        return LINK;
+    }
     static dAcPy_c *LINK;
 };
diff --git a/src/REL/d/a/npc/d_a_npc_saltalk.cpp b/src/REL/d/a/npc/d_a_npc_saltalk.cpp
index 11d55d47..9fe2be03 100644
--- a/src/REL/d/a/npc/d_a_npc_saltalk.cpp
+++ b/src/REL/d/a/npc/d_a_npc_saltalk.cpp
@@ -159,8 +159,9 @@ bool dAcNpcSltk_c::checkSomething(mVec3_c pos) {
 void dAcNpcSltk_c::initializeState_Wait() {}
 void dAcNpcSltk_c::executeState_Wait() {
     bool checkResult = false;
-    // Regswap this, link
-    dAcPy_c *link = dAcPy_c::LINK;
+
+    const dAcPy_c *link = dAcPy_c::GetLink();
+
     dAcNpcSlb2_c *slb = mRef.get();
     if (slb != nullptr) {
         if (isSomething0()) {