Merge branch 'master' into various3

include/d/a/d_a_alink.h

@@ -3,35 +3,38 @@
 
 #include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
 #include "JSystem/J3DGraphBase/J3DMatBlock.h"
+#include "JSystem/JParticle/JPAParticle.h"
 #include "Z2AudioLib/Z2Creature.h"
 #include "Z2AudioLib/Z2WolfHowlMgr.h"
 #include "d/a/d_a_player.h"
-#include "d/bg/d_bg_s.h"
+#include "d/bg/d_bg_s_acch.h"
+#include "d/bg/d_bg_s_lin_chk.h"
+#include "d/bg/d_bg_w_base.h"
 #include "d/cc/d_cc_d.h"
-#include "d/cc/d_cc_mass_s.h"
 #include "d/d_attention.h"
-#include "d/d_drawlist.h"
 #include "d/d_eye_hl.h"
 #include "d/d_jnt_col.h"
-#include "d/kankyo/d_kankyo.h"
 #include "d/meter/d_meter2_info.h"
 #include "d/msg/d_msg_flow.h"
 #include "d/particle/d_particle.h"
 #include "d/particle/d_particle_copoly.h"
+#include "d/save/d_save.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor_mng.h"
-#include "f_op/f_op_scene.h"
+#include "global.h"
 #include "rel/d/a/kytag/d_a_kytag05/d_a_kytag05.h"
 #include "rel/d/a/tag/d_a_tag_mmsg/d_a_tag_mmsg.h"
 
-class fopEn_enemy_c;
-class daAlinkHIO_anm_c;
-class J3DAnmTevRegKey;
-class dDemo_actor_c;
-class daScex_c;
+class J2DAnmColorKey;
+class J2DAnmTransformKey;
 class J2DScreen;
 class J2DPane;
 class J2DAnmBase;
