Merge pull request #367 from Trueffeloot/work11

Few files OK

8 files changed, 119 insertions, 5 deletions

diff --git a/include/d/com/d_com_inf_game.h b/include/d/com/d_com_inf_game.h
index eb21ea5267..08c464b260 100644
--- a/include/d/com/d_com_inf_game.h
+++ b/include/d/com/d_com_inf_game.h
@@ -3372,6 +3372,11 @@ inline void dComIfGd_setListDark() {
     g_dComIfG_gameInfo.drawlist.setXluListDark();
 }
 
+inline void dComIfGd_setListInvisible() {
+    g_dComIfG_gameInfo.drawlist.setOpaListInvisible();
+    g_dComIfG_gameInfo.drawlist.setXluListInvisible();
+}
+
 inline void dComIfGd_setListDarkBG() {
     g_dComIfG_gameInfo.drawlist.setOpaListDarkBG();
     g_dComIfG_gameInfo.drawlist.setXluListDarkBG();
diff --git a/include/d/d_drawlist.h b/include/d/d_drawlist.h
index 5a67a9181c..3f4ddfe924 100644
--- a/include/d/d_drawlist.h
+++ b/include/d/d_drawlist.h
@@ -315,6 +315,8 @@ public:
     void setOpaListSky() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_SKY]); }
     void setXluListDark() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK]); }
     void setOpaListDark() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK]); }
+    void setOpaListInvisible() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_INVISIBLE]); }
+    void setXluListInvisible() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_INVISIBLE]); }
     void setXluListDarkBG() { setXluDrawList(mDrawBuffers[DB_XLU_LIST_DARK_BG]); }
     void setOpaListDarkBG() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST_DARK_BG]); }
     void setOpaList() { setOpaDrawList(mDrawBuffers[DB_OPA_LIST]); }
diff --git a/include/d/pane/d_pane_class.h b/include/d/pane/d_pane_class.h
index 1a6f716e9e..3edc2f78cc 100644
--- a/include/d/pane/d_pane_class.h
+++ b/include/d/pane/d_pane_class.h
@@ -64,6 +64,9 @@ public:
     JUtility::TColor getInitBlack() { return mInitBlack; }
     JUtility::TColor getInitWhite() { return mInitWhite; }
 
+    f32 getInitGlobalPosX() { return mGlobalPos.x; }
+    f32 getInitGlobalPosY() { return mGlobalPos.y; }
+
 private:
     /* 0x1C */ void* mpFirstStackSize;
     /* 0x20 */ s16* field_0x20;
diff --git a/include/msg/scrn/d_msg_scrn_place.h b/include/msg/scrn/d_msg_scrn_place.h
index 7b44e3622e..4d454b6a6f 100644
--- a/include/msg/scrn/d_msg_scrn_place.h
+++ b/include/msg/scrn/d_msg_scrn_place.h
@@ -1,6 +1,24 @@
 #ifndef MSG_SCRN_D_MSG_SCRN_PLACE_H
 #define MSG_SCRN_D_MSG_SCRN_PLACE_H
 
-#include "dolphin/types.h"
+#include "msg/scrn/d_msg_scrn_base.h"
+
+class dMsgScrnPlace_c : public dMsgScrnBase_c {
+public:
+    /* 802463CC */ dMsgScrnPlace_c();
+
+    /* 802467C4 */ virtual ~dMsgScrnPlace_c();
+    /* 80246924 */ virtual void exec();
+    /* 80246A44 */ virtual void drawSelf();
+    /* 80246A9C */ virtual void fukiAlpha(f32);
+    /* 80246B28 */ virtual void fukiScale(f32);
+    /* 80246B2C */ virtual void fukiTrans(f32, f32);
+    /* 80246B30 */ virtual void fontAlpha(f32);
+
+    /* 0xC4 */ CPaneMgr* mpBaseParent;
+    /* 0xC8 */ CPaneMgr* mpFontParent;
+    /* 0xCC */ f32 mScaleX;
+    /* 0xD0 */ f32 mScaleY;
+};
 
 #endif /* MSG_SCRN_D_MSG_SCRN_PLACE_H */
diff --git a/include/msg/scrn/d_msg_scrn_staff.h b/include/msg/scrn/d_msg_scrn_staff.h
index 10ab0529aa..9ab344106a 100644
--- a/include/msg/scrn/d_msg_scrn_staff.h
+++ b/include/msg/scrn/d_msg_scrn_staff.h
@@ -1,6 +1,23 @@
 #ifndef MSG_SCRN_D_MSG_SCRN_STAFF_H
 #define MSG_SCRN_D_MSG_SCRN_STAFF_H
 
