summaryrefslogtreecommitdiff
path: root/src/battle_transition.c
diff options
context:
space:
mode:
authorGriffinR <griffin.g.richards@gmail.com>2020-12-14 23:22:41 -0500
committerGitHub <noreply@github.com>2020-12-14 23:22:41 -0500
commit15c2856b24c91d1fe4c3d5f3fe4d84d87827f386 (patch)
tree3367bb9a7ae8b701acf43cb8df6e137cf94f72bb /src/battle_transition.c
parentc61142188292a0edfe9154a93e440739560490cf (diff)
parent69cfe5ad01f135e16c330891d3b6d9fc7853e632 (diff)
Merge pull request #1265 from Kurausukun/berry_crush
fakematch fixes, begin documenting Berry Crush (based on #1187)
Diffstat (limited to 'src/battle_transition.c')
-rw-r--r--src/battle_transition.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c
index 496cc9e09..74e1548e7 100644
--- a/src/battle_transition.c
+++ b/src/battle_transition.c
@@ -1956,10 +1956,7 @@ static bool8 Phase2_Ripple_Func2(struct Task *task)
for (i = 0; i < 160; i++, r4 += r8)
{
s16 var = r4 >> 8;
-
- var++;
- var--;
- gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(var, r3);
+ gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(var & 0xffff, r3);
}
if (++task->tData3 == 81)