From 73873f11bddff9ae8c3a1675bcac4317a9d24f9f Mon Sep 17 00:00:00 2001
From: Pheenoh <pheenoh@gmail.com>
Date: Wed, 21 Dec 2022 09:56:34 -0700
Subject: [PATCH] fixes for taka

---
 include/d/a/d_a_npc.h | 14 +++++++-------
 include/d/d_path.h    |  1 -
 src/d/a/d_a_npc.cpp   |  6 +++---
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/include/d/a/d_a_npc.h b/include/d/a/d_a_npc.h
index 6c3bdb6bbd..67c63d578b 100644
--- a/include/d/a/d_a_npc.h
+++ b/include/d/a/d_a_npc.h
@@ -164,14 +164,14 @@ public:
     /* 80146188 */ int chkPassed1(cXyz, int);
     /* 801464D8 */ int chkPassed2(cXyz, cXyz*, int, int);
 
-    inline cXyz* getPntPos(u16 i_idx) {
+    cXyz* getPntPos(u16 i_idx) {
         u16 tmpidx = i_idx;
 
         dStage_dPnt_c* tmppnt = &mpRoomPath->m_points[tmpidx];
         return &tmppnt->m_position;
     }
 
-    inline int chkClose() { 
+    int chkClose() { 
         int roomPath = dPath_ChkClose(mpRoomPath); 
         return roomPath;
     }
@@ -181,7 +181,7 @@ public:
         return path->m_num; 
     }
 
-    inline u16& getIdx() { return mIdx; }
+    u16& getIdx() { return mIdx; }
 };
 
 class mDoExt_McaMorfSO;
@@ -389,11 +389,11 @@ public:
     /* 8014CCE8 */ virtual void changeBtk(int*, int*);
     /* 8014A628 */ virtual void setMotionAnm(int, f32, int);
 
-    inline bool checkHide() { 
+    bool checkHide() { 
         return field_0xe25 || (!dComIfGs_wolfeye_effect_check() && field_0xa89); 
     }
 
-    inline s16 checkStep() {
+    s16 checkStep() {
         return mStepNo == 1;
     }
 
@@ -820,8 +820,8 @@ public:
     /* 80150DE0 */ int getDstPos(cXyz, cXyz&);
     /* 80150EB4 */ void setNextIdxDst(cXyz);
 
-    inline u16& getIdx() { return mIdx; };
-    inline cXyz* getPntPos(); // finish
+    u16& getIdx() { return mIdx; };
+    cXyz* getPntPos(); // finish
 };
 
 class daNpcF_MoveBgActor_c {
diff --git a/include/d/d_path.h b/include/d/d_path.h
index e68c146eb7..e3c17df3b9 100644
--- a/include/d/d_path.h
+++ b/include/d/d_path.h
@@ -15,7 +15,6 @@ struct dPath {
     /* 0x8 */ dStage_dPnt_c* m_points;
 };
 
-// should be move to dlib TU per chn debug
 inline int dPath_ChkClose(dPath* i_path) { return (i_path->m_closed & 1); }
 
 dPath* dPath_GetRoomPath(int path_index, int room_no);
diff --git a/src/d/a/d_a_npc.cpp b/src/d/a/d_a_npc.cpp
index c8a550aa03..723d4d7c9e 100644
--- a/src/d/a/d_a_npc.cpp
+++ b/src/d/a/d_a_npc.cpp
@@ -898,7 +898,7 @@ int daNpcT_Path_c::setNextPathInfo(s8 param_0, u8 i_direction) {
     mDirection = i_direction;
     u16 next_id = mpRoomPath->m_nextID;
 
-    if (next_id != 65535) {
+    if (next_id != 0xFFFF) {
         mpRoomPath = dPath_GetRoomPath(next_id,param_0);
         if (!mpRoomPath) {
             return 0;
@@ -2152,7 +2152,7 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa
                 }
 
                 if (talk_partner_conv->isMouthCheck()) {
-                    field_0xd98 &= 0xffffbfff;
+                    field_0xd98 &= ~0x4000;
                 } else {
                     field_0xd98 |= 0x4000;
                 }
@@ -2160,7 +2160,7 @@ int daNpcT_c::ctrlMsgAnm(int* param_0, int* param_1, fopAc_ac_c* param_2, int pa
                 field_0xdb4 = 0x14;
             } else {
                 if (field_0xd98 & 0x4000) {
-                    field_0xd98 &= 0xffffbfff;
+                    field_0xd98 &= ~0x4000;
                 }
                 mSubMtd = (profile_method_class*)-1;
             }