diff options
| author | GriffinR <griffin.g.richards@gmail.com> | 2021-01-19 13:53:30 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-19 13:53:30 -0500 |
| commit | c2ddb92c9e0905a6625f83f7b5e0936b630c0597 (patch) | |
| tree | ea118ba89c546e36a16f0487e51886b0eb43544b /src/pokenav_main_menu.c | |
| parent | 6c91534304a1d8631a5a656905f062167431753d (diff) | |
| parent | 2dfaba9472c933f5a659a38fa2581ecf3d3f0ef7 (diff) | |
Merge pull request #1310 from sphericalice/pokeemerald
Make broader use of RGB macros
Diffstat (limited to 'src/pokenav_main_menu.c')
| -rw-r--r-- | src/pokenav_main_menu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index 009cf783f..21bddf1cd 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -496,7 +496,7 @@ void PokenavCopyPalette(const u16 *src, const u16 *dest, int size, int a3, int a g1 = ((((GET_G(*dest) << 8) - (g << 8)) / a3) * a4) >> 8; b1 = ((((GET_B(*dest) << 8) - (b << 8)) / a3) * a4) >> 8; - r = (r + r1) & 0x1F; //_RGB(r + r1, g + g1, b + b1); doesn't match; I have to assign the value of ((r + r1) & 0x1F) to r1 + r = (r + r1) & 0x1F; //_RGB(r + r1, g + g1, b + b1); doesn't match; I have to assign the value of ((r + r1) & 0x1F) to r g = (g + g1) & 0x1F; //See above b = (b + b1) & 0x1F; //See above |