Add some missing palette macro use

2023-05-23 13:16:18 -04:00
parent 8c537ccd72
commit 14f7e49099
67 changed files with 270 additions and 294 deletions
@@ -1199,16 +1199,12 @@ const u8 *GetMonIconTiles(u16 species, bool32 handleDeoxys)
 void TryLoadAllMonIconPalettesAtOffset(u16 offset)
 {
    s32 i;
-    const struct SpritePalette* monIconPalettePtr;
-
-    if (offset <= BG_PLTT_ID(10))
+    if (offset <= BG_PLTT_ID(16 - ARRAY_COUNT(gMonIconPaletteTable)))
    {
-        monIconPalettePtr = gMonIconPaletteTable;
-        for (i = ARRAY_COUNT(gMonIconPaletteTable) - 1; i >= 0; i--)
+        for (i = 0; i < (int)ARRAY_COUNT(gMonIconPaletteTable); i++)
        {
-            LoadPalette(monIconPalettePtr->data, offset, PLTT_SIZE_4BPP);
-            offset += 0x10;
-            monIconPalettePtr++;
+            LoadPalette(gMonIconPaletteTable[i].data, offset, PLTT_SIZE_4BPP);
+            offset += 16;
        }
    }
 }