d_a_salbage_obj OK

3 files changed, 45 insertions, 3 deletions

diff --git a/include/toBeSorted/attention.h b/include/toBeSorted/attention.h
index 96a8ed3e..45a59c8c 100644
--- a/include/toBeSorted/attention.h
+++ b/include/toBeSorted/attention.h
@@ -169,10 +169,10 @@ public:
 
 private:
     /* 0xBDC */ u8 field_0xBDC;
-
+    
+public:
     static AttentionManager *sInstance;
 
-public:
     bool create();
     bool createHeap();
     bool execute();
diff --git a/include/toBeSorted/dowsing_target.h b/include/toBeSorted/dowsing_target.h
index d988e86c..90e1763f 100644
--- a/include/toBeSorted/dowsing_target.h
+++ b/include/toBeSorted/dowsing_target.h
@@ -2,7 +2,6 @@
 #define DOWSING_TARGET_H
 
 #include "d/a/d_a_base.h"
-#include "f/f_list_nd.h"
 #include "m/m_vec.h"
 
 class DowsingTarget {
@@ -32,6 +31,10 @@ public:
     virtual ~DowsingTarget();            // 0x08
     virtual void getPosition(mVec3_c &); // 0x0C
 
+    void setOffset(const mVec3_c &offset) {
+        mOffset = offset;
+    }
+
     bool doRegister();
     bool doUnregister();
     void initialize(DowsingSlot type, u16 unk, const mVec3_c *offset, f32 f);
diff --git a/include/toBeSorted/salvage_mgr.h b/include/toBeSorted/salvage_mgr.h
new file mode 100644
index 00000000..3e268936
--- /dev/null
+++ b/include/toBeSorted/salvage_mgr.h
@@ -0,0 +1,39 @@
+#ifndef D_SALVAGE_MGR_H
+#define D_SALVAGE_MGR_H
+
+#include "common.h"
+#include "d/a/d_a_base.h"
+#include "m/m_mtx.h"
+
+class dAcSalbageObj_c;
+class dAcNpcSlb_c;
+
+class dSalvageMgr_c {
+public:
+    // Directly accessing seems to be required
+    // static dSalvageMgr_c *GetInstance() {
+    //     return sInstance;
+    // }
+
+    bool checkDeliveredStoryflag(const s32& id) const;
+    bool startedQuestForSalvageObj(const dAcSalbageObj_c *obj) const;
+    bool hasDowsingForSalvageObj(const dAcSalbageObj_c *obj) const;
+    mMtx_c getCarryRotMtx(const s32 &id) const;
+    mMtx_c getCarryRotMtx2(const s32 &id) const {
+        return getCarryRotMtx(id);
+    }
+    s32 getCurrentSalvageObjId() const;
+    void deleteObjAndSlb();
+
+    static dSalvageMgr_c *sInstance;
+
+    bool hasObjAndSlb() const {
+        return mObjRef.isLinked() && mSlbRef.isLinked();
+    }
+
+    /* 0x00 */ dAcRef_c<dAcSalbageObj_c> mObjRef;
+    /* 0x0C */ dAcRef_c<dAcNpcSlb_c> mSlbRef;
+private:
+};
+
+#endif