This commit is contained in:
Niko 2022-11-29 20:22:32 -05:00
parent 500c5d1b74
commit 2b8019fda0
2 changed files with 9 additions and 3 deletions

View File

@ -10,7 +10,10 @@ void DECOMP_RB_Potion_PerFrame_InAir(struct Thread* t)
inst = t->inst;
mw = t->object;
inst->matrix.t[0] += mw->velocity[0] * (gGT->elapsedTimeMS >> 5)
inst->matrix.t[1] += mw->velocity[1] * (gGT->elapsedTimeMS >> 5)
inst->matrix.t[2] += mw->velocity[2] * (gGT->elapsedTimeMS >> 5)
inst->matrix.t[0] += mw->velocity[0] * (gGT->elapsedTimeMS >> 5);
inst->matrix.t[1] += mw->velocity[1] * (gGT->elapsedTimeMS >> 5);
inst->matrix.t[2] += mw->velocity[2] * (gGT->elapsedTimeMS >> 5);
// gravity, decrease velocity over time
mw->velocity[1] -= ((gGT->elapsedTimeMS << 2) >> 5);
}

View File

@ -936,8 +936,11 @@ void FUN_800ac6b4(int param_1)
*(int *)(iVar6 + 0x4c) =
*(int *)(iVar6 + 0x4c) + ((int)*(short *)(iVar7 + 0x10) * *(int *)(puVar3 + 0x1d04) >> 5);
// gravity, decrease velocity over time
iVar4 = (uint)*(ushort *)(iVar7 + 0xe) - ((*(int *)(puVar3 + 0x1d04) << 2) >> 5);
*(undefined2 *)(iVar7 + 0xe) = (short)iVar4;
// terminal velocity
if (iVar4 * 0x10000 >> 0x10 < -0x60) {
*(undefined2 *)(iVar7 + 0xe) = 0xffa0;
}