diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-08-23 21:50:49 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-23 21:50:49 -0400 |
| commit | 3edbbb1758727fe7e74dbcba4844a186fdc8897f (patch) | |
| tree | ef0a9c6d70b6e411b8e483eade6cddef529d1364 /src | |
| parent | f64e3c50ce7624cc5aa0e8cd565e78c3a70de0ac (diff) | |
| parent | f3be719f3c1718be8719755d4eeb3cd0bae67aca (diff) | |
Merge pull request #92 from jiangzhengwenjz/battle_transition
'real' match BT_Phase2FullScreenWave_UpdateWave
Diffstat (limited to 'src')
| -rw-r--r-- | src/battle_transition.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 0fd92d631..9a04218de 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -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) |