mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-09 12:37:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Improve several almost-matching TUs (#2653)

Browse Source
This commit is contained in:
Max Roncace
2025-09-13 16:02:28 -04:00
committed by GitHub
parent 1bec780a36
commit d3d34b03bc
17 changed files with 405 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/actor/d_a_grass.h
+11 -5
View File
@@ -13,8 +13,10 @@ public:
/* 8051DF54 */ void Direction_Set(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, cCcD_Obj*, csXyz*);
/* 8051E1C8 */ void WorkAt(fopAc_ac_c*, u32, int, dCcMassS_HitInf*, u16);
/* 8051EB88 */ void hitCheck(int, u16);
/* 80520940 */ ~dGrass_data_c();
/* 8052097C */ dGrass_data_c();
/* 80520940 */ ~dGrass_data_c() {}
/* 8052097C */ dGrass_data_c() {
m_state = 0;
}
/* 0x00 */ u8 m_state;
/* 0x01 */ u8 field_0x01;
@@ -33,7 +35,9 @@ class dGrass_room_c {
public:
/* 8051EDE0 */ void newData(dGrass_data_c*);
/* 8051EDF0 */ void deleteData();
/* 80520928 */ dGrass_room_c();
/* 80520928 */ dGrass_room_c() {
mp_data = NULL;
}
dGrass_data_c* getData() { return mp_data; }
@@ -42,7 +46,9 @@ public:
class dGrass_anm_c {
public:
/* 80520934 */ dGrass_anm_c();
/* 80520934 */ dGrass_anm_c() {
m_state = 0;
}
/* 0x00 */ u8 m_state;
/* 0x02 */ s16 m_angY;
@@ -62,7 +68,7 @@ public:
/* 805208E4 */ void setAnm(int, s16);
/* 8051F03C */ virtual void draw();
/* 8051BFBC */ virtual ~dGrass_packet_c() {}
/* 8051BFBC */ virtual ~dGrass_packet_c();
typedef void (dGrass_packet_c::*deleteFunc)(int);
static deleteFunc m_deleteRoom;
include/d/actor/d_a_npc_midp.h
+8 -10
View File
@@ -20,7 +20,6 @@ public:
TYPE_0,
TYPE_1,
};
/* 80A70C6C */ ~daNpc_midP_c();
/* 80A70D90 */ int create();
/* 80A71074 */ int CreateHeap();
@@ -55,13 +54,13 @@ public:
daNpcT_MotionSeqMngr_c::sequenceStepData_c const* param_5, int param_6,
daNpcT_evtData_c const* param_7, char** param_8) :
daNpcT_c(param_1, param_2, param_3, param_4, param_5, param_6, param_7, param_8) {}
/* 80A7390C */ u16 getEyeballRMaterialNo();
/* 80A73914 */ u16 getEyeballLMaterialNo();
/* 80A7391C */ s32 getHeadJointNo();
/* 80A73924 */ s32 getNeckJointNo();
/* 80A7392C */ s32 getBackboneJointNo();
/* 80A73934 */ BOOL checkChangeJoint(int);
/* 80A73944 */ BOOL checkRemoveJoint(int);
/* 80A7390C */ u16 getEyeballRMaterialNo() { return 3; }
/* 80A73914 */ u16 getEyeballLMaterialNo() { return 2; }
/* 80A7391C */ s32 getHeadJointNo() { return 4; }
/* 80A73924 */ s32 getNeckJointNo() { return 3; }
/* 80A7392C */ s32 getBackboneJointNo() { return 2; }
/* 80A73934 */ BOOL checkChangeJoint(int param_0) { return param_0 == 4; }
/* 80A73944 */ BOOL checkRemoveJoint(int param_0) { return param_0 == 8; }
int getFlowNodeNo() {
u16 nodeNo = home.angle.x;
@@ -88,7 +87,7 @@ STATIC_ASSERT(sizeof(daNpc_midP_c) == 0xfa0);
class daNpc_midP_Param_c {
public:
/* 80A73954 */ ~daNpc_midP_Param_c();
/* 80A73954 */ virtual ~daNpc_midP_Param_c() {}
struct Data {
/* 0x00 */ f32 field_0x00;
@@ -134,5 +133,4 @@ public:
static const Data m;
};
#endif /* D_A_NPC_MIDP_H */
include/d/actor/d_a_obj_volcball.h
-4
View File
@@ -27,9 +27,6 @@ public:
};
struct vball_s {
/* 80D21FA8 */ ~vball_s() {}
/* 80D2214C */ vball_s() {}
/* 0x000 */ J3DModel* mpModel;
/* 0x004 */ cXyz field_0x4;
/* 0x010 */ cXyz field_0x10;
@@ -108,7 +105,6 @@ public:
/* 80D23A0C */ int _delete();
/* 80D22DDC */ virtual bool eventStart();
/* 80D23B24 */ virtual ~daObjVolcBall_c() {}
u8 getSwBit() { return fopAcM_GetParamBit(this, 0, 8); }
u8 getSwBit2() { return fopAcM_GetParamBit(this, 8, 8); }
include/d/actor/d_a_player.h
+1 -1
View File
@@ -1043,7 +1043,7 @@ public:
cXyz* getRightHandPosP() { return &mRightHandPos; }
cXyz* getHeadTopPosP() { return &mHeadTopPos; }
const cXyz& getSwordTopPos() const { return mSwordTopPos; }
const cXyz getSwordTopPos() const { return mSwordTopPos; }
u32 checkWolf() const { return checkNoResetFlg1(FLG1_IS_WOLF); }
u32 checkEquipHeavyBoots() const { return checkNoResetFlg0(FLG0_EQUIP_HVY_BOOTS); }
include/d/d_kankyo.h
+16 -4
View File
@@ -507,12 +507,24 @@ inline dScnKy_env_light_c* dKy_getEnvlight() {
class dKankyo_HIO_c {
public:
/* 0x000 */ u8 pad[0xB4];
/* 0x0B4 */ u8 field_0xB4;
/* 0x0B8 */ f32 field_0xB8;
/* 0x0BC */ u8 field_0xBC[0x3F4 - 0xbc];
/* 0x000 */ u8 field_0x000[0x6d - 0x0];
/* 0x000 */ u8 field_0x06d;
/* 0x000 */ u8 field_0x06e[0xb4 - 0x6e];
/* 0x0B4 */ u8 field_0x0b4;
/* 0x0B8 */ f32 field_0x0b8;
/* 0x0BC */ u8 field_0x0bc[0x3f4 - 0xbc];
/* 0x3F4 */ f32 field_0x3f4;
/* 0x3F8 */ f32 field_0x3f8;
/* 0x3FC */ u8 field_0x3fc[0x694 - 0x3fc];
u8 field_0x694;
u8 field_0x695;
u8 field_0x696;
u8 field_0x697[0x698 - 0x697];
bool field_0x698;
u8 field_0x699[0x69c - 0x699];
f32 field_0x69c;
u8 field_0x6a0[0x79b - 0x6a0];
u8 field_0x79b;
};
extern dKankyo_HIO_c g_kankyoHIO;