Correct berry fix graphics colors, more PLTT constant use (#1892)

2023-08-09 12:49:21 -04:00
parent 912a80e27a
commit 6eaaa50ad5
20 changed files with 39 additions and 252 deletions
@@ -421,13 +421,11 @@ u16 Unused_LoadBgPalette(u8 bg, const void *src, u16 size, u16 destOffset)

    if (!IsInvalidBg32(bg))
    {
-        u16 paletteOffset = (sGpuBgConfigs2[bg].basePalette * 0x20) + (destOffset * 2);
+        u16 paletteOffset = PLTT_OFFSET_4BPP(sGpuBgConfigs2[bg].basePalette) + (destOffset * 2);
        cursor = RequestDma3Copy(src, (void *)(paletteOffset + BG_PLTT), size, 0);

        if (cursor == -1)
-        {
            return -1;
-        }
    }
    else
    {