diff options
| author | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-25 06:58:56 +0800 |
|---|---|---|
| committer | jiangzhengwenjz <jiangzhengwenjzw@qq.com> | 2019-08-25 06:58:56 +0800 |
| commit | 8b14f4e90abf8010e83d6b38a26034458ce36d5d (patch) | |
| tree | b435edeb745cd9d232011cdcea7662711987e1d1 /src/battle_transition.c | |
| parent | 41a7e6967dd4fd79eb01a45f4d77cf7c2ca11dc1 (diff) | |
| parent | 74e2a0e123be0ecd0e0df516ce242aea9c348117 (diff) | |
Merge branch 'master' into battle
Diffstat (limited to 'src/battle_transition.c')
| -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) |