mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-06-15 22:20:06 -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
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},
};