mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-05-24 15:20:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_a_bk OK

Browse Source
This commit is contained in:
LagoLunatic
2025-03-24 20:32:30 -04:00
parent 8c89f42a0c
commit 13fd5f3dc4
13 changed files with 1044 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/c/c_damagereaction.h
+5 -3
View File
@@ -178,16 +178,18 @@ public:
/* 0x772 */ u8 m772[0x774 - 0x772];
/* 0x774 */ dPa_smokeEcallBack mParticleCallBack;
/* 0x794 */ s16 m794;
/* 0x796 */ u8 m796[0x7A0 - 0x796];
/* 0x796 */ u8 m796[0x798 - 0x796];
/* 0x798 */ f32 m798;
/* 0x79C */ cXyz* m79C;
/* 0x7A0 */ cXyz m7A0;
/* 0x7AC */ u8 m7AC[0x7AE - 0x7AC];
/* 0x7AE */ s16 m7AE;
/* 0x7B0 */ u8 m7B0[0x7B2 - 0x7B0];
/* 0x7B2 */ s16 m7B2;
/* 0x7B4 */ u8 m7B4[0x7B6 - 0x7B4];
/* 0x7B4 */ s16 m7B4;
/* 0x7B6 */ u8 m7B6;
/* 0x7B7 */ u8 m7B7[0x7B8 - 0x7B7];
/* 0x7B8 */ int m7B8;
/* 0x7B8 */ fpc_ProcID m7B8;
}; // Size: 0x7BC
// STATIC_ASSERT(sizeof(damagereaction) == 0x7BC);
include/d/actor/d_a_bk.h
+2 -1
View File
@@ -8,6 +8,7 @@
class dPath;
namespace daObj_Search { class Act_c; };
struct br_s;
class bk_class : public fopEn_enemy_c {
public:
@@ -69,7 +70,7 @@ public:
/* 0x034F */ u8 m034F;
/* 0x0350 */ dPa_smokeEcallBack m0350;
/* 0x0370 */ damagereaction dr;
/* 0x0B2C */ u8 m0B2C[0x0B30 - 0x0B2C];
/* 0x0B2C */ br_s* m0B2C;
/* 0x0B30 */ int m0B30;
/* 0x0B34 */ int m0B34;
/* 0x0B38 */ u8 m0B38[0x0B44 - 0x0B38];
include/d/actor/d_a_bridge.h
+5 -2
View File
@@ -36,13 +36,16 @@ struct br_s {
/* 0x3F4 */ f32 m3F4;
/* 0x3F8 */ u8 m3F8[0x3FC - 0x3F8];
/* 0x3FC */ f32 m3FC;
/* 0x400 */ u8 m400[0x408 - 0x400];
/* 0x400 */ s16 m400;
/* 0x402 */ u8 m402[0x406 - 0x402];
/* 0x406 */ u8 m406;
/* 0x407 */ u8 m407[0x408 - 0x407];
/* 0x408 */ u8 m408;
/* 0x409 */ u8 m409[0x40C - 0x409];
/* 0x40C */ cXyz mScale;
/* 0x418 */ s16 m418;
/* 0x41A */ u8 m41A[0x41C - 0x41A];
};
}; // Size: 0x41C
class bridge_class : public fopAc_ac_c {
public:
include/d/d_cc_s.h
+1 -1
View File
@@ -63,4 +63,4 @@ public:
STATIC_ASSERT(sizeof(dCcS) == 0x29F4);
#endif /* D_CC_D_CC_S_H */
#endif /* D_CC_D_CC_S_H */
include/f_op/f_op_actor_mng.h
+4
View File
@@ -474,6 +474,10 @@ inline fpc_ProcID fopAcM_create(s16 i_procName, createFunc i_createFunc, void* p
return fpcM_Create(i_procName, i_createFunc, params);
}
inline fpc_ProcID fopAcM_Create(s16 i_procName, createFunc i_createFunc, void* params) {
return fpcM_Create(i_procName, i_createFunc,params);
}
void* fopAcM_fastCreate(s16 procName, u32 parameter, cXyz* p_pos = NULL, int roomNo = -1,
csXyz* p_angle = NULL, cXyz* p_scale = NULL, s8 subType = -1,
createFunc p_createFunc = NULL, void* p_createFuncData = NULL);
src/d/actor/d_a_bk.cpp
+1004 -25
View File
File diff suppressed because it is too large Load Diff
src/d/actor/d_a_fganon.cpp
+3 -3
View File
@@ -2239,9 +2239,9 @@ void energy_ball_move(fganon_class* i_this) {
csXyz local_7c(0,0,0);
local_7c.y = (short)cM_atan2s(i_this->m3F8.x, i_this->m3F8.z);
dComIfGp_particle_set(dPa_name::ID_SCENE_81F0, &i_this->m3E0, &local_7c);
#if VERSION == VERSION_USA
mDoAud_seStart(JA_SE_LK_PG_BOMB_STRIKE, &i_this->m3E0, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
#endif
#if VERSION == VERSION_USA
mDoAud_seStart(JA_SE_LK_PG_BOMB_STRIKE, &i_this->m3E0, 0, dComIfGp_getReverb(fopAcM_GetRoomNo(a_this)));
#endif
PSVECAdd(&i_this->m3E0, &i_this->m3F8, &i_this->m3E0);
i_this->m40A = 5;
}
src/d/actor/d_a_npc_md.cpp
+1 -1
View File
@@ -2744,7 +2744,7 @@ void daNpc_Md_c::eventOrder() {
break;
case 10:
mCurEvent = 6;
dComIfGp_event_order(dEvtType_OTHER_e, 0xFF, 1, 0xFFFF, dComIfGp_getPlayer(0), this, mEventIdxTable[mCurEvent]);
dComIfGp_event_order(dEvtType_OTHER_e, 0xFF, dEvtFlag_NOPARTNER_e, 0xFFFF, dComIfGp_getPlayer(0), this, mEventIdxTable[mCurEvent]);
return;
case 11:
mCurEvent = 7;
src/d/actor/d_a_npc_nz_cut.inc
+1 -1
View File
@@ -365,7 +365,7 @@ void daNpc_Nz_c::cutGoHomeProc() {
/* 000044D4-00004520 .text cutChkGetItemStart__10daNpc_Nz_cFv */
void daNpc_Nz_c::cutChkGetItemStart() {
if(field_0x8F8 >= 3) {
fopAcM_orderChangeEventId(dComIfGp_getPlayer(0), this, field_0x8FA, 1, 0xFFFF);
fopAcM_orderChangeEventId(dComIfGp_getPlayer(0), this, field_0x8FA, dEvtFlag_NOPARTNER_e, 0xFFFF);
}
}
src/d/actor/d_a_npc_people.cpp
+1 -1
View File
@@ -5610,7 +5610,7 @@ void daNpcPeople_c::eventOrder() {
fopAcM_orderChangeEventId(dComIfGp_getPlayer(0), this, m766[0], 0, 0xFFFF);
}
else if(m78D == 0xB) {
fopAcM_orderChangeEventId(dComIfGp_getPlayer(0), this, m766[0], 8, 0xFFFF);
fopAcM_orderChangeEventId(dComIfGp_getPlayer(0), this, m766[0], dEvtFlag_UNK8_e, 0xFFFF);
}
else if(m78D == 0xC) {
fopAcM_orderChangeEventId(dComIfGp_getPlayer(0), this, m766[1], 0, 0xFFFF);
src/d/d_cc_mass_s.cpp
+1 -1
View File
@@ -210,7 +210,7 @@ void dCcMassS_Mng::Clear() {
/* 800AD234-800AD310 .text Set__12dCcMassS_MngFP8cCcD_ObjUc */
void dCcMassS_Mng::Set(cCcD_Obj* i_obj, u8 i_priority) {
if (mMassObjCount >= 5) {
if (mMassObjCount >= (s32)ARRAY_SIZE(mMassObjs)) {
for (int i = 0; i < (s32)ARRAY_SIZE(mMassObjs); i++) {
int priority = mMassObjs[i].GetPriority();
if (priority > i_priority || (priority == i_priority && cM_rndF(1.0f) < 0.5f)) {
src/d/d_snap.cpp
-1
View File
@@ -43,7 +43,6 @@ struct CharaData {
}; // Size: 0x12
static const CharaData l_CharaData[] = {
{ // 0x00
/* offset */ {0, 10, 0},
/* radius */ 25,
src/m_Do/m_Do_mtx.cpp
+16 -16
View File
@@ -11,6 +11,22 @@
#include "weak_bss_3569.h" // IWYU pragma: keep
Mtx mDoMtx_stack_c::now;
Mtx mDoMtx_stack_c::buffer[16];
Mtx* mDoMtx_stack_c::next = mDoMtx_stack_c::buffer;
Mtx* mDoMtx_stack_c::end = mDoMtx_stack_c::buffer + ARRAY_SIZE(mDoMtx_stack_c::buffer);
mDoMtx_stack_c mDoMtx_stack;
mDoMtx_quatStack_c mDoMtx_quatStack;
Mtx g_mDoMtx_identity = {
{1.0f, 0.0f, 0.0f, 0.0f},
{0.0f, 1.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 1.0f, 0.0f},
};
/* 8000CB48-8000CBEC .text mDoMtx_XYZrotM__FPA4_fsss */
void mDoMtx_XYZrotM(Mtx mtx, s16 x, s16 y, s16 z) {
Mtx tmp;
@@ -281,12 +297,6 @@ void mDoMtx_MtxToRot(const Mtx m, csXyz* o_rot) {
}
}
Mtx mDoMtx_stack_c::now;
Mtx mDoMtx_stack_c::buffer[16];
Mtx* mDoMtx_stack_c::next = mDoMtx_stack_c::buffer;
Mtx* mDoMtx_stack_c::end = mDoMtx_stack_c::buffer + ARRAY_SIZE(mDoMtx_stack_c::buffer);
/* 8000D74C-8000D7CC .text push__14mDoMtx_stack_cFv */
bool mDoMtx_stack_c::push() {
if (next >= end) {
@@ -343,13 +353,3 @@ void mDoMtx_stack_c::quatM(const Quaternion* param_0) {
mDoMtx_quat(tmp, param_0);
mDoMtx_concat(now, tmp, now);
}
mDoMtx_stack_c mDoMtx_stack;
mDoMtx_quatStack_c mDoMtx_quatStack;
Mtx g_mDoMtx_identity = {
{1.0f, 0.0f, 0.0f, 0.0f},
{0.0f, 1.0f, 0.0f, 0.0f},
{0.0f, 0.0f, 1.0f, 0.0f},
};