Merge branch 'master' into extern-cleanup

src/contest_link_80F57C4.c

@@ -934,7 +934,7 @@ static void sub_80F6AE8(void)
 //     windowTemplate.width = 30;
 //     windowTemplate.height = 2;
 //     windowId = AddWindow(&windowTemplate);
-//     FillWindowPixelBuffer(windowId, 0x11);
+//     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
 //     origWidth = GetStringWidth(1, text, 0) + 9;
 //     strWidth = origWidth;
 //     if (strWidth < 0)