d_a_tag_Lv6Gate almost matching (#1990)

2 files changed, 47 insertions, 24 deletions

diff --git a/include/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.h b/include/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.h
index b2714592db..e9c2ae8c2d 100644
--- a/include/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.h
+++ b/include/rel/d/a/tag/d_a_tag_Lv6Gate/d_a_tag_Lv6Gate.h
@@ -1,19 +1,42 @@
 #ifndef D_A_TAG_LV6GATE_H
 #define D_A_TAG_LV6GATE_H
 
+#include "d/bg/d_bg_w.h"
+#include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_actor_mng.h"
 
 class daTagLv6Gate_c : public fopAc_ac_c {
 public:
-    /* 80D4F8B8 */ void createHeap();
-    /* 80D4FBD8 */ void create();
-    /* 80D4FEDC */ void execute();
-    /* 80D506AC */ void draw();
+    /* 80D4F8B8 */ int createHeap();
+    /* 80D4FBD8 */ int create();
+    /* 80D4FEDC */ int execute();
+    /* 80D506AC */ int draw();
+
+    inline ~daTagLv6Gate_c();
+
+    inline void seStair();
+    inline void seGlassOff();
+    inline void seGlassOn();
+    inline void initBaseMtx();
+    inline void setBaseMtx();
+    inline void create_init();
+    inline bool checkOpenArea();
+    inline void cut1();
+    inline void cut2();
+    inline void cut4();
 
     void stabMasterSword() { field_0x76a = 1; }
+    u8 getSwitchNo1() { return fopAcM_GetParam(this) & 0xFF; }
+    u8 getSwitchNo2() { return fopAcM_GetParam(this) >> 0x8 & 0xFF; }
 
-    /* 0x568 */ u8 field_0x568[0x76A - 0x568];
+    /* 0x568 */ J3DModel* mpModel[2];
+    /* 0x570 */ mDoExt_btkAnm* mpBtk[2];
+    /* 0x578 */ dBgW mBgW[2];
+    /* 0x6F8 */ Mtx field_0x6f8[2];
+    /* 0x758 */ request_of_phase_process_class mPhase;
+    /* 0x760 */ f32 field_0x760[2];
+    /* 0x768 */ s16 mEvtId;
     /* 0x76A */ u8 field_0x76a;
-};
+};  // Size: 0x76C
 
 #endif /* D_A_TAG_LV6GATE_H */
diff --git a/include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h b/include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h
index 75c80fc8c9..46057741cd 100644
--- a/include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h
+++ b/include/rel/d/a/tag/d_a_tag_Lv7Gate/d_a_tag_Lv7Gate.h
@@ -6,13 +6,13 @@
 
 class daTagLv7Gate_c : public fopAc_ac_c {
 public:
-    inline ~daTagLv7Gate_c();
-
     /* 80D50C64 */ int create();
     /* 80D50D30 */ void create_init();
     /* 80D511C8 */ int execute();
     /* 80D51628 */ void calcFly();
 
+    inline ~daTagLv7Gate_c();
+
     inline int createHeap();
     inline void setPath(u8 i_path_ID);
     inline void initBaseMtx();
@@ -22,24 +22,24 @@ public:
     inline bool setNextPoint();
     inline int draw();
 
-    u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10); }
+    u8 getPathID() { return fopAcM_GetParam(this) >> 0x10; }
     u16 getFlowNodeNo() { return fopAcM_GetParam(this); }
 
-    /* 0X568 */ J3DModel* mpModel;
-    /* 0X56C */ mDoExt_bckAnm* mpBck;
-    /* 0X570 */ dPath* mRoomPath;
-    /* 0X574 */ request_of_phase_process_class mPhase;
-    /* 0X57C */ cXyz mPos2;
-    /* 0X588 */ cXyz mPos1;
-    /* 0X594 */ csXyz field_0x594;
-    /* 0X59C */ char* mEvName;
-    /* 0X5A0 */ int field_0x5a0;
-    /* 0X5A4 */ f32 mDistance;
-    /* 0X5A8 */ f32 mLastFrame;
-    /* 0X5AC */ u16 field_0x5ac;
-    /* 0X5AE */ s16 mEvtId;
-    /* 0X5B0 */ bool field_0x5b0;
-    /* 0X5B1 */ bool field_0x5b1;
+    /* 0x568 */ J3DModel* mpModel;
+    /* 0x56C */ mDoExt_bckAnm* mpBck;
+    /* 0x570 */ dPath* mRoomPath;
+    /* 0x574 */ request_of_phase_process_class mPhase;
+    /* 0x57C */ cXyz mPos2;
+    /* 0x588 */ cXyz mPos1;
+    /* 0x594 */ csXyz field_0x594;
+    /* 0x59C */ char* mEvName;
+    /* 0x5A0 */ int field_0x5a0;
+    /* 0x5A4 */ f32 mDistance;
+    /* 0x5A8 */ f32 mLastFrame;
+    /* 0x5AC */ u16 field_0x5ac;
+    /* 0x5AE */ s16 mEvtId;
+    /* 0x5B0 */ bool field_0x5b0;
+    /* 0x5B1 */ bool field_0x5b1;
 };  // Size: 0x5B4
 
 #endif /* D_A_TAG_LV7GATE_H */