d_a_obj_tntrap

configure.py

@@ -1703,7 +1703,7 @@ def MatchingFor(*versions):
     ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d_a_obj_rforce"),
     ActorRel(MatchingFor("GZLJ01", "GZLE01", "GZLP01"),    "d_a_obj_smplbg", extra_cflags=['-pragma "nosyminline on"']),
     ActorRel(NonMatching, "d_a_obj_tapestry"),
-    ActorRel(NonMatching, "d_a_obj_tntrap"),
+    ActorRel(MatchingFor("GZLJ01","GZLE01","GZLP01"), "d_a_obj_tntrap", extra_cflags=['-pragma "nosyminline on"']),
     ActorRel(Matching,    "d_a_obj_tower"),
     ActorRel(NonMatching, "d_a_obj_trap"),
     ActorRel(NonMatching, "d_a_obj_tribox"),

include/d/actor/d_a_obj_tntrap.h

@@ -1,34 +1,62 @@
 #ifndef D_A_OBJ_TNTRAP_H
 #define D_A_OBJ_TNTRAP_H
 
+#include "JSystem/JParticle/JPAEmitter.h"
+#include "d/d_a_obj.h"
+#include "d/d_bg_w.h"
 #include "f_op/f_op_actor.h"
 
+
+
+struct SomeStruct {
+    Mtx calcMtx;
+    JPABaseEmitter* emitterPairs[2][2];  
+    JPABaseEmitter* emitterPairs2[1][3];  
+};
+
 class daObjTnTrap_c : public fopAc_ac_c {
+
+typedef bool(daObjTnTrap_c::*ActProcFunc)();
+typedef void(daObjTnTrap_c::*InitProcFunc)();
+
 public:
-    void param_get_arg0() const {}
-    void param_get_mapType() const {}
-    void param_get_swSave() const {}
-    void param_get_swSave2() const {}
+    enum Prm_e{
+        PRM_SWSAVE_W = 0x08,
+        PRM_SWSAVE_S = 0x00,
 
-    void chk_appear();
+        PRM_SWSAVE2_W = 0x08,
+        PRM_SWSAVE2_S = 0x08,
+
+        PRM_ARG0_W   = 0x01,
+        PRM_ARG0_S   = 0x10,
+
+        PRM_MAPTYPE_W  = 0x2,
+        PRM_MAPTYPE_S  = 0x11,
+    };
+    int param_get_arg0() const {return daObj::PrmAbstract<Prm_e>(this,PRM_ARG0_W,PRM_ARG0_S);}
+    int param_get_mapType() const {return daObj::PrmAbstract<Prm_e>(this,PRM_MAPTYPE_W,PRM_MAPTYPE_S);}
+    int param_get_swSave() const {return daObj::PrmAbstract<Prm_e>(this,PRM_SWSAVE_W,PRM_SWSAVE_S);}
+    int param_get_swSave2() const {return daObj::PrmAbstract<Prm_e>(this,PRM_SWSAVE2_W,PRM_SWSAVE2_S);}
+
+    BOOL chk_appear();
     void set_mtx();
-    void solidHeapCB(fopAc_ac_c*);
-    void create_heap();
+    static int solidHeapCB(fopAc_ac_c*);
+    bool create_heap();
     void particle_set(int, float);
     void particle_delete(int);
     void set_se();
     void set_tri(int);
-    void chk_event_flg();
+    bool chk_event_flg();
     void set_em_set_offsetY();
     cPhs_State _create();
     bool _delete();
-    void trap_off_wait_act_proc();
-    void trap_on_wait_act_proc();
-    void demo_regist_wait_act_proc();
-    void demo_wait_act_proc();
-    void demo_wait2_act_proc();
-    void demo_end_wait_act_proc();
-    void hide_wait_act_proc();
+    bool trap_off_wait_act_proc();
+    bool trap_on_wait_act_proc();
+    bool demo_regist_wait_act_proc();
+    bool demo_wait_act_proc();
+    bool demo_wait2_act_proc();
+    bool demo_end_wait_act_proc();
+    bool hide_wait_act_proc();
     void dummy_proc();
     void trap_off_wait_act_init_proc();
     void trap_on_wait_act_init_proc();
@@ -40,7 +68,25 @@ class daObjTnTrap_c : public fopAc_ac_c {
     bool _draw();
 
 public:
-    /* Place member variables here */
-};
+    /* 0x290 */ request_of_phase_process_class field_0x290;
+    /* 0x298 */ s32 field_0x298;
+    /* 0x29C */ dCcD_Stts mStts;
+    /* 0x2D8 */ dCcD_Tri field_0x2D8[2][4];
+    /* 0xD58 */ dBgW* field_0xD58;
+    /* 0xD5C */ SomeStruct field_0xD5C;
+    /* 0xDC0 */ int field_0xDA8; 
+    /* 0xD90 */ u8 field_0xDAC[0xDB4 - 0xDAC];
+    /* 0xDB8 */ ActProcFunc field_0xDB4;
+    /* 0xDC0 */ s32 field_0xDC0;
+    /* 0xDC4 */ u8 field_0xDC4;
+    /* 0xDC8 */ int field_0xDC8;
+    /* 0xDCC */ int field_0xDCC;
+    /* 0xDD0 */ int field_0xDD0;
+    /* 0xDD4 */ s32 field_0xDD4;
+    /* 0xDD8 */ s16 field_0xDD8[4];
+    /* 0xDE0 */ u8 field_0xDE0[4];
+    /* 0xDE4 */ f32 field_0xDE4[2];
+};  // Size: 0xDEC
+
 
 #endif /* D_A_OBJ_TNTRAP_H */

include/d/actor/d_a_ship.h

@@ -135,7 +135,7 @@ class daShip_c : public fopAc_ac_c {
     daTornado_c* getTornadoActor() const { return mTornadoActor; }
     fopAc_ac_c* getWhirlActor() const { return mWhirlActor; }
     void offCraneHookFlg() {}
-    void offFantomGanonBattle() {}
+    void offFantomGanonBattle() {offStateFlg(daSFLG_UNK800000_e);}
     void offStateFlg(daSHIP_SFLG flag) { mStateFlag &= ~flag;}
     void offTornadoFlg() {
         mTornadoID = fpcM_ERROR_PROCESS_ID_e;
@@ -149,7 +149,7 @@ class daShip_c : public fopAc_ac_c {
     void onCb1Ride() {}
     void onCraneHookFlg() {}
     void onCrashFlg() {}
-    void onFantomGanonBattle() {}
+    void onFantomGanonBattle() {onStateFlg(daSFLG_UNK800000_e);}
     //TODO: Is this right?
     void onLinkSit() { onStateFlg(daSFLG_UNK4000000_e); }
     void onSceneChange() { onStateFlg(daSFLG_UNK20000000_e); }