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/pokeblock_feed.c
+++ b/src/pokeblock_feed.c
@@ -579,7 +579,7 @@ static bool8 TransitionToPokeblockFeedScene(void)
        gMain.state++;
        break;
    case 10:
-        SetWindowBorderStyle(0, 1, 1, 14);
+        DrawStdFrameWithCustomTileAndPalette(0, 1, 1, 14);
        gMain.state++;
        break;
    case 11:
@@ -702,7 +702,7 @@ static void HandleInitWindows(void)
    DeactivateAllTextPrinters();
    LoadUserWindowBorderGfx(0, 1, 0xE0);
    LoadPalette(gUnknown_0860F074, 0xF0, 0x20);
-    FillWindowPixelBuffer(0, 0);
+    FillWindowPixelBuffer(0, PIXEL_FILL(0));
    PutWindowTilemap(0);
    schedule_bg_copy_tilemap_to_vram(0);
 }