-#include "dolphin/types.h"
+#include "msg/scrn/d_msg_scrn_base.h"
+
+class dMsgScrnStaff_c : public dMsgScrnBase_c {
+public:
+    /* 80246B34 */ dMsgScrnStaff_c(u8);
+
+    /* 80246DD8 */ virtual ~dMsgScrnStaff_c();
+    /* 80246EE8 */ virtual void exec();
+    /* 80246F68 */ virtual void drawSelf();
+    /* 80246FC0 */ virtual void fukiAlpha(f32);
+    /* 80246FE4 */ virtual void fukiScale(f32);
+    /* 80246FE8 */ virtual void fukiTrans(f32, f32);
+    /* 80246FEC */ virtual void fontAlpha(f32);
+
+    /* 0XC4 */ u8 field_0xc4[0xD0 - 0xC8];
+    /* 0xCC */ f32 field_0xcc;
+    /* 0xD0 */ f32 field_0xd0;
+};
 
 #endif /* MSG_SCRN_D_MSG_SCRN_STAFF_H */
diff --git a/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h b/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h
index c7483aad38..3fcb200228 100644
--- a/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h
+++ b/include/rel/d/a/obj/d_a_obj_hsTarget/d_a_obj_hsTarget.h
@@ -1,6 +1,29 @@
 #ifndef D_A_OBJ_HSTARGET_H
 #define D_A_OBJ_HSTARGET_H
 
-#include "dolphin/types.h"
+#include "d/bg/d_bg_s_movebg_actor.h"
+#include "f_op/f_op_actor_mng.h"
+#include "m_Do/m_Do_hostIO.h"
+class daHsTarget_c : public dBgS_MoveBgActor {
+public:
+    /* 80C1F490 */ void setBaseMtx();
+    /* 80C1F518 */ int CreateHeap();
+    /* 80C1F598 */ int create();
+    /* 80C1F6B0 */ int Execute(f32 (**)[3][4]);
+    /* 80C1F6C4 */ int Draw();
+    /* 80C1F728 */ int Delete();
+
+    u8 getModelType() { return fopAcM_GetParamBit(this, 0, 4); }
+
+    /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
+    /* 0x5A8 */ J3DModel* mpModel;
+    /* 0x5AC */ u8 mIndex;
+};  // Size: 0x5B0
+
+class daHsTarget_HIO_c : mDoHIO_entry_c {
+public:
+    /* 80C1F42C */ daHsTarget_HIO_c();
+    /* 80C1F7F4 */ virtual ~daHsTarget_HIO_c() {}
+};
 
 #endif /* D_A_OBJ_HSTARGET_H */
diff --git a/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h b/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h
index 1ae9a205fb..c0323f8c7b 100644
--- a/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h
+++ b/include/rel/d/a/obj/d_a_obj_onsen/d_a_obj_onsen.h
@@ -1,6 +1,27 @@
 #ifndef D_A_OBJ_ONSEN_H
 #define D_A_OBJ_ONSEN_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 daObjOnsen_c : public dBgS_MoveBgActor {
+public:
+    /* 80CA7B58 */ void initBaseMtx();
+    /* 80CA7BB0 */ void setBaseMtx();
+    /* 80CA7C28 */ int Create();
+    /* 80CA7C74 */ int CreateHeap();
+    /* 80CA7E44 */ int create1st();
+    /* 80CA7EEC */ int Execute(Mtx**);
+    /* 80CA7F1C */ int Draw();
+    /* 80CA8008 */ int Delete();
+
+    u32 getType() { return fopAcM_GetParamBit(this, 0, 8); }
+
+    /* 0x5A0 */ request_of_phase_process_class mPhaseReq;
+    /* 0x5A8 */ J3DModel* mpModel[2];
+    /* 0x5B0 */ mDoExt_btkAnm* mpBtk;
+    /* 0x5B4 */ u8 mType;
+};     // Size: 0x5B8
 
 #endif /* D_A_OBJ_ONSEN_H */
diff --git a/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h b/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h
index 1bd52172db..38e497c98a 100644
--- a/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h
+++ b/include/rel/d/a/obj/d_a_obj_rcircle/d_a_obj_rcircle.h
@@ -1,6 +1,31 @@
 #ifndef D_A_OBJ_RCIRCLE_H
 #define D_A_OBJ_RCIRCLE_H
 
-#include "dolphin/types.h"
+#include "f_op/f_op_actor_mng.h"
+#include "d/com/d_com_inf_game.h"
+
+class daObjRCircle_c : public fopAc_ac_c {
+public:
+    /* 80CB8678 */ daObjRCircle_c();
+    
+    /* 80CB8814 */ int createHeap();
+    /* 80CB8928 */ int create();
+    /* 80CB8A28 */ int Delete();
+    /* 80CB8A5C */ int draw();
+    /* 80CB8B28 */ int execute();
+    /* 80CB8BE4 */ void init();
+    /* 80CB8BF0 */ void setModelMtx();
+
+    int getSwBit() { return fopAcM_GetParamBit(this, 0, 8) & 0xFF; }
+
+    /* 0x568 */ request_of_phase_process_class mPhaseReq;
+    
+    /* 80CB874C */ virtual ~daObjRCircle_c();
+
+    /* 0x574 */ mDoExt_brkAnm mBrk;
+    /* 0x58C */ mDoExt_btkAnm mBtk;
+    /* 0x5A4 */ J3DModel* mpModel;
+    /* 0x5A8 */ u8 mSwitch;
+};
 
 #endif /* D_A_OBJ_RCIRCLE_H */