diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2019-09-27 09:11:22 -0400 |
| commit | 7b8b5b5c8c02156d7cdaa76212ad68f01b1600c9 (patch) | |
| tree | 32b1c3ce14f272708fdc4b5b944a8dc9c14d07e3 /src/battle_transition.c | |
| parent | 27aae9da9a570b6787171e33fa29c43c507187c1 (diff) | |
| parent | 208e1c968959c781562f0b94c03368385ce7012c (diff) | |
Merge branch 'master' into gflib
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 ae6c28711..c34419048 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); } |