Merge branch 'master' of https://github.com/pret/pokeemerald into synchronise

1 files changed, 34 insertions, 34 deletions

diff --git a/src/window.c b/src/window.c
index e93577e3a..8efd1c281 100644
--- a/src/window.c
+++ b/src/window.c
@@ -52,7 +52,7 @@ bool16 InitWindows(const struct WindowTemplate *templates)
         gWindows[i].tileData = NULL;
     }
 
-    for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].priority; bgLayer != 0xFF && i < 0x20; ++i, bgLayer = templates[i].priority)
+    for (i = 0, allocatedBaseBlock = 0, bgLayer = templates[i].bg; bgLayer != 0xFF && i < 0x20; ++i, bgLayer = templates[i].bg)
     {
         if (gUnneededFireRedVariable == 1)
         {
@@ -121,14 +121,14 @@ u16 AddWindow(const struct WindowTemplate *template)
 
     for (win = 0; win < WINDOWS_MAX; ++win)
     {
-        if ((bgLayer = gWindows[win].window.priority) == 0xFF)
+        if ((bgLayer = gWindows[win].window.bg) == 0xFF)
             break;
     }
 
     if (win == WINDOWS_MAX)
         return 0xFF;
 
-    bgLayer = template->priority;
+    bgLayer = template->bg;
     allocatedBaseBlock = 0;
 
     if (gUnneededFireRedVariable == 1)
@@ -190,14 +190,14 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template)
 
     for (win = 0; win < WINDOWS_MAX; ++win)
     {
-        if (gWindows[win].window.priority == 0xFF)
+        if (gWindows[win].window.bg == 0xFF)
             break;
     }
 
     if (win == WINDOWS_MAX)
         return 0xFF;
 
-    bgLayer = template->priority;
+    bgLayer = template->bg;
     allocatedBaseBlock = 0;
 
     if (gUnneededFireRedVariable == 1)
@@ -221,7 +221,7 @@ int AddWindowWithoutTileMap(const struct WindowTemplate *template)
 
 void RemoveWindow(u8 windowId)
 {
-    u8 bgLayer = gWindows[windowId].window.priority;
+    u8 bgLayer = gWindows[windowId].window.bg;
 
     if (gUnneededFireRedVariable == 1)
     {
@@ -277,14 +277,14 @@ void CopyWindowToVram(u8 windowId, u8 mode)
     switch (mode)
     {
         case 1:
-            CopyBgTilemapBufferToVram(windowLocal.window.priority);
+            CopyBgTilemapBufferToVram(windowLocal.window.bg);
             break;
         case 2:
-            LoadBgTiles(windowLocal.window.priority, windowLocal.tileData, windowSize, windowLocal.window.baseBlock);
+            LoadBgTiles(windowLocal.window.bg, windowLocal.tileData, windowSize, windowLocal.window.baseBlock);
             break;
         case 3:
-            LoadBgTiles(windowLocal.window.priority, windowLocal.tileData, windowSize, windowLocal.window.baseBlock);
-            CopyBgTilemapBufferToVram(windowLocal.window.priority);
+            LoadBgTiles(windowLocal.window.bg, windowLocal.tileData, windowSize, windowLocal.window.baseBlock);
+            CopyBgTilemapBufferToVram(windowLocal.window.bg);
             break;
     }
 }
@@ -309,14 +309,14 @@ void CopyWindowRectToVram(u32 windowId, u32 mode, u32 x, u32 y, u32 w, u32 h)
         switch (mode)
         {
             case 1:
-                CopyBgTilemapBufferToVram(windowLocal.window.priority);
+                CopyBgTilemapBufferToVram(windowLocal.window.bg);
                 break;
             case 2:
-                LoadBgTiles(windowLocal.window.priority, windowLocal.tileData + (rectPos * 32), rectSize, windowLocal.window.baseBlock + rectPos);
+                LoadBgTiles(windowLocal.window.bg, windowLocal.tileData + (rectPos * 32), rectSize, windowLocal.window.baseBlock + rectPos);
                 break;
             case 3:
-                LoadBgTiles(windowLocal.window.priority, windowLocal.tileData + (rectPos * 32), rectSize, windowLocal.window.baseBlock + rectPos);
-                CopyBgTilemapBufferToVram(windowLocal.window.priority);
+                LoadBgTiles(windowLocal.window.bg, windowLocal.tileData + (rectPos * 32), rectSize, windowLocal.window.baseBlock + rectPos);
+                CopyBgTilemapBufferToVram(windowLocal.window.bg);
                 break;
         }
     }
@@ -327,8 +327,8 @@ void PutWindowTilemap(u8 windowId)
     struct Window windowLocal = gWindows[windowId];
 
     WriteSequenceToBgTilemapBuffer(
-        windowLocal.window.priority,
-        GetBgAttribute(windowLocal.window.priority, 0xA) + windowLocal.window.baseBlock,
+        windowLocal.window.bg,
+        GetBgAttribute(windowLocal.window.bg, 0xA) + windowLocal.window.baseBlock,
         windowLocal.window.tilemapLeft,
         windowLocal.window.tilemapTop,
         windowLocal.window.width,
@@ -340,13 +340,13 @@ void PutWindowTilemap(u8 windowId)
 void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette)
 {
     struct Window windowLocal = gWindows[windowId];
-    u16 currentRow = windowLocal.window.baseBlock + (y * windowLocal.window.width) + x + GetBgAttribute(windowLocal.window.priority, 0xA);
+    u16 currentRow = windowLocal.window.baseBlock + (y * windowLocal.window.width) + x + GetBgAttribute(windowLocal.window.bg, 0xA);
     int i;
 
     for (i = 0; i < height; ++i)
     {
         WriteSequenceToBgTilemapBuffer(
-            windowLocal.window.priority,
+            windowLocal.window.bg,
             currentRow,
             windowLocal.window.tilemapLeft + x,
             windowLocal.window.tilemapTop + y + i,
@@ -364,7 +364,7 @@ void ClearWindowTilemap(u8 windowId)
     struct Window windowLocal = gWindows[windowId];
 
     FillBgTilemapBufferRect(
-        windowLocal.window.priority,
+        windowLocal.window.bg,
         gUnknown_03002F60,
         windowLocal.window.tilemapLeft,
         windowLocal.window.tilemapTop,
@@ -376,13 +376,13 @@ void ClearWindowTilemap(u8 windowId)
 void PutWindowRectTilemap(u8 windowId, u8 x, u8 y, u8 width, u8 height)
 {
     struct Window windowLocal = gWindows[windowId];
-    u16 currentRow = windowLocal.window.baseBlock + (y * windowLocal.window.width) + x + GetBgAttribute(windowLocal.window.priority, 0xA);
+    u16 currentRow = windowLocal.window.baseBlock + (y * windowLocal.window.width) + x + GetBgAttribute(windowLocal.window.bg, 0xA);
     int i;
 
     for (i = 0; i < height; ++i)
     {
         WriteSequenceToBgTilemapBuffer(
-            windowLocal.window.priority,
+            windowLocal.window.bg,
             currentRow,
             windowLocal.window.tilemapLeft + x,
             windowLocal.window.tilemapTop + y + i,
@@ -443,7 +443,7 @@ void FillWindowPixelRect(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16
     FillBitmapRect4Bit(&pixelRect, x, y, width, height, fillValue);
 }
 
-void CopyToWindowPixelBuffer(u8 windowId, const u8 *src, u16 size, u16 tileOffset)
+void CopyToWindowPixelBuffer(u8 windowId, const void *src, u16 size, u16 tileOffset)
 {
     if (size != 0)
         CpuCopy16(src, gWindows[windowId].tileData + (0x20 * tileOffset), size);
@@ -529,7 +529,7 @@ void ScrollWindow(u8 windowId, u8 direction, u8 distance, u8 fillValue)
 void CallWindowFunction(u8 windowId, void ( *func)(u8, u8, u8, u8, u8, u8))
 {
     struct WindowTemplate window = gWindows[windowId].window;
-    func(window.priority, window.tilemapLeft, window.tilemapTop, window.width, window.height, window.paletteNum);
+    func(window.bg, window.tilemapLeft, window.tilemapTop, window.width, window.height, window.paletteNum);
 }
 
 bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
@@ -551,7 +551,7 @@ bool8 SetWindowAttribute(u8 windowId, u8 attributeId, u32 value)
     case WINDOW_TILE_DATA:
         gWindows[windowId].tileData = (u8*)(value);
         return TRUE;
-    case WINDOW_PRIORITY:
+    case WINDOW_BG:
     case WINDOW_WIDTH:
     case WINDOW_HEIGHT:
     default:
@@ -563,8 +563,8 @@ u32 GetWindowAttribute(u8 windowId, u8 attributeId)
 {
     switch (attributeId)
     {
-    case WINDOW_PRIORITY:
-        return gWindows[windowId].window.priority;
+    case WINDOW_BG:
+        return gWindows[windowId].window.bg;
     case WINDOW_TILEMAP_LEFT:
         return gWindows[windowId].window.tilemapLeft;
     case WINDOW_TILEMAP_TOP:
@@ -590,7 +590,7 @@ static u8 GetNumActiveWindowsOnBg(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;
@@ -609,12 +609,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 (gUnknown_03002F70[bgLayer] == 0)
     {
         u16 attribute = GetBgAttribute(bgLayer, 8);
@@ -693,14 +693,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;
     }
 }
@@ -711,7 +711,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;