diff options
| author | Kurausukun <lord.uber1@gmail.com> | 2020-12-10 23:30:52 -0500 |
|---|---|---|
| committer | Kurausukun <lord.uber1@gmail.com> | 2020-12-10 23:30:52 -0500 |
| commit | 58976ebaa8d73d174940f622ec36f22bcd2fd8a2 (patch) | |
| tree | c27ab24ed83fdb16654b5814d681af487b119601 /src/battle_transition.c | |
| parent | 32ae13f9b66ab1b01146e5746e9350f97f055526 (diff) | |
| parent | 8d29f65c6c7f34aa53ae2e7ae3e4f34a95025602 (diff) | |
Merge remote-tracking branch 'upstream/master' into berry_crush
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 43a90ac98..74e1548e7 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -3970,7 +3970,7 @@ static bool8 Phase2_FrontierLogoWave_Func4(struct Task *task) for (i = 0; i < 160; i++, var6 += var8) { - const u16 index = var6 >> 8; + s16 index = var6 / 256; gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index & 0xff, amplitude); } |