mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-08-15 04:02:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'decomp/main'

Browse Source
This commit is contained in:
PJB3005
2026-04-11 19:59:09 +02:00
parent 93f7c0ab1a 9b900a1a55
commit 71a8642f19
28 changed files with 137 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/d/actor/d_a_e_tk2.cpp
+2 -2
View File
@@ -398,7 +398,7 @@ static int daE_TK2_Execute(e_tk2_class* i_this) {
cXyz cStack_94;
cXyz cStack_a0;
if (i_this->mExecuteState == 0x00) {
if (i_this->mActionTimer[3] == 0x00) {
dBgS_ObjGndChk_Spl ground_check;
cStack_94 = actor->current.pos;
cStack_94.y += 200.0f;
@@ -602,7 +602,7 @@ static int daE_TK2_Create(fopAc_ac_c* actor) {
i_this->mSound.init(&actor->current.pos, &actor->eyePos, 0x3, 0x1);
i_this->mSound.setEnemyName("E_tk2");
i_this->mAtInfo.mpSound = &i_this->mSound;
i_this->mExecuteState = 0x14;
i_this->mActionTimer[3] = 0x14;
daE_TK2_Execute(i_this);
}
return phase;
src/d/actor/d_a_obj_tombo.cpp
+2 -2
View File
@@ -411,7 +411,7 @@ void daObjTOMBO_c::BoomChk() {
speedF = 5.0f;
field_0x71c = 5.0f;
mIsHitByBoomerang = false;
field_0x718 = 100;
field_0x714[2] = 100;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Tombo", 6), 2, 5.0f, 1.0f,
0.0f, -1.0f);
home.pos = current.pos;
@@ -422,7 +422,7 @@ void daObjTOMBO_c::BoomChk() {
mIsHitByBoomerang = false;
speedF = 5.0f;
field_0x71c = 5.0f;
field_0x718 = 100;
field_0x714[2] = 100;
mpMorf->setAnm((J3DAnmTransform*)dComIfG_getObjectRes("Tombo", 6), 2, 5.0f, 1.0f,
0.0f, -1.0f);
current.pos.y = old.pos.y = playerPos.y + 100.0f;