diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2019-01-05 13:37:52 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-05 13:37:52 -0600 |
| commit | cbf7d6cee59e7aa2cdef6b9e89fa62fbeb4a07c5 (patch) | |
| tree | 8bdc21da52583b33d1945663cc461cda75da349e /src/battle_main.c | |
| parent | 95db853a78c9c5b358c92e856be83207ce8ea22c (diff) | |
| parent | 50a26bffe4766d53881d9fba521ecf1019aed0b4 (diff) | |
Merge pull request #513 from DizzyEggg/hmmm
Get rid of 3 fakematchings and 1 nonmatching
Diffstat (limited to 'src/battle_main.c')
| -rw-r--r-- | src/battle_main.c | 18 |
1 files changed, 12 insertions, 6 deletions
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(); |