Missed some fill values

Must have forgotten to check FillWindowPixelRect.

10 files changed, 22 insertions, 21 deletions

diff --git a/src/battle_pyramid_bag.c b/src/battle_pyramid_bag.c
index 20029b284..dec8d4bca 100644
--- a/src/battle_pyramid_bag.c
+++ b/src/battle_pyramid_bag.c
@@ -804,7 +804,7 @@ static void sub_81C5A98(u8 listMenuTaskId, u8 arg1)
 static void sub_81C5AB8(u8 y, u8 arg1)
 {
     if (arg1 == 0xFF)
-        FillWindowPixelRect(0, 0, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
+        FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
         PrintOnWindow_Font1(0, gText_SelectorArrow2, 0, y, 0, 0, 0, arg1);
 }
diff --git a/src/easy_chat.c b/src/easy_chat.c
index afc4c6c5b..5a3ebf69c 100644
--- a/src/easy_chat.c
+++ b/src/easy_chat.c
@@ -4106,9 +4106,9 @@ static void sub_811D950(u8 arg0, u8 arg1)
         var1 = 0;
     }
 
-    FillWindowPixelRect(2, 0x11, 0, y, 224, var2);
+    FillWindowPixelRect(2, PALETTE_NUM_TO_FILL_VALUE(1), 0, y, 224, var2);
     if (var1)
-        FillWindowPixelRect(2, 0x11, 0, 0, 224, var1);
+        FillWindowPixelRect(2, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 224, var1);
 }
 
 static void sub_811D9B4(void)
