diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2020-08-21 12:44:07 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-21 12:44:07 -0400 |
| commit | cd895e497d68bf9adbaa067dc411cc99a3bd1a4b (patch) | |
| tree | ad8bed728bb939cf08fbb8b9fd7d4c009a06459e /src/battle_transition.c | |
| parent | 6c34effda93c67a37895e79b684b31b3cb9a2a88 (diff) | |
| parent | 0e7f634b00f904ac29088f3b7fdac0c51999be2d (diff) | |
Merge pull request #1141 from GriffinRichards/add-nonmatch
Wrap asm statements in NONMATCHING
Diffstat (limited to 'src/battle_transition.c')
| -rw-r--r-- | src/battle_transition.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/battle_transition.c b/src/battle_transition.c index 2ffa28645..b0cdbd93a 100644 --- a/src/battle_transition.c +++ b/src/battle_transition.c @@ -3974,7 +3974,9 @@ static bool8 Phase2_FrontierLogoWave_Func4(struct Task *task) for (i = 0; i < 160; i++, var6 += var8) { s16 index = var6 / 256; - asm(""); + #ifndef NONMATCHING + asm(""); + #endif gScanlineEffectRegBuffers[0][i] = sTransitionStructPtr->field_16 + Sin(index, amplitude); } |