Merge pull request #92 from jiangzhengwenjz/battle_transition

'real' match BT_Phase2FullScreenWave_UpdateWave
This commit is contained in:
PikalaxALT
2019-08-23 21:50:49 -04:00
committed by GitHub
+3 -4
View File
@@ -1380,10 +1380,9 @@ static bool8 BT_Phase2FullScreenWave_UpdateWave(struct Task *task)
for (i = 0; i < 160; ++i, theta += frequency)
{
s16 var = theta >> 8;
#ifndef NONMATCHING
asm("");
#endif
++var;
--var;
gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->bg123VOfs + Sin(var, amplitude);
}
if (++task->tDelayForFade == 41)