Remove weak ctors/dtors from .cpp files

include/d/actor/d_a_andsw2.h

@@ -3,7 +3,7 @@
 
 #include "f_op/f_op_actor.h"
 
-struct daAndsw2_c : public fopAc_ac_c {
+class daAndsw2_c : public fopAc_ac_c {
 public:
     void setActio(u8 action) { mAction = action; }
 

include/d/actor/d_a_bomb2.h

@@ -70,7 +70,7 @@ namespace daBomb2 {
         
     };
 
-    class Act_c : public fopAc_ac_c { 
+    class Act_c : public fopAc_ac_c {
     public:
         void prm_get_start() const {}
         void prm_get_stick() const {}

include/d/actor/d_a_itembase.h

@@ -39,7 +39,7 @@ struct daItemBase_c_m_data {
 
 STATIC_ASSERT(sizeof(daItemBase_c_m_data) == 0x4C);
 
-struct daItemBase_c : public fopAc_ac_c {
+class daItemBase_c : public fopAc_ac_c {
 public:
     BOOL DeleteBase(const char*);
     BOOL CreateItemHeap(const char*, short, short, short, short, short, short, short);
@@ -91,4 +91,7 @@ public:
 
 STATIC_ASSERT(sizeof(daItemBase_c) == 0x63C);
 
+int CheckItemCreateHeap(fopAc_ac_c*);
+int CheckFieldItemCreateHeap(fopAc_ac_c*);
+
 #endif /* D_A_ITEMBASE_H */

include/d/actor/d_a_itembase_static.h

@@ -1,9 +0,0 @@
-#ifndef D_A_ITEMBASE_STATIC_H
-#define D_A_ITEMBASE_STATIC_H
-
-#include "f_op/f_op_actor.h"
-
-int CheckItemCreateHeap(fopAc_ac_c*);
-int CheckFieldItemCreateHeap(fopAc_ac_c*);
-
-#endif /* D_A_ITEMBASE_STATIC_H */

include/d/actor/d_a_npc_ds1.h

@@ -2,6 +2,7 @@
 #define D_A_NPC_DS1_H
 
 #include "f_op/f_op_actor.h"
+#include "d/d_shop.h"
 
 class daNpc_Ds1_c : public fopAc_ac_c {
 public:

include/d/actor/d_a_obj_htetu1.h

@@ -3,7 +3,28 @@
 
 #include "f_op/f_op_actor.h"
 
-class daObjHtetu1Splash_c : public fopAc_ac_c {
+class daObjHtetu1_c : public fopAc_ac_c {
+public:
+    // TODO: this function is marked as weak in the REL symbol map, but it does not get inlined for some reason?
+    // void check_sw() {}
+    void check_sw();
+
+    void solidHeapCB(fopAc_ac_c*);
+    void create_heap();
+    s32 _create();
+    BOOL _delete();
+    void init_mtx();
+    void unlock();
+    void get_water_h();
+    void splash_manager();
+    BOOL _execute();
+    BOOL _draw();
+
+public:
+    /* Place member variables here */
+};
+
+class daObjHtetu1Splash_c {
 public:
     void chk_stop() {}
     void delete_s() {}
@@ -15,9 +36,6 @@ public:
     void timer_play_particle(short) {}
 
     void create_s(unsigned short, cXyz*, csXyz*, dKy_tevstr_c*);
-
-public:
-    /* Place member variables here */
 };
 
 #endif /* D_A_OBJ_HTETU1_H */

include/d/actor/d_a_shop_item.h

@@ -10,7 +10,8 @@ struct daShopItem_c_m_data {
     /* 0x18 */ SVec field_0x18;
 };
 
-struct daShopItem_c : public daItemBase_c {
+class daShopItem_c : public daItemBase_c {
+public:
     inline BOOL _delete();
     void setTevType(int) {}
 

include/d/actor/d_a_spotbox.h

@@ -3,7 +3,7 @@
 
 #include "f_op/f_op_actor.h"
 
-struct daSpotbox_c : public fopAc_ac_c {
+class daSpotbox_c : public fopAc_ac_c {
 public:
     inline s32 create();
     inline BOOL draw();