diff options
| author | YunataSavior <58997725+YunataSavior@users.noreply.github.com> | 2026-01-12 12:18:58 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-01-12 22:18:58 +0200 |
| commit | 53aaed17c0a635c8f5542c2b2aeaa65f63c734c4 (patch) | |
| tree | cfcadbcc3c387e03cd89bf77909f5c989155cf89 /src/d | |
| parent | a2e8347e8d74bb5bdfac723faf5a2a8d30d987e2 (diff) | |
obj_pumpkin dbg equiv (#3036)
Diffstat (limited to 'src/d')
| -rw-r--r-- | src/d/actor/d_a_e_rd.cpp | 10 | ||||
| -rw-r--r-- | src/d/actor/d_a_obj_pumpkin.cpp | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/src/d/actor/d_a_e_rd.cpp b/src/d/actor/d_a_e_rd.cpp index afb31f2cd6..41746956c3 100644 --- a/src/d/actor/d_a_e_rd.cpp +++ b/src/d/actor/d_a_e_rd.cpp @@ -769,7 +769,7 @@ static void ride_off(e_rd_class* i_this) { e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); if (bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be); + UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); i_this->field_0x9be = 0; if (bullbo->mActionID != 22 && bullbo->mActionID != 23 && bullbo->mActionID != 24) { @@ -2677,7 +2677,7 @@ static void e_rd_s_damage(e_rd_class* i_this) { if (i_this->field_0x9be != 0) { e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); if (bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be); + UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); } i_this->field_0x9be = 0; @@ -2777,7 +2777,7 @@ static void rd_disappear(e_rd_class* i_this) { if (i_this->field_0x9be != 0) { e_wb_class* bullbo = (e_wb_class*)fopAcM_SearchByID(i_this->mWbActorID); if (bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be); + UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); if (bullbo->mActionID == 1) { bullbo->mActionID = 0; } @@ -3908,7 +3908,7 @@ static void e_rd_ikki_end(e_rd_class* i_this) { i_this->field_0x9bc = 0; if (daPy_getPlayerActorClass()->checkHorseRide() && bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be); + UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); i_this->field_0x9be = 0; bullbo->mActionID = 16; bullbo->mActionMode = 0; @@ -3976,7 +3976,7 @@ static void e_rd_ikki2_end(e_rd_class* i_this) { i_this->field_0x9bc = 0; if (bullbo != NULL) { - UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be); + UNSET_FLAG(bullbo->mStatusFlags, i_this->field_0x9be, u16); i_this->field_0x9be = 0; } diff --git a/src/d/actor/d_a_obj_pumpkin.cpp b/src/d/actor/d_a_obj_pumpkin.cpp index db62ad2fa3..f841a75adc 100644 --- a/src/d/actor/d_a_obj_pumpkin.cpp +++ b/src/d/actor/d_a_obj_pumpkin.cpp @@ -243,6 +243,7 @@ int daObj_Pumpkin_c::Delete() { } int daObj_Pumpkin_c::Execute() { + int sp_0x30 = 0; f32 var_f29 = mpHIO->m.floating_offset; f32 f_scale = mpHIO->m.scale; s16 sp_0x14 = 0; @@ -278,7 +279,7 @@ int daObj_Pumpkin_c::Execute() { mAcchCir.SetWallR(mpHIO->m.width * mPumpkinScale); mAcchCir.SetWallH(mpHIO->m.knee_length * mPumpkinScale); gravity = mpHIO->m.gravity * mPumpkinScale; - int sp_0x30 = 0; + sp_0x30 = 0; if (fopAcM_checkCarryNow(this) || fopAcM_checkHawkCarryNow(this) || field_0xbb3) { sp_0x30 = 1; } @@ -449,8 +450,8 @@ int daObj_Pumpkin_c::Execute() { current.angle.y = cM_atan2s(sp_0x4C.x, sp_0x4C.z); } - sp_0x10 *= streamPower; - cLib_chaseAngleS(&field_0xB38.y, (field_0xB38.y < 0) ? -sp_0x10 : sp_0x10, 0x10); + MULT_ANGLE_2(sp_0x10, streamPower); + cLib_chaseAngleS(&field_0xB38.y, (field_0xB38.y < 0) ? sp_0x10*-1 : sp_0x10, 0x10); if (field_0xBAB) { cLib_addCalc2(&speedF, streamPower * 1.55f, 0.15f, 1.0f); } else { |