Merge branch 'master' into various3

This commit is contained in:
hatal175
2023-05-18 12:10:49 +03:00
committed by GitHub
647 changed files with 1786 additions and 923 deletions
+13 -10
View File
@@ -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:
+1 -1
View File
@@ -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:
+2 -1
View File
@@ -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;
+2 -1
View File
@@ -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 */
+4 -1
View File
@@ -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"
+1 -1
View File
@@ -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:
+2 -6
View File
@@ -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() {}
+2 -1
View File
@@ -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
};
+5 -2
View File
@@ -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:
+2 -3
View File
@@ -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:
+2 -1
View File
@@ -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:
+1 -1
View File
@@ -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*,
+1
View File
@@ -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"
+7 -9
View File
@@ -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 {};
+9 -6
View File
@@ -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:
+4
View File
@@ -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 {
+1
View File
@@ -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);
+4 -1
View File
@@ -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:
+2 -1
View File
@@ -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,
+5 -4
View File
@@ -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:
+3 -2
View File
@@ -2,11 +2,12 @@
#define D_D_ATTENTION_H
#include "SSystem/SComponent/c_angle.h"
#include "d/a/d_a_player.h"
#include "d/save/d_save.h"
#include "dolphin/types.h"
#include "global.h"
#include "m_Do/m_Do_ext.h"
class fopAc_ac_c;
class dAttHint_c {
public:
dAttHint_c() {}
+1
View File
@@ -3,6 +3,7 @@
#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"
+4 -3
View File
@@ -5,10 +5,11 @@
#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_stage.h"
#include "dolphin/types.h"
#include "d/d_drawlist.h"
#include "d/d_cam_param.h"
#include "d/d_drawlist.h"
#include "d/d_stage.h"
#include "dolphin/gx/GXStruct.h"
#include "dolphin/types.h"
class fopAc_ac_c;
+8 -2
View File
@@ -2,7 +2,6 @@
#define D_D_DEMO_H
#include "JSystem/JGadget/binary.h"
#include "JSystem/JMessage/control.h"
#include "JSystem/JStage/JSGAmbientLight.h"
#include "JSystem/JStage/JSGCamera.h"
#include "JSystem/JStage/JSGFog.h"
@@ -11,13 +10,20 @@
#include "JSystem/JStudio/JStudio_JAudio2/control.h"
#include "JSystem/JStudio/JStudio_JParticle/object-particle.h"
#include "JSystem/JStudio/JStudio_JStage/object.h"
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/gx/GXEnum.h"
#include "dolphin/gx/GXStruct.h"
class J3DModel;
class dDemo_actor_c;
class dDemo_camera_c;
class dDemo_ambient_c;
class dDemo_light_c;
class dDemo_fog_c;
class fopAc_ac_c;
struct jmessage_tControl;
class dDemo_object_c {
public:
/* 80038F54 */ dDemo_object_c();
+3 -1
View File
@@ -1,7 +1,9 @@
#ifndef D_D_DOOR_PARAM2_H
#define D_D_DOOR_PARAM2_H
#include "f_op/f_op_actor_mng.h"
#include "dolphin/types.h"
class fopAc_ac_c;
class door_param2_c {
public:
+10 -7
View File
@@ -2,18 +2,21 @@
#define D_D_DRAWLIST_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "SSystem/SComponent/c_m3d_g_pla.h"
#include "SSystem/SComponent/c_xyz.h"
#include "d/kankyo/d_kankyo.h"
#include "dolphin/gx/GX.h"
#include "dolphin/gx/GXStruct.h"
#include "dolphin/mtx/mtx.h"
#include "dolphin/mtx/mtx44.h"
#include "dolphin/mtx/mtxvec.h"
#include "dolphin/types.h"
#include "f_op/f_op_view.h"
#include "m_Do/m_Do_ext.h"
#include "global.h"
class J3DDrawBuffer;
class J3DModel;
class J3DPacket;
class JUTFont;
class dKy_tevstr_c;
class cM_rnd_c {
public:
+3 -3
View File
@@ -1,10 +1,10 @@
#ifndef D_D_EYE_HL_H
#define D_D_EYE_HL_H
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/J3DGraphBase/J3DDrawBuffer.h"
#include "JSystem/JUtility/JUTTexture.h"
#include "dolphin/types.h"
class J3DModelData;
struct ResTIMG;
class dEyeHL_c;
class dEyeHL_mng_c {
+1
View File
@@ -3,6 +3,7 @@
#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"
-1
View File
@@ -1,7 +1,6 @@
#ifndef D_D_ITEM_H
#define D_D_ITEM_H
#include "d/com/d_com_inf_game.h"
#include "dolphin/types.h"
void execItemGet(u8 item_id);
+4 -1
View File
@@ -3,8 +3,11 @@
#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"
#include "f_op/f_op_actor.h"
class fopAc_ac_c;
class dJntColData_c {
public:
+2 -2
View File
@@ -1,11 +1,11 @@
#ifndef D_D_KANTERA_ICON_METER_H
#define D_D_KANTERA_ICON_METER_H
#include "d/com/d_com_inf_game.h"
#include "d/d_drawlist.h"
#include "d/pane/d_pane_class.h"
#include "dolphin/types.h"
class CPaneMgr;
class dDlst_KanteraIcon_c : public dDlst_base_c {
public:
/* 801AECB8 */ virtual void draw();
+2 -1
View File
@@ -1,10 +1,11 @@
#ifndef D_D_KY_THUNDER_H
#define D_D_KY_THUNDER_H
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "f_op/f_op_kankyo.h"
#include "m_Do/m_Do_ext.h"
class JKRSolidHeap;
class dThunder_modelInfo_c {
public:
/* 0x00 */ J3DModel* mpModel;
+4 -2
View File
@@ -1,9 +1,11 @@
#ifndef D_D_LIB_H
#define D_D_LIB_H
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/mtx/quat.h"
#include "dolphin/os/OS.h"
#include "f_op/f_op_actor.h"
#include "dolphin/os/OSTime.h"
class fopAc_ac_c;
struct JKRAramArchive;
u32 dLib_getExpandSizeFromAramArchive(JKRAramArchive* arc, char const* resName);
+4 -1
View File
@@ -1,9 +1,12 @@
#ifndef D_D_MODEL_H
#define D_D_MODEL_H
#include "d/com/d_com_inf_game.h"
#include "JSystem/J3DGraphBase/J3DPacket.h"
#include "dolphin/types.h"
class J3DModelData;
class dKy_tevstr_c;
class dMdl_obj_c {
public:
MtxP getMtx() { return mMtx; }
+10 -1
View File
@@ -1,9 +1,18 @@
#ifndef D_D_NAME_H
#define D_D_NAME_H
#include "d/com/d_com_inf_game.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
class CPaneMgr;
class CPaneMgrAlpha;
class J2DAnmColorKey;
class J2DAnmTextureSRTKey;
class J2DTextBox;
class JUTFont;
struct STControl;
class dSelect_cursor_c;
class dNm_HIO_c {
public:
/* 8024E3E0 */ dNm_HIO_c();
+4 -2
View File
@@ -1,9 +1,11 @@
#ifndef D_D_PATH_H
#define D_D_PATH_H
#include "d/d_stage.h"
#include "dolphin/types.h"
class dStage_dPnt_c;
class cBgS_PolyInfo;
struct cXyz;
struct dStage_dPnt_c;
struct dPath {
/* 0x0 */ u16 m_num;
+5 -2
View File
@@ -1,13 +1,16 @@
#ifndef D_D_RESORCE_H
#define D_D_RESORCE_H
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JKernel/JKRHeap.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"
class JKRArchive;
class JKRHeap;
class JKRSolidHeap;
class dRes_info_c {
public:
/* 8003A260 */ dRes_info_c();
+2
View File
@@ -6,6 +6,8 @@
#include "d/d_drawlist.h"
#include "d/d_select_icon.h"
class J2DAnmTransformKey;
class dSelect_cursorHIO_c {
public:
/* 801941E4 */ dSelect_cursorHIO_c();
+2 -1
View File
@@ -2,9 +2,10 @@
#define D_D_SIMPLE_MODEL_H
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "JSystem/JKernel/JKRSolidHeap.h"
#include "dolphin/types.h"
class JKRSolidHeap;
class modelList_c {
public:
void init() {
+3 -1
View File
@@ -1,8 +1,10 @@
#ifndef D_D_SPLINE_PATH_H
#define D_D_SPLINE_PATH_H
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#include "d/d_path.h"
struct dPath;
struct dPathCurve {
/* 80097C5C */ void Init(dPath*);
+5 -2
View File
@@ -1,13 +1,16 @@
#ifndef D_D_STAGE_H
#define D_D_STAGE_H
#include "JSystem/JKernel/JKRExpHeap.h"
#include "SSystem/SComponent/c_lib.h"
#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_op/f_op_actor.h"
#include "f_pc/f_pc_priority.h"
#include "global.h"
class JKRExpHeap;
struct stage_vrboxcol_info_class {
// VRB
+6 -2
View File
@@ -2,13 +2,17 @@
#define D_D_TIMER_H
#include "JSystem/J2DGraph/J2DPane.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "SSystem/SComponent/c_phase.h"
#include "SSystem/SComponent/c_xyz.h"
#include "f_op/f_op_msg.h"
#include "d/d_drawlist.h"
#include "d/msg/d_msg_object.h"
#include "dolphin/os/OSTime.h"
#include "dolphin/types.h"
#include "f_op/f_op_msg.h"
class CPaneMgr;
class JKRArchive;
class JKRExpHeap;
s32 dTimer_createStockTimer();
s32 dTimer_createTimer(s32 param_0, u32 param_1, u8 param_2, u8 param_3, f32 param_4, f32 param_5,
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef D_D_TRESURE_H
#define D_D_TRESURE_H
#include "dolphin/mtx/mtxvec.h"
#include "dolphin/mtx/vec.h"
#include "dolphin/types.h"
class dTres_c {
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef D_D_VIBRATION_H
#define D_D_VIBRATION_H
#include "d/save/d_save.h"
#include "SSystem/SComponent/c_xyz.h"
#include "d/d_vib_pattern.h"
#include "dolphin/types.h"
+4 -4
View File
@@ -2,11 +2,11 @@
#define D_EVENT_D_EVENT_H
#include "d/a/d_a_itembase.h"
#include "d/a/d_a_player.h"
#include "d/d_stage.h"
#include "d/event/d_event_manager.h"
#include "d/save/d_save.h"
#include "dolphin/types.h"
#include "global.h"
struct dStage_MapEvent_dt_c;
class fopAc_ac_c;
#if DEBUG
class dEvDb_bit_c {
+3 -3
View File
@@ -1,9 +1,9 @@
#ifndef D_EVENT_D_EVENT_DATA_H
#define D_EVENT_D_EVENT_DATA_H
#include "d/d_stage.h"
#include "f_op/f_op_msg.h"
#include "d/save/d_save.h"
#include "global.h"
class msg_class;
struct event_binary_data_header {
/* 0x00 */ u32 eventTop; // offset to Event chunk
+2 -1
View File
@@ -2,7 +2,8 @@
#define D_EVENT_D_EVENT_LIB_H
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class fopAc_ac_c;
template <typename A0>
struct action_class {
+3
View File
@@ -1,9 +1,12 @@
#ifndef D_EVENT_D_EVENT_MANAGER_H
#define D_EVENT_D_EVENT_MANAGER_H
#include "SSystem/SComponent/c_xyz.h"
#include "d/event/d_event_data.h"
#include "dolphin/types.h"
class fopAc_ac_c;
class dEvent_exception_c {
public:
dEvent_exception_c() { mEventInfoIdx = -1; }
+4 -1
View File
@@ -1,9 +1,12 @@
#ifndef D_FILE_D_FILE_SEL_INFO_H
#define D_FILE_D_FILE_SEL_INFO_H
#include "d/com/d_com_inf_game.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
class CPaneMgrAlpha;
class dSv_save_c;
class dFile_info_c {
public:
/* 80192434 */ dFile_info_c(JKRArchive*, u8);
+3 -1
View File
@@ -1,7 +1,9 @@
#ifndef D_FILE_D_FILE_SEL_WARNING_H
#define D_FILE_D_FILE_SEL_WARNING_H
#include "d/com/d_com_inf_game.h"
#include "JSystem/JUtility/TColor.h"
class JKRArchive;
class dFile_warning_c {
public:
+18 -7
View File
@@ -2,13 +2,24 @@
#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"
#include "JSystem/J3DGraphLoader/J3DModelLoader.h"
#include "JSystem/J3DGraphLoader/J3DAnmLoader.h"
#include "global.h"
class CPaneMgr;
class CPaneMgrAlpha;
class J2DAnmBase;
class J2DAnmTransform;
class J2DPane;
class J2DPicture;
class J2DScreen;
class JKRArchive;
class JUTFont;
struct STControl;
struct cXyz;
class dFile_warning_c;
class dMsgString_c;
class dName_c;
class dSelect_cursor_c;
class dSv_save_c;
class dDlst_FileSel_c {
public:
+3 -4
View File
@@ -1,17 +1,16 @@
#ifndef D_KANKYO_D_KANKYO_H
#define D_KANKYO_D_KANKYO_H
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/J3DGraphBase/J3DStruct.h"
#include "JSystem/JParticle/JPAParticle.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "Z2AudioLib/Z2EnvSeMgr.h"
#include "d/kankyo/d_kankyo_wether.h"
#include "dolphin/gx/GX.h"
#include "dolphin/gx/GXStruct.h"
#include "dolphin/types.h"
#include "global.h"
#include "m_Do/m_Do_ext.h"
class JPABaseEmitter;
class cBgS_PolyInfo;
void dKankyo_DayProc();
+1
View File
@@ -4,6 +4,7 @@
#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();
+1
View File
@@ -3,6 +3,7 @@
#include "d/d_drawlist.h"
#include "dolphin/types.h"
#include "global.h"
class dDrawPath_c : public dDlst_base_c {
public:
+3 -1
View File
@@ -1,11 +1,13 @@
#ifndef D_MAP_D_MAP_PATH_DMAP_H
#define D_MAP_D_MAP_PATH_DMAP_H
#include "d/d_stage.h"
#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;
class dMpath_c {
public:
/* 8003F758 */ static bool isExistMapPathData();
+6 -2
View File
@@ -1,8 +1,12 @@
#ifndef D_MENU_D_MENU_CALIBRATION_H
#define D_MENU_D_MENU_CALIBRATION_H
#include "d/com/d_com_inf_game.h"
#include "d/msg/d_msg_string.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
class CPaneMgr;
class JKRExpHeap;
class dMsgString_c;
class dSelect_cursor_c;
class dMenu_Calibration_c {
public:
+6 -3
View File
@@ -1,11 +1,13 @@
#ifndef D_MENU_D_MENU_COLLECT_H
#define D_MENU_D_MENU_COLLECT_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/d_drawlist.h"
#include "d/kankyo/d_kankyo.h"
#include "dolphin/types.h"
class CPaneMgr;
struct CSTControl;
struct STControl;
class dMsgString_c;
class dMenu_save_c;
class dMenu_Option_c;
@@ -13,6 +15,7 @@ class dMenu_Letter_c;
class dMenu_Fishing_c;
class dMenu_Skill_c;
class dMenu_Insect_c;
class dSelect_cursor_c;
class dMenu_Collect2D_c;
class dMenu_Collect2DTop_c : public dDlst_base_c {
+9 -2
View File
@@ -1,11 +1,18 @@
#ifndef D_MENU_D_MENU_DMAP_H
#define D_MENU_D_MENU_DMAP_H
#include "JSystem/J2DGraph/J2DOrthoGraph.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "dolphin/mtx/vec.h"
#include "dolphin/types.h"
class CPaneMgr;
struct CSTControl;
class J2DOrthoGraph;
class J2DPicture;
class J2DScreen;
class JKRArchive;
class JKRExpHeap;
struct STControl;
class dMenu_DmapMapCtrl_c;
class dMenu_DmapBg_c;
class mDoDvdThd_mountArchive_c;
+7 -6
View File
@@ -1,14 +1,15 @@
#ifndef D_MENU_D_MENU_FISHING_H
#define D_MENU_D_MENU_FISHING_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_dvd_thread.h"
#include "d/msg/d_msg_string.h"
class CPaneMgr;
struct CSTControl;
class J2DTextBox;
struct STControl;
class dMsgString_c;
class mDoDvdThd_mountArchive_c;
class dMenu_Fishing_c : public dDlst_base_c {
public:
+7 -3
View File
@@ -1,12 +1,16 @@
#ifndef D_MENU_D_MENU_FMAP_H
#define D_MENU_D_MENU_FMAP_H
#include "d/d_drawlist.h"
#include "d/d_lib.h"
#include "SSystem/SComponent/c_xyz.h"
#include "d/msg/d_msg_flow.h"
#include "d/pane/d_pane_class.h"
#include "dolphin/types.h"
struct CSTControl;
class J2DAnmTextureSRTKey;
class JKRArchive;
class JKRExpHeap;
class JKRHeap;
struct STControl;
class dMenu_Fmap_stage_data_c;
class dMenu_Fmap_world_data_c;
class dMenu_Fmap_region_data_c;
+6 -3
View File
@@ -1,13 +1,16 @@
#ifndef D_MENU_D_MENU_INSECT_H
#define D_MENU_D_MENU_INSECT_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
class CPaneMgr;
struct CSTControl;
class J2DTextBox;
struct STControl;
class dMsgScrn3Select_c;
class dMsgString_c;
class dSelect_cursor_c;
class dMenu_Insect_c : public dDlst_base_c {
public:
+6 -3
View File
@@ -1,14 +1,17 @@
#ifndef D_MENU_D_MENU_LETTER_H
#define D_MENU_D_MENU_LETTER_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
class CPaneMgr;
struct CSTControl;
class J2DTextBox;
struct STControl;
class mDoDvdThd_mountArchive_c;
class dMsgString_c;
class dMsgScrnArrow_c;
class dSelect_cursor_c;
class dMenu_Letter_c : public dDlst_base_c {
public:
+7 -3
View File
@@ -1,16 +1,20 @@
#ifndef D_MENU_D_MENU_OPTION_H
#define D_MENU_D_MENU_OPTION_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
class CPaneMgr;
struct CSTControl;
class J2DTextBox;
class JUTFont;
struct STControl;
class dFile_warning_c;
class dMenu_Calibration_c;
class mDoDvdThd_mountArchive_c;
class dMsgString_c;
class dMeterHaihai_c;
class dSelect_cursor_c;
class dMenu_Option_c : public dDlst_base_c {
public:
+7 -4
View File
@@ -1,14 +1,17 @@
#ifndef D_MENU_D_MENU_RING_H
#define D_MENU_D_MENU_RING_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
class dMsgString_c;
class CPaneMgr;
struct CSTControl;
class J2DTextBox;
struct STControl;
class dKantera_icon_c;
class dMsgString_c;
class dMenu_ItemExplain_c;
class dSelect_cursor_c;
class dMenu_Ring_c : public dDlst_base_c {
public:
+10 -4
View File
@@ -1,17 +1,23 @@
#ifndef D_MENU_D_MENU_SAVE_H
#define D_MENU_D_MENU_SAVE_H
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_dvd_thread.h"
#include "d/save/d_save.h"
class CPaneMgr;
class CPaneMgrAlpha;
struct CSTControl;
class J2DAnmColorKey;
class J2DAnmTransformKey;
class JUTFont;
struct STControl;
class dMsgString_c;
class dFile_warning_c;
class dFile_info_c;
class dMsgScrnExplain_c;
class dSelect_cursor_c;
class mDoDvdThd_mountArchive_c;
class dDlst_MenuSaveExplain_c : public dDlst_base_c {
public:
+6 -3
View File
@@ -1,13 +1,16 @@
#ifndef D_MENU_D_MENU_SKILL_H
#define D_MENU_D_MENU_SKILL_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "d/d_lib.h"
#include "d/d_select_cursor.h"
#include "d/d_drawlist.h"
#include "dolphin/types.h"
class CPaneMgr;
struct CSTControl;
class J2DTextBox;
struct STControl;
class mDoDvdThd_mountArchive_c;
class dMsgString_c;
class dSelect_cursor_c;
class dMenu_Skill_c : public dDlst_base_c {
public:
+10 -5
View File
@@ -2,17 +2,22 @@
#define D_MENU_D_MENU_WINDOW_H
#include "d/d_drawlist.h"
#include "d/menu/d_menu_collect.h"
#include "d/meter/d_meter2_info.h"
#include "f_op/f_op_msg.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_controller_pad.h"
#include "m_Do/m_Do_graphic.h"
#include "m_Do/m_Do_mtx.h"
class dMenu_Ring_c;
struct CSTControl;
struct STControl;
class dMenu_Collect_c;
class dMenu_Dmap_c;
class dMenu_Fishing_c;
class dMenu_Fmap_c;
class dMenu_Insect_c;
class dMenu_Letter_c;
class dMenu_Option_c;
class dMenu_Ring_c;
class dMenu_Skill_c;
class dMenu_save_c;
class dDlst_MENU_CAPTURE_c : public dDlst_base_c {
public:
+8 -4
View File
@@ -1,13 +1,17 @@
#ifndef D_METER_D_METER2_H
#define D_METER_D_METER2_H
#include "JSystem/JKernel/JKRExpHeap.h"
#include "d/com/d_com_inf_game.h"
#include "d/meter/d_meter2_draw.h"
#include "d/meter/d_meter_map.h"
#include "d/d_drawlist.h"
#include "f_op/f_op_msg.h"
#include "dolphin/types.h"
class CPaneMgr;
class J2DAnmColor;
class J2DAnmTextureSRTKey;
class J2DAnmTransformKey;
class JKRExpHeap;
class JKRHeap;
class dMeter2Draw_c;
class dMeterMap_c;
class dMeterSub_c : public dDlst_base_c {
+7 -4
View File
@@ -1,14 +1,17 @@
#ifndef D_METER_D_METER2_DRAW_H
#define D_METER_D_METER2_DRAW_H
#include "JSystem/J2DGraph/J2DAnimation.h"
#include "JSystem/J2DGraph/J2DPicture.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/JUtility/TColor.h"
#include "d/d_drawlist.h"
#include "d/pane/d_pane_class.h"
#include "dolphin/types.h"
class CPaneMgr;
class CPaneMgrAlpha;
class J2DAnmColorKey;
class J2DAnmTransformKey;
class JKRExpHeap;
class JKRHeap;
enum dMeter2Draw_actionFlag {
/* 0x0 */ ACTION_FLG_DEFAULT,
/* 0x2 */ ACTION_FLG_EMPHASIS = 2,
+6 -8
View File
@@ -1,14 +1,12 @@
#ifndef D_METER_D_METER2_INFO_H
#define D_METER_D_METER2_INFO_H
#include "JSystem/JUtility/JUTTexture.h"
#include "d/d_resorce.h"
#include "d/menu/d_menu_window.h"
#include "d/meter/d_meter2.h"
#include "d/msg/d_msg_class.h"
#include "d/msg/d_msg_flow.h"
#include "d/pane/d_pane_class.h"
#include "f_op/f_op_actor.h"
#include "SSystem/SComponent/c_xyz.h"
class CPaneMgr;
class J2DTextBox;
class JMSMesgEntry_c;
class JUTFont;
struct dMenu_LetterData {
u16 mSubject;
+3 -2
View File
@@ -1,12 +1,13 @@
#ifndef D_METER_D_METER_HIO_H
#define D_METER_D_METER_HIO_H
#include "JSystem/JKernel/JKRArchive.h"
#include "JSystem/JUtility/TColor.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
#include "m_Do/m_Do_ext.h"
#include "global.h"
class JKRArchive;
class dMeter_menuHIO_c {
public:
+2 -2
View File
@@ -1,11 +1,11 @@
#ifndef D_METER_D_METER_MAP_H
#define D_METER_D_METER_MAP_H
#include "JSystem/J2DGraph/J2DPicture.h"
#include "JSystem/J2DGraph/J2DScreen.h"
#include "d/map/d_map_path_dmap.h"
#include "dolphin/types.h"
class J2DPicture;
// move renderingAmap_c + dMap_c later
class renderingAmap_c : public renderingPlusDoorAndCursor_c {
public:
+5 -2
View File
@@ -3,8 +3,11 @@
#include "JSystem/JMessage/control.h"
#include "JSystem/JMessage/processor.h"
#include "d/msg/d_msg_out_font.h"
#include "f_op/f_op_msg.h"
#include "SSystem/SComponent/c_xyz.h"
class COutFont_c;
class J2DTextBox;
class JUTFont;
struct JMSMesgEntry_c {
/* 0x00 */ u32 mStringOffset;
+4 -1
View File
@@ -1,7 +1,10 @@
#ifndef D_MSG_D_MSG_FLOW_H
#define D_MSG_D_MSG_FLOW_H
#include "f_op/f_op_msg.h"
#include "dolphin/types.h"
class fopAc_ac_c;
class msg_class;
// all mesg_flow_node structs members might be wrong
struct mesg_flow_node {
+7 -3
View File
@@ -1,15 +1,19 @@
#ifndef D_MSG_D_MSG_OBJECT_H
#define D_MSG_D_MSG_OBJECT_H
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "JSystem/JMessage/control.h"
#include "JSystem/JMessage/processor.h"
#include "JSystem/JMessage/resource.h"
#include "d/com/d_com_inf_game.h"
#include "d/msg/d_msg_class.h"
#include "f_op/f_op_msg.h"
class COutFont_c;
class J2DTextBox;
class JUTFont;
class dMsgScrnBase_c;
class dMsgString_c;
struct jmessage_tReference;
struct jmessage_tRenderingProcessor;
struct jmessage_tSequenceProcessor;
class dMsgObject_c : public msg_class {
public:
+3 -2
View File
@@ -2,8 +2,9 @@
#define D_MSG_D_MSG_OUT_FONT_H
#include "dolphin/types.h"
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "JSystem/J2DGraph/J2DPicture.h"
class J2DPicture;
class J2DTextBox;
class COutFontSet_c {
public:
+3 -1
View File
@@ -2,7 +2,9 @@
#define D_MSG_D_MSG_STRING_H
#include "d/msg/d_msg_string_base.h"
#include "d/msg/d_msg_out_font.h"
class COutFont_c;
class JUTFont;
class dMsgString_c : public dMsgStringBase_c {
public:
+4 -1
View File
@@ -1,8 +1,11 @@
#ifndef D_MSG_D_MSG_STRING_BASE_H
#define D_MSG_D_MSG_STRING_BASE_H
#include "d/msg/d_msg_object.h"
#include "JSystem/JMessage/resource.h"
class COutFont_c;
class J2DTextBox;
class JUTFont;
struct jmessage_string_tControl;
struct jmessage_string_tReference;
struct jmessage_string_tSequenceProcessor;
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef D_PANE_D_PANE_CLASS_H
#define D_PANE_D_PANE_CLASS_H
#include "JSystem/J2DGraph/J2DTextBox.h"
#include "JSystem/JUtility/TColor.h"
#include "d/pane/d_pane_class_alpha.h"
#include "dolphin/types.h"
+5 -3
View File
@@ -1,11 +1,13 @@
#ifndef D_PANE_D_PANE_CLASS_ALPHA_H
#define D_PANE_D_PANE_CLASS_ALPHA_H
#include "JSystem/J2DGraph/J2DScreen.h"
#include "JSystem/J2DGraph/J2DWindow.h"
#include "JSystem/JKernel/JKRExpHeap.h"
#include "JSystem/J2DGraph/J2DPane.h"
#include "dolphin/types.h"
class J2DPane;
class J2DScreen;
class JKRExpHeap;
class CPaneMgrAlpha {
public:
/* 8025546C */ virtual ~CPaneMgrAlpha();
+11 -2
View File
@@ -2,9 +2,18 @@
#define D_PARTICLE_D_PARTICLE_H
#include "JSystem/JParticle/JPAParticle.h"
#include "d/particle/d_particle_name.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/gx/GXStruct.h"
#include "dolphin/types.h"
#include "f_op/f_op_actor.h"
class J3DAnmTexPattern;
class J3DModel;
class J3DModelData;
class JKRExpHeap;
class JKRSolidHeap;
class dKy_tevstr_c;
class fopAc_ac_c;
class dPa_levelEcallBack : public JPAEmitterCallBack {
public:
+3 -1
View File
@@ -1,9 +1,11 @@
#ifndef D_PARTICLE_D_PARTICLE_COPOLY_H
#define D_PARTICLE_D_PARTICLE_COPOLY_H
#include "d/bg/d_bg_s_acch.h"
#include "SSystem/SComponent/c_sxyz.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
class dBgS_Acch;
struct dKy_tevstr_c;
class dPaPo_c {
+9 -2
View File
@@ -1,9 +1,16 @@
#ifndef D_S_D_S_LOGO_H
#define D_S_D_S_LOGO_H
#include "d/com/d_com_inf_game.h"
#include "SSystem/SComponent/c_phase.h"
#include "dolphin/types.h"
#include "SSystem/SComponent/c_lib.h"
#include "f_op/f_op_scene.h"
class JKRExpHeap;
class JKRHeap;
struct ResTIMG;
class dDlst_2D_c;
class mDoDvdThd_mountXArchive_c;
class mDoDvdThd_toMainRam_c;
class dLog_HIO_c {
public:
+5 -1
View File
@@ -1,10 +1,14 @@
#ifndef D_S_D_S_PLAY_H
#define D_S_D_S_PLAY_H
#include "d/com/d_com_inf_game.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;
class mDoDvdThd_toMainRam_c;
class dScnPly_reg_HIO_c {
public:
/* 8025AD78 */ virtual ~dScnPly_reg_HIO_c();
+2 -1
View File
@@ -3,8 +3,9 @@
#include "MSL_C/string.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/os/OS.h"
#include "dolphin/os/OSTime.h"
#include "dolphin/types.h"
#include "global.h"
#define DEFAULT_SELECT_ITEM_INDEX 0
#define MAX_SELECT_ITEM 4
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef D_SHOP_D_SHOP_ITEM_CTRL_H
#define D_SHOP_D_SHOP_ITEM_CTRL_H
#include "d/a/d_a_shop_item_static.h"
#include "SSystem/SComponent/c_xyz.h"
#include "dolphin/types.h"
class dShopItemCtrl_c {
+3
View File
@@ -5,6 +5,9 @@
#include "d/shop/d_shop_item_ctrl.h"
#include "dolphin/types.h"
class dSelect_cursor_c;
struct STControl;
typedef int (*ShopCam_actionFunc)(void);
class ShopCam_action_c {