mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-06 01:18:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_tbox2 done, f_op_actor_mng cleanup, cleanup fopAc_ac_c member names (#2084)

Browse Source
This commit is contained in:
TakaRikka
2024-03-04 17:33:13 -08:00
committed by GitHub
parent 1a421c4a4e
commit dede32dbc9
334 changed files with 3797 additions and 6195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/JSystem/JUtility/JUTAssert.h
+4
View File
@@ -28,12 +28,16 @@
#define JUT_LOG(LINE, ...) \
JUTAssertion::setLogMessage_f(JUTAssertion::getSDevice(), __FILE__, LINE, __VA_ARGS__)
#define JUT_CONFIRM(LINE, COND) \
JUTAssertion::setConfirmMessage(JUTAssertion::getSDevice(), __FILE__, LINE, COND, #COND)
#else
#define JUT_ASSERT(...)
#define JUT_ASSERT_REPORT(...)
#define JUT_PANIC(...)
#define JUT_WARN(...)
#define JUT_LOG(...)
#define JUT_CONFIRM(...)
#endif
namespace JUTAssertion {
include/d/a/d_a_alink.h
+3 -3
View File
@@ -1813,7 +1813,7 @@ public:
/* 800DC474 */ int procCoSwimFreezeReturn();
/* 800DC548 */ static BOOL checkEnemyGroup(fopAc_ac_c*);
/* 800DC5A4 */ static BOOL checkSpecialNpc(fopAc_ac_c*);
/* 800DC5DC */ bool checkShieldAttackEmphasys();
/* 800DC5DC */ BOOL checkShieldAttackEmphasys();
/* 800DC678 */ BOOL checkGuardActionChange();
/* 800DC79C */ void stickArrowIncrement(int);
/* 800DC8C4 */ void setArrowShieldActor(fopAc_ac_c*, int);
@@ -3262,7 +3262,7 @@ public:
var_r5 = 0;
if (mItemAcKeep.getActor() != NULL &&
mItemAcKeep.getActor()->mEvtInfo.i_checkCommandDemoAccrpt() != 0) {
mItemAcKeep.getActor()->eventInfo.i_checkCommandDemoAccrpt() != 0) {
var_r5 = 1;
}
@@ -3559,7 +3559,7 @@ private:
/* 0x02854 */ daPy_actorKeep_c mCargoCarryAcKeep;
/* 0x0285C */ daPy_actorKeep_c field_0x285c;
/* 0x02864 */ dMsgFlow_c mMsgFlow;
/* 0x028B0 */ int field_0x28b0[0x10];
/* 0x028B0 */ unsigned int mShieldArrowIDs[16];
/* 0x028F0 */ unsigned int mMsgClassID;
/* 0x028F4 */ int mAtnActorID;
/* 0x028F8 */ int field_0x28f8;
include/d/a/d_a_npc.h
+3 -3
View File
@@ -259,7 +259,7 @@ public:
/* 0xD90 */ u32 field_0xd90;
/* 0xD94 */ u32 field_0xd94;
/* 0xD98 */ u32 field_0xd98;
/* 0xD9C */ profile_method_class* mSubMtd;
/* 0xD9C */ profile_method_class* sub_method;
/* 0xDA0 */ u8 field_0xda0[8];
/* 0xDA8 */ u32 field_0xda8;
/* 0xDAC */ int field_0xdac;
@@ -640,13 +640,13 @@ public:
/* 80155BCC */ virtual void drawOtherMdls();
BOOL chkActorInSpeakArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) {
return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[3]);
return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.field_0x0[3]);
}
BOOL chkPlayerInSpeakArea(fopAc_ac_c* i_actor) {
return chkActorInSpeakArea(daPy_getPlayerActorClass(), i_actor);
}
BOOL chkActorInTalkArea(fopAc_ac_c* i_actorCheck, fopAc_ac_c* i_actorArea) {
return chkActorInAttnArea(i_actorCheck, i_actorArea, mAttentionInfo.field_0x0[1]);
return chkActorInAttnArea(i_actorCheck, i_actorArea, attention_info.field_0x0[1]);
}
BOOL chkPlayerInTalkArea(fopAc_ac_c* i_actor) {
return chkActorInTalkArea(daPy_getPlayerActorClass(), i_actor);
include/d/d_item.h
+1
View File
@@ -396,5 +396,6 @@ int isBomb(u8);
int isArrow(u8);
int addBombCount(u8, u8);
BOOL isBottleItem(u8 item_no);
u8 check_itemno(int i_itemNo);
#endif /* D_D_ITEM_H */
include/dolphin/os.h
+1
View File
@@ -99,6 +99,7 @@ void OSReportInit(void);
#define ASSERTMSG(exp, msg) (void)((exp) || (OSPanic(__FILE__, __LINE__, (msg)), 0))
#else
#define OS_REPORT(...)
#define OS_REPORT_ERROR(...)
#define OS_PANIC(...)
#define ASSERTMSG(exp, msg) ((void)0)
#endif
include/f_op/f_op_actor.h
+39 -47
View File
@@ -13,10 +13,10 @@ struct actor_method_class {
struct actor_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition mBase;
/* 0x24 */ actor_method_class* mSubMtd;
/* 0x28 */ u32 mStatus;
/* 0x24 */ actor_method_class* sub_method;
/* 0x28 */ u32 status;
/* 0x2C */ u8 mActorType;
/* 0x2D */ u8 mCullType;
/* 0x2D */ u8 cullType;
};
// Unclear what this is. Only appears in 4 profiles (BG,DSHUTTER,PATH,SCENE_EXIT)
@@ -156,8 +156,6 @@ public:
}; // Size = 0x18
struct actor_place {
/* 807E2468 */ // void operator=(actor_place const&);
/* 0x00 */ cXyz pos;
/* 0x0C */ csXyz angle;
/* 0x12 */ s8 roomNo;
@@ -165,65 +163,63 @@ struct actor_place {
};
struct actor_attention_types {
void setFlag(u32 flags) { mFlags |= flags; }
/* 0x00 */ u8 field_0x0[9];
/* 0x0A */ s16 field_0xa;
/* 0x0C */ cXyz mPosition;
/* 0x18 */ u32 mFlags;
/* 0x0C */ cXyz position;
/* 0x18 */ u32 flags;
}; // Size = 0x1C
class dJntCol_c;
struct cull_sphere {
/* 0x0 */ Vec mCenter;
/* 0xC */ f32 mRadius;
/* 0x0 */ Vec center;
/* 0xC */ f32 radius;
};
struct cull_box {
/* 0x0 */ Vec mMin;
/* 0xC */ Vec mMax;
/* 0x0 */ Vec min;
/* 0xC */ Vec max;
};
class fopAc_ac_c : public leafdraw_class {
public:
/* 0x0C0 */ int mAcType;
/* 0x0C4 */ create_tag_class mAcTg;
/* 0x0D8 */ create_tag_class mDwTg;
/* 0x0EC */ profile_method_class* mSubMtd;
/* 0x0F0 */ JKRSolidHeap* mHeap;
/* 0x0F4 */ dEvt_info_c mEvtInfo;
/* 0x10C */ dKy_tevstr_c mTevStr;
/* 0x494 */ u16 mSetID;
/* 0x496 */ u8 mGroup;
/* 0x497 */ s8 mCullType;
/* 0x498 */ u8 mDemoActorId;
/* 0x499 */ s8 mSubtype;
/* 0x49A */ u8 mCarryType;
/* 0x49C */ u32 mStatus;
/* 0x4A0 */ u32 mCondition;
/* 0x4A4 */ u32 mParentPcId;
/* 0x4A8 */ actor_place orig;
/* 0x4BC */ actor_place next;
/* 0x0C0 */ int actor_type;
/* 0x0C4 */ create_tag_class actor_tag;
/* 0x0D8 */ create_tag_class draw_tag;
/* 0x0EC */ profile_method_class* sub_method;
/* 0x0F0 */ JKRSolidHeap* heap;
/* 0x0F4 */ dEvt_info_c eventInfo;
/* 0x10C */ dKy_tevstr_c tevStr;
/* 0x494 */ u16 setID;
/* 0x496 */ u8 group;
/* 0x497 */ u8 cullType;
/* 0x498 */ u8 demoActorID;
/* 0x499 */ s8 subtype;
/* 0x49A */ u8 carryType;
/* 0x49C */ u32 actor_status;
/* 0x4A0 */ u32 actor_condition;
/* 0x4A4 */ u32 parentActorID;
/* 0x4A8 */ actor_place home;
/* 0x4BC */ actor_place old;
/* 0x4D0 */ actor_place current;
/* 0x4E4 */ csXyz shape_angle;
/* 0x4EC */ cXyz mScale;
/* 0x4EC */ cXyz scale;
/* 0x4F8 */ cXyz speed;
/* 0x504 */ MtxP mCullMtx;
/* 0x504 */ MtxP cullMtx;
union {
/* 0x508 */ cull_box mBox;
/* 0x508 */ cull_sphere mSphere;
} mCull;
/* 0x520 */ f32 mCullSizeFar;
/* 0x508 */ cull_box box;
/* 0x508 */ cull_sphere sphere;
} cull;
/* 0x520 */ f32 cullSizeFar;
/* 0x524 */ J3DModel* model;
/* 0x528 */ dJntCol_c* mJntCol;
/* 0x528 */ dJntCol_c* jntCol;
/* 0x52C */ f32 speedF;
/* 0x530 */ f32 mGravity;
/* 0x534 */ f32 mMaxFallSpeed;
/* 0x538 */ cXyz mEyePos;
/* 0x544 */ actor_attention_types mAttentionInfo;
/* 0x530 */ f32 gravity;
/* 0x534 */ f32 maxFallSpeed;
/* 0x538 */ cXyz eyePos;
/* 0x544 */ actor_attention_types attention_info;
/* 0x560 */ s16 field_0x560;
/* 0x562 */ s16 mHealth;
/* 0x562 */ s16 health;
/* 0x564 */ u8 field_0x564;
/* 0x565 */ u8 field_0x565;
/* 0x566 */ u8 field_0x566;
@@ -233,10 +229,6 @@ public:
~fopAc_ac_c();
static u32 stopStatus;
const cXyz& getPosition() const { return current.pos; }
const csXyz& getAngle() const { return current.angle; }
s8 getRoomNo() const { return current.roomNo; }
}; // Size: 0x568
STATIC_ASSERT(sizeof(fopAc_ac_c) == 0x568);
include/f_op/f_op_actor_mng.h
+45 -148
View File
@@ -141,15 +141,15 @@ inline s16 fopAcM_GetName(void* pActor) {
}
inline MtxP fopAcM_GetMtx(const fopAc_ac_c* pActor) {
return pActor->mCullMtx;
return pActor->cullMtx;
}
inline u32 fopAcM_checkStatus(fopAc_ac_c* pActor, u32 status) {
return pActor->mStatus & status;
inline u32 fopAcM_checkStatus(fopAc_ac_c* pActor, u32 actor_status) {
return pActor->actor_status & actor_status;
}
inline u32 fopAcM_checkCarryNow(fopAc_ac_c* pActor) {
return pActor->mStatus & 0x2000;
return pActor->actor_status & 0x2000;
}
enum fopAcM_CARRY {
@@ -163,7 +163,7 @@ enum fopAcM_CARRY {
};
inline u32 fopAcM_CheckCarryType(fopAc_ac_c* actor, fopAcM_CARRY type) {
return actor->mCarryType & type;
return actor->carryType & type;
}
inline u32 fopAcM_checkHookCarryNow(fopAc_ac_c* pActor) {
@@ -183,7 +183,7 @@ inline void fopAcM_SetParam(void* p_actor, u32 param) {
}
inline void fopAcM_SetJntCol(fopAc_ac_c* i_actorP, dJntCol_c* i_jntColP) {
i_actorP->mJntCol = i_jntColP;
i_actorP->jntCol = i_jntColP;
}
inline s16 fopAcM_GetProfName(const void* pActor) {
@@ -191,15 +191,15 @@ inline s16 fopAcM_GetProfName(const void* pActor) {
}
inline u8 fopAcM_GetGroup(const fopAc_ac_c* p_actor) {
return p_actor->mGroup;
return p_actor->group;
}
inline void fopAcM_OnStatus(fopAc_ac_c* pActor, u32 flag) {
pActor->mStatus |= flag;
pActor->actor_status |= flag;
}
inline void fopAcM_OffStatus(fopAc_ac_c* pActor, u32 flag) {
pActor->mStatus &= ~flag;
pActor->actor_status &= ~flag;
}
inline fopAc_ac_c* fopAcM_Search(fopAcIt_JudgeFunc func, void* param) {
@@ -210,40 +210,40 @@ inline fopAc_ac_c* fopAcM_SearchByID(unsigned int id) {
return (fopAc_ac_c*)fopAcIt_Judge((fopAcIt_JudgeFunc)fpcSch_JudgeByID, &id);
}
inline cXyz& fopAcM_GetPosition_p(fopAc_ac_c* pActor) {
return pActor->current.pos;
inline cXyz* fopAcM_GetPosition_p(fopAc_ac_c* pActor) {
return &pActor->current.pos;
}
inline cXyz& fopAcM_GetPosition(fopAc_ac_c* pActor) {
return pActor->current.pos;
}
inline cXyz& fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) {
return pActor->next.pos;
inline cXyz* fopAcM_GetOldPosition_p(fopAc_ac_c* pActor) {
return &pActor->old.pos;
}
inline cXyz& fopAcM_GetSpeed_p(fopAc_ac_c* pActor) {
return pActor->speed;
inline cXyz* fopAcM_GetSpeed_p(fopAc_ac_c* pActor) {
return &pActor->speed;
}
inline csXyz& fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
return pActor->current.angle;
inline csXyz* fopAcM_GetAngle_p(fopAc_ac_c* pActor) {
return &pActor->current.angle;
}
inline csXyz& fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
return pActor->shape_angle;
inline csXyz* fopAcM_GetShapeAngle_p(fopAc_ac_c* pActor) {
return &pActor->shape_angle;
}
inline bool fopAcM_CheckCondition(fopAc_ac_c* p_actor, u32 flag) {
return p_actor->mCondition & flag;
return p_actor->actor_condition & flag;
}
inline void fopAcM_OnCondition(fopAc_ac_c* p_actor, u32 flag) {
p_actor->mCondition |= flag;
p_actor->actor_condition |= flag;
}
inline void fopAcM_OffCondition(fopAc_ac_c* p_actor, u32 flag) {
p_actor->mCondition &= ~flag;
p_actor->actor_condition &= ~flag;
}
inline BOOL fopAcM_IsActor(void* actor) {
@@ -263,19 +263,19 @@ inline void fopAcM_cancelHookCarryNow(fopAc_ac_c* actor) {
}
inline s8 fopAcM_GetHomeRoomNo(const fopAc_ac_c* pActor) {
return pActor->orig.roomNo;
return pActor->home.roomNo;
}
inline void fopAcM_SetGravity(fopAc_ac_c* actor, f32 gravity) {
actor->mGravity = gravity;
actor->gravity = gravity;
}
inline void fopAcM_SetMaxFallSpeed(fopAc_ac_c* actor, f32 speed) {
actor->mMaxFallSpeed = speed;
actor->maxFallSpeed = speed;
}
inline void fopAcM_SetMtx(fopAc_ac_c* actor, MtxP m) {
actor->mCullMtx = m;
actor->cullMtx = m;
}
inline void fopAcM_SetSpeed(fopAc_ac_c* actor, f32 x, f32 y, f32 z) {
@@ -286,8 +286,8 @@ inline void fopAcM_SetSpeedF(fopAc_ac_c* actor, f32 f) {
actor->speedF = f;
}
inline void fopAcM_SetStatus(fopAc_ac_c* actor, u32 status) {
actor->mStatus = status;
inline void fopAcM_SetStatus(fopAc_ac_c* actor, u32 actor_status) {
actor->actor_status = actor_status;
}
inline void fopAcM_SetModel(fopAc_ac_c* actor, J3DModel* model) {
@@ -307,39 +307,39 @@ inline f32 fopAcM_GetSpeedF(const fopAc_ac_c* p_actor) {
}
inline f32 fopAcM_GetGravity(const fopAc_ac_c* p_actor) {
return p_actor->mGravity;
return p_actor->gravity;
}
inline f32 fopAcM_GetMaxFallSpeed(const fopAc_ac_c* p_actor) {
return p_actor->mMaxFallSpeed;
return p_actor->maxFallSpeed;
}
inline const cXyz& fopAcM_GetSpeed_p(const fopAc_ac_c* p_actor) {
return p_actor->speed;
inline const cXyz* fopAcM_GetSpeed_p(const fopAc_ac_c* p_actor) {
return &p_actor->speed;
}
inline const cXyz& fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) {
return p_actor->current.pos;
inline const cXyz* fopAcM_GetPosition_p(const fopAc_ac_c* p_actor) {
return &p_actor->current.pos;
}
inline dJntCol_c* fopAcM_GetJntCol(fopAc_ac_c* i_actor) {
return i_actor->mJntCol;
return i_actor->jntCol;
}
inline void fopAcM_setCullSizeFar(fopAc_ac_c* i_actor, f32 i_far) {
i_actor->mCullSizeFar = i_far;
i_actor->cullSizeFar = i_far;
}
inline f32 fopAcM_getCullSizeFar(const fopAc_ac_c* i_actor) {
return i_actor->mCullSizeFar;
return i_actor->cullSizeFar;
}
inline void fopAcM_SetCullSize(fopAc_ac_c* i_actor, s8 i_cullsize) {
i_actor->mCullType = i_cullsize;
i_actor->cullType = i_cullsize;
}
inline int fopAcM_GetCullSize(const fopAc_ac_c* i_actor) {
return i_actor->mCullType;
return i_actor->cullType;
}
inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
@@ -347,11 +347,11 @@ inline BOOL fopAcM_CULLSIZE_IS_BOX(int i_culltype) {
}
inline Vec fopAcM_getCullSizeSphereCenter(const fopAc_ac_c* i_actor) {
return i_actor->mCull.mSphere.mCenter;
return i_actor->cull.sphere.center;
}
inline f32 fopAcM_getCullSizeSphereR(const fopAc_ac_c* i_actor) {
return i_actor->mCull.mSphere.mRadius;
return i_actor->cull.sphere.radius;
}
inline void dComIfGs_onSwitch(int i_no, int i_roomNo);
@@ -390,7 +390,7 @@ inline f32 fopAcM_searchActorDistanceY(const fopAc_ac_c* actorA, const fopAc_ac_
}
inline u16 fopAcM_GetSetId(const fopAc_ac_c* p_actor) {
return p_actor->mSetID;
return p_actor->setID;
}
inline void dComIfGs_onActor(int bitNo, int roomNo);
@@ -638,12 +638,12 @@ inline void fopAcM_seStartCurrent(const fopAc_ac_c* actor, u32 sfxID, u32 param_
inline void fopAcM_seStart(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
mDoAud_seStart(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo));
mDoAud_seStart(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo));
}
inline void fopAcM_seStartLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
s8 roomNo = fopAcM_GetRoomNo(actor);
i_mDoAud_seStartLevel(sfxID, &actor->mEyePos, param_2, dComIfGp_getReverb(roomNo));
i_mDoAud_seStartLevel(sfxID, &actor->eyePos, param_2, dComIfGp_getReverb(roomNo));
}
inline void fopAcM_seStartCurrentLevel(const fopAc_ac_c* actor, u32 sfxID, u32 param_2) {
@@ -656,110 +656,7 @@ inline void fopAcM_offActor(fopAc_ac_c* pActor, u32 flag) {
}
inline void fopAcM_OnCarryType(fopAc_ac_c* pActor, fopAcM_CARRY param_2) {
pActor->mCarryType |= param_2;
}
extern "C" {
void fopAcM_initManager__Fv(void);
void fopAcM_CreateAppend__Fv(void);
void fopAcM_DeleteHeap__FP10fopAc_ac_c(void);
void fopAcM_FastCreate__FsPFPv_iPvPv(void);
void fopAcM_Log__FPC10fopAc_ac_cPCc(void);
void fopAcM_SearchByID__FUiPP10fopAc_ac_c(void);
void fopAcM_calcSpeed__FP10fopAc_ac_c(void);
void fopAcM_callCallback__FP10fopAc_ac_cPFP10fopAc_ac_c_iP7JKRHeap(void);
void fopAcM_cancelCarryNow__FP10fopAc_ac_c(void);
void fopAcM_create__FsUsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
void fopAcM_createChild__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
void fopAcM_createDemoItem__FPC4cXyziiPC5csXyziPC4cXyzUc(void);
void fopAcM_createItem__FPC4cXyziiiPC5csXyzPC4cXyzi(void);
void fopAcM_createItemForDirectGet__FPC4cXyziiPC5csXyzPC4cXyzff(void);
void fopAcM_createItemForPresentDemo__FPC4cXyziUciiPC5csXyzPC4cXyz(void);
void fopAcM_createItemForSimpleDemo__FPC4cXyziiPC5csXyzPC4cXyzff(void);
void fopAcM_createItemForTrBoxDemo__FPC4cXyziiiPC5csXyzPC4cXyz(void);
void fopAcM_createItemFromTable__FPC4cXyziiiPC5csXyziPC4cXyzPfPfb(void);
void fopAcM_create__FsUlPC4cXyziPC5csXyzPC4cXyzSc(void);
void fopAcM_cullingCheck__FPC10fopAc_ac_c(void);
void fopAcM_delete__FP10fopAc_ac_c(void);
void fopAcM_delete__FUi(void);
void fopAcM_effHamonSet__FPUlPC4cXyzff(void);
void fopAcM_entrySolidHeap__FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(void);
void fopAcM_entrySolidHeap___FP10fopAc_ac_cPFP10fopAc_ac_c_iUl(void);
void fopAcM_fastCreate__FsUlPC4cXyziPC5csXyzPC4cXyzScPFPv_iPv(void);
void fopAcM_fastCreateItem__FPC4cXyziiPC5csXyzPC4cXyzPfPfiiPFPv_i(void);
void fopAcM_fastCreateItem2__FPC4cXyziiiiPC5csXyzPC4cXyz(void);
void fopAcM_fastCreate__FPCcUlPC4cXyziPC5csXyzPC4cXyzPFPv_iPv(void);
void fopAcM_findObject4EventCB__FP10fopAc_ac_cPv(void);
void fopAcM_findObjectCB__FPC10fopAc_ac_cPv(void);
void gndCheck__11fopAcM_gc_cFPC4cXyz(void);
void fopAcM_getEventPartner__FPC10fopAc_ac_c(void);
void fopAcM_getItemEventPartner__FPC10fopAc_ac_c(void);
void fopAcM_getItemNoFromTableNo__FUc(void);
void fopAcM_getPolygonAngle__FRC13cBgS_PolyInfos(void);
void fopAcM_getPolygonAngle__FPC8cM3dGPlas(void);
void fopAcM_getProcNameString__FPC10fopAc_ac_c(void);
void fopAcM_getTalkEventPartner__FPC10fopAc_ac_c(void);
void fopAcM_getWaterStream__FPC4cXyzRC13cBgS_PolyInfoP4cXyzPii(void);
void fopAcM_getWaterY__FPC4cXyzPf(void);
void lineCheck__11fopAcM_lc_cFPC4cXyzPC4cXyzPC10fopAc_ac_c(void);
void fopAcM_orderCatchEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_orderChangeEventId__FP10fopAc_ac_csUsUs(void);
void fopAcM_orderDoorEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_orderItemEvent__FP10fopAc_ac_cUsUs(void);
void fopAcM_orderMapToolAutoNextEvent__FP10fopAc_ac_cUcsUsUsUs(void);
void fopAcM_orderMapToolEvent__FP10fopAc_ac_cUcsUsUsUs(void);
void fopAcM_orderOtherEvent__FP10fopAc_ac_cPCcUsUsUs(void);
void fopAcM_orderOtherEventId__FP10fopAc_ac_csUcUsUsUs(void);
void fopAcM_orderOtherEvent__FP10fopAc_ac_cP10fopAc_ac_cPCcUsUsUs(void);
void fopAcM_orderSpeakEvent__FP10fopAc_ac_cUsUs(void);
void fopAcM_orderTalkEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_orderTalkItemBtnEvent__FUsP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_orderTreasureEvent__FP10fopAc_ac_cP10fopAc_ac_cUsUs(void);
void fopAcM_posMove__FP10fopAc_ac_cPC4cXyz(void);
void fopAcM_posMoveF__FP10fopAc_ac_cPC4cXyz(void);
void fopAcM_searchActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchActorDistance__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchActorDistanceXZ__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchActorDistanceXZ2__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchFromName__FPCcUlUl(void);
void fopAcM_searchFromName4Event__FPCcs(void);
void fopAcM_seenActorAngleY__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_setCarryNow__FP10fopAc_ac_ci(void);
void fopAcM_setCullSizeBox__FP10fopAc_ac_cffffff(void);
void fopAcM_setEffectMtx__FPC10fopAc_ac_cPC12J3DModelData(void);
void fopAcM_setRoomLayer__FPvi(void);
void fopAcM_setStageLayer__FPv(void);
void waterCheck__11fopAcM_wt_cFPC4cXyz(void);
void fpoAcM_relativePos__FPC10fopAc_ac_cPC4cXyzP4cXyz(void);
void fopAcM_SearchByName__FsPP10fopAc_ac_c(void);
void fopAcM_createChildFromOffset__FsUiUlPC4cXyziPC5csXyzPC4cXyzScPFPv_i(void);
void fopAcM_SetMin__FP10fopAc_ac_cfff(void);
void fopAcM_SetMax__FP10fopAc_ac_cfff(void);
void fopAcM_setCullSizeSphere__FP10fopAc_ac_cffff(void);
void fopAcM_setCullSizeBox2__FP10fopAc_ac_cP12J3DModelData(void);
void fopAcM_addAngleY__FP10fopAc_ac_css(void);
void fopAcM_searchActorAngleX__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_searchActorDistance2__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_rollPlayerCrash__FPC10fopAc_ac_cfUlffif(void);
void fopAcM_checkCullingBox__FPA4_fffffff(void);
void fopAcM_orderPotentialEvent__FP10fopAc_ac_cUsUsUs(void);
void fopAcM_createItemFromEnemyID__FUcPC4cXyziiPC5csXyzPC4cXyzPfPf(void);
void fopAcM_createItemForBoss__FPC4cXyziiPC5csXyzPC4cXyzffi(void);
void fopAcM_createItemForMidBoss__FPC4cXyziiPC5csXyzPC4cXyzii(void);
void fopAcM_createBokkuri__FUsPC4cXyziiiPC4cXyzii(void);
void fopAcM_createWarpHole__FPC4cXyzPC5csXyziUcUcUc(void);
void fopAcM_myRoomSearchEnemy__FSc(void);
void fopAcM_createDisappear__FPC10fopAc_ac_cPC4cXyzUcUcUc(void);
void fopAcM_otoCheck__FPC10fopAc_ac_cf(void);
void fopAcM_otherBgCheck__FPC10fopAc_ac_cPC10fopAc_ac_c(void);
void fopAcM_wayBgCheck__FPC10fopAc_ac_cff(void);
void fopAcM_plAngleCheck__FPC10fopAc_ac_cs(void);
void fopAcM_effSmokeSet1__FPUlPUlPC4cXyzPC5csXyzfPC12dKy_tevstr_ci(void);
void fopAcM_riverStream__FP4cXyzPsPff(void);
void fopAcM_carryOffRevise__FP10fopAc_ac_c(void);
void fopAcM_searchFromName4Event__FPCcs(void);
void fopAcM_GetName__FPv(void); // mostly inlined
void fopAcM_GetID__FPCv(void); // mostly inlined
pActor->carryType |= param_2;
}
#endif
include/f_op/f_op_camera.h
+1 -1
View File
@@ -7,7 +7,7 @@ class camera_class;
struct camera_process_profile_definition {
/* 0x00 */ view_process_profile_definition mBase;
/* 0x3C */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x3C */ leafdraw_method_class* sub_method; // Subclass methods
};
static s32 fopCam_Draw(camera_class* param_1);
include/f_op/f_op_kankyo.h
+3 -3
View File
@@ -7,8 +7,8 @@
class kankyo_class : public leafdraw_class {
public:
/* 0xC0 */ int mBsType;
/* 0xC4 */ create_tag_class mDwTg;
/* 0xD8 */ leafdraw_method_class* mSubMtd;
/* 0xC4 */ create_tag_class draw_tag;
/* 0xD8 */ leafdraw_method_class* sub_method;
/* 0xDC */ cXyz mPos;
/* 0xE8 */ cXyz mScale;
/* 0xF4 */ u32 mParam;
@@ -16,7 +16,7 @@ public:
struct kankyo_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition base;
/* 0x24 */ leafdraw_method_class* mSubMtd;
/* 0x24 */ leafdraw_method_class* sub_method;
}; // Size: 0x28
extern leafdraw_method_class g_fopKy_Method;
include/f_op/f_op_msg.h
+2 -2
View File
@@ -9,8 +9,8 @@ class fopAc_ac_c;
class msg_class : public leafdraw_class {
public:
/* 0xC0 */ int mMsgType;
/* 0xC4 */ create_tag_class mDwTg;
/* 0xD8 */ leafdraw_method_class* mSubMtd;
/* 0xC4 */ create_tag_class draw_tag;
/* 0xD8 */ leafdraw_method_class* sub_method;
/* 0xDC */ fopAc_ac_c* mpActor;
/* 0xE0 */ cXyz mPos;
/* 0xEC */ u32 mMsgID;
include/f_op/f_op_msg_mng.h
+1 -1
View File
@@ -11,7 +11,7 @@ class msg_class;
struct msg_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition mBase;
/* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods
};
struct fopMsg_prm_class {
include/f_op/f_op_overlap.h
+1 -1
View File
@@ -12,7 +12,7 @@ public:
struct overlap_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition base;
/* 0x24 */ leafdraw_method_class* mSubMtd;
/* 0x24 */ leafdraw_method_class* sub_method;
}; // Size: 0x28
static s32 fopOvlp_Draw(void* param_1);
include/f_op/f_op_view.h
+2 -2
View File
@@ -7,7 +7,7 @@
struct view_process_profile_definition {
/* 0x00 */ leaf_process_profile_definition mBase;
/* 0x24 */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x24 */ leafdraw_method_class* sub_method; // Subclass methods
/* 0x28 */ u8 unk28;
/* 0x29 */ u8 unk29[3]; // pad
/* 0x2C */ u32 unk2C;
@@ -41,7 +41,7 @@ struct view_port_class {
};
struct view_class : public leafdraw_class {
/* 0x0C0 */ leafdraw_method_class* mSubMtd;
/* 0x0C0 */ leafdraw_method_class* sub_method;
/* 0x0C4 */ u8 field_0xc4;
/* 0x0C8 */ f32 mNear;
/* 0x0CC */ f32 mFar;
include/f_pc/f_pc_leaf.h
+1 -1
View File
@@ -23,7 +23,7 @@ typedef struct leafdraw_class {
typedef struct leaf_process_profile_definition {
/* 0x00 */ process_profile_definition mBase;
/* 0x1C */ leafdraw_method_class* mSubMtd; // Subclass methods
/* 0x1C */ leafdraw_method_class* sub_method; // Subclass methods
/* 0x20 */ s16 mPriority; // mDrawPriority
} leaf_process_profile_definition;
include/f_pc/f_pc_node.h
+1 -1
View File
@@ -22,7 +22,7 @@ typedef struct process_node_class {
typedef struct node_process_profile_definition {
/* 0x00 */ process_profile_definition mBase;
/* 0x1C */ process_method_class* mSubMtd; // Subclass methods
/* 0x1C */ process_method_class* sub_method; // Subclass methods
} node_process_profile_definition;
s32 fpcNd_DrawMethod(nodedraw_method_class* pNodeMethod, void* pData);
include/f_pc/f_pc_profile.h
+1 -1
View File
@@ -13,7 +13,7 @@ typedef struct process_profile_definition {
/* 0x04 */ u16 mListID;
/* 0x06 */ u16 mListPrio;
/* 0x08 */ s16 mProcName;
/* 0x0C */ process_method_class* mSubMtd; // Subclass methods
/* 0x0C */ process_method_class* sub_method; // Subclass methods
/* 0x10 */ s32 mSize;
/* 0x14 */ s32 mSizeOther;
/* 0x18 */ s32 mParameters;
include/rel/d/a/d_a_scene_exit/d_a_scene_exit.h
+2 -2
View File
@@ -12,8 +12,8 @@ public:
u8 getArg1() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u8 getArg0() { return fopAcM_GetParam(this); }
u32 getSwNo() { return fopAcM_GetParam(this) >> 0x18; }
u16 getOffEventBit() { return orig.angle.z & 0xFFF; }
u16 getOnEventBit() { return orig.angle.x & 0xFFF; }
u16 getOffEventBit() { return home.angle.z & 0xFFF; }
u16 getOnEventBit() { return home.angle.x & 0xFFF; }
u8 getPathID() { return (fopAcM_GetParam(this) >> 0x10) & 0xFF; }
void setSceneChangeOK() { mSceneChangeOK = true; }
include/rel/d/a/d_a_tbox/d_a_tbox.h
+2 -1
View File
@@ -7,12 +7,13 @@
#include "d/bg/d_bg_s_movebg_actor.h"
#include "f_op/f_op_actor_mng.h"
#include "m_Do/m_Do_hostIO.h"
#include "dolphin/types.h"
class dBgW;
class daTboxBase_c : public dBgS_MoveBgActor {
protected:
virtual BOOL checkSmallTbox() = 0;
/* 0x5A0 */ dCcD_Stts mStts;
/* 0x5DC */ dCcD_Cyl mCyl;
};
include/rel/d/a/d_a_tbox2/d_a_tbox2.h
+74 -1
View File
@@ -1,6 +1,79 @@
#ifndef D_A_TBOX2_H
#define D_A_TBOX2_H
#include "dolphin/types.h"
#include "rel/d/a/d_a_tbox/d_a_tbox.h"
class daTbox2_c : public daTboxBase_c {
public:
enum Type_e {
TYPE_SMALL_e,
TYPE_BIG_e,
};
enum Mode_e {
MODE_EXEC_WAIT_e,
MODE_EXEC_e,
};
enum Action_e {
ACTION_OPEN_WAIT_e,
ACTION_OPEN_DEMO_e,
ACTION_NOT_OPEN_DEMO_e,
ACTION_WAIT_e,
};
enum EventAct_e {
EVACT_WAIT_e,
EVACT_OPEN_e,
EVACT_APPEAR_e,
EVACT_OPEN_SHORT_e,
};
/* 80496A18 */ void initBaseMtx();
/* 80496A54 */ void setBaseMtx();
/* 80496E3C */ int create1st();
/* 8049724C */ int demoProc();
/* 80497478 */ void openInit();
/* 804975EC */ void mode_proc_call();
/* 80497678 */ void mode_exec_wait();
/* 80497790 */ void mode_exec();
/* 8049780C */ void action();
/* 804978C8 */ void init_actionWait();
/* 804978D4 */ void actionWait();
/* 804978D8 */ void init_actionNotOpenDemo();
/* 804978E4 */ void actionNotOpenDemo();
/* 8049794C */ void init_actionOpenDemo();
/* 80497958 */ void actionOpenDemo();
/* 80497A0C */ void init_actionOpenWait();
/* 80497A18 */ void actionOpenWait();
/* 80497BD0 */ int setGetDemoItem();
/* 80497C60 */ BOOL boxCheck();
/* 80496C20 */ virtual int CreateHeap();
/* 80496AB8 */ virtual int Create();
/* 80497500 */ virtual int Execute(f32 (**)[3][4]);
/* 80497DA0 */ virtual int Draw();
/* 80497E6C */ virtual int Delete();
/* 80498140 */ virtual BOOL checkSmallTbox() { return true; }
u8 getModelType() { return fopAcM_GetParamBit(this, 8, 4); }
u8 getItemNo() { return fopAcM_GetParamBit(this, 0, 8); }
/* 0x718 */ u8 mReturnRupee;
/* 0x71C */ request_of_phase_process_class mPhase;
/* 0x724 */ J3DModel* mpModel;
/* 0x728 */ mDoExt_bckAnm* mpBck;
/* 0x72C */ dBgS_ObjAcch mAcch;
/* 0x904 */ dBgS_AcchCir mAcchCir;
/* 0x944 */ dCcD_Stts mCcStts2;
/* 0x980 */ dCcD_Cyl mCcCyl2;
/* 0xABC */ u8 mModelType;
/* 0xABD */ u8 mAction;
/* 0xABE */ u8 mMode;
/* 0xABF */ bool mNoDraw;
/* 0xAC0 */ u8 field_0xAC0[0xAC4 - 0xAC0];
/* 0xAC4 */ int mStaffIdx;
/* 0xAC8 */ dBgW* mBoxBgW;
};
#endif /* D_A_TBOX2_H */
include/rel/d/a/npc/d_a_npc_ne/d_a_npc_ne.h
+1 -1
View File
@@ -177,7 +177,7 @@ public:
#endif
/* 0x04 */ s8 field_0x04;
/* 0x08 */ f32 mScale;
/* 0x08 */ f32 scale;
/* 0x0C */ f32 mWalkSpeed;
/* 0x10 */ f32 mRunSpeed;
/* 0x14 */ f32 mSwimSpeed;
include/rel/d/a/npc/d_a_npc_wrestler/d_a_npc_wrestler.h
+1 -1
View File
@@ -80,7 +80,7 @@ public:
/* 80B40D24 */ virtual void drawOtherMdls();
int getWrestlerAction() { return mWrestlerAction; }
u8 getType() { return mSubtype & 0x7F; }
u8 getType() { return subtype & 0x7F; }
u8 getWrestlerType() { return getType(); }
static u8 mEvtSeqList[84];
include/rel/d/a/obj/d_a_obj_grave_stone/d_a_obj_grave_stone.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
/* 0x00 */ bool field_0x00;
/* 0x04 */ cXyz mPos;
/* 0x10 */ csXyz mAngle;
/* 0x18 */ cXyz mScale;
/* 0x18 */ cXyz scale;
/* 0x24 */ dPaPo_c field_0x24;
}; // Size: 0x5C
include/rel/d/a/obj/d_a_obj_sekizoa/d_a_obj_sekizoa.h
+1 -1
View File
@@ -69,7 +69,7 @@ public:
int prm = fopAcM_GetParam(this) >> 0x1C;
u8 type;
switch (mSubtype) {
switch (subtype) {
case 0:
switch (prm) {
case 1:
include/rel/d/a/obj/d_a_obj_stoneMark/d_a_obj_stoneMark.h
+1 -1
View File
@@ -20,7 +20,7 @@ public:
/* 0x0590 */ dBgS_ObjAcch mObjAcch;
/* 0x0768 */ dBgS_AcchCir mAcchCir;
/* 0x07A8 */ dCcD_Stts mStts;
/* 0x07E4 */ Mtx mCullMtx;
/* 0x07E4 */ Mtx cullMtx;
};
#endif /* D_A_OBJ_STONEMARK_H */
include/rel/d/a/obj/d_a_obj_wchain/d_a_obj_wchain.h
+2 -2
View File
@@ -33,12 +33,12 @@ public:
/* 80D310AC */ int execute();
/* 80D31810 */ int draw();
GXLightObj* getLightObj() { return &mTevStr.mLightObj.mLightObj; }
GXLightObj* getLightObj() { return &tevStr.mLightObj.mLightObj; }
J3DModelData* getChainModelData() { return mpChainModelData; }
cXyz* getChainPos() { return mChainPos; }
csXyz* getChainAngle() { return mChainAngle; }
s16* getChainAngleZ() { return mChainRotation; }
cXyz& getJumpAimPos() { return mEyePos; }
cXyz& getJumpAimPos() { return eyePos; }
cXyz& getTopPos() { return mTopPos; }
cXyz& getRoofPos() { return mRoofPos; }
f32 getPullLength() { return mPullLength; }
include/rel/d/a/obj/d_a_obj_wind_stone/d_a_obj_wind_stone.h
+1 -1
View File
@@ -26,7 +26,7 @@ public:
s8 getTuneId() { return fopAcM_GetParamBit(this, 4, 4); }
int getNextSceneId() { return fopAcM_GetParamBit(this, 0, 4); }
u32 getSwBit1() { return orig.angle.x & 0xff; }
u32 getSwBit1() { return home.angle.x & 0xff; }
u32 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
u32 getDelEveFlgId() { return fopAcM_GetParamBit(this, 0x10, 0x10); }
include/rel/d/a/obj/d_a_obj_yobikusa/d_a_obj_yobikusa.h
+1 -1
View File
@@ -33,7 +33,7 @@ public:
static u8 const M_attr[64];
static u8 ActionTable[72];
int getType() { return mSubtype & 0x7F; }
int getType() { return subtype & 0x7F; }
u8 getPathID() { return fopAcM_GetParam(this); }
bool isPlayerCorrect() { return (s8)(u8)(fopAcM_GetParam(this) >> 8) > 0; }
include/rel/d/a/tag/d_a_tag_assistance/d_a_tag_assistance.h
+1 -1
View File
@@ -8,7 +8,7 @@
class daTagAssist_c : public fopAc_ac_c {
public:
void create_init() {
mAttentionInfo.mFlags = 0;
attention_info.flags = 0;
field_0x570 = -1;
}
include/rel/d/a/tag/d_a_tag_chkpoint/d_a_tag_chkpoint.h
+13 -13
View File
@@ -9,7 +9,7 @@ class daTag_Chk_c : public fopAc_ac_c {
public:
/* 8048A6F8 */ s32 execute();
u16 getAreaType() { return orig.angle.z & 0x100; }
u16 getAreaType() { return home.angle.z & 0x100; }
u16 getHeight() { return fopAcM_GetParam(this) & 0xff; }
u8 getSwBit() { return fopAcM_GetParam(this) >> 8; }
u8 getSwBit2() { return fopAcM_GetParam(this) >> 16; }
@@ -18,27 +18,27 @@ public:
fopAcM_SetupActor(this, daTag_Chk_c);
if (getAreaType() == 0) {
mScale.x *= 50.0f;
mScale.y *= 100.0f;
mScale.z *= 50.0f;
scale.x *= 50.0f;
scale.y *= 100.0f;
scale.z *= 50.0f;
mPos1.set(current.pos.x - mScale.x, current.pos.y, current.pos.z - mScale.z);
mPos2.set(current.pos.x + mScale.x, current.pos.y + mScale.y, current.pos.z + mScale.z);
mPos1.set(current.pos.x - scale.x, current.pos.y, current.pos.z - scale.z);
mPos2.set(current.pos.x + scale.x, current.pos.y + scale.y, current.pos.z + scale.z);
} else {
mScale.x *= 100.0f;
mScale.y *= 100.0f;
mScale.z *= 0.0f;
scale.x *= 100.0f;
scale.y *= 100.0f;
scale.z *= 0.0f;
mPos1.set(0.0f, current.pos.y, 0.0f);
mPos2.set(0.0f, current.pos.y + mScale.y, 0.0f);
mPos2.set(0.0f, current.pos.y + scale.y, 0.0f);
}
mAttentionInfo.mPosition = current.pos;
attention_info.position = current.pos;
u16 l_height = getHeight();
l_height != 0xff ? mAttentionInfo.mPosition.y += l_height * 10.0f : mAttentionInfo.mPosition.y += mScale.y * 0.5f;
l_height != 0xff ? attention_info.position.y += l_height * 10.0f : attention_info.position.y += scale.y * 0.5f;
mEyePos = mAttentionInfo.mPosition;
eyePos = attention_info.position;
return cPhs_COMPLEATE_e;
}
private:
include/rel/d/a/tag/d_a_tag_myna2/d_a_tag_myna2.h
+1 -1
View File
@@ -11,7 +11,7 @@ public:
u8 getSwBit() { return fopAcM_GetParam(this) >> 8; }
u8 getMode() { return fopAcM_GetParam(this); }
f32 getExtent() { return mScale.x * 100.0f;}
f32 getExtent() { return scale.x * 100.0f;}
private:
/* 0x568 */ u32 mSwitchNo;
include/rel/d/a/tag/d_a_tag_push/d_a_tag_push.h
+2 -2
View File
@@ -28,10 +28,10 @@ public:
u8 getBitSW2() { return (fopAcM_GetParam(this) >> 8) & 0xFF; }
u32 getFlowNodeNo() {
if (orig.angle.x == 0xFFFF) {
if (home.angle.x == 0xFFFF) {
return 0xFFFFFFFF;
} else {
return orig.angle.x & 0xFFFF;
return home.angle.x & 0xFFFF;
}
}
include/rel/d/a/tag/d_a_tag_telop/d_a_tag_telop.h
+1 -1
View File
@@ -11,7 +11,7 @@ public:
int create();
void execute();
u16 getMessageNo() { return orig.angle.z; }
u16 getMessageNo() { return home.angle.z; }
private:
/* 0x568 */ u16 mMessageNo;
include/rel/d/a/tag/d_a_tag_theB_hint/d_a_tag_theB_hint.h
+1 -1
View File
@@ -71,7 +71,7 @@ public:
int create() {
fopAcM_SetupActor(this, daTagTheBHint_c);
field_0x568 = pow(mScale.x * 100.0f,2.0f);
field_0x568 = pow(scale.x * 100.0f,2.0f);
return cPhs_COMPLEATE_e;
}
include/rel/d/a/tag/d_a_tag_wljump/d_a_tag_wljump.h
+1 -1
View File
@@ -17,7 +17,7 @@ public:
if (field_0x568 < 0) {
return NULL;
} else {
return &mEyePos;
return &eyePos;
}
}