diff --git a/src/field_specials.c b/src/field_specials.c
index 1cf16e74c..b4017f0ef 100644
--- a/src/field_specials.c
+++ b/src/field_specials.c
@@ -3001,7 +3001,7 @@ static void sub_813AA60(u16 a0, u16 a1)
 
     if (a0 > 2 && a0 < 7)
     {
-        FillWindowPixelRect(0, 0x11, 0, 0, 216, 32);
+        FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 216, 32);
         switch (a0)
         {
             case 3:
@@ -3140,7 +3140,7 @@ static void sub_813AD34(u8 a0, u16 a1)
 
     if (a0 == 9 || a0 == 10)
     {
-        FillWindowPixelRect(gUnknown_0203AB5E, 0x11, 0, 0, 96, 48);
+        FillWindowPixelRect(gUnknown_0203AB5E, PALETTE_NUM_TO_FILL_VALUE(1), 0, 0, 96, 48);
         if (a0 == 10)
         {
             AddTextPrinterParameterized(gUnknown_0203AB5E, 1, gUnknown_085B3254[a1], 0, 1, 0, NULL);
diff --git a/src/item_menu.c b/src/item_menu.c
index f561ebb36..8ade67614 100755
--- a/src/item_menu.c
+++ b/src/item_menu.c
@@ -896,7 +896,7 @@ void bag_menu_print_cursor_(u8 a, u8 b)
 void bag_menu_print_cursor(u8 a, u8 b)
 {
     if (b == 0xFF)
-        FillWindowPixelRect(0, 0, 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
+        FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), 0, a, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
         bag_menu_print(0, 1, gText_SelectorArrow2, 0, a, 0, 0, 0, b);
 
diff --git a/src/menu.c b/src/menu.c
index 753bd52a9..6a181532e 100644
--- a/src/menu.c
+++ b/src/menu.c
@@ -934,7 +934,7 @@ void RedrawMenuCursor(u8 oldPos, u8 newPos)
 
     width = GetMenuCursorDimensionByFont(sMenu.fontId, 0);
     height = GetMenuCursorDimensionByFont(sMenu.fontId, 1);
-    FillWindowPixelRect(sMenu.windowId, 0x11, sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height);
+    FillWindowPixelRect(sMenu.windowId, PALETTE_NUM_TO_FILL_VALUE(1), sMenu.left, sMenu.optionHeight * oldPos + sMenu.top, width, height);
     AddTextPrinterParameterized(sMenu.windowId, sMenu.fontId, gText_SelectorArrow3, sMenu.left, sMenu.optionHeight * newPos + sMenu.top, 0, 0);
 }
 
@@ -1313,7 +1313,7 @@ void sub_8199060(u8 oldCursorPos, u8 newCursorPos)
     u8 xPos = (oldCursorPos % sMenu.horizontalCount) * sMenu.optionWidth + sMenu.left;
     u8 yPos = (oldCursorPos / sMenu.horizontalCount) * sMenu.optionHeight + sMenu.top;
     FillWindowPixelRect(sMenu.windowId,
-                        0x11,
+                        PALETTE_NUM_TO_FILL_VALUE(1),
                         xPos,
                         yPos,
                         cursorWidth,
diff --git a/src/party_menu.c b/src/party_menu.c
index ceb89ae30..03e267e74 100755
--- a/src/party_menu.c
+++ b/src/party_menu.c
@@ -3479,8 +3479,9 @@ static void DisplayPartyPokemonHPBar(u16 hp, u16 maxhp, struct Struct203CEDC *pt
     FillWindowPixelRect(ptr->windowId, gUnknown_08615AB8[0], ptr->unk0->unk4[20], ptr->unk0->unk4[21] + 1, hpFraction, 2);
     if (hpFraction != ptr->unk0->unk4[22])
     {
-        FillWindowPixelRect(ptr->windowId, 13, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21], ptr->unk0->unk4[22] - hpFraction, 1);
-        FillWindowPixelRect(ptr->windowId, 2, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21] + 1, ptr->unk0->unk4[22] - hpFraction, 2);
+        // This appears to be an alternating fill
+        FillWindowPixelRect(ptr->windowId, 0x0D, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21], ptr->unk0->unk4[22] - hpFraction, 1);
+        FillWindowPixelRect(ptr->windowId, 0x02, ptr->unk0->unk4[20] + hpFraction, ptr->unk0->unk4[21] + 1, ptr->unk0->unk4[22] - hpFraction, 2);
     }
     CopyWindowToVram(ptr->windowId, 2);
 }
diff --git a/src/player_pc.c b/src/player_pc.c
index 028101edb..c088a6ce7 100644
--- a/src/player_pc.c
+++ b/src/player_pc.c
@@ -1005,7 +1005,7 @@ static void sub_816BFE0(u8 y, u8 b, u8 speed)
 {
     u8 windowId = gUnknown_0203BCC4->windowIds[0];
     if (b == 0xFF)
-        FillWindowPixelRect(windowId, 17, 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
+        FillWindowPixelRect(windowId, PALETTE_NUM_TO_FILL_VALUE(1), 0, y, GetMenuCursorDimensionByFont(1, 0), GetMenuCursorDimensionByFont(1, 1));
     else
         AddTextPrinterParameterized4(windowId, 1, 0, y, 0, 0, gUnknown_085DFF8C, speed, gText_SelectorArrow2);
 }
diff --git a/src/pokedex.c b/src/pokedex.c
index 2e5e8f213..f54fdbd29 100644
--- a/src/pokedex.c
+++ b/src/pokedex.c
@@ -2152,7 +2152,7 @@ static void CreateCaughtBall(u16 a, u8 x, u8 y, u16 unused)
     if (a)
         BlitBitmapToWindow(0, gUnknown_0855D2BE, x * 8, y * 8, 8, 16);
     else
-        FillWindowPixelRect(0, 0, x * 8, y * 8, 8, 16);
+        FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x * 8, y * 8, 8, 16);
 }
 
 static u8 CreateMonName(u16 num, u8 left, u8 top)
