Fix symbol errors

6 files changed, 85 insertions, 33 deletions

diff --git a/include/d/a/d_a_salbage_obj.h b/include/d/a/d_a_salbage_obj.h
index e00732e3..762efb36 100644
--- a/include/d/a/d_a_salbage_obj.h
+++ b/include/d/a/d_a_salbage_obj.h
@@ -1,6 +1,7 @@
 #ifndef D_A_SALBAGE_OBJ_H
 #define D_A_SALBAGE_OBJ_H
 
+#include "common.h"
 #include "d/a/obj/d_a_obj_base.h"
 #include "d/col/bg/d_bg_s_acch.h"
 #include "d/col/cc/d_cc_d.h"
@@ -14,9 +15,17 @@
 
 class dAcSalbageObj_c;
 
+enum SalvageObj_e {
+    SALVAGE_OBJ_PROPERA = 0,
+    SALVAGE_OBJ_ROULETTE = 1,
+    SALVAGE_OBJ_DIVINER_CRYSTAL = 2,
+    SALVAGE_OBJ_WATER_JAR = 5,
+    SALVAGE_OBJ_POT = 6,
+};
+
 class SalbageRelated {
 public:
-    SalbageRelated(dAcSalbageObj_c *obj) : mpObj(obj), mSalvageObjId(6) {}
+    SalbageRelated(dAcSalbageObj_c *obj, s32 id) : mpObj(obj), mCarried(false), mHidden(false), mSalvageObjId(id) {}
 
     /* vt 0x08 */ virtual ~SalbageRelated() {}
     /* vt 0x0C */ virtual void setCarried() {
@@ -68,7 +77,14 @@ class dAcSalbageObj_c : public dAcObjBase_c {
     };
 
 public:
-    dAcSalbageObj_c() : mStateMgr(*this), mSalbageRelated(this), mDowsingTarget(this, DowsingTarget::SLOT_NONE) {}
+    dAcSalbageObj_c(m3d::smdl_c *mdl, s32 salvageObjId)
+        : field_0x330(0),
+          mpMdl(mdl),
+          mStateMgr(*this),
+          mSalbageRelated(this, salvageObjId),
+          mDowsingTarget(this, DowsingTarget::SLOT_NONE),
+          mIsDemoState(false),
+          mpNextStateId(nullptr) {}
     virtual ~dAcSalbageObj_c() {}
 
     virtual int preExecute() override;
@@ -82,6 +98,14 @@ public:
         return false;
     }
 
+    /* vt 0x84-0x8C */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Wait);
+    /* vt 0x90-0x98 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Carried);
+    /* vt 0x9C-0xA4 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Demo);
+    /* vt 0xA8-0xB0 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, DemoThrow);
+    /* vt 0xB4-0xBC */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Fly);
+    /* vt 0xC0-0xC8 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, After);
+    STATE_FUNC_DECLARE(dAcSalbageObj_c, Kill);
+
 protected:
     bool shouldBeActiveDowsingTarget() const;
     void initSalbageObj();
@@ -97,14 +121,6 @@ protected:
     void updateBgAcchCir();
     void updateMdl();
 
-    /* vt 0x84-0x8C */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Wait);
-    /* vt 0x90-0x98 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Carried);
-    /* vt 0x9C-0xA4 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Demo);
-    /* vt 0xA8-0xB0 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, DemoThrow);
-    /* vt 0xB4-0xBC */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, Fly);
-    /* vt 0xC0-0xC8 */ STATE_VIRTUAL_FUNC_DECLARE(dAcSalbageObj_c, After);
-    STATE_FUNC_DECLARE(dAcSalbageObj_c, Kill);
-
     /* vt 0xCC */ virtual mMtx_c calcWorldMtx();
     /* vt 0xD0 */ virtual void vt_0xD0() {}
 
@@ -142,7 +158,7 @@ protected:
         return 50.0f;
     }
 
-    /* 0x330 */ u8 _0x330[0x334 - 0x330];
+    /* 0x330 */ UNKWORD field_0x330;
 
     /* 0x334 */ m3d::smdl_c *mpMdl;
     /* 0x338 */ dShadowCircle_c mShadow;
