Merge branch 'master' of https://github.com/pret/pokefirered into doc-ql

2023-08-18 11:26:22 -04:00
parent 45e4c30d38 e72a26a6c1
commit 10c1e1298f
221 changed files with 3371 additions and 3779 deletions
@@ -2175,7 +2175,7 @@ void PatchObjectPalette(u16 paletteTag, u8 paletteSlot)
 {
    u8 paletteIndex = FindObjectEventPaletteIndexByTag(paletteTag);

-    LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, 16 * paletteSlot + 0x100, 0x20);
+    LoadPalette(sObjectEventSpritePalettes[paletteIndex].data, OBJ_PLTT_ID(paletteSlot), PLTT_SIZE_4BPP);
    ApplyGlobalFieldPaletteTint(paletteSlot);
 }