1 files changed, 8 insertions, 10 deletions
diff --git a/src/window_8bpp.c b/src/window_8bpp.c
index 5eac3c558..c58c13802 100644
--- a/src/window_8bpp.c
+++ b/src/window_8bpp.c
@@ -2,13 +2,11 @@
 #include "window.h"
 #include "malloc.h"
 #include "bg.h"
+#include "blit.h"
 
 EWRAM_DATA static struct Window* sWindowPtr = NULL;
 EWRAM_DATA static u16 sWindowSize = 0;
 
-extern void BlitBitmapRect4BitTo8Bit(struct Bitmap *src, struct Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u8 colorKey, u8 paletteNum);
-extern void FillBitmapRect8Bit(struct Bitmap *surface, u16 x, u16 y, u16 width, u16 height, u8 fillValue);
-
 static u8 GetNumActiveWindowsOnBg8Bit(u8 bgId);
 
 static void nullsub_9(void)
@@ -23,12 +21,12 @@ u16 AddWindow8Bit(struct WindowTemplate *template)
 
     for (windowId = 0; windowId < 32; windowId++)
     {
-        if (gWindows[windowId].window.priority == 0xFF)
+        if (gWindows[windowId].window.bg == 0xFF)
             break;
     }
     if (windowId == WINDOWS_MAX)
         return 0xFF;
-    bgLayer = template->priority;
+    bgLayer = template->bg;
     if (gWindowBgTilemapBuffers[bgLayer] == 0)
     {
         u16 attribute = GetBgAttribute(bgLayer, 8);
@@ -107,14 +105,14 @@ void CopyWindowToVram8Bit(u8 windowId, u8 mode)
     switch (mode)
     {
         case 1:
-            CopyBgTilemapBufferToVram(sWindowPtr->window.priority);
+            CopyBgTilemapBufferToVram(sWindowPtr->window.bg);
             break;
         case 2:
-            LoadBgTiles(sWindowPtr->window.priority, sWindowPtr->tileData, sWindowSize, sWindowPtr->window.baseBlock);
+            LoadBgTiles(sWindowPtr->window.bg, sWindowPtr->tileData, sWindowSize, sWindowPtr->window.baseBlock);
             break;
         case 3:
-            LoadBgTiles(sWindowPtr->window.priority, sWindowPtr->tileData, sWindowSize, sWindowPtr->window.baseBlock);
-            CopyBgTilemapBufferToVram(sWindowPtr->window.priority);
+            LoadBgTiles(sWindowPtr->window.bg, sWindowPtr->tileData, sWindowSize, sWindowPtr->window.baseBlock);
+            CopyBgTilemapBufferToVram(sWindowPtr->window.bg);
             break;
     }
 }
@@ -125,7 +123,7 @@ static u8 GetNumActiveWindowsOnBg8Bit(u8 bgId)
     s32 i;
     for (i = 0; i < WINDOWS_MAX; i++)
     {
-        if (gWindows[i].window.priority == bgId)
+        if (gWindows[i].window.bg == bgId)
             windowsNum++;
     }
     return windowsNum;