From fb06e4a3c94ae17b73df6d3aecf2d18213aa183e Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Jun 2019 08:13:38 -0400 Subject: Modernize code Can compile with arm-none-eabi-gcc 8.3.0 gbafix correctly handles ELF input --- src/roulette_util.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/roulette_util.c') diff --git a/src/roulette_util.c b/src/roulette_util.c index 9531302d9..16c3e8150 100755 --- a/src/roulette_util.c +++ b/src/roulette_util.c @@ -409,6 +409,7 @@ void UpdatePulseBlend(struct PulseBlend *pulseBlend) } break; case 2: // Flip back and forth + // This code is never reached if (pulseBlendPalette->fadeDirection) pulseBlendPalette->blendCoeff = 0; else -- cgit v1.2.3 From b839c213073f99d73d03bb28f0fd350e13afba09 Mon Sep 17 00:00:00 2001 From: PikalaxALT Date: Wed, 26 Jun 2019 16:23:00 -0400 Subject: Fix/suppress warnings when building with gcc-8 --- src/roulette_util.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/roulette_util.c') diff --git a/src/roulette_util.c b/src/roulette_util.c index 16c3e8150..f1f04a73a 100755 --- a/src/roulette_util.c +++ b/src/roulette_util.c @@ -408,8 +408,8 @@ void UpdatePulseBlend(struct PulseBlend *pulseBlend) } } break; - case 2: // Flip back and forth - // This code is never reached + case (MODERN ? -2 : 2): // Flip back and forth + // This code is never reached in vanilla if (pulseBlendPalette->fadeDirection) pulseBlendPalette->blendCoeff = 0; else -- cgit v1.2.3