diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-09-08 21:55:29 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-08 21:55:29 -0400 |
| commit | 8f6d6b933e081d6e7a35b52bd36da9d11952145b (patch) | |
| tree | 591ae4ff89812fbd41576c3bcfdba322c032e0d6 /src/battle_transition.c | |
| parent | fb29a464e63d544f63b8981fdac44981a79eb4a9 (diff) | |
| parent | f980188b82f3a00348a5a78caf33cc0eb8812aa2 (diff) | |
Merge pull request #1181 from PokeCodec/trainer-hill
Remove fakematch in trainer_hill.c
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 559279e74..4a9d26303 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -3973,11 +3973,8 @@ static bool8 Phase2_FrontierLogoWave_Func4(struct Task *task) for (i = 0; i < 160; i++, var6 += var8) { - s16 index = var6 / 256; - #ifndef NONMATCHING - asm(""); - #endif - gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude); + const u16 index = var6 >> 8; + gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index & 0xff, amplitude); } if (++task->tData3 == 101) |