diff --git a/include/d/a/obj/d_a_obj_diviner_crystal.h b/include/d/a/obj/d_a_obj_diviner_crystal.h
index 4c96fd48..0d67d6f0 100644
--- a/include/d/a/obj/d_a_obj_diviner_crystal.h
+++ b/include/d/a/obj/d_a_obj_diviner_crystal.h
@@ -1,17 +1,27 @@
 #ifndef D_A_OBJ_DIVINER_CRYSTAL_H
 #define D_A_OBJ_DIVINER_CRYSTAL_H
 
-#include "d/a/obj/d_a_obj_base.h"
+#include "d/a/d_a_salbage_obj.h"
+#include "m/m3d/m_anmmatclr.h"
+#include "m/m3d/m_anmtexsrt.h"
+#include "m/m3d/m_smdl.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
 
-class dAcODivinerCrystal_c : public dAcObjBase_c {
+class dAcODivinerCrystal_c : public dAcSalbageObj_c {
 public:
-    dAcODivinerCrystal_c() : mStateMgr(*this, sStateID::null) {}
+    dAcODivinerCrystal_c() : dAcSalbageObj_c(&mMdl1, SALVAGE_OBJ_DIVINER_CRYSTAL) {}
     virtual ~dAcODivinerCrystal_c() {}
 
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcODivinerCrystal_c, dAcSalbageObj_c, DemoThrow);
+    STATE_FUNC_DECLARE(dAcODivinerCrystal_c, Stay);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcODivinerCrystal_c);
+    /* 0x970 */ nw4r::g3d::ResFile mResMaybe;
+    /* 0x974 */ m3d::smdl_c mMdl1;
+    /* 0x990 */ m3d::smdl_c mMdl2;
+    /* 0x9AC */ m3d::anmTexSrt_c mAnmTexSrt;
+    /* 0x9D8 */ m3d::anmMatClr_c mAnmMatClr;
 };
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_pot_sal.h b/include/d/a/obj/d_a_obj_pot_sal.h
index 5a4a6e49..59c3dec3 100644
--- a/include/d/a/obj/d_a_obj_pot_sal.h
+++ b/include/d/a/obj/d_a_obj_pot_sal.h
@@ -2,17 +2,20 @@
 #define D_A_OBJ_POT_SAL_H
 
 #include "d/a/d_a_salbage_obj.h"
+#include "m/m3d/m_smdl.h"
 #include "s/s_State.hpp"
 
 class dAcOpotSal_c : public dAcSalbageObj_c {
 public:
-    dAcOpotSal_c() {}
+    dAcOpotSal_c() : dAcSalbageObj_c(&mMdl1, SALVAGE_OBJ_POT) {}
     virtual ~dAcOpotSal_c() {}
 
     STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcOpotSal_c, dAcSalbageObj_c, DemoThrow);
     STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcOpotSal_c, dAcSalbageObj_c, After);
 
 private:
+    /* 0x970 */ m3d::smdl_c mMdl1;
+    /* 0x98C */ m3d::smdl_c mMdl2;
 };
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_propera.h b/include/d/a/obj/d_a_obj_propera.h
index 1326f80b..91104f97 100644
--- a/include/d/a/obj/d_a_obj_propera.h
+++ b/include/d/a/obj/d_a_obj_propera.h
@@ -1,17 +1,20 @@
 #ifndef D_A_OBJ_PROPERA_H
 #define D_A_OBJ_PROPERA_H
 
-#include "d/a/obj/d_a_obj_base.h"
-#include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
+#include "d/a/d_a_salbage_obj.h"
+#include "d/col/bg/d_bg_w.h"
+#include "m/m3d/m_smdl.h"
 
