Merge branch 'master' into extern-cleanup

2019-03-08 02:45:26 -05:00
parent 80a4ee1145 bd157b301d
commit 5886f82ef5
229 changed files with 3431 additions and 3446 deletions
--- a/src/diploma.c
+++ b/src/diploma.c
@@ -196,7 +196,7 @@ static void InitDiplomaWindow(void)
    InitWindows(sDiplomaWinTemplates);
    DeactivateAllTextPrinters();
    LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
-    FillWindowPixelBuffer(0, 0);
+    FillWindowPixelBuffer(0, PIXEL_FILL(0));
    PutWindowTilemap(0);
 }