npc_besu, npc_toby DBG equiv (#3051)

include/d/actor/d_a_npc.h

@@ -817,6 +817,12 @@ STATIC_ASSERT(sizeof(daNpcT_c) == 0xE40);
         fopAcM_OnCondition(ptr, fopAcCnd_INIT_e); \
     }
 
+#if DEBUG
+    #define NpcT_CHK_ACTION(ClassName) chkAction(&ClassName::test)
+#else
+    #define NpcT_CHK_ACTION(ClassName) FALSE
+#endif
+
 BOOL daNpcT_chkEvtBit(u32 i_idx);
 BOOL daNpcT_chkPointInArea(cXyz param_0, cXyz param_1, cXyz param_2, s16 param_3, BOOL param_4);
 u8 daNpcT_getDistTableIdx(int param_0, int param_1);

include/d/actor/d_a_npc_besu.h

@@ -104,6 +104,7 @@ public:
     int nurse(void*);
     int giveHotWater(void*);
     int talk(void*);
+    BOOL test(void* param_0);
     daNpc_Besu_c(
             daNpcT_faceMotionAnmData_c const* i_faceMotionAnmData,
             daNpcT_motionAnmData_c const* i_motionAnmData,

include/d/actor/d_a_tag_push.h

@@ -14,12 +14,9 @@ public:
     int isDelete();
     int chkPointInArea(cXyz);
 
-    u32 getId() {
-        u32 id = fopAcM_GetParam(this) >> 0x18;
-        if (id != 0xFF) {
-            return id;
-        }
-        return -1;
+    int getId() {
+        u16 id = (fopAcM_GetParam(this) & 0xFF000000) >> 24;
+        return (id == 0xFF) ? -1 : id;
     }
 
     u8 getBitSW() { return fopAcM_GetParam(this) & 0xFF; }

include/d/d_com_static.h

@@ -6,7 +6,7 @@
 u8 daNpcKakashi_getSwdTutorialStep();
 void daNpcKakashi_setSwdTutorialStep(u8 iEvtNum);
 bool daNpcKakashi_getSwdTutorialResult();
-u8 daNpcKakashi_chkSwdTutorialStage();
+bool daNpcKakashi_chkSwdTutorialStage();
 u8 daNpcKakashi_getSuccessCount();
 void daNpcKakashi_clrSuccessCount();
 void daNpcKakashi_setSwdTutorialResult(bool param_0);