mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-09-07 10:11:43 -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/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;
}
}