From b7569965815dee8fc2f18927cec60ec2716dd8de Mon Sep 17 00:00:00 2001 From: DizzyEggg Date: Sat, 5 Jan 2019 19:25:46 +0100 Subject: fakematch and nonmatch --- src/battle_main.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) (limited to 'src/battle_main.c') diff --git a/src/battle_main.c b/src/battle_main.c index df1828d18..4e2a87beb 100644 --- a/src/battle_main.c +++ b/src/battle_main.c @@ -656,16 +656,19 @@ static void CB2_InitBattleInternal(void) gBattle_WIN0V = 0x5051; ScanlineEffect_Clear(); - for (i = 0; i < 80; i++) + i = 0; + while (i < 80) { gScanlineEffectRegBuffers[0][i] = 0xF0; gScanlineEffectRegBuffers[1][i] = 0xF0; + i++; } - for (i = 80; i < 160; i++) + + while (i < 160) { - asm(""::"r"(i)); gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; + i++; } ScanlineEffect_SetParams(sIntroScanlineParams16Bit); @@ -2222,16 +2225,19 @@ void sub_8038D64(void) gBattle_WIN0V = 0x5051; ScanlineEffect_Clear(); - for (i = 0; i < 80; i++) + i = 0; + while (i < 80) { gScanlineEffectRegBuffers[0][i] = 0xF0; gScanlineEffectRegBuffers[1][i] = 0xF0; + i++; } - for (i = 80; i < 160; i++) + + while (i < 160) { - asm(""::"r"(i)); // Needed to stop the compiler from optimizing out the loop counter. gScanlineEffectRegBuffers[0][i] = 0xFF10; gScanlineEffectRegBuffers[1][i] = 0xFF10; + i++; } ResetPaletteFade(); -- cgit v1.2.3