diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2020-05-20 15:23:21 -0400 |
|---|---|---|
| committer | huderlem <huderlem@gmail.com> | 2020-05-24 08:28:02 -0500 |
| commit | f9e6f7540fed38b3ee36db7aad01d65831ca6dd9 (patch) | |
| tree | 54dd6c2cee93726a0d3d1b9554aec26233b5fe65 /src/battle_anim_effects_2.c | |
| parent | c6205b3df45273af953ec7318834b558a30ed930 (diff) | |
Use fixed point macros for math util
Diffstat (limited to 'src/battle_anim_effects_2.c')
| -rwxr-xr-x | src/battle_anim_effects_2.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index f98b65913..f7d1eea10 100755 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1578,7 +1578,7 @@ static void AnimAirWaveProjectile(struct Sprite *sprite) { sprite->data[0] = 8; task->data[5] = 4; - a = MathUtil_Inv16(0x1000); + a = MathUtil_Inv16(Q_8_8(16)); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; @@ -1597,8 +1597,8 @@ static void AnimAirWaveProjectile(struct Sprite *sprite) sprite->data[1] = 0; sprite->data[6] = 0; sprite->data[5] = 0; - sprite->data[3] = MathUtil_Mul16(MathUtil_Mul16(b, a), MathUtil_Inv16(0x1C0)); - sprite->data[4] = MathUtil_Mul16(MathUtil_Mul16(c, a), MathUtil_Inv16(0x1C0)); + sprite->data[3] = MathUtil_Mul16(MathUtil_Mul16(b, a), MathUtil_Inv16(Q_8_8(1.75))); + sprite->data[4] = MathUtil_Mul16(MathUtil_Mul16(c, a), MathUtil_Inv16(Q_8_8(1.75))); sprite->callback = AnimAirWaveProjectile_Step1; } } @@ -1690,7 +1690,7 @@ void AnimTask_AirCutterProjectile(u8 taskId) xDiff = attackerX - targetX; gTasks[taskId].data[5] = MathUtil_Mul16(xDiff, MathUtil_Inv16(gBattleAnimArgs[2] & ~1)); - gTasks[taskId].data[6] = MathUtil_Mul16(gTasks[taskId].data[5], 0x80); + gTasks[taskId].data[6] = MathUtil_Mul16(gTasks[taskId].data[5], Q_8_8(0.5)); gTasks[taskId].data[7] = gBattleAnimArgs[2]; if (targetY >= attackerY) { |