diff options
| author | GriffinR <griffin.richards@comcast.net> | 2019-09-26 15:03:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-26 15:03:22 -0400 |
| commit | 1491b1855b9a604642c6c882f29d489959189d93 (patch) | |
| tree | b48426b94f51b5f972cc564daefb751da8fe6668 /src/battle_transition.c | |
| parent | de6e1e9ecf72f9ffad23d83a3cfccdbabd2b239b (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into document-eventscripts
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 3e86fcf51..fb7fd0c2f 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -1961,9 +1961,10 @@ static bool8 Phase2_Ripple_Func2(struct Task *task) for (i = 0; i < 160; i++, r4 += r8) { - // todo: fix the asm s16 var = r4 >> 8; - asm(""); + + var++; + var--; gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3); } |