diff options
author | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-24 14:59:35 -0400 |
---|---|---|
committer | PikalaxALT <pikalaxalt@gmail.com> | 2021-05-24 14:59:35 -0400 |
commit | 5c965f5357c09a9eaaad029441401498e0877966 (patch) | |
tree | 2b8049c703ac29c8a0e35ec63db11f277ba850c5 /src/battle_anim_effects_2.c | |
parent | 23c07589f5c515cbf16db08881142b6ae76dc5ee (diff) |
Rename fixed point math routines again
Diffstat (limited to 'src/battle_anim_effects_2.c')
-rw-r--r-- | src/battle_anim_effects_2.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/battle_anim_effects_2.c b/src/battle_anim_effects_2.c index b2342a0c9..e24434a0e 100644 --- a/src/battle_anim_effects_2.c +++ b/src/battle_anim_effects_2.c @@ -1532,7 +1532,7 @@ void AnimAirWaveProjectile(struct Sprite *sprite) { sprite->data[0] = 8; task->data[5] = 4; - a = invfx16(0x1000); + a = Q_8_8_inv(0x1000); sprite->pos1.x += sprite->pos2.x; sprite->pos1.y += sprite->pos2.y; sprite->pos2.y = 0; @@ -1551,8 +1551,8 @@ void AnimAirWaveProjectile(struct Sprite *sprite) sprite->data[1] = 0; sprite->data[6] = 0; sprite->data[5] = 0; - sprite->data[3] = mulfx16(mulfx16(b, a), invfx16(0x1C0)); - sprite->data[4] = mulfx16(mulfx16(c, a), invfx16(0x1C0)); + sprite->data[3] = Q_8_8_mul(Q_8_8_mul(b, a), Q_8_8_inv(0x1C0)); + sprite->data[4] = Q_8_8_mul(Q_8_8_mul(c, a), Q_8_8_inv(0x1C0)); sprite->callback = AnimAirWaveProjectile_Step1; } } @@ -1643,18 +1643,18 @@ void AnimTask_AirCutterProjectile(u8 taskId) else xDiff = attackerX - targetX; - gTasks[taskId].data[5] = mulfx16(xDiff, invfx16(gBattleAnimArgs[2] & ~1)); - gTasks[taskId].data[6] = mulfx16(gTasks[taskId].data[5], 0x80); + gTasks[taskId].data[5] = Q_8_8_mul(xDiff, Q_8_8_inv(gBattleAnimArgs[2] & ~1)); + gTasks[taskId].data[6] = Q_8_8_mul(gTasks[taskId].data[5], 0x80); gTasks[taskId].data[7] = gBattleAnimArgs[2]; if (targetY >= attackerY) { yDiff = targetY - attackerY; - gTasks[taskId].data[8] = mulfx16(yDiff, invfx16(gTasks[taskId].data[5])) & ~1; + gTasks[taskId].data[8] = Q_8_8_mul(yDiff, Q_8_8_inv(gTasks[taskId].data[5])) & ~1; } else { yDiff = attackerY - targetY; - gTasks[taskId].data[8] = mulfx16(yDiff, invfx16(gTasks[taskId].data[5])) | 1; + gTasks[taskId].data[8] = Q_8_8_mul(yDiff, Q_8_8_inv(gTasks[taskId].data[5])) | 1; } gTasks[taskId].data[3] = gBattleAnimArgs[3]; |