diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 12:16:01 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2018-12-09 12:16:01 +0100 |
| commit | c46499b05c81f1d1a872a33ce5b2fd9a20964dc7 (patch) | |
| tree | d5c1023549cb38f6a039bcdc29fbf90b01160935 /src/field_screen_effect.c | |
| parent | 4683cdc30cbe81db56b69dfeb7a1fb32fe6641e2 (diff) | |
field screen review changes
Diffstat (limited to 'src/field_screen_effect.c')
| -rw-r--r-- | src/field_screen_effect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/field_screen_effect.c b/src/field_screen_effect.c index 0de86d4f4..b0572b393 100644 --- a/src/field_screen_effect.c +++ b/src/field_screen_effect.c @@ -1083,9 +1083,9 @@ static void sub_80B028C(u8 a1) u16 color[1]; if (!a1) - color[0] = 0x1F; + color[0] = RGB_RED; else - color[0] = 0x7C00; + color[0] = RGB_BLUE; for (i = 0; i < 16; i++) { @@ -1113,7 +1113,7 @@ static bool8 sub_80B02C8(u16 a1) } } - SetGpuReg(REG_OFFSET_BLDALPHA, (hi << 8) | lo); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(lo, hi)); if (lo == 0 && hi == 0x10) return TRUE; @@ -1135,9 +1135,9 @@ static void sub_80B0318(u8 taskId) data[10] = REG_WINOUT; ClearGpuRegBits(REG_OFFSET_DISPCNT, DISPCNT_WIN1_ON); SetGpuRegBits(REG_OFFSET_BLDCNT, gUnknown_82EC7CC[0]); - SetGpuReg(REG_OFFSET_BLDALPHA, 1804); - SetGpuReg(REG_OFFSET_WININ, 63); - SetGpuReg(REG_OFFSET_WINOUT, 30); + SetGpuReg(REG_OFFSET_BLDALPHA, BLDALPHA_BLEND(12, 7)); + SetGpuReg(REG_OFFSET_WININ, WININ_WIN0_BG_ALL | WININ_WIN0_OBJ | WININ_WIN0_CLR); + SetGpuReg(REG_OFFSET_WINOUT, WINOUT_WIN01_BG1 | WINOUT_WIN01_BG2 | WINOUT_WIN01_BG3 | WINOUT_WIN01_OBJ); sub_8199C30(0, 0, 0, 0x1E, 0x14, 0xF); schedule_bg_copy_tilemap_to_vram(0); SetFlash2ScanlineEffectWindowBoundaries(&gScanlineEffectRegBuffers[0][0], data[2], data[3], 1); |