Merge branch 'master' of https://github.com/zeldaret/tp into d_menu_insect-1

4 files changed, 42 insertions, 4 deletions

diff --git a/include/d/bg/d_bg_s_movebg_actor.h b/include/d/bg/d_bg_s_movebg_actor.h
index 0623dd94e2..8ce7aab010 100644
--- a/include/d/bg/d_bg_s_movebg_actor.h
+++ b/include/d/bg/d_bg_s_movebg_actor.h
@@ -24,7 +24,7 @@ public:
 
     /* 80078688 */ virtual int CreateHeap();
     /* 80078690 */ virtual int Create();
-    /* 80078698 */ virtual int Execute(f32 (**)[3][4]);
+    /* 80078698 */ virtual int Execute(Mtx**);
     /* 800786A0 */ virtual int Draw();
     /* 800786A8 */ virtual int Delete();
     /* 800786B0 */ virtual int IsDelete();
diff --git a/include/d/menu/d_menu_ring.h b/include/d/menu/d_menu_ring.h
index 3d1e87f07a..9bb032c509 100644
--- a/include/d/menu/d_menu_ring.h
+++ b/include/d/menu/d_menu_ring.h
@@ -127,7 +127,7 @@ private:
     /* 0x5B8 */ f32 field_0x5b8[10];
     /* 0x5E0 */ f32 field_0x5e0[10];
     /* 0x608 */ f32 field_0x608;
-    /* 0x604 */ f32 field_0x604;
+    /* 0x60C */ f32 field_0x60c;
     /* 0x610 */ f32 field_0x610;
     /* 0x614 */ f32 field_0x614;
     /* 0x618 */ f32 field_0x618;
diff --git a/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h b/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h
index bf5b408eba..2811bea1eb 100644
--- a/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h
+++ b/include/rel/d/a/d_a_izumi_gate/d_a_izumi_gate.h
@@ -1,6 +1,24 @@
 #ifndef D_A_IZUMI_GATE_H
 #define D_A_IZUMI_GATE_H
 
-#include "dolphin/types.h"
+#include "d/bg/d_bg_s_movebg_actor.h"
+#include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
+
+class daIzumiGate_c : public dBgS_MoveBgActor {
+public:
+    /* 80849098 */ void initBaseMtx();
+    /* 808490B8 */ void setBaseMtx();
+    /* 80849260 */ int CreateHeap();
+    /* 808492D8 */ int Create();
+    /* 808492FC */ int Execute(Mtx**);
+    /* 80849328 */ int Draw();
+    /* 808493CC */ int Delete();
+
+    inline int create();
+
+    /* 0x5A0 */ J3DModel* mpModel;
+    /* 0x5A4 */ request_of_phase_process_class mPhaseReq;
+};     // Size: 0x5AC
 
 #endif /* D_A_IZUMI_GATE_H */
diff --git a/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h b/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h
index 06a6362d10..b4c1b1e174 100644
--- a/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h
+++ b/include/rel/d/a/obj/d_a_obj_vground/d_a_obj_vground.h
@@ -1,6 +1,26 @@
 #ifndef D_A_OBJ_VGROUND_H
 #define D_A_OBJ_VGROUND_H
 
-#include "dolphin/types.h"
+#include "d/com/d_com_inf_game.h"
+#include "f_op/f_op_actor_mng.h"
+
+class daObjVGnd_c : public fopAc_ac_c {
+public:
+    /* 80D213F8 */ void initBaseMtx();
+    /* 80D21448 */ void setBaseMtx();
+    /* 80D214AC */ int Create();
+    /* 80D21500 */ int CreateHeap();
+    /* 80D216F4 */ int create();
+    /* 80D217A8 */ int execute();
+    /* 80D21878 */ int draw();
+    /* 80D2194C */ int _delete();
+
+    u32 getSwbit() { return fopAcM_GetParamBit(this, 0, 8); }
+
+    /* 0x568 */ request_of_phase_process_class mPhaseReq;
+    /* 0x570 */ J3DModel* mpModel;
+    /* 0x574 */ mDoExt_btkAnm* mpBtk;
+    /* 0x578 */ mDoExt_brkAnm* mpBrk;
+};     // Size: 0x57C
 
 #endif /* D_A_OBJ_VGROUND_H */