diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-14 23:07:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-14 23:07:38 -0400 |
| commit | 6f4bf2cb0535b1a7dc72029c65d93e3ebdb19f95 (patch) | |
| tree | bb345f43ac8e5efc15a7c8fb4153df00523efc17 /src/palette.c | |
| parent | f22e583db60f3d0c33a3d02509c51c2a861e6abd (diff) | |
| parent | baa9f7f55f64f15f5bff54017537b8e467671b34 (diff) | |
Merge pull request #322 from PikalaxALT/field_effect
Decompile field_effect.s
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); } } |