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
+2 -3
View File
@@ -1381,9 +1381,8 @@ static bool8 BT_Phase2FullScreenWave_UpdateWave(struct Task *task)
{ {
s16 var = theta >> 8; s16 var = theta >> 8;
#ifndef NONMATCHING ++var;
asm(""); --var;
#endif
gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->bg123VOfs + Sin(var, amplitude); gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->bg123VOfs + Sin(var, amplitude);
} }
if (++task->tDelayForFade == 41) if (++task->tDelayForFade == 41)