+class J3DAnmTevRegKey;
+class dDemo_actor_c;
+class daAlinkHIO_anm_c;
+class daScex_c;
+class fopEn_enemy_c;
 
 class daAlink_lockCursor_c : public dDlst_base_c {
 public:

include/d/a/d_a_horse_static.h

@@ -2,7 +2,7 @@
 #define D_A_D_A_HORSE_STATIC_H
 
 #include "dolphin/types.h"
-#include "rel/d/a/e/d_a_e_wb/d_a_e_wb.h"
+#include "f_op/f_op_actor.h"
 
 class daTagHstop_c : public fopAc_ac_c {
 public:

include/d/a/d_a_item_static.h

@@ -2,9 +2,10 @@
 #define D_A_D_A_ITEM_STATIC_H
 
 #include "SSystem/SComponent/c_lib.h"
+#include "Z2AudioLib/Z2SoundObject.h"
 #include "dolphin/types.h"
 #include "d/a/d_a_itembase.h"
-#include "d/a/d_a_itembase_static.h"
+#include "d/cc/d_cc_d.h"
 #include "d/particle/d_particle.h"
 
 class daItem_c;

include/d/a/d_a_itembase_static.h

@@ -1,9 +1,10 @@
 #ifndef D_A_D_A_ITEMBASE_STATIC_H
 #define D_A_D_A_ITEMBASE_STATIC_H
 
-#include "d/a/d_a_itembase.h"
 #include "dolphin/types.h"
 
+class fopAc_ac_c;
+
 void CheckFieldItemCreateHeap(fopAc_ac_c* actor);
 
 #endif /* D_A_D_A_ITEMBASE_STATIC_H */

include/d/a/d_a_npc.h

@@ -1,9 +1,12 @@
 #ifndef D_A_D_A_NPC_H
 #define D_A_D_A_NPC_H
 
+#include "JSystem/J3DGraphAnimator/J3DMaterialAnm.h"
+#include "Z2AudioLib/Z2Creature.h"
 #include "d/com/d_com_inf_game.h"
 #include "d/d_path.h"
-#include "d/msg/d_msg_object.h"
+#include "d/msg/d_msg_flow.h"
+#include "d/particle/d_particle_copoly.h"
 #include "dolphin/types.h"
 #include "global.h"
 

include/d/a/d_a_obj_ss_base.h

@@ -1,7 +1,7 @@
 #ifndef A_OBJ_D_A_OBJ_SS_BASE_H
 #define A_OBJ_D_A_OBJ_SS_BASE_H
 
-#include "f_op/f_op_actor_mng.h"
+#include "f_op/f_op_actor.h"
 
 class daObj_SSBase_c : public fopAc_ac_c {
 public:

include/d/a/d_a_player.h

@@ -1,16 +1,12 @@
 #ifndef D_A_D_A_PLAYER_H
 #define D_A_D_A_PLAYER_H
 
-#include "JSystem/J3DGraphAnimator/J3DAnimation.h"
-#include "JSystem/JUtility/JUTTexture.h"
-#include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "d/d_drawlist.h"
-#include "d/d_resorce.h"
-#include "d/d_stage.h"
-#include "d/save/d_save.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_actor.h"
 
+struct ResTIMG;
+
 class daPy_sightPacket_c : public dDlst_base_c {
 public:
     daPy_sightPacket_c() {}

include/d/bg/d_bg_plc.h

@@ -1,9 +1,10 @@
 #ifndef D_BG_D_BG_PLC_H
 #define D_BG_D_BG_PLC_H
 
-#include "d/bg/d_bg_pc.h"
 #include "dolphin/types.h"
 
+struct sBgPc;
+
 enum {
     /* 0x14 */ ZELDA_CODE_SIZE = 0x14
 };

include/d/bg/d_bg_s.h

@@ -4,9 +4,12 @@
 #include "SSystem/SComponent/c_bg_s_gnd_chk.h"
 #include "SSystem/SComponent/c_bg_s_lin_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
-#include "d/bg/d_bg_w.h"
+#include "d/bg/d_bg_w_base.h"
 #include "dolphin/types.h"
-#include "f_op/f_op_actor.h"
+#include "global.h"
+
+class dBgW;
+class fopAc_ac_c;
 
 class cBgS_ChkElm {
 public:

include/d/bg/d_bg_s_acch.h

@@ -6,13 +6,12 @@
 #include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_m3d_g_lin.h"
 #include "SSystem/SComponent/c_m3d_g_pla.h"
-#include "d/a/d_a_player.h"
 #include "d/bg/d_bg_s_gnd_chk.h"
-#include "d/bg/d_bg_s_lin_chk.h"
 #include "d/bg/d_bg_s_roof_chk.h"
 #include "d/bg/d_bg_s_wtr_chk.h"
 #include "dolphin/types.h"
-//#include "d/bg/d_bg_s.h"
+
+class fopAc_ac_c;
 
 class dBgS_AcchCir : public cBgS_PolyInfo {
 private:

include/d/bg/d_bg_s_lin_chk.h

@@ -4,7 +4,8 @@
 #include "SSystem/SComponent/c_bg_s_lin_chk.h"
 #include "d/bg/d_bg_s_chk.h"
 #include "dolphin/types.h"
-#include "f_op/f_op_actor.h"
+
+class fopAc_ac_c;
 
 class dBgS_LinChk : public cBgS_LinChk, public dBgS_Chk {
 public:

include/d/bg/d_bg_s_movebg_actor.h

@@ -2,8 +2,8 @@
 #define D_BG_D_BG_S_MOVEBG_ACTOR_H
 
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
-#include "d/bg/d_bg_w.h"
 #include "dolphin/types.h"
+#include "f_op/f_op_actor.h"
 
 class dBgW;
 typedef void (*MoveBGActor_SetFunc)(dBgW*, void*, cBgS_PolyInfo const&, bool, cXyz*, csXyz*,

include/d/bg/d_bg_s_sph_chk.h

@@ -1,6 +1,7 @@
 #ifndef D_BG_D_BG_S_SPH_CHK_H
 #define D_BG_D_BG_S_SPH_CHK_H
 
+#include "SSystem/SComponent/c_bg_s_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "SSystem/SComponent/c_m3d_g_sph.h"

include/d/bg/d_bg_w.h

@@ -1,17 +1,15 @@
 #ifndef D_BG_D_BG_W_H
 #define D_BG_D_BG_W_H
 
-#include "JSystem/J3DGraphBase/J3DVertex.h"
-#include "SSystem/SComponent/c_bg_s_gnd_chk.h"
-#include "SSystem/SComponent/c_bg_s_lin_chk.h"
-#include "SSystem/SComponent/c_bg_s_poly_info.h"
-#include "SSystem/SComponent/c_m3d_g_tri.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/bg/d_bg_s_grp_pass_chk.h"
-#include "d/bg/d_bg_s_poly_pass_chk.h"
+#include "SSystem/SComponent/c_m3d_g_aab.h"
+#include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "d/bg/d_bg_w_base.h"
+#include "dolphin/mtx/mtx.h"
 #include "dolphin/types.h"
-#include "f_op/f_op_actor.h"
+
+class cBgS_GrpPassChk;
+class cBgS_PolyPassChk;
+class fopAc_ac_c;
 
 struct dBgS_CaptPoly {};
 

include/d/bg/d_bg_w_base.h

@@ -1,17 +1,20 @@
 #ifndef D_BG_D_BG_W_BASE_H
 #define D_BG_D_BG_W_BASE_H
 
-#include "SSystem/SComponent/c_bg_s_gnd_chk.h"
-#include "SSystem/SComponent/c_bg_s_lin_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
-#include "SSystem/SComponent/c_bg_s_shdw_draw.h"
 #include "SSystem/SComponent/c_bg_w.h"
-#include "d/bg/d_bg_s_acch.h"
-#include "d/bg/d_bg_s_sph_chk.h"
+#include "SSystem/SComponent/c_m3d_g_pla.h"
 #include "dolphin/types.h"
-#include "f_op/f_op_actor.h"
 
+class cBgS_GndChk;
+class cBgS_LinChk;
+class cBgS_ShdwDraw;
+class dBgS_Acch;
 struct dBgS_CaptPoly;
+class dBgS_RoofChk;
+class dBgS_SphChk;
+class dBgS_SplGrpChk;
+class fopAc_ac_c;
 
 class dBgW_Base : public cBgW_BgId {
 public:

include/d/bg/d_bg_w_kcol.h

@@ -1,10 +1,14 @@
 #ifndef D_BG_D_BG_W_KCOL_H
 #define D_BG_D_BG_W_KCOL_H
 
+#include "SSystem/SComponent/c_m3d_g_aab.h"
 #include "d/bg/d_bg_plc.h"
 #include "d/bg/d_bg_w_base.h"
 #include "dolphin/types.h"
 
+class cBgS_GrpPassChk;
+class cBgS_PolyPassChk;
+struct dBgPc;
 struct dBgS_CaptPoly;
 
 struct KC_PrismData {

include/d/cc/d_cc_mass_s.h

@@ -3,6 +3,7 @@
 
 #include "SSystem/SComponent/c_cc_d.h"
 #include "dolphin/types.h"
+#include "global.h"
 
 typedef void (*dCcMassS_ObjCallback)(fopAc_ac_c*, cXyz*, u32);
 

include/d/cc/d_cc_s.h

@@ -2,9 +2,12 @@
 #define D_CC_D_CC_S_H
 
 #include "SSystem/SComponent/c_cc_s.h"
-#include "d/cc/d_cc_d.h"
 #include "d/cc/d_cc_mass_s.h"
 #include "dolphin/types.h"
+#include "global.h"
+
+class dCcD_GObjInf;
+class dCcD_GStts;
 
 class dCcS : public cCcS {
 public:

include/d/cc/d_cc_uty.h

@@ -3,7 +3,8 @@
 
 #include "d/com/d_com_inf_game.h"
 #include "dolphin/types.h"
-#include "f_op/f_op_actor.h"
+
+class fopAc_ac_c;
 
 enum dCcU_AtType {
     /* 0x01 */ HIT_TYPE_LINK_NORMAL_ATTACK = 1,

include/d/com/d_com_inf_game.h

@@ -1,14 +1,11 @@
 #ifndef D_COM_D_COM_INF_GAME_H
 #define D_COM_D_COM_INF_GAME_H
 
-#include "d/a/d_a_alink.h"
 #include "d/bg/d_bg_s.h"
 #include "d/cc/d_cc_s.h"
 #include "d/d_attention.h"
 #include "d/d_drawlist.h"
-#include "d/d_procname.h"
 #include "d/d_resorce.h"
-#include "d/d_simple_model.h"
 #include "d/d_stage.h"
 #include "d/d_vibration.h"
 #include "d/event/d_event.h"
@@ -16,9 +13,13 @@
 #include "d/particle/d_particle.h"
 #include "d/save/d_save.h"
 #include "f_op/f_op_camera_mng.h"
-#include "f_op/f_op_scene_mng.h"
+#include "global.h"
 
+class JKRAramArchive;
+class dSmplMdl_draw_c;
 class dTimer_c;
+class daPy_py_c;
+class scene_class;
 
 class __d_timer_info_c {
 public: