d_a_obj_carry work, SETUP_ACTOR macro, header cleanup (#1885)

* d_a_obj_carry work, SETUP_ACTOR macro * rm headers, add script * progress * macro rename, consistent spacing
2026-06-27 00:45:10 -04:00 · 2023-08-16 13:07:52 -06:00
parent c372915a50
commit f9380b3e05
4558 changed files with 741 additions and 6064 deletions
@@ -3,7 +3,6 @@

 #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"
@@ -19,9 +18,7 @@
 #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 "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"

@@ -1,7 +1,6 @@
 #ifndef D_A_D_A_HORSE_STATIC_H
 #define D_A_D_A_HORSE_STATIC_H

-#include "dolphin/types.h"
 #include "f_op/f_op_actor.h"

 class daTagHstop_c : public fopAc_ac_c {
@@ -2,8 +2,6 @@
 #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/cc/d_cc_d.h"
 #include "d/particle/d_particle.h"
@@ -4,7 +4,6 @@
 #include "SSystem/SComponent/c_phase.h"
 #include "d/bg/d_bg_s_acch.h"
 #include "d/cc/d_cc_d.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor.h"

 struct daItemBase_data {
@@ -1,7 +1,6 @@
 #ifndef D_A_D_A_ITEMBASE_STATIC_H
 #define D_A_D_A_ITEMBASE_STATIC_H

-#include "dolphin/types.h"

 class fopAc_ac_c;

@@ -8,7 +8,6 @@
 #include "d/d_path.h"
 #include "d/msg/d_msg_flow.h"
 #include "d/particle/d_particle_copoly.h"
-#include "dolphin/types.h"
 #include "global.h"

 struct bckGetParam {
@@ -1,6 +1,5 @@
 #ifndef D_A_D_A_OBJ_H
 #define D_A_D_A_OBJ_H

-#include "dolphin/types.h"

 #endif /* D_A_D_A_OBJ_H */
@@ -2,7 +2,6 @@
 #define D_A_D_A_PLAYER_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor.h"

 struct ResTIMG;
@@ -1,9 +1,6 @@
 #ifndef D_BG_D_BG_S_H
 #define D_BG_D_BG_S_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 "d/bg/d_bg_w_base.h"
 #include "dolphin/types.h"
 #include "global.h"
@@ -1,7 +1,6 @@
 #ifndef D_BG_D_BG_S_ACCH_H
 #define D_BG_D_BG_S_ACCH_H

-#include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "SSystem/SComponent/c_m3d_g_cir.h"
 #include "SSystem/SComponent/c_m3d_g_cyl.h"
 #include "SSystem/SComponent/c_m3d_g_lin.h"
@@ -3,7 +3,6 @@

 #include "d/bg/d_bg_s_grp_pass_chk.h"
 #include "d/bg/d_bg_s_poly_pass_chk.h"
-#include "dolphin/types.h"

 class dBgS_Chk : public dBgS_PolyPassChk, public dBgS_GrpPassChk {
 public:
@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_bg_s_gnd_chk.h"
 #include "d/bg/d_bg_s_chk.h"
-#include "dolphin/types.h"

 class dBgS_GndChk : public cBgS_GndChk, public dBgS_Chk {
 public:
@@ -2,7 +2,6 @@
 #define D_BG_D_BG_S_GRP_PASS_CHK_H

 #include "SSystem/SComponent/c_bg_s_chk.h"
-#include "dolphin/types.h"

 class dBgS_GrpPassChk : public cBgS_GrpPassChk {
 public:
@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_bg_s_lin_chk.h"
 #include "d/bg/d_bg_s_chk.h"
-#include "dolphin/types.h"

 class fopAc_ac_c;

@@ -1,8 +1,6 @@
 #ifndef D_BG_D_BG_S_MOVEBG_ACTOR_H
 #define D_BG_D_BG_S_MOVEBG_ACTOR_H

-#include "SSystem/SComponent/c_bg_s_poly_info.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_actor.h"

 class dBgW;
@@ -1,7 +1,6 @@
 #ifndef D_BG_D_BG_S_ROOF_CHK_H
 #define D_BG_D_BG_S_ROOF_CHK_H

-#include "SSystem/SComponent/c_bg_s_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "d/bg/d_bg_s_chk.h"
@@ -1,9 +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_s_chk.h"
 #include "dolphin/types.h"
@@ -1,7 +1,6 @@
 #ifndef D_BG_D_BG_S_SPL_GRP_CHK_H
 #define D_BG_D_BG_S_SPL_GRP_CHK_H

-#include "SSystem/SComponent/c_bg_s_chk.h"
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "d/bg/d_bg_s_chk.h"
@@ -2,7 +2,6 @@
 #define D_BG_D_BG_S_WTR_CHK_H

 #include "d/bg/d_bg_s_spl_grp_chk.h"
-#include "dolphin/types.h"

 class dBgS_WtrChk : public dBgS_SplGrpChk {
 public:
@@ -2,7 +2,6 @@
 #define D_BG_D_BG_W_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"
@@ -4,7 +4,6 @@
 #include "SSystem/SComponent/c_bg_s_poly_info.h"
 #include "SSystem/SComponent/c_bg_w.h"
 #include "SSystem/SComponent/c_m3d_g_pla.h"
-#include "dolphin/types.h"

 class cBgS_GndChk;
 class cBgS_LinChk;
@@ -4,7 +4,6 @@
 #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;
@@ -8,7 +8,6 @@

 #include "SSystem/SComponent/c_cc_d.h"
 #include "Z2AudioLib/Z2SeMgr.h"
-#include "dolphin/types.h"

 enum dCcD_hitSe {
    /* 0  */ dCcD_SE_NONE,
@@ -2,7 +2,6 @@
 #define D_CC_D_CC_MASS_S_H

 #include "SSystem/SComponent/c_cc_d.h"
-#include "dolphin/types.h"
 #include "global.h"

 typedef void (*dCcMassS_ObjCallback)(fopAc_ac_c*, cXyz*, u32);
@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_cc_s.h"
 #include "d/cc/d_cc_mass_s.h"
-#include "dolphin/types.h"
 #include "global.h"

 class dCcD_GObjInf;
@@ -2,7 +2,6 @@
 #define D_CC_D_CC_UTY_H

 #include "d/com/d_com_inf_game.h"
-#include "dolphin/types.h"

 class fopAc_ac_c;

@@ -1,7 +1,6 @@
 #ifndef D_COM_D_COM_INF_ACTOR_H
 #define D_COM_D_COM_INF_ACTOR_H

-#include "dolphin/types.h"

 class dComIfGoat_info_c {
 public:
@@ -4,14 +4,11 @@
 #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_resorce.h"
-#include "d/d_stage.h"
 #include "d/d_vibration.h"
 #include "d/event/d_event.h"
 #include "d/event/d_event_manager.h"
 #include "d/particle/d_particle.h"
-#include "d/save/d_save.h"
 #include "f_op/f_op_camera_mng.h"
 #include "global.h"

@@ -1,6 +1,5 @@
 #ifndef D_D_ATT_DIST_H
 #define D_D_ATT_DIST_H

-#include "dolphin/types.h"

 #endif /* D_D_ATT_DIST_H */
@@ -2,8 +2,6 @@
 #define D_D_ATTENTION_H

 #include "SSystem/SComponent/c_angle.h"
-#include "dolphin/types.h"
-#include "global.h"
 #include "m_Do/m_Do_ext.h"

 class fopAc_ac_c;
@@ -1,11 +1,9 @@
 #ifndef D_D_BOMB_H
 #define D_D_BOMB_H

-#include "Z2AudioLib/Z2SoundObject.h"
 #include "d/bg/d_bg_s_acch.h"
 #include "d/bg/d_bg_s_lin_chk.h"
 #include "d/cc/d_cc_d.h"
-#include "d/kankyo/d_kankyo.h"
 #include "f_op/f_op_actor_mng.h"

 class daNbomb_c {
@@ -1,7 +1,6 @@
 #ifndef D_D_BRIGHT_CHECK_H
 #define D_D_BRIGHT_CHECK_H

-#include "dolphin/types.h"
 #include "d/com/d_com_inf_game.h"

 // class dBrightCheck_c {
@@ -2,7 +2,6 @@
 #define D_D_CAM_PARAM_H

 #include "SSystem/SComponent/c_angle.h"
-#include "SSystem/SComponent/c_xyz.h"

 struct dCamMath {
    /* 8008813C */ static f32 rationalBezierRatio(f32, f32);
@@ -1,8 +1,6 @@
 #ifndef D_D_CAMERA_H
 #define D_D_CAMERA_H

-#include "SSystem/SComponent/c_angle.h"
-#include "SSystem/SComponent/c_xyz.h"
 #include "d/bg/d_bg_s_lin_chk.h"
 #include "d/bg/d_bg_s_gnd_chk.h"
 #include "d/d_cam_param.h"
@@ -1,12 +1,6 @@
 #ifndef D_D_DEMO_H
 #define D_D_DEMO_H

-#include "JSystem/JGadget/binary.h"
-#include "JSystem/JStage/JSGAmbientLight.h"
-#include "JSystem/JStage/JSGCamera.h"
-#include "JSystem/JStage/JSGFog.h"
-#include "JSystem/JStage/JSGLight.h"
-#include "JSystem/JStudio/JStudio/jstudio-object.h"
 #include "JSystem/JStudio/JStudio_JAudio2/control.h"
 #include "JSystem/JStudio/JStudio_JParticle/object-particle.h"
 #include "JSystem/JStudio/JStudio_JStage/object.h"
@@ -3,10 +3,6 @@

 #include "JSystem/J2DGraph/J2DPicture.h"
 #include "SSystem/SComponent/c_m3d_g_pla.h"
-#include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/gx/GXStruct.h"
-#include "dolphin/mtx/mtx.h"
-#include "dolphin/mtx/mtx44.h"
 #include "dolphin/types.h"
 #include "f_op/f_op_view.h"
 #include "m_Do/m_Do_ext.h"
@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_phase.h"
 #include "d/menu/d_menu_save.h"
-#include "dolphin/gx/GXStruct.h"
 #include "f_op/f_op_msg.h"
 #include "f_op/f_op_msg_mng.h"
 #include "m_Do/m_Do_hostIO.h"
@@ -4,7 +4,6 @@
 #include "JSystem/J3DGraphAnimator/J3DModel.h"
 #include "SSystem/SComponent/c_m3d_g_lin.h"
 #include "SSystem/SComponent/c_sxyz.h"
-#include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/types.h"

 class fopAc_ac_c;
@@ -2,7 +2,6 @@
 #define D_D_KANTERA_ICON_METER_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"

 class CPaneMgr;

@@ -2,7 +2,6 @@
 #define D_D_MODEL_H

 #include "JSystem/J3DGraphBase/J3DPacket.h"
-#include "dolphin/types.h"

 class J3DModelData;
 class dKy_tevstr_c;
@@ -1,8 +1,6 @@
 #ifndef D_D_NAME_H
 #define D_D_NAME_H

-#include "d/d_drawlist.h"
-#include "dolphin/types.h"
 #include "d/d_select_cursor.h"
 #include "MSL_C/string.h"

@@ -1,9 +1,6 @@
 #ifndef D_D_RESORCE_H
 #define D_D_RESORCE_H

-#include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/types.h"
-#include "global.h"
 #include "m_Do/m_Do_dvd_thread.h"
 #include "m_Do/m_Do_ext.h"

@@ -1,8 +1,6 @@
 #ifndef D_D_SELECT_CURSOR_H
 #define D_D_SELECT_CURSOR_H

-#include "JSystem/J2DGraph/J2DPane.h"
-#include "JSystem/J2DGraph/J2DScreen.h"
 #include "d/d_drawlist.h"
 #include "d/d_select_icon.h"

@@ -2,7 +2,6 @@
 #define D_D_SIMPLE_MODEL_H

 #include "JSystem/J3DGraphAnimator/J3DModel.h"
-#include "dolphin/types.h"

 class JKRSolidHeap;

@@ -2,7 +2,6 @@
 #define D_D_SPLINE_PATH_H

 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/types.h"

 struct dPath;

@@ -5,8 +5,6 @@
 #include "d/kankyo/d_kankyo.h"
 #include "d/kankyo/d_kankyo_data.h"
 #include "d/save/d_save.h"
-#include "dolphin/gx/GXStruct.h"
-#include "dolphin/types.h"
 #include "f_pc/f_pc_priority.h"
 #include "global.h"

@@ -1,10 +1,6 @@
 #ifndef D_D_TIMER_H
 #define D_D_TIMER_H

-#include "JSystem/J2DGraph/J2DPane.h"
-#include "SSystem/SComponent/c_phase.h"
-#include "SSystem/SComponent/c_xyz.h"
-#include "d/d_drawlist.h"
 #include "d/msg/d_msg_object.h"
 #include "dolphin/os/OSTime.h"
 #include "dolphin/types.h"
@@ -2,7 +2,6 @@
 #define D_D_TRESURE_H

 #include "dolphin/mtx/vec.h"
-#include "dolphin/types.h"

 class dTres_c {
 public:
@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_xyz.h"
 #include "d/d_vib_pattern.h"
-#include "dolphin/types.h"

 class dVibration_c {
 public:
@@ -2,7 +2,6 @@
 #define D_EVENT_D_EVENT_H

 #include "d/a/d_a_itembase.h"
-#include "dolphin/types.h"
 #include "global.h"

 struct dStage_MapEvent_dt_c;
@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_xyz.h"
 #include "d/event/d_event_data.h"
-#include "dolphin/types.h"

 class fopAc_ac_c;

@@ -2,7 +2,6 @@
 #define D_FILE_D_FILE_SEL_INFO_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"

 class CPaneMgrAlpha;
 class dSv_save_c;
@@ -1,9 +1,7 @@
 #ifndef D_FILE_D_FILE_SELECT_H
 #define D_FILE_D_FILE_SELECT_H

-#include "dolphin/types.h"
 #include "d/com/d_com_inf_game.h"
-#include "m_Do/m_Do_MemCard.h"
 #include "d/file/d_file_sel_warning.h"
 #include "d/d_name.h"
 #include "d/msg/d_msg_string.h"
@@ -2,10 +2,7 @@
 #define D_KANKYO_D_KANKYO_H

 #include "JSystem/J3DGraphBase/J3DStruct.h"
-#include "SSystem/SComponent/c_sxyz.h"
-#include "SSystem/SComponent/c_xyz.h"
 #include "d/kankyo/d_kankyo_wether.h"
-#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 #include "global.h"
 #include "m_Do/m_Do_ext.h"
@@ -200,7 +197,7 @@ public:
    //inline dKy_tevstr_c& operator=(const dKy_tevstr_c& b);   
    
    /* 0x000 */ J3DLightObj mLightObj;
-    /* 0x074 */ J3DLightObj field_0x074[6];
+    /* 0x074 */ J3DLightObj mLights[6];
    /* 0x32C */ cXyz field_0x32c;
    /* 0x338 */ cXyz mLightPosWorld;
    /* 0x344 */ f32 field_0x344;
@@ -4,7 +4,6 @@
 #include "JSystem/J3DGraphBase/J3DPacket.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"

 void dKyw_wether_draw();
@@ -2,7 +2,6 @@
 #define D_MAP_D_MAP_PATH_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"
 #include "global.h"

 class dDrawPath_c : public dDlst_base_c {
@@ -3,7 +3,6 @@

 #include "d/d_tresure.h"
 #include "d/map/d_map_path.h"
-#include "dolphin/types.h"

 class dStage_FileList2_dt_c;
 struct stage_tgsc_data_class;
@@ -3,7 +3,6 @@

 #include "d/d_drawlist.h"
 #include "d/kankyo/d_kankyo.h"
-#include "dolphin/types.h"

 class CPaneMgr;
 struct CSTControl;
@@ -2,7 +2,6 @@
 #define D_MENU_D_MENU_DMAP_H

 #include "d/d_select_cursor.h"
-#include "dolphin/mtx/vec.h"
 #include "dolphin/types.h"

 class CPaneMgr;
@@ -2,7 +2,6 @@
 #define D_MENU_D_MENU_FISHING_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"

 class CPaneMgr;
 struct CSTControl;
@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_xyz.h"
 #include "d/msg/d_msg_flow.h"
-#include "dolphin/types.h"

 struct CSTControl;
 class J2DAnmTextureSRTKey;
@@ -2,7 +2,6 @@
 #define D_MENU_D_MENU_INSECT_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"

 class CPaneMgr;
 struct CSTControl;
@@ -2,7 +2,6 @@
 #define D_MENU_D_MENU_LETTER_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"

 class CPaneMgr;
 struct CSTControl;
@@ -1,6 +1,5 @@
 #ifndef D_MENU_D_MENU_MAP_COMMON_H
 #define D_MENU_D_MENU_MAP_COMMON_H

-#include "dolphin/types.h"

 #endif /* D_MENU_D_MENU_MAP_COMMON_H */
@@ -2,7 +2,6 @@
 #define D_MENU_D_MENU_OPTION_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"

 class CPaneMgr;
 struct CSTControl;
@@ -2,7 +2,6 @@
 #define D_MENU_D_MENU_RING_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"

 class CPaneMgr;
 struct CSTControl;
@@ -2,7 +2,6 @@
 #define D_MENU_D_MENU_SAVE_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"
 #include "d/save/d_save.h"

 class CPaneMgr;
@@ -2,7 +2,6 @@
 #define D_MENU_D_MENU_SKILL_H

 #include "d/d_drawlist.h"
-#include "dolphin/types.h"

 class CPaneMgr;
 struct CSTControl;
@@ -3,7 +3,6 @@

 #include "d/d_drawlist.h"
 #include "f_op/f_op_msg.h"
-#include "dolphin/types.h"
 #include "m_Do/m_Do_graphic.h"

 struct CSTControl;
@@ -3,7 +3,6 @@

 #include "d/d_drawlist.h"
 #include "f_op/f_op_msg.h"
-#include "dolphin/types.h"

 class CPaneMgr;
 class J2DAnmColor;
@@ -1,7 +1,6 @@
 #ifndef D_METER_D_METER2_DRAW_H
 #define D_METER_D_METER2_DRAW_H

-#include "JSystem/JUtility/TColor.h"
 #include "d/d_drawlist.h"
 #include "dolphin/types.h"

@@ -4,7 +4,6 @@
 #include "JSystem/JUtility/TColor.h"
 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/types.h"
 #include "global.h"

 class JKRArchive;
@@ -2,7 +2,6 @@
 #define D_METER_D_METER_MAP_H

 #include "d/map/d_map_path_dmap.h"
-#include "dolphin/types.h"

 class J2DPicture;

@@ -2,7 +2,6 @@
 #define D_MSG_D_MSG_CLASS_H

 #include "JSystem/JMessage/control.h"
-#include "JSystem/JMessage/processor.h"
 #include "SSystem/SComponent/c_xyz.h"

 class COutFont_c;
@@ -2,7 +2,6 @@
 #define D_MSG_D_MSG_OBJECT_H

 #include "JSystem/JMessage/control.h"
-#include "JSystem/JMessage/resource.h"
 #include "d/com/d_com_inf_game.h"
 #include "f_op/f_op_msg.h"

@@ -1,7 +1,6 @@
 #ifndef D_MSG_D_MSG_UNIT_H
 #define D_MSG_D_MSG_UNIT_H

-#include "dolphin/types.h"

 class dMsgUnit_c {
 public:
@@ -3,7 +3,6 @@

 #include "JSystem/JUtility/TColor.h"
 #include "d/pane/d_pane_class_alpha.h"
-#include "dolphin/types.h"

 void dPaneClass_showNullPane(J2DScreen*);
 void dPaneClass_showNullPane(J2DPane*);
@@ -2,7 +2,6 @@
 #define D_PANE_D_PANE_CLASS_ALPHA_H

 #include "JSystem/J2DGraph/J2DPane.h"
-#include "dolphin/types.h"

 class J2DPane;
 class J2DScreen;
@@ -1,6 +1,5 @@
 #ifndef D_PANE_D_PANE_CLASS_EX_H
 #define D_PANE_D_PANE_CLASS_EX_H

-#include "dolphin/types.h"

 #endif /* D_PANE_D_PANE_CLASS_EX_H */
@@ -3,9 +3,6 @@

 #include "JSystem/JParticle/JPAParticle.h"
 #include "JSystem/JParticle/JPAEmitter.h"
-#include "SSystem/SComponent/c_sxyz.h"
-#include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/gx/GXStruct.h"
 #include "dolphin/types.h"
 #include "d/kankyo/d_kankyo.h"

@@ -3,7 +3,6 @@

 #include "SSystem/SComponent/c_sxyz.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/types.h"

 class dBgS_Acch;
 struct dKy_tevstr_c;
@@ -1,8 +1,6 @@
 #ifndef D_S_D_S_LOGO_H
 #define D_S_D_S_LOGO_H

-#include "SSystem/SComponent/c_phase.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_scene.h"

 class JKRExpHeap;
@@ -1,6 +1,5 @@
 #ifndef D_S_D_S_MENU_H
 #define D_S_D_S_MENU_H

-#include "dolphin/types.h"

 #endif /* D_S_D_S_MENU_H */
@@ -1,7 +1,6 @@
 #ifndef D_S_D_S_NAME_H
 #define D_S_D_S_NAME_H

-#include "dolphin/types.h"
 #include "f_op/f_op_camera_mng.h"
 #include "f_op/f_op_scene.h"

@@ -1,9 +1,7 @@
 #ifndef D_S_D_S_PLAY_H
 #define D_S_D_S_PLAY_H

-#include "SSystem/SComponent/c_phase.h"
 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/types.h"
 #include "f_op/f_op_scene.h"

 class mDoDvdThd_mountXArchive_c;
@@ -1,6 +1,5 @@
 #ifndef D_S_D_S_ROOM_H
 #define D_S_D_S_ROOM_H

-#include "dolphin/types.h"

 #endif /* D_S_D_S_ROOM_H */
@@ -1,6 +1,5 @@
 #ifndef D_S_D_S_TITLE_H
 #define D_S_D_S_TITLE_H

-#include "dolphin/types.h"

 #endif /* D_S_D_S_TITLE_H */
@@ -4,7 +4,6 @@
 #include "MSL_C/string.h"
 #include "SSystem/SComponent/c_xyz.h"
 #include "dolphin/os/OSTime.h"
-#include "dolphin/types.h"
 #include "global.h"

 #define DEFAULT_SELECT_ITEM_INDEX 0
@@ -1,7 +1,6 @@
 #ifndef D_SAVE_D_SAVE_HIO_H
 #define D_SAVE_D_SAVE_HIO_H

-#include "dolphin/types.h"
 #include "global.h"

 class dSvBit_childTransformHIO_c {
@@ -2,7 +2,6 @@
 #define D_SHOP_D_SHOP_ITEM_CTRL_H

 #include "SSystem/SComponent/c_xyz.h"
-#include "dolphin/types.h"

 class dShopItemCtrl_c {
 public:
@@ -3,7 +3,6 @@

 #include "d/a/d_a_npc.h"
 #include "d/shop/d_shop_item_ctrl.h"
-#include "dolphin/types.h"

 class dSelect_cursor_c;
 struct STControl;