diff options
| author | scnorton <scnorton@biociphers.org> | 2017-06-13 10:19:12 -0400 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-06-13 10:19:12 -0400 |
| commit | bf5ee99db06cbd805058cc4c2f0fcb4ccf9506da (patch) | |
| tree | 5d55b2504c4ebc3d0108b4eb9c495e189fc485cb /src/palette.c | |
| parent | 175d4724a33bbb34e1a5ee609584a45ab9685058 (diff) | |
| parent | db6818ca9149304463e5e2219ec90993a3af53b2 (diff) | |
Merge branch 'field_effect'
Diffstat (limited to 'src/palette.c')
| -rw-r--r-- | src/palette.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/palette.c b/src/palette.c index 165eb2eae..a610049bc 100644 --- a/src/palette.c +++ b/src/palette.c @@ -615,7 +615,7 @@ static u8 UpdateFastPaletteFade(void) if (b < b0) b = b0; - gPlttBufferFaded[i] = r | (g << 5) | (b << 10); + gPlttBufferFaded[i] = RGB(r, g, b); } break; case FAST_FADE_OUT_TO_WHTIE: @@ -633,7 +633,7 @@ static u8 UpdateFastPaletteFade(void) if (b > 31) b = 31; - gPlttBufferFaded[i] = r | (g << 5) | (b << 10); + gPlttBufferFaded[i] = RGB(r, g, b); } break; case FAST_FADE_IN_FROM_BLACK: @@ -659,7 +659,7 @@ static u8 UpdateFastPaletteFade(void) if (b > b0) b = b0; - gPlttBufferFaded[i] = r | (g << 5) | (b << 10); + gPlttBufferFaded[i] = RGB(r, g, b); } break; case FAST_FADE_OUT_TO_BLACK: @@ -677,7 +677,7 @@ static u8 UpdateFastPaletteFade(void) if (b < 0) b = 0; - gPlttBufferFaded[i] = r | (g << 5) | (b << 10); + gPlttBufferFaded[i] = RGB(r, g, b); } } |