diff options
| author | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-02 17:43:21 -0400 |
|---|---|---|
| committer | PokeCodec <67983839+PokeCodec@users.noreply.github.com> | 2020-09-04 19:49:53 -0400 |
| commit | 3a2a2b6ba98d8805df2dde059f07026dcd972326 (patch) | |
| tree | db6096a53225444a760780515a6a7a0a9a626c0c /src/pokenav_main_menu.c | |
| parent | 1cdd0ac199b921dc31a42c56455262b49b5076f1 (diff) | |
Fix issues according to feedback
Diffstat (limited to 'src/pokenav_main_menu.c')
| -rw-r--r-- | src/pokenav_main_menu.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/pokenav_main_menu.c b/src/pokenav_main_menu.c index a2adebc27..cdaa0b3d6 100644 --- a/src/pokenav_main_menu.c +++ b/src/pokenav_main_menu.c @@ -486,14 +486,13 @@ void sub_81C79BC(const u16 *a0, const u16 *a1, int a2, int a3, int a4, u16 *pale int r1, g1, b1; while (a2--) { + r = GET_R(*a0); + g = GET_G(*a0); + b = GET_B(*a0); - r = R(*a0); - g = G(*a0); - b = B(*a0); - - r1 = ((((R(*a1) << 8) - (r << 8)) / a3) * a4) >> 8; - g1 = ((((G(*a1) << 8) - (g << 8)) / a3) * a4) >> 8; - b1 = ((((B(*a1) << 8) - (b << 8)) / a3) * a4) >> 8; + r1 = ((((GET_R(*a1) << 8) - (r << 8)) / a3) * a4) >> 8; + g1 = ((((GET_G(*a1) << 8) - (g << 8)) / a3) * a4) >> 8; + b1 = ((((GET_B(*a1) << 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) g = (g + g1) & 0x1F; //See above |