d_a_salbage_obj OK

include/d/a/npc/d_a_npc_salbage_robot.h

@@ -1,13 +1,13 @@
 #ifndef D_A_NPC_SALBAGE_ROBOT_H
 #define D_A_NPC_SALBAGE_ROBOT_H
 
-#include "d/a/npc/d_a_npc.h"
+#include "d/a/npc/d_a_ordinary_npc.h"
+#include "m/m_mtx.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
 
-class dAcNpcSlb_c : public dAcNpc_c {
+class dAcNpcSlb_c : public dAcOrdinaryNpc_c {
 public:
-    dAcNpcSlb_c() : mStateMgr(*this, sStateID::null) {}
+    dAcNpcSlb_c() {}
     virtual ~dAcNpcSlb_c() {}
 
     STATE_FUNC_DECLARE(dAcNpcSlb_c, Hide);
@@ -16,8 +16,15 @@ public:
     STATE_FUNC_DECLARE(dAcNpcSlb_c, Kill);
     STATE_FUNC_DECLARE(dAcNpcSlb_c, Kill2);
 
+    // ouch
+    mMtx_c getCarriedObjMtx() const {
+        return mCarryObjMtx;
+    }
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcNpcSlb_c);
+    u8 _pad[0xD50 - sizeof(dAcOrdinaryNpc_c)];
+
+    /* 0xD50 */ mMtx_c mCarryObjMtx;
 };
 
 #endif

include/d/a/npc/d_a_npc_talk_kensei.h

@@ -0,0 +1,16 @@
+#ifndef D_A_NPC_TALK_KENSEI_H
+#define D_A_NPC_TALK_KENSEI_H
+
+#include "d/a/npc/d_a_ordinary_npc.h"
+
+class dAcSalbageObj_c;
+
+class dAcNpcTalkKensei_c : public dAcOrdinaryNpc_c {
+public:
+    static dAcNpcTalkKensei_c *GetInstance();
+    void triggerSalvageQuestion(dAcSalbageObj_c *);
+
+private:
+};
+
+#endif