-class dAcObjPropera_c : public dAcObjBase_c {
+class dAcObjPropera_c : public dAcSalbageObj_c {
 public:
-    dAcObjPropera_c() : mStateMgr(*this, sStateID::null) {}
+    dAcObjPropera_c() : dAcSalbageObj_c(&mMdl, SALVAGE_OBJ_PROPERA) {}
     virtual ~dAcObjPropera_c() {}
 
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcObjPropera_c, dAcSalbageObj_c, DemoThrow);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcObjPropera_c);
+    /* 0x970 */ m3d::smdl_c mMdl;
+    /* 0x98C */ dBgW mBgW;
 };
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_roulette.h b/include/d/a/obj/d_a_obj_roulette.h
index 3563269e..0c096ba3 100644
--- a/include/d/a/obj/d_a_obj_roulette.h
+++ b/include/d/a/obj/d_a_obj_roulette.h
@@ -1,17 +1,22 @@
 #ifndef D_A_OBJ_ROULETTE_H
 #define D_A_OBJ_ROULETTE_H
 
-#include "d/a/obj/d_a_obj_base.h"
+#include "d/a/d_a_salbage_obj.h"
+#include "m/m3d/m_anmtexsrt.h"
+#include "m/m3d/m_mdl.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
 
-class dAcObjRoulette_c : public dAcObjBase_c {
+class dAcObjRoulette_c : public dAcSalbageObj_c {
 public:
-    dAcObjRoulette_c() : mStateMgr(*this, sStateID::null) {}
+    dAcObjRoulette_c() : dAcSalbageObj_c(&mMdl, SALVAGE_OBJ_ROULETTE) {}
     virtual ~dAcObjRoulette_c() {}
 
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcObjRoulette_c, dAcSalbageObj_c, DemoThrow);
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcObjRoulette_c, dAcSalbageObj_c, Wait);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcObjRoulette_c);
+    /* 0x970 */ m3d::mdl_c mMdl;
+    /* 0x994 */ m3d::anmTexSrt_c mAnm;
 };
 
 #endif
diff --git a/include/d/a/obj/d_a_obj_water_jar.h b/include/d/a/obj/d_a_obj_water_jar.h
index 82ee89a3..4941ca25 100644
--- a/include/d/a/obj/d_a_obj_water_jar.h
+++ b/include/d/a/obj/d_a_obj_water_jar.h
@@ -1,17 +1,32 @@
 #ifndef D_A_OBJ_WATER_JAR_H
 #define D_A_OBJ_WATER_JAR_H
 
-#include "d/a/obj/d_a_obj_base.h"
+#include "common.h"
+#include "d/a/d_a_salbage_obj.h"
+#include "d/col/cc/d_cc_d.h"
+#include "m/m3d/m_anmchr.h"
+#include "m/m3d/m_smdl.h"
+#include "nw4r/g3d/res/g3d_resfile.h"
 #include "s/s_State.hpp"
-#include "s/s_StateMgr.hpp"
+#include "toBeSorted/actor_event.h"
+#include "toBeSorted/d_emitter.h"
 
-class dAcOWaterJar_c : public dAcObjBase_c {
+class dAcOWaterJar_c : public dAcSalbageObj_c {
 public:
-    dAcOWaterJar_c() : mStateMgr(*this, sStateID::null) {}
+    dAcOWaterJar_c() : mEvent(*this, nullptr), dAcSalbageObj_c(&mMdl1, SALVAGE_OBJ_WATER_JAR) {}
     virtual ~dAcOWaterJar_c() {}
 
+    STATE_VIRTUAL_OVERRIDE_FUNC_DECLARE(dAcOWaterJar_c, dAcSalbageObj_c, DemoThrow);
+
 private:
-    /* 0x??? */ STATE_MGR_DECLARE(dAcOWaterJar_c);
+    /* 0x970 */ ActorEventRelated mEvent;
+    /* 0x9C0 */ nw4r::g3d::ResFile mResMaybe;
+    /* 0x9C4 */ m3d::smdl_c mMdl1;
+    /* 0x9E0 */ m3d::smdl_c mMdl2;
+    /* 0x9FC */ m3d::anmChr_c mAnm;
+    /* 0xA34 */ EffectsStruct mEffect;
+    /* 0xA68 */ u8 _0xA68[0xA6C - 0xA68];
+    /* 0xA6C */ dCcD_Cyl mCcCyl;
 };
 
 #endif