mirror/tp
1
0
Fork 0
mirror of https://github.com/zeldaret/tp synced 2026-08-22 06:44:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

run clang-format

Browse Source
This commit is contained in:
Pheenoh
2020-12-26 11:31:49 -05:00
parent 64a6a97b7b
commit 4c504d078d
180 changed files with 4083 additions and 4253 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_a/d_a_alink/d_a_alink.h
+123 -120
View File
@@ -1,30 +1,30 @@
#ifndef D_A_ALINK_H_
#define D_A_ALINK_H_
#include "global.h"
#include "f/f_op/f_op_actor.h"
#include "d/d_cc/d_cc_d.h"
#include "JSystem/J3DGraphAnimator/J3DJoint.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/J3DGraphAnimator/J3DModelLoader.h"
#include "SComponent/c_bg_s_poly_info.h"
#include "d/d_a/d_a_player/d_a_player.h"
#include "d/d_cc/d_cc_d.h"
#include "d/d_com/d_com_inf_game/d_com_inf_game.h"
#include "d/d_resource/d_resource.h"
#include "d/d_save/d_save/d_save.h"
#include "SComponent/c_bg_s_poly_info.h"
#include "JSystem/J3DGraphAnimator/J3DModelData.h"
#include "JSystem/J3DGraphAnimator/J3DModel.h"
#include "JSystem/J3DGraphAnimator/J3DModelLoader.h"
#include "JSystem/J3DGraphAnimator/J3DJoint.h"
#include "f/f_op/f_op_actor.h"
#include "global.h"
typedef u32 daAlink_ANM;
typedef u32 daAlink_UPPER;
typedef u32 daAlink_UNDER;
typedef u32 daAlink_FTANM;
class daAlink_matAnm_c{
public:
class daAlink_matAnm_c {
public:
void init(void);
void calc(J3DMaterial*) const;
private:
private:
u8 unk0[0xf4];
float unk244;
float unk248;
@@ -38,18 +38,18 @@ class daAlinkHIO_anm_c;
class daPy_frameCtrl_c;
struct cM3dGPla;
struct csXyz{ //move later
s16 x,y,z;
struct csXyz { // move later
s16 x, y, z;
};
class daAlink_c{
public:
class daAlink_c {
public:
u32 getE3Zhint(void);
const char* getAlinkArcName(void);
u32 checkStageName(const char*);
void tgHitCallback(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*);
void coHitCallback(fopAc_ac_c*, dCcD_GObjInf*);
void setMatrixWorldAxisRot(float(*)[4],short,short,short,int,const cXyz*);
void setMatrixWorldAxisRot(float (*)[4], short, short, short, int, const cXyz*);
bool jointControll(int);
void setUpperFront(void);
void changeBlendRate(int);
@@ -59,7 +59,7 @@ class daAlink_c{
bool wolfModelCallBack(int);
void setHatAngle(void);
void calcHairAngle(short*);
void setHairAngle(cXyz*,float,float);
void setHairAngle(cXyz*, float, float);
void setLookPosFromOut(cXyz*);
int checkAttentionPosAngle(cXyz*);
bool checkActorPosAngle(fopAc_ac_c*, cXyz**);
@@ -68,13 +68,13 @@ class daAlink_c{
double setEyeMove(cXyz*, short, short);
void setNeckAngle(void);
bool getStickAngleFromPlayerShape(short*) const;
void commonLineCheck(cXyz*,cXyz*);
void commonLineCheck(cXyz*, cXyz*);
int getMoveBGActorName(cBgS_PolyInfo&, int);
bool checkGoronRide(void);
void setMoveSlantAngle(void);
bool setArmMatrix(void);
bool setFootMatrix(void);
void setMatrixOffset(float*,float);
void setMatrixOffset(float*, float);
bool setLegAngle(float, daAlink_footData_c*, short*, short*, int);
void footBgCheck(void);
void handBgCheck(void);
@@ -134,7 +134,8 @@ class daAlink_c{
bool checkUnderMove1BckNoArc(daAlink_ANM) const;
u32 getUnderUpperAnime(daAlink_ANM, J3DAnmTransform**, J3DAnmTransform**, int, u32);
void setDoubleAnimeBlendRatio(float);
void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, float, float, float, int);
void commonDoubleAnime(J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*, J3DAnmTransform*,
float, float, float, int);
bool setDoubleAnime(float, float, float, daAlink_ANM, daAlink_ANM, int, float);
void commonSingleAnime(J3DAnmTransform*, J3DAnmTransform*, float, float, short);
void setSingleAnimeBase(daAlink_ANM);
@@ -192,111 +193,114 @@ class daAlink_c{
bool checkSlope(void) const;
void setPlayerPosAndAngle(cXyz const*, short, int);
void setPlayerPosAndAngle(cXyz const*, csXyz const*);
void setPlayerPosAndAngle(float(*)[4]);
void setPlayerPosAndAngle(float (*)[4]);
u32 itemTriggerCheck(u8);
u32 itemButtonCheck(u8);
private:
private:
u8 unk[14268];
};
extern "C"{
void tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*, dCcD_GObjInf*);
void coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*);
void J3DMaterialAnm_NS_calc(void);
void PSVECAdd(Vec*, Vec*, Vec*);
void mDoMtx_stack_c_NS_transM(float, float, float);
void daAlink_c_NS_concatMagneBootInvMtx(void);
void mDoMtx_ZXYrotM(void);
void mDoMtx_YrotM(void);
void daAlink_c_NS_concatMagneBootMtx(void);
void mDoMtx_stack_c_NS_transS(void);
void PSMTXQuat(void);
void PSMTXInverse(void);
void mDoMtx_stack_c_NS_quatM(void);
void PSMTXTrans(void);
void daAlink_c_NS_checkUnderMove0BckNoArc(void);
void mDoMtx_QuatConcat(void);
void JMAEulerToQuat(void);
void daAlink_c_NS_checkBowAnime(void);
void setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz(float(*)[4],short,short,short,int,const cXyz*);
void daAlink_c_NS_checkHorseLieAnime(void);
void csXyz_X1_(void);
void daAlink_c_NS_checkNoUpperAnime(void);
void daAlink_c_NS_checkUpperReadyThrowAnime(void);
void daAlink_c_NS_setDoubleAnimeBlendRatio(void);
void changeBlendRate__9daAlink_cFi(int);
void daAlink_c_NS_setArmMatrix(void);
void daAlink_c_NS_setFootMatrix(void);
void setUpperFront__9daAlink_cFv(void);
bool jointControll__9daAlink_cFi(int);
void resetRootMtx__9daAlink_cFv(void);
bool modelCallBack__9daAlink_cFi(int);
void daAlink_c_NS_checkZoraWearAbility(void);
void mDoMtx_stack_c_NS_scaleM(void);
void mDoMtx_XYZrotM(void);
void mDoMtx_ZrotM(void);
bool headModelCallBack__9daAlink_cFi(int);
void daAlink_c_NS_changeWolfBlendRate(void);
void daAlink_c_NS_setWolfFootMatrix(void);
bool wolfModelCallBack__9daAlink_cFi(int);
void cLib_addCalcAngleS2(void);
void PSMTXMultVec(void);
void daAlink_c_NS_getMoveBGActorName(void);
void daAlink_c_NS_multVecMagneBootInvMtx(void);
void cXyz_NS___ml(void);
void cXyz_NS_atan2sY_XZ(void);
void cM_atan2s(void);
void cLib_distanceAngleS(void);
void cXyz_NS_atan2sX_Z(void);
void PSMTXMultVecSR(void);
void cXyz_NS___mi(void);
void dKyw_get_AllWind_vec(void);
void PSVECSquareMag(void);
void cLib_addCalcAngleS(void);
void cM_rndF(void);
void calcHairAngle__9daAlink_cFPs(short*);
void setHairAngle__9daAlink_cFP4cXyzff(cXyz*,float,float);
void cLib_targetAngleY(void);
void daAlink_c_NS_checkEnemyGroup(void);
int checkAttentionPosAngle__9daAlink_cFP4cXyz(cXyz*);
void daAlink_c_NS_getDemoLookActor(void);
void daAlink_c_NS_checkDemoMoveMode(void);
bool isTransformLV__21dSv_player_status_b_cCFi(int);
void dKy_darkworld_check(void);
void daAlink_c_NS_checkAttentionState(void);
void daAlink_c_NS_checkUnderMove0BckNoArcWolf(void);
void daAlink_c_NS_checkWindSpeedOnAngleAnime(void);
void daAlink_c_NS_getCopyRodControllActor(void);
void dAttLook_c_NS_convPId(void);
void daAlink_c_NS_checkEventRun(void);
bool checkActorPosAngle__9daAlink_cFP10fopAc_ac_cPP4cXyz(fopAc_ac_c*, cXyz**);
void dCamera_c_NS_GetForceLockOnActor(void);
void dCam_getBody(void);
void dAttention_c_NS_LockonTarget(void);
void cM_rnd(void);
void fopAcIt_Judge(void);
void dAttList_c_NS_getActor(void);
void dAttention_c_NS_GetLockonList(void);
void fopAcM_getTalkEventPartner(void);
extern "C" {
void tgHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInfP12dCcD_GObjInf(fopAc_ac_c*,
dCcD_GObjInf*,
dCcD_GObjInf*);
void coHitCallback__9daAlink_cFP10fopAc_ac_cP12dCcD_GObjInf(fopAc_ac_c*, dCcD_GObjInf*);
void J3DMaterialAnm_NS_calc(void);
void PSVECAdd(Vec*, Vec*, Vec*);
void mDoMtx_stack_c_NS_transM(float, float, float);
void daAlink_c_NS_concatMagneBootInvMtx(void);
void mDoMtx_ZXYrotM(void);
void mDoMtx_YrotM(void);
void daAlink_c_NS_concatMagneBootMtx(void);
void mDoMtx_stack_c_NS_transS(void);
void PSMTXQuat(void);
void PSMTXInverse(void);
void mDoMtx_stack_c_NS_quatM(void);
void PSMTXTrans(void);
void daAlink_c_NS_checkUnderMove0BckNoArc(void);
void mDoMtx_QuatConcat(void);
void JMAEulerToQuat(void);
void daAlink_c_NS_checkBowAnime(void);
void setMatrixWorldAxisRot__9daAlink_cFPA4_fsssiPC4cXyz(float (*)[4], short, short, short, int,
const cXyz*);
void daAlink_c_NS_checkHorseLieAnime(void);
void csXyz_X1_(void);
void daAlink_c_NS_checkNoUpperAnime(void);
void daAlink_c_NS_checkUpperReadyThrowAnime(void);
void daAlink_c_NS_setDoubleAnimeBlendRatio(void);
void changeBlendRate__9daAlink_cFi(int);
void daAlink_c_NS_setArmMatrix(void);
void daAlink_c_NS_setFootMatrix(void);
void setUpperFront__9daAlink_cFv(void);
bool jointControll__9daAlink_cFi(int);
void resetRootMtx__9daAlink_cFv(void);
bool modelCallBack__9daAlink_cFi(int);
void daAlink_c_NS_checkZoraWearAbility(void);
void mDoMtx_stack_c_NS_scaleM(void);
void mDoMtx_XYZrotM(void);
void mDoMtx_ZrotM(void);
bool headModelCallBack__9daAlink_cFi(int);
void daAlink_c_NS_changeWolfBlendRate(void);
void daAlink_c_NS_setWolfFootMatrix(void);
bool wolfModelCallBack__9daAlink_cFi(int);
void cLib_addCalcAngleS2(void);
void PSMTXMultVec(void);
void daAlink_c_NS_getMoveBGActorName(void);
void daAlink_c_NS_multVecMagneBootInvMtx(void);
void cXyz_NS___ml(void);
void cXyz_NS_atan2sY_XZ(void);
void cM_atan2s(void);
void cLib_distanceAngleS(void);
void cXyz_NS_atan2sX_Z(void);
void PSMTXMultVecSR(void);
void cXyz_NS___mi(void);
void dKyw_get_AllWind_vec(void);
void PSVECSquareMag(void);
void cLib_addCalcAngleS(void);
void cM_rndF(void);
void calcHairAngle__9daAlink_cFPs(short*);
void setHairAngle__9daAlink_cFP4cXyzff(cXyz*, float, float);
void cLib_targetAngleY(void);
void daAlink_c_NS_checkEnemyGroup(void);
int checkAttentionPosAngle__9daAlink_cFP4cXyz(cXyz*);
void daAlink_c_NS_getDemoLookActor(void);
void daAlink_c_NS_checkDemoMoveMode(void);
bool isTransformLV__21dSv_player_status_b_cCFi(int);
void dKy_darkworld_check(void);
void daAlink_c_NS_checkAttentionState(void);
void daAlink_c_NS_checkUnderMove0BckNoArcWolf(void);
void daAlink_c_NS_checkWindSpeedOnAngleAnime(void);
void daAlink_c_NS_getCopyRodControllActor(void);
void dAttLook_c_NS_convPId(void);
void daAlink_c_NS_checkEventRun(void);
bool checkActorPosAngle__9daAlink_cFP10fopAc_ac_cPP4cXyz(fopAc_ac_c*, cXyz**);
void dCamera_c_NS_GetForceLockOnActor(void);
void dCam_getBody(void);
void dAttention_c_NS_LockonTarget(void);
void cM_rnd(void);
void fopAcIt_Judge(void);
void dAttList_c_NS_getActor(void);
void dAttention_c_NS_GetLockonList(void);
void fopAcM_getTalkEventPartner(void);
}
//daalink_matanm init
// daalink_matanm init
extern float lbl_80452CC0;
extern u8 lbl_80450FC8;
extern u8 lbl_80450FC9;
//daalink_matanm calc
// daalink_matanm calc
extern double lbl_80452CB0;
extern float lbl_80452CB8;
//daalink setmatrixworldaxisrot
struct now{ // m_Do_mtx::mDoMtx_stack_c::now
// daalink setmatrixworldaxisrot
struct now { // m_Do_mtx::mDoMtx_stack_c::now
float unk0[4];
float unk10[4];
float unk20[4];
};
struct mCurrentMtx{ // J3DGraphBase::J3DSys::mCurrentMtx
struct mCurrentMtx { // J3DGraphBase::J3DSys::mCurrentMtx
float unk0[4];
float unk10[4];
float unk20[4];
@@ -304,14 +308,14 @@ struct mCurrentMtx{ // J3DGraphBase::J3DSys::mCurrentMtx
extern now lbl_803DD470;
extern mCurrentMtx lbl_80434BE4;
//daalink modelcallback
struct j3dsys; // J3DGraphBase::j3dSys
// daalink modelcallback
struct j3dsys; // J3DGraphBase::j3dSys
extern j3dsys lbl_80434AC8;
//daalink headmodelcallback
// daalink headmodelcallback
extern float lbl_80452EDC;
//daalink sethatangle
// daalink sethatangle
extern float lbl_80452CE0;
extern double lbl_80452CE8;
extern float lbl_80452D50;
@@ -328,12 +332,12 @@ extern float lbl_80453058;
extern float lbl_80453100;
extern float lbl_804531F0;
extern float lbl_804531F4;
extern cXyz lbl_80430CF4; // SComponent::cXyz::Zero
extern cXyz lbl_80430D0C; // SComponent::cXyz::BaseX
extern cXyz lbl_80430D24; // SComponent::cXyz::BaseY
extern u8 lbl_80439A20[65536]; // JMath::JMath::sincosTable_
extern cXyz lbl_80430CF4; // SComponent::cXyz::Zero
extern cXyz lbl_80430D0C; // SComponent::cXyz::BaseX
extern cXyz lbl_80430D24; // SComponent::cXyz::BaseY
extern u8 lbl_80439A20[65536]; // JMath::JMath::sincosTable_
//daalink sethairangle
// daalink sethairangle
extern float lbl_80452C98;
extern float lbl_80452D18;
extern float lbl_80452D5C;
@@ -354,15 +358,14 @@ extern float lbl_80453208;
extern float lbl_8045320C;
extern float lbl_80453210;
//daalink checkattentionposangle
extern u8 lbl_8038E5A4[0x6C]; // daAlinkHIO_horse_c0::m
// daalink checkattentionposangle
extern u8 lbl_8038E5A4[0x6C]; // daAlinkHIO_horse_c0::m
//daalink getneckaimpos
extern u32 lbl_80451018; // daPy_py_c::m_midnaActor
// daalink getneckaimpos
extern u32 lbl_80451018; // daPy_py_c::m_midnaActor
extern float lbl_80452D68;
extern float lbl_80452DB0;
extern float lbl_80452DE0;
extern float lbl_80452E44;
#endif
include/d/d_a/d_a_horse_static/d_a_horse_static.h
+17 -17
View File
@@ -1,21 +1,21 @@
#include "dolphin/types.h"
class e_wb_class{
public:
u32 checkWait(void);
void setPlayerRideNow(void);
void setPlayerRide(void);
void getOff(void);
u8 checkDownDamage(void);
u8 checkNormalRideMode(void) const;
void setRunRideMode(void);
class e_wb_class {
public:
u32 checkWait(void);
void setPlayerRideNow(void);
void setPlayerRide(void);
void getOff(void);
u8 checkDownDamage(void);
u8 checkNormalRideMode(void) const;
void setRunRideMode(void);
private:
u8 unk0[0x5b4];
s16 unk1460;
u8 unk1462[0xd9];
s16 unk1680;
u16 unk1682;
u8 unk1684[0x2a];
u16 unk1726;
private:
u8 unk0[0x5b4];
s16 unk1460;
u8 unk1462[0xd9];
s16 unk1680;
u16 unk1682;
u8 unk1684[0x2a];
u16 unk1726;
};
include/d/d_a/d_a_item_static/d_a_item_static.h
+10 -10
View File
@@ -1,14 +1,14 @@
#include "dolphin/types.h"
class daItem_c{
public:
u32 startCtrl(void);
u32 startControl(void);
u32 endControl(void);
class daItem_c {
public:
u32 startCtrl(void);
u32 startControl(void);
u32 endControl(void);
private:
u8 unk0[0x948];
u8 unk2376;
u8 unk2377;
u8 unk2378;
private:
u8 unk0[0x948];
u8 unk2376;
u8 unk2377;
u8 unk2378;
};
include/d/d_a/d_a_player/d_a_player.h
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef D_A_PLAYER_H_
#define D_A_PLAYER_H_
class daPy_anmHeap_c{
};
class daPy_anmHeap_c {};
#endif
include/d/d_bomb/d_bomb.h
+3 -2
View File
@@ -1,12 +1,13 @@
#include "global.h"
#include "f/f_op/f_op_actor.h"
#include "global.h"
class dBomb_c{
class dBomb_c {
public:
bool checkStateCarry();
bool checkFlowerBombWait(fopAc_ac_c* param_1);
bool checkWaterBomb(fopAc_ac_c* param_1);
bool checkInsectBombMove(fopAc_ac_c* param_1);
private:
u8 p1[0x8];
s16 unk_1;
include/d/d_cc/d_cc_d.h
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef D_CC_D_H_
#define D_CC_D_H_
struct dCcD_GObjInf{
};
struct dCcD_GObjInf {};
#endif
include/d/d_com/d_com_inf_game/d_com_inf_game.h
+24 -26
View File
@@ -8,19 +8,19 @@
#include "d/d_save/d_save/d_save.h"
class dComIfG_play_c {
public:
public:
void ct(void);
void init(void);
u8 unk[0x100];
};
class dCcMassS_Mng {
public:
public:
u8 unk[0x274];
};
class dAttDraw_c {
public:
public:
u8 unk[0x178];
};
@@ -36,34 +36,32 @@ class dComIfG_camera_info_class {
u8 unk[0x38];
};
struct mDoExt_bckAnm{
struct mDoExt_bckAnm {};
};
struct item_func{
float hearts; //bf80
u32 rupees; //bf84
s16 small_keys; //bf88
s16 kakera_heart; //bf8a
s16 magic; //bf8c
u16 unk; //bf8e
s16 magic_lv; //bf90
u8 unk2[2]; //bf92/93 // removed stuff?
u32 unk3; //bf94 //related to lantern?
u32 unk4; //bf98 //related to lantern?
u32 unk5; //bf9c //related to lantern?
u32 unk6; //bfa0 //related to oxygen?
u32 unk7; //bfa4 //related to oxygen?
u32 unk8; //bfa8 //related to oxygen?
u32 unk9; //bfac //related to oxygen?
u32 unk10; //bfb0 //related to oxygen?
s16 arrows; //bfb4
s16 seeds; //bfb6
struct item_func {
float hearts; // bf80
u32 rupees; // bf84
s16 small_keys; // bf88
s16 kakera_heart; // bf8a
s16 magic; // bf8c
u16 unk; // bf8e
s16 magic_lv; // bf90
u8 unk2[2]; // bf92/93 // removed stuff?
u32 unk3; // bf94 //related to lantern?
u32 unk4; // bf98 //related to lantern?
u32 unk5; // bf9c //related to lantern?
u32 unk6; // bfa0 //related to oxygen?
u32 unk7; // bfa4 //related to oxygen?
u32 unk8; // bfa8 //related to oxygen?
u32 unk9; // bfac //related to oxygen?
u32 unk10; // bfb0 //related to oxygen?
s16 arrows; // bfb4
s16 seeds; // bfb6
};
// 16 bytes too big, figure out later
class dComIfG_inf_c {
public:
public:
/* 0x00000 */ dSv_info_c info;
/* 0x00EEC */ u8 unk2[0x4C];
/* 0x00F38 */ dComIfG_play_c play;
include/d/d_drawlist/d_drawlist.h
+4 -4
View File
@@ -4,21 +4,21 @@
#include "dolphin/types.h"
class dDlst_FileInfo_c {
public:
public:
void draw(void);
~dDlst_FileInfo_c();
private:
private:
};
class dDlst_list_c {
public:
public:
static u32 mWipeColor;
static u32 mWipeDlst;
static u32 mWipeRate;
static u32 mWipeSpeed;
private:
private:
u8 unk[0x161A0];
};
include/d/d_event/d_event/d_event.h
+2 -2
View File
@@ -4,8 +4,8 @@
#include "dolphin/types.h"
class dEvt_control_c {
public:
u8 unk[0x130];
public:
u8 unk[0x130];
};
#endif
include/d/d_event/d_event_manager/d_event_manager.h
+2 -2
View File
@@ -4,8 +4,8 @@
#include "dolphin/types.h"
class dEvent_manager_c {
public:
u8 unk[0x6C8];
public:
u8 unk[0x6C8];
};
#endif
include/d/d_file/d_file_sel_info/d_file_sel_info.h
+4 -4
View File
@@ -5,8 +5,8 @@
#include "JSystem/JKernel/JKRArchive/JKRArchive.h"
#include "JSystem/JUtility/JUTFont/JUTFont.h"
#include "d/d_drawlist/d_drawlist.h"
#include "d/d_save/d_save/d_save.h"
#include "d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h"
#include "d/d_save/d_save/d_save.h"
struct dFile_info_c_vtable {
u32* addr1;
@@ -15,8 +15,8 @@ struct dFile_info_c_vtable {
};
class dFile_info_c {
public:
dFile_info_c(JKRArchive*,u8);
public:
dFile_info_c(JKRArchive*, u8);
~dFile_info_c();
void screenSet(void);
s32 setSaveData(dSv_save_c*, int, u8);
@@ -27,7 +27,7 @@ class dFile_info_c {
void modeMove(void);
void _draw(void);
private:
private:
dFile_info_c_vtable vtable;
JKRArchive* archive;
dDlst_FileInfo_c file_info_draw_list;
include/d/d_item/d_item/d_item.h
+1 -1
View File
@@ -1,7 +1,7 @@
#ifndef D_ITEM_H_
#define D_ITEM_H_
int checkItemGet(u8,int);
int checkItemGet(u8, int);
extern int (*item_func_ptr[256])(void);
extern int (*item_getcheck_func_ptr[256])(void);
include/d/d_meter2/d_meter2_info/d_meter2_info.h
+4 -3
View File
@@ -7,7 +7,7 @@ struct dMeter2Info_c_vtable {
};
class dMeter2Info_c {
public:
public:
dMeter2Info_c::dMeter2Info_c();
dMeter2Info_c::~dMeter2Info_c();
void init(void);
@@ -31,7 +31,8 @@ class dMeter2Info_c {
void resetMeterString(void);
void setWarpInfo(const char*, const cXyz&, s16, u8, u8, u8);
u8 getItemType(u8);
u8 readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, int); // define J2DPicture
u8 readItemTexture(u8, void*, J2DPicture*, void*, J2DPicture*, void*, J2DPicture*, void*,
J2DPicture*, int); // define J2DPicture
void setItemColor(u8, J2DPicture*, J2DPicture*, J2DPicture*, J2DPicture*);
u8 get2ndTexture(u8);
u8 get3rdTexture(u8);
@@ -48,7 +49,7 @@ class dMeter2Info_c {
void setMiniGameCount(s8);
void setSaveStageName(const char*);
private:
private:
dMeter2Info_c_vtable* vtable;
u8 unk4[4];
u32 unk8;
include/d/d_pane/d_pane_class_alpha/d_pane_class_alpha.h
+1 -3
View File
@@ -1,8 +1,6 @@
#ifndef D_PANE_CLASS_ALPHA_H_
#define D_PANE_CLASS_ALPHA_H_
class CPaneMgrAlpha {
};
class CPaneMgrAlpha {};
#endif
include/d/d_resource/d_resource.h
+4 -8
View File
@@ -8,8 +8,8 @@
#include "m_Do/m_Do_dvd_thread/m_Do_dvd_thread.h"
class dRes_info_c {
public:
private:
public:
private:
u8 unk[0x24];
// u8* name;
// u32 unk4;
@@ -23,12 +23,8 @@ class dRes_info_c {
// void** resource_buffer;
};
struct J3DAnmBase{
struct J3DAnmBase {};
};
struct J3DAnmTransform{
};
struct J3DAnmTransform {};
#endif
include/d/d_save/d_save/d_save.h
+82 -110
View File
@@ -14,11 +14,7 @@
#define BOMB_BAG_MAX 3
#define BOTTLE_MAX 4
enum Wallets {
WALLET,
BIG_WALLET,
GIANT_WALLET
};
enum Wallets { WALLET, BIG_WALLET, GIANT_WALLET };
enum ItemSlots {
SLOT_0,
@@ -306,44 +302,20 @@ enum ItemTable {
noentry9 = 60
};
enum EquipmentBits {
CLOTHING_BITFIELD,
SWORD_BITFIELD,
SHIELD_BITFIELD
};
enum EquipmentBits { CLOTHING_BITFIELD, SWORD_BITFIELD, SHIELD_BITFIELD };
enum Swords {
ORDON_SWORD_FLAG,
MASTER_SWORD_FLAG,
WOODEN_SWORD_FLAG,
LIGHT_SWORD_FLAG
};
enum Swords { ORDON_SWORD_FLAG, MASTER_SWORD_FLAG, WOODEN_SWORD_FLAG, LIGHT_SWORD_FLAG };
enum Shields {
ORDON_SHIELD_FLAG,
HYLIAN_SHIELD_FLAG,
WOODEN_SHIELD_FLAG
};
enum Shields { ORDON_SHIELD_FLAG, HYLIAN_SHIELD_FLAG, WOODEN_SHIELD_FLAG };
enum Armors {
KOKIRI_CLOTHES_FLAG
};
enum Armors { KOKIRI_CLOTHES_FLAG };
enum DungeonItem {
MAP_FLAG,
COMPASS_FLAG,
BOSS_KEY_FLAG,
OOCCOO_NOTE_FLAG = 6
};
enum DungeonItem { MAP_FLAG, COMPASS_FLAG, BOSS_KEY_FLAG, OOCCOO_NOTE_FLAG = 6 };
enum AreaVessel {
FARON_VESSEL,
ELDIN_VESSEL,
LANAYRU_VESSEL
};
enum AreaVessel { FARON_VESSEL, ELDIN_VESSEL, LANAYRU_VESSEL };
class dSv_player_status_a_c {
public:
public:
void init(void);
void setSelectItemIndex(signed int, u8);
u8 getSelectItemIndex(signed int) const;
@@ -353,12 +325,14 @@ class dSv_player_status_a_c {
int isMagicFlag(u8) const;
u16& getCurrentHealth() { return mCurrentHealth; }
u8& getScent() { return mEquipment[3];}
void setWalletLV(u8 lv) { mCurrentWallet = lv;}
void setLanternOil(u16 amount) { mMaxLanternOil = amount; mCurrentLanternOil = amount; }
u8& getScent() { return mEquipment[3]; }
void setWalletLV(u8 lv) { mCurrentWallet = lv; }
void setLanternOil(u16 amount) {
mMaxLanternOil = amount;
mCurrentLanternOil = amount;
}
private:
private:
u16 mMaxHealth;
u16 mCurrentHealth;
u16 mCurrentRupees;
@@ -381,14 +355,14 @@ class dSv_player_status_a_c {
};
class dSv_player_status_b_c {
public:
public:
void init(void);
void onDarkClearLV(int);
BOOL isDarkClearLV(int) const;
void onTransformLV(int);
BOOL isTransformLV(int) const;
private:
private:
u32 unk0;
u32 unk4;
u8 mTransformLevelFlag;
@@ -403,16 +377,16 @@ class dSv_player_status_b_c {
// move to SComponent later
class cXyz {
public:
public:
float x, y, z;
};
class dSv_horse_place_c {
public:
public:
void init(void);
void set(const char*, const cXyz&, s16, s8);
private:
private:
cXyz mPosition;
u16 mXRotation;
char mCurrentStage[8];
@@ -421,11 +395,11 @@ class dSv_horse_place_c {
};
class dSv_player_return_place_c {
public:
public:
void init(void);
void set(const char*, s8, u8);
private:
private:
char mCurrentStage[8];
u8 mSpawnId;
u8 mRoomId;
@@ -434,13 +408,13 @@ class dSv_player_return_place_c {
};
class dSv_player_field_last_stay_info_c {
public:
public:
void init(void);
BOOL isRegionBit(int unk) const;
void onRegionBit(int unk);
void set(const char*, const cXyz&, s16, s8, u8);
private:
private:
cXyz mLastPosition;
s16 mLastAngle;
char mLastStage[8];
@@ -452,11 +426,11 @@ class dSv_player_field_last_stay_info_c {
};
class dSv_player_last_mark_info_c {
public:
public:
void init(void);
void setWarpItemData(const char*, const cXyz&, s16, s8, u8, u8);
private:
private:
cXyz mOoccooPosition;
s16 mOoccooXRotation;
char mOoccooStage[8];
@@ -467,7 +441,7 @@ class dSv_player_last_mark_info_c {
};
class dSv_player_item_c {
public:
public:
void init(void);
void setItem(int, u8);
u8 getItem(int, bool) const;
@@ -493,25 +467,25 @@ class dSv_player_item_c {
void setRodTypeLevelUp(void);
void setBaitItem(u8);
private:
private:
u8 mItems[24];
u8 mItemSlots[24];
};
class dSv_player_get_item_c {
public:
public:
void init(void);
void onFirstBit(u8);
void offFirstBit(u8);
int isFirstBit(u8) const;
private:
private:
u32 mPauseMenuBitFields[4];
u8 padding[16];
};
class dSv_player_item_record_c {
public:
public:
void init(void);
void setBombNum(u8, u8);
u8 getBombNum(u8) const;
@@ -521,7 +495,7 @@ class dSv_player_item_record_c {
void setBowAmount(u8 amount) { mBow = amount; }
private:
private:
u8 mBow;
u8 mBombBags[3];
u8 mBottles[4];
@@ -530,20 +504,20 @@ class dSv_player_item_record_c {
};
class dSv_player_item_max_c {
public:
public:
void init(void);
void setBombNum(u8, u8);
u8 getBombNum(u8) const;
void setBowCapacity(u8 max) { mItemCapacities[0] = max; }
u8 getBowCapacity(){ return mItemCapacities[0];}
u8 getBowCapacity() { return mItemCapacities[0]; }
private:
private:
u8 mItemCapacities[8];
};
class dSv_player_collect_c {
public:
public:
void init(void);
void setCollect(int, u8);
BOOL isCollect(int, u8) const;
@@ -554,7 +528,7 @@ class dSv_player_collect_c {
u8 getPoeCount() { return mPoeCount; }
private:
private:
u8 unk0[8];
u8 unk8;
u8 mCrystal;
@@ -565,59 +539,59 @@ class dSv_player_collect_c {
};
class dSv_player_wolf_c {
public:
public:
void init(void);
private:
private:
u8 unk0[3];
u8 unk3;
};
class dSv_light_drop_c {
public:
public:
void init(void);
void setLightDropNum(u8, u8);
u8 getLightDropNum(u8) const;
void onLightDropGetFlag(u8);
BOOL isLightDropGetFlag(u8) const;
private:
private:
u8 mLightDropCounts[4];
u8 mLightDropGetFlag;
u8 unk5[3];
};
class dSv_letter_info_c {
public:
public:
void init(void);
void onLetterGetFlag(int);
BOOL isLetterGetFlag(int) const;
void onLetterReadFlag(int);
int isLetterReadFlag(int) const;
private:
private:
u32 mLetterGetBitfields[2];
u32 mLetterReadBitfields[2];
u8 unk16[64];
};
class dSv_fishing_info_c {
public:
public:
void init(void);
void addFishCount(u8); // merged with init in the assembly
private:
private:
u16 mFishCount[16];
u8 unk32[16];
u8 padding[4];
};
class dSv_player_info_c {
public:
public:
void init(void);
char* getLinkName() { return (char*)link_name; }
private:
private:
u32 unk0;
u32 unk4;
u32 unk8;
@@ -634,7 +608,7 @@ class dSv_player_info_c {
};
class dSv_player_config_c {
public:
public:
void init(void);
u32 checkVibration(void) const;
u8 getSound(void);
@@ -642,7 +616,7 @@ class dSv_player_config_c {
u8 getVibration(void);
void setVibration(u8);
private:
private:
u8 unk0;
u8 mSoundMode;
u8 unk2;
@@ -658,7 +632,7 @@ class dSv_player_config_c {
};
class dSv_player_c {
public:
public:
void init(void);
dSv_player_info_c& getPlayerInfo() { return mPlayerInfo; }
dSv_player_status_a_c& getPlayerStatusA() { return player_status_a; }
@@ -672,7 +646,7 @@ class dSv_player_c {
void setPlayerStatusAWalletLV(u8 lv) { player_status_a.setWalletLV(lv); }
void setPlayerStatusAOil(u16 amount) { player_status_a.setLanternOil(amount); }
private:
private:
dSv_player_status_a_c player_status_a;
dSv_player_status_b_c player_status_b;
dSv_horse_place_c horse_place;
@@ -694,7 +668,7 @@ class dSv_player_c {
#pragma pack(push, 1)
class dSv_memBit_c {
public:
public:
void init(void);
void onTbox(int);
void offTbox(int);
@@ -708,11 +682,9 @@ class dSv_memBit_c {
void onDungeonItem(int);
bool isDungeonItem(int) const;
u8 getSmallKeys() {
return small_key_flags;
}
u8 getSmallKeys() { return small_key_flags; }
private:
private:
u32 area_flags_bitfields1[2];
u32 area_flags_bitfields2[4];
u32 rupee_flags_bitfields;
@@ -722,7 +694,7 @@ class dSv_memBit_c {
#pragma pack(pop)
class dSv_event_c {
public:
public:
void init(void);
void onEventBit(u16);
void offEventBit(u16);
@@ -730,15 +702,15 @@ class dSv_event_c {
void setEventReg(u16, u8);
u8 getEventReg(u16) const;
private:
private:
u8 events[256];
};
class dSv_MiniGame_c {
public:
public:
void init(void);
private:
private:
u8 unk0;
u8 unk1[3];
u32 unk4;
@@ -749,30 +721,30 @@ class dSv_MiniGame_c {
};
class dSv_memory_c {
public:
public:
dSv_memory_c(void); // the assembly for this is in d_com_inf_game.s
void init(void);
dSv_memBit_c& getTempFlags() { return temp_flags; }
private:
private:
dSv_memBit_c temp_flags;
u8 padding30[2];
};
class dSv_memory2_c {
public:
public:
dSv_memory2_c(void); // the assembly for this is in d_com_inf_game.s
void init(void);
void onVisitedRoom(int);
void offVisitedRoom(int);
BOOL isVisitedRoom(int);
private:
private:
u32 unk0[2];
};
class dSv_danBit_c {
public:
public:
bool init(s8);
void onSwitch(int);
void offSwitch(int);
@@ -781,7 +753,7 @@ class dSv_danBit_c {
void onItem(int);
BOOL isItem(int) const;
private:
private:
s8 mStageNum;
u8 unk1;
u8 unk2[2];
@@ -791,7 +763,7 @@ class dSv_danBit_c {
};
class dSv_zoneBit_c {
public:
public:
void init(void);
void clearRoomSwitch(void);
void clearRoomItem(void);
@@ -808,7 +780,7 @@ class dSv_zoneBit_c {
void onOneItem(int);
BOOL isOneItem(int) const;
private:
private:
u16 switch_bitfield[2];
u16 room_switch;
u16 item_bitfield[2];
@@ -817,7 +789,7 @@ class dSv_zoneBit_c {
};
class dSv_zoneActor_c {
public:
public:
void init(void);
void on(int);
void off(int);
@@ -825,12 +797,12 @@ class dSv_zoneActor_c {
static const int ACTOR_MAX = 0xFFFF;
private:
private:
u32 actor_bitfield[4];
};
class dSv_zone_c {
public:
public:
dSv_zone_c(void); // the assembly for this is in d_com_inf_game.s
void init(int);
dSv_zoneBit_c& getZoneBit() { return zone_bit; }
@@ -838,7 +810,7 @@ class dSv_zone_c {
s8& getUnk0() { return unk0; }
private:
private:
s8 unk0;
u8 unk1;
dSv_zoneBit_c zone_bit;
@@ -846,10 +818,10 @@ class dSv_zone_c {
};
class dSv_restart_c {
public:
public:
void setRoom(const cXyz&, s16, s8);
private:
private:
u8 unk0;
u8 unk1[5];
s16 mXRotation;
@@ -858,10 +830,10 @@ class dSv_restart_c {
};
class dSv_turnRestart_c {
public:
public:
void set(const cXyz&, s16, s8, u32);
private:
private:
cXyz mPosition;
u32 unk12;
s16 mXRotation;
@@ -869,13 +841,13 @@ class dSv_turnRestart_c {
};
class dSv_reserve_c {
public:
private:
public:
private:
u8 unk[80];
};
class dSv_save_c {
public:
public:
void init(void);
dSv_memory2_c* getSave2(int);
dSv_player_c& getPlayer() { return player; }
@@ -888,7 +860,7 @@ class dSv_save_c {
static const int STAGE_MAX = 4;
private:
private:
dSv_player_c player;
dSv_memory_c area_flags[32];
dSv_memory2_c unk_flags[64];
@@ -898,7 +870,7 @@ class dSv_save_c {
};
class dSv_info_c {
public:
public:
void init(void);
void getSave(int);
void putSave(int);
@@ -917,10 +889,10 @@ class dSv_info_c {
void card_to_memory(char*, int);
void initdata_to_card(char*, int);
dSv_save_c& getSaveFile(){ return save_file; }
dSv_memory_c& getMemory(){ return memory; }
dSv_save_c& getSaveFile() { return save_file; }
dSv_memory_c& getMemory() { return memory; }
private:
private:
dSv_save_c save_file;
dSv_memory_c memory;
dSv_danBit_c dungeon_bit;
include/d/d_save/d_save_HIO/d_save_HIO.h
+7 -7
View File
@@ -10,14 +10,14 @@ struct dSvBit_childSwPerfectionHIO_c_vtable {
};
class dSvBit_childSwPerfectionHIO_c {
public:
dSvBit_childSwPerfectionHIO_c();
void init(void);
~dSvBit_childSwPerfectionHIO_c();
dSvBit_childSwPerfectionHIO_c_vtable* __vt;
public:
dSvBit_childSwPerfectionHIO_c();
void init(void);
~dSvBit_childSwPerfectionHIO_c();
dSvBit_childSwPerfectionHIO_c_vtable* __vt;
private:
u8 unk0[10];
private:
u8 unk0[10];
};
#endif