mirror of
https://github.com/zeldaret/tww.git
synced 2026-08-19 21:33:07 -04:00
+1806
-56
File diff suppressed because it is too large
Load Diff
@@ -564,16 +564,16 @@ void move(bmdfoot_class* i_this) {
|
||||
|
||||
if (boss != NULL) {
|
||||
sVar1 = (u16)(fopAcM_GetParam(actor) & 0xF) << 13;
|
||||
cMtx_YrotS(*calc_mtx, boss->shape_angle.y);
|
||||
cMtx_XrotM(*calc_mtx, boss->shape_angle.x);
|
||||
cMtx_ZrotM(*calc_mtx, boss->shape_angle.z);
|
||||
cMtx_YrotS(*calc_mtx, boss->actor.shape_angle.y);
|
||||
cMtx_XrotM(*calc_mtx, boss->actor.shape_angle.x);
|
||||
cMtx_ZrotM(*calc_mtx, boss->actor.shape_angle.z);
|
||||
cMtx_YrotM(*calc_mtx, sVar1);
|
||||
actor->current.angle.y = sVar1 + boss->shape_angle.y;
|
||||
actor->current.angle.y = sVar1 + boss->actor.shape_angle.y;
|
||||
local_20.x = 0.0f;
|
||||
local_20.y = REG14_F(3);
|
||||
local_20.z = REG14_F(4) + 180.0f;
|
||||
MtxPosition(&local_20, &cStack_2c);
|
||||
actor->current.pos = boss->current.pos + cStack_2c;
|
||||
actor->current.pos = boss->actor.current.pos + cStack_2c;
|
||||
switch (i_this->m2BA) {
|
||||
case 0:
|
||||
wait(i_this);
|
||||
|
||||
@@ -467,7 +467,7 @@ void hand_move(bmdhand_class* i_this) {
|
||||
|
||||
hand_s* pcVar9 = i_this->m324;
|
||||
if (boss != NULL) {
|
||||
actor->current.angle.y = ((u16)actor->base.mParameters & 0x1f) * -0xccc + REG8_S(4) + -13000 + boss->shape_angle.y;
|
||||
actor->current.angle.y = ((u16)actor->base.mParameters & 0x1f) * -0xccc + REG8_S(4) + -13000 + boss->actor.shape_angle.y;
|
||||
MTXCopy(boss->mpMorf->mpModel->getAnmMtx(boss_joint_d[(actor->base.mParameters & 0x1fU)]), *calc_mtx);
|
||||
local_40.x = REG14_F(6);
|
||||
local_40.y = REG14_F(7);
|
||||
|
||||
@@ -330,7 +330,7 @@ void daMachine_c::attack() {
|
||||
field_0xc04.setFrame(0.0f);
|
||||
field_0xc04.setPlaySpeed(f31);
|
||||
field_0xc78 += 1;
|
||||
// Fall through
|
||||
// fallthrough
|
||||
case 2:
|
||||
if(field_0xc04.play()) {
|
||||
field_0xc78 = NULL;
|
||||
|
||||
Reference in New Issue
Block a user