@@ -2170,7 +2170,7 @@ static u8 CreateMonName(u16 num, u8 left, u8 top)
 
 void sub_80BD28C(u8 x, u8 y, u16 unused)
 {
-    FillWindowPixelRect(0, 0, x * 8, y * 8, 0x60, 16);
+    FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x * 8, y * 8, 0x60, 16);
 }
 
 static void CreateInitialPokemonSprites(u16 selectedMon, u16 b)
@@ -4784,7 +4784,7 @@ void sub_80C1270(const u8 *str, u32 left, u32 top)
 
 void sub_80C12B0(u32 x, u32 y, u32 width, u32 height)
 {
-    FillWindowPixelRect(0, 0, x, y, width, height);
+    FillWindowPixelRect(0, PALETTE_NUM_TO_FILL_VALUE(0), x, y, width, height);
 }
 
 void sub_80C12E0(u8 taskId)
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 0f88b7d73..f0c68e7d0 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -3469,7 +3469,7 @@ static void PrintMovePowerAndAccuracy(u16 moveIndex)
     const u8 *text;
     if (moveIndex != 0)
     {
-        FillWindowPixelRect(14, 0, 53, 0, 19, 32);
+        FillWindowPixelRect(14, PALETTE_NUM_TO_FILL_VALUE(0), 53, 0, 19, 32);
 
         if (gBattleMoves[moveIndex].power < 2)
         {
@@ -3619,7 +3619,7 @@ static void PrintNewMoveDetailsOrCancelText(void)
 static void sub_81C4064(void)
 {
     u8 windowId = AddWindowFromTemplateList(sPageMovesTemplate, 0);
-    FillWindowPixelRect(windowId, 0, 0, 66, 72, 16);
+    FillWindowPixelRect(windowId, PALETTE_NUM_TO_FILL_VALUE(0), 0, 66, 72, 16);
     CopyWindowToVram(windowId, 2);
 }
 
@@ -3628,11 +3628,11 @@ static void sub_81C40A0(u8 moveIndex1, u8 moveIndex2)
     u8 windowId1 = AddWindowFromTemplateList(sPageMovesTemplate, 0);
     u8 windowId2 = AddWindowFromTemplateList(sPageMovesTemplate, 1);
 
-    FillWindowPixelRect(windowId1, 0, 0, moveIndex1 * 16, 0x48, 0x10);
-    FillWindowPixelRect(windowId1, 0, 0, moveIndex2 * 16, 0x48, 0x10);
+    FillWindowPixelRect(windowId1, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex1 * 16, 0x48, 0x10);
+    FillWindowPixelRect(windowId1, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex2 * 16, 0x48, 0x10);
 
-    FillWindowPixelRect(windowId2, 0, 0, moveIndex1 * 16, 0x30, 0x10);
-    FillWindowPixelRect(windowId2, 0, 0, moveIndex2 * 16, 0x30, 0x10);
+    FillWindowPixelRect(windowId2, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex1 * 16, 0x30, 0x10);
+    FillWindowPixelRect(windowId2, PALETTE_NUM_TO_FILL_VALUE(0), 0, moveIndex2 * 16, 0x30, 0x10);
 
     PrintMoveNameAndPP(moveIndex1);
     PrintMoveNameAndPP(moveIndex2);
diff --git a/src/trainer_card.c b/src/trainer_card.c
index 1f9191632..8d244d656 100755
--- a/src/trainer_card.c
+++ b/src/trainer_card.c
@@ -1103,7 +1103,7 @@ static void PrintTimeOnCard(void)
     r10 = width + 30;
     r7 -= r10;
 
-    FillWindowPixelRect(1, 0, r7, r4, r10, 15);
+    FillWindowPixelRect(1, PALETTE_NUM_TO_FILL_VALUE(0), r7, r4, r10, 15);
     ConvertIntToDecimalStringN(gStringVar4, hours, 1, 3);
     AddTextPrinterParameterized3(1, 1, r7, r4, gUnknown_0856FB0C, TEXT_SPEED_FF, gStringVar4);
     r7 += 18;