d_a_obj_ohatch (#834)

* d_a_obj_ohatch

* PR

2 files changed, 32 insertions, 5 deletions

diff --git a/include/d/actor/d_a_obj_ohatch.h b/include/d/actor/d_a_obj_ohatch.h
index ba53fc30..a8d1b2cf 100644
--- a/include/d/actor/d_a_obj_ohatch.h
+++ b/include/d/actor/d_a_obj_ohatch.h
@@ -2,15 +2,25 @@
 #define D_A_OBJ_OHATCH_H
 
 #include "f_op/f_op_actor.h"
+#include "d/d_a_obj.h"
+
+class dBgW;
 
 class daObjOhatch_c : public fopAc_ac_c {
+    typedef void (daObjOhatch_c::*ActionFunc)();
+
+    enum Param_e {
+        PRM_SWSAVE_W = 8,
+        PRM_SWSAVE_S = 0,
+    };
+
 public:
-    void param_get_swSave() const {}
+    s32 param_get_swSave() const { return daObj::PrmAbstract(this, PRM_SWSAVE_W, PRM_SWSAVE_S); }
 
     void set_mtx();
     void init_mtx();
-    void solidHeapCB(fopAc_ac_c*);
-    void create_heap();
+    static BOOL solidHeapCB(fopAc_ac_c*);
+    bool create_heap();
     cPhs_State _create();
     bool _delete();
     void close_wait_act_proc();
@@ -22,7 +32,18 @@ public:
     bool _draw();
 
 public:
-    /* Place member variables here */
-};
+    /* 0x290 */ request_of_phase_process_class mPhase;
+    /* 0x298 */ J3DModel* mModel;
+    /* 0x29C */ s32 m29C;
+    /* 0x2A0 */ dBgW* mBgW1;
+    /* 0x2A4 */ dBgW* mBgW2;
+    /* 0x2A8 */ Mtx m2A8;
+    /* 0x2D8 */ s16 m2D8;
+    /* 0x2DC */ ActionFunc mActionFunc;
+    /* 0x2E8 */ f32 m2E8;
+    /* 0x2EC */ s32 m2EC;
+    /* 0x2F0 */ s16 m2F0;
+    /* 0x2F2 */ s16 m2F2;
+}; // size = 0x2F4
 
 #endif /* D_A_OBJ_OHATCH_H */
diff --git a/include/m_Do/m_Do_hostIO.h b/include/m_Do/m_Do_hostIO.h
index 40ff7188..b9660b4e 100644
--- a/include/m_Do/m_Do_hostIO.h
+++ b/include/m_Do/m_Do_hostIO.h
@@ -12,6 +12,12 @@ class JORGenEvent;
 class JOREvent;
 class JORServer;
 
+#if VERSION == VERSION_DEMO
+#define HIO(name) l_HIO.##name
+#else
+#define HIO(name) L_HIO::##name
+#endif
+
 class JORMContext {
 public:
     void genCheckBox(const char* param_1, u8* param_2, u8 param_3, u32 param_4, JOREventListener* param_5, u16 param_6, u16 param_7, u16 param_8, u16 param_9) {