Create COPYWIN defines for CopyWindowToVram calls

include/berry_crush.h

@@ -112,7 +112,7 @@ struct BerryCrushGame
     u8 unk8;
     u8 unk9;
     u8 unkA;
-    u8 unkB;
+    u8 textSpeed;
     u8 unkC;
     u8 unkD;
     u8 unkE;

include/window.h

@@ -54,8 +54,15 @@ u16 AddWindow(const struct WindowTemplate *template);
 int AddWindowWithoutTileMap(const struct WindowTemplate *template);
 void RemoveWindow(u8 windowId);
 void FreeAllWindowBuffers(void);
+
+// Mode parameter for funcs below
+#define COPYWIN_MAP  1
+#define COPYWIN_GFX  2
+#define COPYWIN_BOTH 3
+
 void CopyWindowToVram(u8 windowId, u8 mode);
-void CopyWindowRectToVram(u32 windowId, u32 mode, u32 x, u32 y, u32 w, u32 h);
+void CopyWindowToVram8Bit(u8 windowId, u8 mode);
+
 void PutWindowTilemap(u8 windowId);
 void PutWindowRectTilemapOverridePalette(u8 windowId, u8 x, u8 y, u8 width, u8 height, u8 palette);
 void ClearWindowTilemap(u8 windowId);
@@ -73,7 +80,6 @@ u16 AddWindow8Bit(const struct WindowTemplate *template);
 void FillWindowPixelBuffer8Bit(u8 windowId, u8 fillValue);
 void FillWindowPixelRect8Bit(u8 windowId, u8 fillValue, u16 x, u16 y, u16 width, u16 height);
 void BlitBitmapRectToWindow4BitTo8Bit(u8 windowId, const u8 *pixels, u16 srcX, u16 srcY, u16 srcWidth, int srcHeight, u16 destX, u16 destY, u16 rectWidth, u16 rectHeight, u8 paletteNum);
-void CopyWindowToVram8Bit(u8 windowId, u8 mode);
 
 extern void *gWindowBgTilemapBuffers[];
 extern struct Window gWindows[];

src/battle_message.c

@@ -2453,7 +2453,7 @@ void BattlePutTextOnWindow(const u8 *text, u8 windowId) {
     if (!(textFlags & 0x80))
     {
         PutWindowTilemap(windowId);
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
     }
 }
 

src/battle_records.c

@@ -198,7 +198,7 @@ static void ClearWindowCommitAndRemove(u8 windowId)
 {
     FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
     ClearWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
     RemoveWindow(windowId);
 }
 
@@ -557,7 +557,7 @@ static void PrintBattleRecords(void)
 static void CommitWindow(u8 windowId)
 {
     PutWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void LoadFrameGfxOnBg(u8 bg)

src/battle_script_commands.c

@@ -5764,7 +5764,7 @@ static void atk6C_drawlvlupbox(void)
     case 4:
         DrawLevelUpWindow1();
         PutWindowTilemap(12);
-        CopyWindowToVram(12, 3);
+        CopyWindowToVram(12, COPYWIN_BOTH);
         ++gBattleScripting.atk6C_state;
         break;
     case 5:
@@ -5780,7 +5780,7 @@ static void atk6C_drawlvlupbox(void)
         {
             PlaySE(SE_SELECT);
             DrawLevelUpWindow2();
-            CopyWindowToVram(12, 2);
+            CopyWindowToVram(12, COPYWIN_GFX);
             ++gBattleScripting.atk6C_state;
         }
         break;
@@ -5796,9 +5796,9 @@ static void atk6C_drawlvlupbox(void)
         if (!sub_8026648())
         {
             ClearWindowTilemap(13);
-            CopyWindowToVram(13, 1);
+            CopyWindowToVram(13, COPYWIN_MAP);
             ClearWindowTilemap(12);
-            CopyWindowToVram(12, 1);
+            CopyWindowToVram(12, COPYWIN_MAP);
             SetBgAttribute(2, BG_ATTR_PRIORITY, 2);
             ShowBg(2);
             gBattleScripting.atk6C_state = 10;
@@ -5840,7 +5840,7 @@ static void sub_8026480(void)
     LoadPalette(gUnknown_82506D0, 0x60, 0x20);
     CopyToWindowPixelBuffer(13, gUnknown_82506F0, 0, 0);
     PutWindowTilemap(13);
-    CopyWindowToVram(13, 3);
+    CopyWindowToVram(13, COPYWIN_BOTH);
     PutMonIconOnLvlUpBox();
 }
 
@@ -5909,8 +5909,8 @@ static void PutLevelAndGenderOnLvlUpBox(void)
     }
     printerTemplate.y = 10;
     printerTemplate.currentY = 10;
-    AddTextPrinter(&printerTemplate, 0xFF, NULL);
+    AddTextPrinter(&printerTemplate, TEXT_SPEED_FF, NULL);
-    CopyWindowToVram(13, 2);
+    CopyWindowToVram(13, COPYWIN_GFX);
 }
 
 static bool8 sub_8026648(void)

src/berry_crush.c

@@ -216,13 +216,13 @@ void sub_814BABC(struct BerryCrushGame *arg0)
     switch (gSaveBlock2Ptr->optionsTextSpeed)
     {
     case OPTIONS_TEXT_SPEED_SLOW:
-        arg0->unkB = 8;
+        arg0->textSpeed = 8;
         break;
     case OPTIONS_TEXT_SPEED_MID:
-        arg0->unkB = 4;
+        arg0->textSpeed = 4;
         break;
     case OPTIONS_TEXT_SPEED_FAST:
-        arg0->unkB = 1;
+        arg0->textSpeed = 1;
         break;
     }
 }

src/berry_crush_2.c

@@ -218,13 +218,13 @@ static u32 sub_814BC74(struct BerryCrushGame * r7, u8 *r5)
         if (r5[1] & 2)
         {
             StringExpandPlaceholders(gStringVar4, gUnknown_846E328[r5[0]]);
-            AddTextPrinterParameterized2(0, 2, gStringVar4, r7->unkB, 0, 2, 1, 3);
+            AddTextPrinterParameterized2(0, 2, gStringVar4, r7->textSpeed, 0, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
         }
         else
         {
-            AddTextPrinterParameterized2(0, 2, gUnknown_846E328[r5[0]], r7->unkB, 0, 2, 1, 3);
+            AddTextPrinterParameterized2(0, 2, gUnknown_846E328[r5[0]], r7->textSpeed, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
         }
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         break;
     case 1:
         if (!IsTextPrinterActive(0))
@@ -1170,7 +1170,7 @@ static u32 sub_814D094(struct BerryCrushGame * r5, u8 *r4)
             return 0;
         DrawDialogueFrame(0, 0);
         AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, 0, 2, 1, 3);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         CreateTask(sub_80DA634, 0);
         break;
     case 3:
@@ -1313,10 +1313,10 @@ static u32 sub_814D3A4(struct BerryCrushGame * r5, UNUSED u8 *r1)
     case 0:
         DrawDialogueFrame(0, 0);
         if (r5->unk14 == 3)
-            AddTextPrinterParameterized2(0, 2, gUnknown_846E328[5], r5->unkB, 0, 2, 1, 3);
+            AddTextPrinterParameterized2(0, 2, gUnknown_846E328[5], r5->textSpeed, 0, 2, 1, 3);
         else
-            AddTextPrinterParameterized2(0, 2, gUnknown_846E328[6], r5->unkB, 0, 2, 1, 3);
+            AddTextPrinterParameterized2(0, 2, gUnknown_846E328[6], r5->textSpeed, 0, 2, 1, 3);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         break;
     case 1:
         if (IsTextPrinterActive(0))

src/berry_crush_3.c

@@ -1004,7 +1004,7 @@ bool32 sub_814E644(struct BerryCrushGame * r4, struct BerryCrushGame_138 * r6)
         sub_814E32C(r4);
         break;
     case 5:
-        CopyWindowToVram(r6->unk82, 3);
+        CopyWindowToVram(r6->unk82, COPYWIN_BOTH);
         r6->unk80 = 0;
         return TRUE;
     }
@@ -1093,7 +1093,7 @@ static void Task_ShowBerryCrushRankings(u8 taskId)
             yPos += 14;
             score = 0;
         }
-        CopyWindowToVram(data[1], 3);
+        CopyWindowToVram(data[1], COPYWIN_BOTH);
         break;
     case 2:
         if (gMain.newKeys & (A_BUTTON | B_BUTTON))
@@ -1191,7 +1191,7 @@ static void sub_814EBB0(struct BerryCrushGame * r6)
                 PLAYER_UNK14(r6, r7)
             );
         }
-        CopyWindowToVram(r6->unk138.unk83[r7], 3);
+        CopyWindowToVram(r6->unk138.unk83[r7], COPYWIN_BOTH);
     }
     CopyBgTilemapBufferToVram(0);
 }

src/berry_pouch.c

@@ -744,7 +744,7 @@ static void BerryPouchSetArrowCursorAt(u8 y, u8 colorIdx)
         width = GetMenuCursorDimensionByFont(2, 0);
         height = GetMenuCursorDimensionByFont(2, 1);
         FillWindowPixelRect(0, 0, 1, y, width, height);
-        CopyWindowToVram(0, 2);
+        CopyWindowToVram(0, COPYWIN_GFX);
     }
     else
     {

src/braille_text.c

@@ -175,7 +175,7 @@ u16 Font6Func(struct TextPrinter *textPrinter)
                     ScrollWindow(textPrinter->printerTemplate.windowId, 0, gUnknown_846FB08[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor));
                     textPrinter->scrollDistance -= gUnknown_846FB08[gSaveBlock2Ptr->optionsTextSpeed];
                 }
-                CopyWindowToVram(textPrinter->printerTemplate.windowId, 2);
+                CopyWindowToVram(textPrinter->printerTemplate.windowId, COPYWIN_GFX);
             }
             else
             {

src/cable_club.c

@@ -80,13 +80,13 @@ static void PrintNewCountOnLinkPlayerCountDisplayWindow(u16 windowId, s32 num)
     SetStdWindowBorderStyle(windowId, FALSE);
     StringExpandPlaceholders(gStringVar4, gUnknown_841DF82);
     AddTextPrinterParameterized(windowId, 2, gStringVar4, 0, 0, TEXT_SPEED_FF, NULL);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void DestroyLinkPlayerCountDisplayWindow(u16 windowId)
 {
     ClearStdWindowAndFrame(windowId, FALSE);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void UpdateLinkPlayerCountDisplay(u8 taskId, u8 num)

src/clear_save_data_screen.c

@@ -107,7 +107,7 @@ static void Task_DrawClearSaveDataScreen(u8 taskId)
     case 4:
         DrawStdFrameWithCustomTileAndPalette(1, TRUE, 0x001, 0xF);
         AddTextPrinterParameterized4(1, 2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B69E);
-        CopyWindowToVram(1, 2);
+        CopyWindowToVram(1, COPYWIN_GFX);
         break;
     case 5:
         CreateYesNoMenu(&sWindowTemplates[0], 2, 0, 2, 0x001, 0xF, 1);
@@ -139,7 +139,7 @@ static void Task_HandleYesNoMenu(u8 taskId)
             PlaySE(SE_SELECT);
             FillWindowPixelBuffer(1, PIXEL_FILL(1));
             AddTextPrinterParameterized4(1, 2, 0, 3, 1, 1, sTextColor, 0, gUnknown_841B6B9);
-            CopyWindowToVram(1, 3);
+            CopyWindowToVram(1, COPYWIN_BOTH);
             ClearSaveData();
             break;
         case MENU_NOTHING_CHOSEN:

src/credits.c

@@ -761,7 +761,7 @@ static void CreateCreditsWindow(void)
     sCreditsMgr->windowId = AddWindow(&sCreditsWindowTemplate);
     FillWindowPixelBuffer(sCreditsMgr->windowId, PIXEL_FILL(0));
     PutWindowTilemap(sCreditsMgr->windowId);
-    CopyWindowToVram(sCreditsMgr->windowId, 3);
+    CopyWindowToVram(sCreditsMgr->windowId, COPYWIN_BOTH);
     sCreditsMgr->windowIsActive = TRUE;
 }
 
@@ -931,7 +931,7 @@ static s32 RollCredits(void)
         sCreditsMgr->mainseqno = CREDITSSCENE_PRINT_DELAY;
         return sCreditsMgr->canSpeedThrough;
     case CREDITSSCENE_PRINT_DELAY:
-        CopyWindowToVram(sCreditsMgr->windowId, 2);
+        CopyWindowToVram(sCreditsMgr->windowId, COPYWIN_GFX);
         sCreditsMgr->timer = sCreditsScript[sCreditsMgr->scrcmdidx].duration;
         sCreditsMgr->scrcmdidx++;
         BeginNormalPaletteFade(0x00008000, 0, 16, 0, RGB_BLACK);
@@ -1781,9 +1781,9 @@ static void LoadCreditsMonPic(u8 whichMon)
         CopyToWindowPixelBuffer(2, (const void *)sWindow2Map_Pikachu, 0, 0);
         break;
     }
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
-    CopyWindowToVram(2, 2);
+    CopyWindowToVram(2, COPYWIN_GFX);
 }
 
 static u16 GetCreditsMonSpecies(u8 whichMon)

src/daycare.c

@@ -1540,7 +1540,7 @@ void ShowDaycareLevelMenu(void)
     menuTemplate.windowId = windowId;
     listMenuTaskId = ListMenuInit(&menuTemplate, 0, 0);
 
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 
     daycareMenuTaskId = CreateTask(Task_HandleDaycareLevelMenuInput, 3);
     gTasks[daycareMenuTaskId].tMenuListTaskId = listMenuTaskId;
@@ -1935,7 +1935,7 @@ static void CB2_EggHatch_1(void)
         PlayFanfare(MUS_FANFA5);
         sEggHatchData->CB2_state++;
         PutWindowTilemap(sEggHatchData->windowId);
-        CopyWindowToVram(sEggHatchData->windowId, 3);
+        CopyWindowToVram(sEggHatchData->windowId, COPYWIN_BOTH);
         break;
     case 6:
         if (IsFanfareTaskInactive())

src/dodrio_berry_picking.c

@@ -2342,7 +2342,7 @@ static void Task_ShowDodrioBerryPickingRecords(u8 taskId)
     case 0:
         data[1] = AddWindow(&sUnknown_84755E0);
         sub_81538D0(data[1]);
-        CopyWindowToVram(data[1], 3);
+        CopyWindowToVram(data[1], COPYWIN_BOTH);
         data[0]++;
         break;
     case 1:
@@ -2353,7 +2353,7 @@ static void Task_ShowDodrioBerryPickingRecords(u8 taskId)
         if (JOY_NEW(A_BUTTON | B_BUTTON))
         {
             rbox_fill_rectangle(data[1]);
-            CopyWindowToVram(data[1], 1);
+            CopyWindowToVram(data[1], COPYWIN_MAP);
             data[0]++;
         }
         break;

src/dodrio_berry_picking_2.c

@@ -1055,7 +1055,7 @@ static void sub_8154B34(void)
                 colorsId = 2;
             name = sub_81533C4(id);
             AddTextPrinterParameterized3(gUnknown_203F440->unk3008[i], 0, left, 1, sTextColorTable[colorsId], -1, name);
-            CopyWindowToVram(gUnknown_203F440->unk3008[i], 2);
+            CopyWindowToVram(gUnknown_203F440->unk3008[i], COPYWIN_GFX);
             window.baseBlock += 0xE;
             sub_8154868(&window);
         }
@@ -1199,8 +1199,8 @@ static void sub_8154F80(void)
                     AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sp0C, sUnknown_8478EA8[j] - width, sUnknown_8478EB0[i], -1, NULL);
             }
         }
-        CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX);
-        CopyWindowToVram(gUnknown_203F440->unk3008[1], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_GFX);
         gUnknown_203F440->state++;
         break;
     case 3:
@@ -1232,8 +1232,8 @@ static void sub_8154F80(void)
         break;
     case 6:
         sub_8154D9C(playersCount);
-        CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX);
-        CopyWindowToVram(gUnknown_203F440->unk3008[1], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_GFX);
         gUnknown_203F440->state++;
         break;
     case 7:
@@ -1291,8 +1291,8 @@ static void sub_8154F80(void)
                 DynamicPlaceholderTextUtil_ExpandPlaceholders(sp0C, gText_FilledStorageSpace);
             AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 0, sp0C, 8, 40, -1, NULL);
         }
-        CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX);
-        CopyWindowToVram(gUnknown_203F440->unk3008[1], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_GFX);
         gUnknown_203F440->state++;
         break;
     case 10:
@@ -1349,8 +1349,8 @@ static void sub_81556E0(void)
         AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_Yes, 8, 2, -1, NULL);
         AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_No, 8, 16, -1, NULL);
         AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_SelectorArrow2, 0, 2, -1, NULL);
-        CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX);
-        CopyWindowToVram(gUnknown_203F440->unk3008[1], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_GFX);
         gUnknown_203F440->state++;
         break;
     case 2:
@@ -1370,7 +1370,7 @@ static void sub_81556E0(void)
         AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_Yes, 8, 2, -1, NULL);
         AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_No, 8, 16, -1, NULL);
         AddTextPrinterParameterized(gUnknown_203F440->unk3008[1], 2, gText_SelectorArrow2, 0, y == 1 ? 2 : 16, -1, NULL);
-        CopyWindowToVram(gUnknown_203F440->unk3008[1], 3);
+        CopyWindowToVram(gUnknown_203F440->unk3008[1], COPYWIN_BOTH);
         // Increment state only if A or B button have been pressed.
         if (JOY_NEW(A_BUTTON))
         {
@@ -1425,7 +1425,7 @@ static void sub_8155A78(void)
         gUnknown_203F440->state++;
         break;
     case 1:
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         gUnknown_203F440->state++;
         break;
     case 2:
@@ -1460,7 +1460,7 @@ static void sub_8155B4C(void)
     case 1:
         FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1));
         AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 2, gText_CommunicationStandby3, 0, 6, -1, NULL);
-        CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX);
         gUnknown_203F440->state++;
         break;
     case 2:
@@ -1500,7 +1500,7 @@ static void sub_8155C80(void)
     case 1:
         FillWindowPixelBuffer(gUnknown_203F440->unk3008[0], PIXEL_FILL(1));
         AddTextPrinterParameterized(gUnknown_203F440->unk3008[0], 2, gText_SomeoneDroppedOut, 0, 6, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_203F440->unk3008[0], 2);
+        CopyWindowToVram(gUnknown_203F440->unk3008[0], COPYWIN_GFX);
         gUnknown_203F440->state++;
         break;
     case 2:

src/easy_chat_3.c

@@ -1323,7 +1323,7 @@ static void PrintTitleText(void)
     FillWindowPixelBuffer(0, PIXEL_FILL(0));
     EC_AddTextPrinterParameterized2(0, 1, titleText, xOffset, 0, TEXT_SPEED_FF, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY);
     PutWindowTilemap(0);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 static void EC_AddTextPrinterParameterized(u8 windowId, u8 fontId, const u8 *str, u8 x, u8 y, u8 speed, void (*callback)(struct TextPrinterTemplate *, u16))
@@ -1379,7 +1379,7 @@ static void PrintECInterfaceTextById(u8 direction)
     if (text2)
         EC_AddTextPrinterParameterized(1, 1, text2, 0, 16, TEXT_SPEED_FF, NULL);
 
-    CopyWindowToVram(1, 3);
+    CopyWindowToVram(1, COPYWIN_BOTH);
 }
 
 static void EC_CreateYesNoMenuWithInitialCursorPos(u8 initialCursorPos)
@@ -1454,7 +1454,7 @@ static void PrintECFields(void)
         EC_AddTextPrinterParameterized(sEasyChatGraphicsResources->windowId, 1, sEasyChatGraphicsResources->ecPrintBuffer, 0, i * 16, TEXT_SPEED_FF, NULL);
     }
 
-    CopyWindowToVram(sEasyChatGraphicsResources->windowId, 3);
+    CopyWindowToVram(sEasyChatGraphicsResources->windowId, COPYWIN_BOTH);
 }
 
 static void DrawECFrameInTilemapBuffer(u16 *tilemap)
@@ -1537,7 +1537,7 @@ static void PrintECMenuById(u32 id)
         break;
     }
 
-    CopyWindowToVram(2, 2);
+    CopyWindowToVram(2, COPYWIN_GFX);
 }
 
 static void PrintECGroupOrAlphaMenu(void)
@@ -1659,7 +1659,7 @@ static void PrintECRowsWin2(u8 row, u8 remrow)
 
     }
 
-    CopyWindowToVram(2, 2);
+    CopyWindowToVram(2, COPYWIN_GFX);
 }
 
 static void ClearECRowsWin2(u8 row, u8 remrow)
@@ -1690,7 +1690,7 @@ static void ClearECRowsWin2(u8 row, u8 remrow)
 static void ClearWin2AndCopyToVram(void)
 {
     FillWindowPixelBuffer(2, PIXEL_FILL(1));
-    CopyWindowToVram(2, 2);
+    CopyWindowToVram(2, COPYWIN_GFX);
 }
 
 static void StartWin2FrameAnim(int animNo)

src/fame_checker.c

@@ -792,7 +792,7 @@ static void Setup_DrawMsgAndListBoxes(void)
 static void FC_PutWindowTilemapAndCopyWindowToVramMode3(u8 windowId)
 {
     PutWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static bool8 SetMessageSelectorIconObjMode(u8 spriteId, u8 objMode)
@@ -853,7 +853,7 @@ static void FC_DestroyWindow(u8 windowId)
 {
     FillWindowPixelBuffer(windowId, 0);
     ClearWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
     RemoveWindow(windowId);
 }
 
@@ -1376,7 +1376,7 @@ static u8 FC_PopulateListMenu(void)
 static void FC_PutWindowTilemapAndCopyWindowToVramMode3_2(u8 windowId)
 {
     PutWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void FC_CreateScrollIndicatorArrowPair(void)

src/field_screen_effect.c

@@ -396,7 +396,7 @@ static void Task_RushInjuredPokemonToCenter(u8 taskId)
         Menu_LoadStdPalAt(0xF0);
         FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
         PutWindowTilemap(windowId);
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
         loc = GetHealLocation(1);
         if (gSaveBlock1Ptr->lastHealLocation.mapGroup == loc->group
          && gSaveBlock1Ptr->lastHealLocation.mapNum == loc->map
@@ -425,7 +425,7 @@ static void Task_RushInjuredPokemonToCenter(u8 taskId)
     case 5:
         windowId = gTasks[taskId].data[1];
         ClearWindowTilemap(windowId);
-        CopyWindowToVram(windowId, 1);
+        CopyWindowToVram(windowId, COPYWIN_MAP);
         RemoveWindow(windowId);
         palette_bg_faded_fill_black();
         FadeInFromBlack();

src/field_specials.c

@@ -1104,7 +1104,7 @@ void DrawElevatorCurrentFloorWindow(void)
         strwidth = GetStringWidth(2, floorname, 0);
         AddTextPrinterParameterized(sElevatorCurrentFloorWindowId, 2, floorname, 56 - strwidth, 16, 0xFF, NULL);
         PutWindowTilemap(sElevatorCurrentFloorWindowId);
-        CopyWindowToVram(sElevatorCurrentFloorWindowId, 3);
+        CopyWindowToVram(sElevatorCurrentFloorWindowId, COPYWIN_BOTH);
     }
 }
 
@@ -1365,7 +1365,7 @@ static void Task_CreateScriptListMenu(u8 taskId)
     Task_CreateMenuRemoveScrollIndicatorArrowPair(taskId);
     task->data[14] = ListMenuInit(&sFieldSpecialsListMenuTemplate, task->data[7], task->data[8]);
     PutWindowTilemap(task->data[13]);
-    CopyWindowToVram(task->data[13], 3);
+    CopyWindowToVram(task->data[13], COPYWIN_BOTH);
     gTasks[taskId].func = Task_ListMenuHandleInput;
 }
 
@@ -1448,7 +1448,7 @@ static void Task_DestroyListMenu(u8 taskId)
     ClearStdWindowAndFrameToTransparent(task->data[13], TRUE);
     FillWindowPixelBuffer(task->data[13], PIXEL_FILL(0));
     ClearWindowTilemap(task->data[13]);
-    CopyWindowToVram(task->data[13], 2);
+    CopyWindowToVram(task->data[13], COPYWIN_GFX);
     RemoveWindow(task->data[13]);
     DestroyTask(taskId);
     EnableBothScriptContexts();

src/fldeff_flash.c

@@ -436,7 +436,7 @@ static void Task_MapPreviewScreen_0(u8 taskId)
         if (!MapPreview_IsGfxLoadFinished())
         {
             data[4] = MapPreview_CreateMapNameWindow(data[3]);
-            CopyWindowToVram(data[4], 3);
+            CopyWindowToVram(data[4], COPYWIN_BOTH);
             data[0]++;
         }
         break;

src/hall_of_fame.c

@@ -456,7 +456,7 @@ static void Task_Hof_InitTeamSaveData(u8 taskId)
 
     DrawDialogueFrame(0, 0);
     AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0, NULL, 2, 1, 3);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
     gTasks[taskId].func = Task_Hof_TrySaveData;
 }
 
@@ -594,7 +594,7 @@ static void Task_Hof_ApplauseAndConfetti(u8 taskId)
         }
         BeginNormalPaletteFade(sSelectedPaletteIndices, 0, 12, 12, HALL_OF_FAME_BG_PAL);
         FillWindowPixelBuffer(0, PIXEL_FILL(0));
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         gTasks[taskId].data[3] = 7;
         gTasks[taskId].func = Task_Hof_WaitBorderFadeAway;
     }
@@ -642,7 +642,7 @@ static void Task_Hof_WaitAndPrintPlayerInfo(u8 taskId)
         HallOfFame_PrintPlayerInfo(1, 2);
         DrawDialogueFrame(0, 0);
         AddTextPrinterParameterized2(0, 2, gText_LeagueChamp, 0, NULL, 2, 1, 3);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         gTasks[taskId].func = Task_Hof_ExitOnKeyPressed;
     }
 }
@@ -972,7 +972,7 @@ static void Task_HofPC_PrintDataIsCorrupted(u8 taskId)
     TopBarWindowPrintString(gText_ABUTTONExit, 8, TRUE);
     DrawDialogueFrame(0, 0);
     AddTextPrinterParameterized2(0, 2, gText_HOFCorrupted, 0, NULL, 2, 1, 3);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
     gTasks[taskId].func = Task_HofPC_ExitOnButtonPress;
 }
 
@@ -988,7 +988,7 @@ static void HallOfFame_PrintWelcomeText(u8 not, u8 used)
     FillWindowPixelBuffer(0, PIXEL_FILL(0));
     PutWindowTilemap(0);
     AddTextPrinterParameterized3(0, 2, x, 1, sTextColors[0], 0, gText_WelcomeToHOF);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u8 unused2)
@@ -1075,7 +1075,7 @@ static void HallOfFame_PrintMonInfo(struct HallofFameMon* currMon, u8 unused1, u
         AddTextPrinterParameterized3(0, 2, 0x60, 0x11, sTextColors[0], 0, text);
 
     }
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
@@ -1118,7 +1118,7 @@ static void HallOfFame_PrintPlayerInfo(u8 unused1, u8 unused2)
 
     AddTextPrinterParameterized3(1, 2, textWidth - 36, 32, sTextColors[1], 0, text);
 
-    CopyWindowToVram(1, 3);
+    CopyWindowToVram(1, COPYWIN_BOTH);
 }
 
 static void ClearVramOamPltt_LoadHofPal(void)

src/intro.c

@@ -992,7 +992,7 @@ static void IntroCB_Init(struct IntroSequenceData * this)
         FillWindowPixelBuffer(0, PIXEL_FILL(0));
         BlitBitmapToWindow(0, this->gamefreakTextBitmap, 0, 40, 144, 16);
         PutWindowTilemap(0);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         this->state++;
         break;
     case 1:
@@ -1118,7 +1118,7 @@ static void IntroCB_GameFreakScene_CreateGameFreakLogo(struct IntroSequenceData
         {
             BlitBitmapToWindow(0, this->gamefreakLogoArtSpriteTiles, 0x38, 0x06, 0x20, 0x40);
             BlitBitmapToWindow(0, this->gamefreakTextBitmap, 0x00, 0x28, 0x90, 0x10);
-            CopyWindowToVram(0, 2);
+            CopyWindowToVram(0, COPYWIN_GFX);
             this->state++;
         }
         break;

src/item_menu.c

@@ -1596,7 +1596,7 @@ static void Task_ItemMenuAction_ToggleSelect(u8 taskId)
     DestroyListMenuTask(data[0], &gBagMenuState.cursorPos[gBagMenuState.pocket], &gBagMenuState.itemsAbove[gBagMenuState.pocket]);
     Bag_BuildListMenuTemplate(gBagMenuState.pocket);
     data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagMenuState.cursorPos[gBagMenuState.pocket], gBagMenuState.itemsAbove[gBagMenuState.pocket]);
-    CopyWindowToVram(0, 1);
+    CopyWindowToVram(0, COPYWIN_MAP);
     Task_ItemMenuAction_Cancel(taskId);
 }
 
@@ -1608,7 +1608,7 @@ static void Task_ItemMenuAction_Give(u8 taskId)
     HideBagWindow(6);
     PutWindowTilemap(0);
     PutWindowTilemap(1);
-    CopyWindowToVram(0, 1);
+    CopyWindowToVram(0, COPYWIN_MAP);
     if (!CanWriteMailHere(itemId))
         DisplayItemMessageInBag(taskId, 2, gText_CantWriteMailHere, Task_WaitAButtonAndCloseContextMenu);
     else if (!itemid_is_unique(itemId))
@@ -1694,7 +1694,7 @@ static void Task_ItemMenuAction_BattleUse(u8 taskId)
         HideBagWindow(6);
         PutWindowTilemap(0);
         PutWindowTilemap(1);
-        CopyWindowToVram(0, 1);
+        CopyWindowToVram(0, COPYWIN_MAP);
         ItemId_GetBattleFunc(gSpecialVar_ItemId)(taskId);
     }
 }
@@ -2131,7 +2131,7 @@ static void Task_Bag_OldManTutorial(u8 taskId)
             HideBagWindow(6);
             PutWindowTilemap(0);
             PutWindowTilemap(1);
-            CopyWindowToVram(0, 1);
+            CopyWindowToVram(0, COPYWIN_MAP);
             DestroyListMenuTask(data[0], NULL, NULL);
             RestorePlayerBag();
             Bag_BeginCloseWin0Animation();
@@ -2242,7 +2242,7 @@ static void Task_Bag_TeachyTvRegister(u8 taskId)
             data[0] = ListMenuInit(&gMultiuseListMenuTemplate, gBagMenuState.cursorPos[gBagMenuState.pocket], gBagMenuState.itemsAbove[gBagMenuState.pocket]);
             Bag_FillMessageBoxWithPalette(0);
             bag_menu_print_cursor_(data[0], 1);
-            CopyWindowToVram(0, 1);
+            CopyWindowToVram(0, COPYWIN_MAP);
             break;
         case 510:
         case 612:
@@ -2305,7 +2305,7 @@ static void Task_Bag_TeachyTvCatching(u8 taskId)
             HideBagWindow(6);
             PutWindowTilemap(0);
             PutWindowTilemap(1);
-            CopyWindowToVram(0, 1);
+            CopyWindowToVram(0, COPYWIN_MAP);
             DestroyListMenuTask(data[0], NULL, NULL);
             RestorePlayerBag();
             Bag_BeginCloseWin0Animation();
@@ -2347,7 +2347,7 @@ static void Task_Bag_TeachyTvStatus(u8 taskId)
             HideBagWindow(6);
             PutWindowTilemap(0);
             PutWindowTilemap(1);
-            CopyWindowToVram(0, 1);
+            CopyWindowToVram(0, COPYWIN_MAP);
             DestroyListMenuTask(data[0], NULL, NULL);
             RestorePlayerBag();
             gItemUseCB = ItemUseCB_MedicineStep;
@@ -2388,7 +2388,7 @@ static void Task_Bag_TeachyTvTMs(u8 taskId)
             HideBagWindow(6);
             PutWindowTilemap(0);
             PutWindowTilemap(1);
-            CopyWindowToVram(0, 1);
+            CopyWindowToVram(0, COPYWIN_MAP);
             DestroyListMenuTask(data[0], NULL, NULL);
             RestorePlayerBag();
             sBagMenuDisplay->exitCB = Pokedude_InitTMCase;

src/learn_move.c

@@ -594,7 +594,7 @@ static void PrintTeachWhichMoveToStrVar1(bool8 onInit)
         StringExpandPlaceholders(gStringVar4, gText_TeachWhichMoveToMon);
         PrintTextOnWindow(7, gStringVar4, 0, 2, 0, 2);
         PutWindowTilemap(7);
-        CopyWindowToVram(7, 3);
+        CopyWindowToVram(7, COPYWIN_BOTH);
     }
 }
 
@@ -714,7 +714,7 @@ static void MoveRelearnerMenuHandleInput(void)
 static void MoveLearnerInitListMenu(void)
 {
     sMoveRelearner->listMenuTaskId = ListMenuInit(&gMultiuseListMenuTemplate, sMoveRelearner->listMenuScrollPos, sMoveRelearner->listMenuScrollRow);
-    CopyWindowToVram(6, 1);
+    CopyWindowToVram(6, COPYWIN_MAP);
 }
 
 static void PrintMoveInfo(u16 move)
@@ -760,8 +760,8 @@ static void LoadMoveInfoUI(void)
     PutWindowTilemap(5);
     PutWindowTilemap(2);
     PutWindowTilemap(7);
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
 }
 
 static void PrintMoveInfoHandleCancel_CopyToVram(void)
@@ -776,15 +776,15 @@ static void PrintMoveInfoHandleCancel_CopyToVram(void)
         for (i = 2; i < 6; i++)
         {
             FillWindowPixelBuffer(i, PIXEL_FILL(0));
-            CopyWindowToVram(i, 2);
+            CopyWindowToVram(i, COPYWIN_GFX);
         }
     }
-    CopyWindowToVram(3, 2);
+    CopyWindowToVram(3, COPYWIN_GFX);
-    CopyWindowToVram(4, 2);
+    CopyWindowToVram(4, COPYWIN_GFX);
-    CopyWindowToVram(2, 2);
+    CopyWindowToVram(2, COPYWIN_GFX);
-    CopyWindowToVram(2, 2);
+    CopyWindowToVram(2, COPYWIN_GFX);
-    CopyWindowToVram(5, 2);
+    CopyWindowToVram(5, COPYWIN_GFX);
-    CopyWindowToVram(7, 3);
+    CopyWindowToVram(7, COPYWIN_BOTH);
 }
 
 static void MoveRelearnerMenu_MoveCursorFunc(s32 itemIndex, bool8 onInit, struct ListMenu *list)
@@ -803,7 +803,7 @@ static s8 YesNoMenuProcessInput(void)
     if (input != -2)
     {
         PutWindowTilemap(6);
-        CopyWindowToVram(6, 1);
+        CopyWindowToVram(6, COPYWIN_MAP);
     }
     return input;
 }

src/link.c

@@ -1513,7 +1513,7 @@ void sub_800AE1C(void)
     PutWindowTilemap(0);
     PutWindowTilemap(2);
     CopyWindowToVram(0, 0);
-    CopyWindowToVram(2, 3);
+    CopyWindowToVram(2, COPYWIN_BOTH);
     ShowBg(0);
     ShowBg(1);
 }
@@ -1526,7 +1526,7 @@ void sub_800AED0(void)
     PutWindowTilemap(1);
     PutWindowTilemap(2);
     CopyWindowToVram(1, 0);
-    CopyWindowToVram(2, 3);
+    CopyWindowToVram(2, COPYWIN_BOTH);
     ShowBg(0);
 }
 

src/list_menu.c

@@ -122,7 +122,7 @@ s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const str
         gMultiuseListMenuTemplate = *listMenuTemplate;
         gMultiuseListMenuTemplate.windowId = sMysteryGiftLinkMenu.windowId;
         sMysteryGiftLinkMenu.listTaskId = ListMenuInit(&gMultiuseListMenuTemplate, 0, 0);
-        CopyWindowToVram(sMysteryGiftLinkMenu.windowId, 1);
+        CopyWindowToVram(sMysteryGiftLinkMenu.windowId, COPYWIN_MAP);
         sMysteryGiftLinkMenu.state = 1;
         break;
     case 1:
@@ -155,7 +155,7 @@ s32 DoMysteryGiftListMenu(const struct WindowTemplate *windowTemplate, const str
                     break;
                 }
             }
-            CopyWindowToVram(sMysteryGiftLinkMenu.windowId, 1);
+            CopyWindowToVram(sMysteryGiftLinkMenu.windowId, COPYWIN_MAP);
         }
         break;
     case 2:
@@ -171,7 +171,7 @@ u8 ListMenuInit(const struct ListMenuTemplate *listMenuTemplate, u16 cursorPos,
 {
     u8 taskId = ListMenuInitInternal(listMenuTemplate, cursorPos, itemsAbove);
     PutWindowTilemap(listMenuTemplate->windowId);
-    CopyWindowToVram(listMenuTemplate->windowId, 2);
+    CopyWindowToVram(listMenuTemplate->windowId, COPYWIN_GFX);
     return taskId;
 }
 
@@ -182,7 +182,7 @@ u8 ListMenuInitInRect(const struct ListMenuTemplate *listMenuTemplate, const str
     
     for (i = 0; rect[i].palNum != 0xFF; i++)
         PutWindowRectTilemapOverridePalette(listMenuTemplate->windowId, rect[i].x, rect[i].y, rect[i].width, rect[i].height, rect[i].palNum);
-    CopyWindowToVram(listMenuTemplate->windowId, 2);
+    CopyWindowToVram(listMenuTemplate->windowId, COPYWIN_GFX);
     return taskId;
 }
 
@@ -266,7 +266,7 @@ void RedrawListMenu(u8 listTaskId)
     FillWindowPixelBuffer(list->template.windowId, PIXEL_FILL(list->template.fillValue));
     ListMenuPrintEntries(list, list->cursorPos, 0, list->template.maxShowed);
     ListMenuDrawCursor(list);
-    CopyWindowToVram(list->template.windowId, 2);
+    CopyWindowToVram(list->template.windowId, COPYWIN_GFX);
 }
 
 static void ChangeListMenuPals(u8 listTaskId, u8 cursorPal, u8 fillValue, u8 cursorShadowPal)
@@ -611,7 +611,7 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn
             ListMenuErasePrintedCursor(list, oldSelectedRow);
             ListMenuDrawCursor(list);
             ListMenuCallSelectionChangedCallback(list, FALSE);
-            CopyWindowToVram(list->template.windowId, 2);
+            CopyWindowToVram(list->template.windowId, COPYWIN_GFX);
             break;
         case 2:
         case 3:
@@ -619,7 +619,7 @@ static bool8 ListMenuChangeSelection(struct ListMenu *list, bool8 updateCursorAn
             ListMenuScroll(list, cursorCount, movingDown);
             ListMenuDrawCursor(list);
             ListMenuCallSelectionChangedCallback(list, FALSE);
-            CopyWindowToVram(list->template.windowId, 2);
+            CopyWindowToVram(list->template.windowId, COPYWIN_GFX);
             break;
         }
     }

src/mail.c

@@ -677,8 +677,8 @@ static void AddMailMessagePrinters(void)
     width = GetStringWidth(1, gText_From, 0);
     AddTextPrinterParameterized3(1, 1, sMailViewResources->nameX, sMailViewResources->messageLayout->nameY, sTextColor, 0, gText_From);
     AddTextPrinterParameterized3(1, 1, sMailViewResources->nameX + width, sMailViewResources->messageLayout->nameY, sTextColor, 0, sMailViewResources->authorNameBuffer);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
-    CopyWindowToVram(1, 3);
+    CopyWindowToVram(1, COPYWIN_BOTH);
 }
 
 static void VBlankCB_ShowMail(void)

src/main_menu.c

@@ -352,7 +352,7 @@ static void Task_PrintMainMenuText(u8 taskId)
         AddTextPrinterParameterized3(MAIN_MENU_WINDOW_NEWGAME_ONLY, 2, 2, 2, sTextColor1, -1, gText_NewGame);
         MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME_ONLY]);
         PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME_ONLY);
-        CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, 3);
+        CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME_ONLY, COPYWIN_BOTH);
         break;
     case MAIN_MENU_CONTINUE:
         FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10));
@@ -364,8 +364,8 @@ static void Task_PrintMainMenuText(u8 taskId)
         MainMenu_DrawWindow(&sWindowTemplate[MAIN_MENU_WINDOW_NEWGAME]);
         PutWindowTilemap(MAIN_MENU_WINDOW_CONTINUE);
         PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME);
-        CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, 2);
+        CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, COPYWIN_GFX);
-        CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, 3);
+        CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, COPYWIN_BOTH);
         break;
     case MAIN_MENU_MYSTERYGIFT:
         FillWindowPixelBuffer(MAIN_MENU_WINDOW_CONTINUE, PIXEL_FILL(10));
@@ -382,9 +382,9 @@ static void Task_PrintMainMenuText(u8 taskId)
         PutWindowTilemap(MAIN_MENU_WINDOW_CONTINUE);
         PutWindowTilemap(MAIN_MENU_WINDOW_NEWGAME);
         PutWindowTilemap(MAIN_MENU_WINDOW_MYSTERYGIFT);
-        CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, 2);
+        CopyWindowToVram(MAIN_MENU_WINDOW_CONTINUE, COPYWIN_GFX);
-        CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, 2);
+        CopyWindowToVram(MAIN_MENU_WINDOW_NEWGAME, COPYWIN_GFX);
-        CopyWindowToVram(MAIN_MENU_WINDOW_MYSTERYGIFT, 3);
+        CopyWindowToVram(MAIN_MENU_WINDOW_MYSTERYGIFT, COPYWIN_BOTH);
         break;
     }
     gTasks[taskId].func = Task_WaitDma3AndFadeIn;
@@ -602,7 +602,7 @@ static void PrintMessageOnWindow4(const u8 *str)
     MainMenu_DrawWindow(&sWindowTemplate[4]);
     AddTextPrinterParameterized3(MAIN_MENU_WINDOW_ERROR, 2, 0, 2, sTextColor1, 2, str);
     PutWindowTilemap(MAIN_MENU_WINDOW_ERROR);
-    CopyWindowToVram(MAIN_MENU_WINDOW_ERROR, 2);
+    CopyWindowToVram(MAIN_MENU_WINDOW_ERROR, COPYWIN_GFX);
     SetGpuReg(REG_OFFSET_WIN0H, 0x13DD);
     SetGpuReg(REG_OFFSET_WIN0V, 0x739D);
 }

src/map_name_popup.c

@@ -84,7 +84,7 @@ static void Task_MapNamePopup(u8 taskId)
             if (task->tReshow)
             {
                 MapNamePopupPrintMapNameOnWindow(task->tWindowId);
-                CopyWindowToVram(task->tWindowId, 2);
+                CopyWindowToVram(task->tWindowId, COPYWIN_GFX);
                 task->tState = 1;
                 task->tReshow = FALSE;
             }
@@ -100,7 +100,7 @@ static void Task_MapNamePopup(u8 taskId)
         if (task->tWindowExists && !task->tWindowCleared)
         {
             rbox_fill_rectangle(task->tWindowId);
-            CopyWindowToVram(task->tWindowId, 1);
+            CopyWindowToVram(task->tWindowId, COPYWIN_MAP);
             task->tWindowCleared = TRUE;
         }
         task->tState = 7;
@@ -183,7 +183,7 @@ static u16 MapNamePopupCreateWindow(bool32 palintoFadedBuffer)
     DrawTextBorderOuter(windowId, r6, 0xD);
     PutWindowTilemap(windowId);
     MapNamePopupPrintMapNameOnWindow(windowId);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
     return windowId;
 }
 

src/map_preview_screen.c

@@ -479,7 +479,7 @@ static void Task_RunMapPreviewScreenForest(u8 taskId)
     case 0:
         if (!MapPreview_IsGfxLoadFinished() && !IsDma3ManagerBusyWithBgCopy())
         {
-            CopyWindowToVram(data[11], 3);
+            CopyWindowToVram(data[11], COPYWIN_BOTH);
             data[0]++;
         }
         break;

src/menu.c

@@ -44,7 +44,7 @@ void DrawDialogFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     PutWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 // not used
@@ -56,7 +56,7 @@ static void DrawDialogFrameWithCustomTile(u8 windowId, bool8 copyToVram, u16 til
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     PutWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void WindowFunc_DrawDialogFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
@@ -96,7 +96,7 @@ void ClearDialogWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram)
     FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
     ClearWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void WindowFunc_ClearDialogWindowAndFrameNullPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
@@ -112,7 +112,7 @@ void DrawStdFrameWithCustomTileAndPalette(u8 windowId, bool8 copyToVram, u16 bas
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     PutWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 // not used
@@ -124,7 +124,7 @@ static void DrawStdFrameWithCustomTile(u8 windowId, bool8 copyToVram, u16 baseTi
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     PutWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void WindowFunc_DrawStdFrameWithCustomTileAndPalette(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
@@ -145,7 +145,7 @@ void ClearStdWindowAndFrameToTransparent(u8 windowId, bool8 copyToVram)
     FillWindowPixelBuffer(windowId, PIXEL_FILL(0));
     ClearWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void WindowFunc_ClearStdWindowAndFrameToTransparent(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
@@ -195,7 +195,7 @@ void TopBarWindowPrintString(const u8 *string, u8 unused, bool8 copyToVram)
         width = GetStringWidth(0, string, 0);
         AddTextPrinterParameterized3(sTopBarWindowId, 0, -20 - width, 1, gUnknown_8456618, 0, string);
         if (copyToVram)
-            CopyWindowToVram(sTopBarWindowId, 3);
+            CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH);
     }
 }
 
@@ -228,7 +228,7 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo
         }
         AddTextPrinterParameterized4(sTopBarWindowId, 1, 4, 1, 0, 0, color, 0, string);
         if (copyToVram)
-            CopyWindowToVram(sTopBarWindowId, 3);
+            CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH);
     }
 }
 
@@ -236,7 +236,7 @@ void TopBarWindowPrintTwoStrings(const u8 *string, const u8 *string2, bool8 fgCo
 static void CopyTopBarWindowToVram(void)
 {
     if (sTopBarWindowId != 0xFF)
-        CopyWindowToVram(sTopBarWindowId, 3);
+        CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH);
 }
 
 void ClearTopBarWindow(void)
@@ -244,7 +244,7 @@ void ClearTopBarWindow(void)
     if (sTopBarWindowId != 0xFF)
     {
         FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(15));
-        CopyWindowToVram(sTopBarWindowId, 3);
+        CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH);
     }
 }
 
@@ -254,7 +254,7 @@ void DestroyTopBarWindow(void)
     {
         FillWindowPixelBuffer(sTopBarWindowId, PIXEL_FILL(0));
         ClearWindowTilemap(sTopBarWindowId);
-        CopyWindowToVram(sTopBarWindowId, 3);
+        CopyWindowToVram(sTopBarWindowId, COPYWIN_BOTH);
         RemoveWindow(sTopBarWindowId);
         sTopBarWindowId = 0xFF;
     }
@@ -457,7 +457,7 @@ void PrintTextArray(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 i
 
     for (i = 0; i < itemCount; i++)
         AddTextPrinterParameterized(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL);
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
 }
 
 void MultichoiceList_PrintItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 lineHeight, u8 itemCount, const struct MenuAction *strs, u8 letterSpacing, u8 lineSpacing)
@@ -466,7 +466,7 @@ void MultichoiceList_PrintItems(u8 windowId, u8 fontId, u8 left, u8 top, u8 line
 
     for (i = 0; i < itemCount; i++)
         AddTextPrinterParameterized5(windowId, fontId, strs[i].text, left, (lineHeight * i) + top, 0xFF, NULL, letterSpacing, lineSpacing);
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
 }
 
 void UnionRoomAndTradeMenuPrintOptions(u8 windowId, u8 fontId, u8 lineHeight, u8 itemCount, const struct MenuAction *strs)
@@ -498,7 +498,7 @@ void AddItemMenuActionTextPrinters(u8 windowId, u8 fontId, u8 left, u8 top, u8 l
         printer.currentY = printer.y;
         AddTextPrinter(&printer, 0xFF, NULL);
     }
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
 }
 
 // not used
@@ -583,7 +583,7 @@ void MultichoiceGrid_PrintItems(u8 windowId, u8 fontId, u8 itemWidth, u8 itemHei
     for (i = 0; i < rows; ++i)
         for (j = 0; j < cols; ++j)
             AddTextPrinterParameterized(windowId, fontId, strs[i * cols + j].text, itemWidth * j + width, yOffset + itemHeight * i, 0xFF, 0);
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
 }
 
 //not used
@@ -598,7 +598,7 @@ static void MultichoiceGrid_PrintItemsCustomOrder(u8 windowId, u8 fontId, u8 ite
     for (i = 0; i < rows; ++i)
         for (j = 0; j < cols; ++j)
             AddTextPrinterParameterized(windowId, fontId, strs[orderArray[i * cols + j]].text, itemWidth * j + width, itemHeight * i, 0xFF, 0);
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
 }
 
 static u8 MultichoiceGrid_InitCursorInternal(u8 windowId, u8 fontId, u8 left, u8 top, u8 optionWidth, u8 cursorHeight, u8 cols, u8 rows, u8 numChoices, u8 cursorPos)

src/mevent_show_card.c

@@ -397,7 +397,7 @@ static void sub_8145D18(u8 whichWindow)
             }
             break;
     }
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void sub_8146060(void)

src/mevent_show_news.c

@@ -326,8 +326,8 @@ static void sub_8146A30(void)
     {
         AddTextPrinterParameterized3(sWork->windowIds[1], 3, 0, 16 * i + 2, sTextPals[sWork->bgSpec->textPal2], 0, sWork->messages[i]);
     }
-    CopyWindowToVram(sWork->windowIds[0], 3);
+    CopyWindowToVram(sWork->windowIds[0], COPYWIN_BOTH);
-    CopyWindowToVram(sWork->windowIds[1], 3);
+    CopyWindowToVram(sWork->windowIds[1], COPYWIN_BOTH);
 }
 
 static void sub_8146B58(void)

src/money.c

@@ -131,6 +131,6 @@ void DrawMoneyBox(int amount, u8 x, u8 y)
 void HideMoneyBox(void)
 {
     ClearStdWindowAndFrameToTransparent(sMoneyBoxWindowId, FALSE);
-    CopyWindowToVram(sMoneyBoxWindowId, 2);
+    CopyWindowToVram(sMoneyBoxWindowId, COPYWIN_GFX);
     RemoveWindow(sMoneyBoxWindowId);
 }

src/mystery_gift_menu.c

@@ -478,7 +478,7 @@ void PrintMysteryGiftOrEReaderTopMenu(bool8 mg_or_ereader, bool32 usePickOkCance
         AddTextPrinterParameterized4(0, 2, 2, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_MysteryGift);
         AddTextPrinterParameterized4(0, 0, 0x78, 2, 0, 0, sMG_Ereader_TextColor_1, 0, gJPText_DecideStop);
     }
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
     PutWindowTilemap(0);
 }
 
@@ -530,14 +530,14 @@ void AddTextPrinterToWindow1(const u8 *str)
     AddTextPrinterParameterized4(1, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
     DrawTextBorderOuter(1, 0x001, 0xF);
     PutWindowTilemap(1);
-    CopyWindowToVram(1, 3);
+    CopyWindowToVram(1, COPYWIN_BOTH);
 }
 
 void ClearTextWindow(void)
 {
     rbox_fill_rectangle(1);
     ClearWindowTilemap(1);
-    CopyWindowToVram(1, 1);
+    CopyWindowToVram(1, COPYWIN_MAP);
 }
 
 bool32 MG_PrintTextOnWindow1AndWaitButton(u8 *textState, const u8 *str)
@@ -645,7 +645,7 @@ u32 MysteryGift_HandleThreeOptionMenu(u8 * unused0, u16 * unused1, u8 whichMenu)
     if (response != -1)
     {
         ClearWindowTilemap(2);
-        CopyWindowToVram(2, 1);
+        CopyWindowToVram(2, COPYWIN_MAP);
     }
     return response;
 }
@@ -670,7 +670,7 @@ s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8
         FillWindowPixelBuffer(*windowId, 0x11);
         AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
         DrawTextBorderOuter(*windowId, 0x001, 0x0F);
-        CopyWindowToVram(*windowId, 2);
+        CopyWindowToVram(*windowId, COPYWIN_GFX);
         PutWindowTilemap(*windowId);
         (*textState)++;
         break;
@@ -694,7 +694,7 @@ s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8
             *textState = 0;
             rbox_fill_rectangle(*windowId);
             ClearWindowTilemap(*windowId);
-            CopyWindowToVram(*windowId, 1);
+            CopyWindowToVram(*windowId, COPYWIN_MAP);
             RemoveWindow(*windowId);
             return input;
         }
@@ -703,7 +703,7 @@ s8 mevent_message_print_and_prompt_yes_no(u8 * textState, u16 * windowId, bool8
         *textState = 0;
         rbox_fill_rectangle(*windowId);
         ClearWindowTilemap(*windowId);
-        CopyWindowToVram(*windowId, 1);
+        CopyWindowToVram(*windowId, COPYWIN_MAP);
         RemoveWindow(*windowId);
         return -1;
     }
@@ -731,7 +731,7 @@ s32 HandleMysteryGiftListMenu(u8 * textState, u16 * windowId, bool32 cannotToss,
         FillWindowPixelBuffer(*windowId, 0x11);
         AddTextPrinterParameterized4(*windowId, 2, 0, 2, 0, 2, sMG_Ereader_TextColor_2, 0, gStringVar4);
         DrawTextBorderOuter(*windowId, 0x001, 0x0F);
-        CopyWindowToVram(*windowId, 2);
+        CopyWindowToVram(*windowId, COPYWIN_GFX);
         PutWindowTilemap(*windowId);
         (*textState)++;
         break;
@@ -764,7 +764,7 @@ s32 HandleMysteryGiftListMenu(u8 * textState, u16 * windowId, bool32 cannotToss,
             *textState = 0;
             rbox_fill_rectangle(*windowId);
             ClearWindowTilemap(*windowId);
-            CopyWindowToVram(*windowId, 1);
+            CopyWindowToVram(*windowId, COPYWIN_MAP);
             RemoveWindow(*windowId);
             return input;
         }
@@ -773,7 +773,7 @@ s32 HandleMysteryGiftListMenu(u8 * textState, u16 * windowId, bool32 cannotToss,
         *textState = 0;
         rbox_fill_rectangle(*windowId);
         ClearWindowTilemap(*windowId);
-        CopyWindowToVram(*windowId, 1);
+        CopyWindowToVram(*windowId, COPYWIN_MAP);
         RemoveWindow(*windowId);
         return -2;
     }

src/naming_screen.c

@@ -708,7 +708,7 @@ static void pokemon_transfer_to_pc_with_message(void)
     DrawDialogueFrame(0, FALSE);
     gTextFlags.canABSpeedUpPrint = TRUE;
     AddTextPrinterParameterized2(0, 2, gStringVar4, GetTextSpeedSetting(), NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 static bool8 sub_809E1D4(void)
@@ -1804,7 +1804,7 @@ static void PrintBufferCharactersOnScreen(void)
     }
 
     CallAddGenderIconFunc();
-    CopyWindowToVram(sNamingScreenData->windows[2], 2);
+    CopyWindowToVram(sNamingScreenData->windows[2], COPYWIN_GFX);
     PutWindowTilemap(sNamingScreenData->windows[2]);
 }
 
@@ -1887,7 +1887,7 @@ static void sub_809FAE4(void)
     FillWindowPixelBuffer(sNamingScreenData->windows[4], PIXEL_FILL(15));
     AddTextPrinterParameterized3(sNamingScreenData->windows[4], 0, 236 - strwidth, 0, color, 0, gText_MoveOkBack);
     PutWindowTilemap(sNamingScreenData->windows[4]);
-    CopyWindowToVram(sNamingScreenData->windows[4], 3);
+    CopyWindowToVram(sNamingScreenData->windows[4], COPYWIN_BOTH);
 }
 
 static void sub_809FB70(void)

src/new_menu_helpers.c

@@ -471,7 +471,7 @@ void DrawDialogueFrame(u8 windowId, bool8 copyToVram)
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     PutWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 void DrawStdWindowFrame(u8 windowId, bool8 copyToVram)
@@ -480,7 +480,7 @@ void DrawStdWindowFrame(u8 windowId, bool8 copyToVram)
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     PutWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram)
@@ -489,7 +489,7 @@ void ClearDialogWindowAndFrame(u8 windowId, bool8 copyToVram)
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     ClearWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
     if (gQuestLogState == QL_STATE_PLAYBACK)
         CommitQuestLogWindow1();
 }
@@ -500,7 +500,7 @@ void ClearStdWindowAndFrame(u8 windowId, bool8 copyToVram)
     FillWindowPixelBuffer(windowId, PIXEL_FILL(1));
     ClearWindowTilemap(windowId);
     if (copyToVram == TRUE)
-        CopyWindowToVram(windowId, 3);
+        CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void WindowFunc_DrawStandardFrame(u8 bg, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 paletteNum)
@@ -644,7 +644,7 @@ void DisplayItemMessageOnField(u8 taskId, u8 textSpeed, const u8 *string, TaskFu
 {
     LoadStdWindowFrameGfx();
     DisplayMessageAndContinueTask(taskId, 0, DLG_WINDOW_BASE_TILE_NUM, DLG_WINDOW_PALETTE_NUM, textSpeed, GetTextSpeedSetting(), string, callback);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 void DisplayYesNoMenuDefaultYes(void)

src/oak_speech.c

@@ -584,7 +584,7 @@ static void CreateHelpDocsPage1(void)
     PutWindowTilemap(sOakSpeechResources->unk_0014[0]);
     FillWindowPixelBuffer(sOakSpeechResources->unk_0014[0], 0x00);
     AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[0], 2, 2, 0, 1, 1, sTextColor_HelpSystem, 0, gNewGame_HelpDocs1);
-    CopyWindowToVram(sOakSpeechResources->unk_0014[0], 3);
+    CopyWindowToVram(sOakSpeechResources->unk_0014[0], COPYWIN_BOTH);
     FillBgTilemapBufferRect_Palette0(1, 0x3000, 1, 3, 5, 16);
     CopyBgTilemapBufferToVram(1);
 }
@@ -606,7 +606,7 @@ static void Task_OakSpeech4(u8 taskId)
             PutWindowTilemap(sOakSpeechResources->unk_0014[i]);
             FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
             AddTextPrinterParameterized4(sOakSpeechResources->unk_0014[i], 2, 6, 0, 1, 1, sTextColor_HelpSystem, 0, sHelpDocsPtrs[i + r7 * 3]);
-            CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
+            CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH);
         }
 
         if (sOakSpeechResources->unk_0012 == 1)
@@ -675,7 +675,7 @@ static void Task_OakSpeech3(u8 taskId)
             {
                 FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
                 ClearWindowTilemap(sOakSpeechResources->unk_0014[i]);
-                CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
+                CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH);
                 RemoveWindow(sOakSpeechResources->unk_0014[i]);
                 sOakSpeechResources->unk_0014[i] = 0;
             }
@@ -699,7 +699,7 @@ static void Task_OakSpeech5(u8 taskId)
         {
             FillWindowPixelBuffer(sOakSpeechResources->unk_0014[i], 0x00);
             ClearWindowTilemap(sOakSpeechResources->unk_0014[i]);
-            CopyWindowToVram(sOakSpeechResources->unk_0014[i], 3);
+            CopyWindowToVram(sOakSpeechResources->unk_0014[i], COPYWIN_BOTH);
             RemoveWindow(sOakSpeechResources->unk_0014[i]);
             sOakSpeechResources->unk_0014[i] = 0;
         }
@@ -733,7 +733,7 @@ static void Task_OakSpeech6(u8 taskId)
         data[14] = AddWindow(&sNewGameAdventureIntroWindowTemplates[0]);
         PutWindowTilemap(data[14]);
         FillWindowPixelBuffer(data[14], 0x00);
-        CopyWindowToVram(data[14], 3);
+        CopyWindowToVram(data[14], COPYWIN_BOTH);
         sOakSpeechResources->unk_0012 = 0;
         gMain.state = 0;
         data[15] = 16;
@@ -856,7 +856,7 @@ static void Task_OakSpeech8(u8 taskId)
         DestroyTopBarWindow();
         FillWindowPixelBuffer(data[14], 0x00);
         ClearWindowTilemap(data[14]);
-        CopyWindowToVram(data[14], 3);
+        CopyWindowToVram(data[14], COPYWIN_BOTH);
         RemoveWindow(data[14]);
         data[14] = 0;
         FillBgTilemapBufferRect_Palette0(1, 0x000, 0, 0, 30, 20);
@@ -902,7 +902,7 @@ static void Task_OakSpeech9(u8 taskId)
     { \
         AddTextPrinterParameterized2(0, 4, str, speed, NULL, 2, 1, 3); \
     } \
-    CopyWindowToVram(0, 3); \
+    CopyWindowToVram(0, COPYWIN_BOTH); \
 })
 
 static void Task_OakSpeech10(u8 taskId)
@@ -1072,7 +1072,7 @@ static void Task_OakSpeech19(u8 taskId)
         sOakSpeechResources->textColor[2] = 3;
         AddTextPrinterParameterized3(gTasks[taskId].data[13], 2, 8, 17, sOakSpeechResources->textColor, 0, gText_Girl);
         Menu_InitCursor(gTasks[taskId].data[13], 2, 0, 1, GetFontAttribute(2, 1) + 2, 2, 0);
-        CopyWindowToVram(gTasks[taskId].data[13], 3);
+        CopyWindowToVram(gTasks[taskId].data[13], COPYWIN_BOTH);
         gTasks[taskId].func = Task_OakSpeech20;
     }
 }
@@ -1869,7 +1869,7 @@ static void PrintNameChoiceOptions(u8 taskId, u8 state)
         AddTextPrinterParameterized(data[13], 2, textPtrs[i], 8, 16 * (i + 1) + 1, 0, NULL);
     }
     Menu_InitCursor(data[13], 2, 0, 1, 16, 5, 0);
-    CopyWindowToVram(data[13], 3);
+    CopyWindowToVram(data[13], COPYWIN_BOTH);
 }
 
 static void GetDefaultName(u8 arg0, u8 namePick)

src/option_menu.c

@@ -318,7 +318,7 @@ static void OptionMenu_PickSwitchCancel(void)
     FillWindowPixelBuffer(2, PIXEL_FILL(15)); 
     AddTextPrinterParameterized3(2, 0, x, 0, sOptionMenuPickSwitchCancelTextColor, 0, gText_PickSwitchCancel);
     PutWindowTilemap(2);
-    CopyWindowToVram(2, 3);
+    CopyWindowToVram(2, COPYWIN_BOTH);
 }
 
 static void OptionMenu_ResetSpriteData(void)
@@ -500,7 +500,7 @@ static void BufferOptionMenuString(u8 selection)
         break;
     }
     PutWindowTilemap(1);
-    CopyWindowToVram(1, 3);
+    CopyWindowToVram(1, COPYWIN_BOTH);
 }
 
 static void CloseAndSaveOptionMenu(u8 taskId)
@@ -524,7 +524,7 @@ static void PrintOptionMenuHeader(void)
     FillWindowPixelBuffer(0, PIXEL_FILL(1));
     AddTextPrinterParameterized(WIN_TEXT_OPTION, 2, gText_MenuOption, 8, 1, TEXT_SPEED_FF, NULL);
     PutWindowTilemap(0);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 static void DrawOptionMenuBg(void)

src/party_menu.c

@@ -731,7 +731,7 @@ static void RenderPartyMenuBox(u8 slot)
     {
         DisplayPartyPokemonDataForMultiBattle(slot);
         LoadPartyBoxPalette(&sPartyMenuBoxes[slot], PARTY_PAL_MULTI_ALT);
-        CopyWindowToVram(sPartyMenuBoxes[slot].windowId, 2);
+        CopyWindowToVram(sPartyMenuBoxes[slot].windowId, COPYWIN_GFX);
         PutWindowTilemap(sPartyMenuBoxes[slot].windowId);
         ScheduleBgCopyTilemapToVram(2);
     }
@@ -740,7 +740,7 @@ static void RenderPartyMenuBox(u8 slot)
         if (GetMonData(&gPlayerParty[slot], MON_DATA_SPECIES) == SPECIES_NONE)
         {
             DrawEmptySlot(sPartyMenuBoxes[slot].windowId);
-            CopyWindowToVram(sPartyMenuBoxes[slot].windowId, 2);
+            CopyWindowToVram(sPartyMenuBoxes[slot].windowId, COPYWIN_GFX);
         }
         else
         {
@@ -2159,7 +2159,7 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf)
             FillWindowPixelBuffer(confirmWindowId, PIXEL_FILL(0));
             AddTextPrinterParameterized4(confirmWindowId, 0, (48 - GetStringWidth(0, gMenuText_Confirm, 0)) / 2u, 1, 0, 0, sFontColorTable[0], -1, gMenuText_Confirm);
             PutWindowTilemap(confirmWindowId);
-            CopyWindowToVram(confirmWindowId, 2);
+            CopyWindowToVram(confirmWindowId, COPYWIN_GFX);
             cancelWindowId = AddWindow(&sMultiCancelButtonWindowTemplate);
             offset = 0;
         }
@@ -2181,7 +2181,7 @@ static void CreateCancelConfirmWindows(bool8 chooseHalf)
             AddTextPrinterParameterized3(cancelWindowId, 0, offset, 1, sFontColorTable[0], -1, gOtherText_Exit);
         }
         PutWindowTilemap(cancelWindowId);
-        CopyWindowToVram(cancelWindowId, 2);
+        CopyWindowToVram(cancelWindowId, COPYWIN_GFX);
         ScheduleBgCopyTilemapToVram(0);
     }
 }
@@ -2467,7 +2467,7 @@ static void DisplayPartyPokemonHPBar(u16 hp, u16 maxhp, struct PartyMenuBox *men
         FillWindowPixelRect(menuBox->windowId, 0x0D, menuBox->infoRects->dimensions[20] + hpFraction, menuBox->infoRects->dimensions[21], menuBox->infoRects->dimensions[22] - hpFraction, 1);
         FillWindowPixelRect(menuBox->windowId, 0x02, menuBox->infoRects->dimensions[20] + hpFraction, menuBox->infoRects->dimensions[21] + 1, menuBox->infoRects->dimensions[22] - hpFraction, 2);
     }
-    CopyWindowToVram(menuBox->windowId, 2);
+    CopyWindowToVram(menuBox->windowId, COPYWIN_GFX);
 }
 
 static void DisplayPartyPokemonDescriptionText(u8 stringId, struct PartyMenuBox *menuBox, u8 c)
@@ -5132,7 +5132,7 @@ static void DisplayLevelUpStatsPg1(u8 taskId)
 
     arrayPtr[12] = CreateLevelUpStatsWindow();
     DrawLevelUpWindowPg1(arrayPtr[12], arrayPtr, &arrayPtr[6], 1, 2, 3);
-    CopyWindowToVram(arrayPtr[12], 2);
+    CopyWindowToVram(arrayPtr[12], COPYWIN_GFX);
     ScheduleBgCopyTilemapToVram(2);
 }
 
@@ -5141,7 +5141,7 @@ static void DisplayLevelUpStatsPg2(u8 taskId)
     s16 *arrayPtr = sPartyMenuInternal->data;
 
     DrawLevelUpWindowPg2(arrayPtr[12], &arrayPtr[6], 1, 2, 3);
-    CopyWindowToVram(arrayPtr[12], 2);
+    CopyWindowToVram(arrayPtr[12], COPYWIN_GFX);
     ScheduleBgCopyTilemapToVram(2);
 }
 

src/player_pc.c

@@ -401,7 +401,7 @@ static void Task_PlayerPcCancel(u8 taskId)
     s16 *data = gTasks[taskId].data;
     ClearStdWindowAndFrameToTransparent(tWindowId, FALSE);
     ClearWindowTilemap(tWindowId);
-    CopyWindowToVram(tWindowId, 1);
+    CopyWindowToVram(tWindowId, COPYWIN_MAP);
     RemoveWindow(tWindowId);
     Task_ReturnToTopMenu(taskId);
 }

src/pokedex_screen.c

@@ -516,11 +516,11 @@ void sub_8102C28(void)
     FillWindowPixelBuffer(1, PIXEL_FILL(15));
     sub_8104C2C(gUnknown_8415DB8);
     PutWindowTilemap(0);
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
     PutWindowTilemap(1);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
     PutWindowTilemap(gUnknown_203ACF0->field_16);
-    CopyWindowToVram(gUnknown_203ACF0->field_16, 2);
+    CopyWindowToVram(gUnknown_203ACF0->field_16, COPYWIN_GFX);
 }
 
 void sub_8102EC0(s32 itemIndex, bool8 onInit, struct ListMenu *list)
@@ -538,7 +538,7 @@ void sub_8102EC0(s32 itemIndex, bool8 onInit, struct ListMenu *list)
         LoadPalette(gUnknown_84520F4[itemIndex].pal, 0x10, 0x20);
     }
     PutWindowTilemap(gUnknown_203ACF0->field_15);
-    CopyWindowToVram(gUnknown_203ACF0->field_15, 2);
+    CopyWindowToVram(gUnknown_203ACF0->field_15, COPYWIN_GFX);
 }
 
 void sub_8102F48(u8 windowId, s32 itemId, u8 y)
@@ -631,8 +631,8 @@ void sub_810317C(void)
     sub_8106E78(gUnknown_8415F3D, 1);
     FillWindowPixelBuffer(1, PIXEL_FILL(15));
     sub_8104C2C(gText_PickOKExit);
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
 }
 
 void sub_8103238(u8 taskId)
@@ -717,8 +717,8 @@ void sub_810345C(void)
     sub_8106E78(gUnknown_8415F4A, 1);
     FillWindowPixelBuffer(1, PIXEL_FILL(15));
     sub_8104C2C(gText_PickOKExit);
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
 }
 
 u16 sub_8103518(u8 a0)
@@ -1841,7 +1841,7 @@ bool8 sub_8104C64(u16 a0, u8 a1, u8 a2)
         FillWindowPixelBuffer(gUnknown_203ACF0->field_20[a1], PIXEL_FILL(0));
         sub_81049FC(gUnknown_203ACF0->field_20[a1], a0, a1 * 16 + 16);
         PutWindowTilemap(gUnknown_203ACF0->field_20[a1]);
-        CopyWindowToVram(gUnknown_203ACF0->field_20[a1], 2);
+        CopyWindowToVram(gUnknown_203ACF0->field_20[a1], COPYWIN_GFX);
     }
     else
         PutWindowTilemap(gUnknown_203ACF0->field_20[a1]);
@@ -1861,7 +1861,7 @@ bool8 sub_8104C64(u16 a0, u8 a1, u8 a2)
             if (sub_8104AB0(a0, FLAG_GET_CAUGHT, TRUE))
                 BlitBitmapRectToWindow(gUnknown_203ACF0->field_24[a1], gUnknown_8443600, 0, 0, 8, 8, 2, 3, 8, 8);
             PutWindowTilemap(gUnknown_203ACF0->field_24[a1]);
-            CopyWindowToVram(gUnknown_203ACF0->field_24[a1], 2);
+            CopyWindowToVram(gUnknown_203ACF0->field_24[a1], COPYWIN_GFX);
         }
     }
     else
@@ -1906,11 +1906,11 @@ bool8 sub_8104F0C(bool8 a0)
         sub_8106E78(gDexCategoryNamePtrs[gUnknown_203ACF0->field_28], 0);
         sub_8104EC0(0, sub_8106AF8(gUnknown_203ACF0->field_2B), sub_8106AF8(gUnknown_203ACF0->field_2A - 1), 160, 2);
     }
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
     FillWindowPixelBuffer(1, PIXEL_FILL(15));
     if (!a0)
         sub_8104C2C(gUnknown_8415F6C);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
     if (gUnknown_203ACF0->field_18[0] != 0xFFFF)
         sub_8104C64(gUnknown_203ACF0->field_18[0], 0, gUnknown_203ACF0->field_2C);
     if (gUnknown_203ACF0->field_18[1] != 0xFFFF)

src/pokemon_jump_4.c

@@ -337,7 +337,7 @@ static void sub_814A0C8(void)
     case 0:
         gUnknown_203F3D8->unk12 = sub_814A754(1, 8, 20, 2);
         AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_WantToPlayAgain2, 0, 2, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_203F3D8->unk12, 2);
+        CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX);
         gUnknown_203F3D8->unk4++;
         break;
     case 1:
@@ -364,7 +364,7 @@ static void sub_814A174(void)
     case 0:
         gUnknown_203F3D8->unk12 = sub_814A754(2, 7, 26, 4);
         AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_SavingDontTurnOffPower, 0, 2, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_203F3D8->unk12, 2);
+        CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX);
         gUnknown_203F3D8->unk4++;
         break;
     case 1:
@@ -407,7 +407,7 @@ static void sub_814A264(void)
     case 0:
         gUnknown_203F3D8->unk12 = sub_814A754(2, 8, 22, 4);
         AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_SomeoneDroppedOut2, 0, 2, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_203F3D8->unk12, 2);
+        CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX);
         gUnknown_203F3D8->unk4++;
         break;
     case 1:
@@ -433,7 +433,7 @@ static void sub_814A308(void)
     case 0:
         gUnknown_203F3D8->unk12 = sub_814A754(7, 10, 16, 2);
         AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gText_CommunicationStandby4, 0, 2, TEXT_SPEED_FF, NULL);
-        CopyWindowToVram(gUnknown_203F3D8->unk12, 2);
+        CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX);
         gUnknown_203F3D8->unk4++;
         break;
     case 1:
@@ -526,7 +526,7 @@ void sub_814A468(u16 itemId, u16 quantity)
     DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_AwesomeWonF701F700);
     gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4);
     AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL);
-    CopyWindowToVram(gUnknown_203F3D8->unk12, 2);
+    CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX);
     gUnknown_203F3D8->unk14 = MUS_FANFA1;
     gUnknown_203F3D8->unkD = 0;
 }
@@ -539,7 +539,7 @@ void sub_814A53C(u16 itemId)
     DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_FilledStorageSpace2);
     gUnknown_203F3D8->unk12 = sub_814A754(4, 8, 22, 4);
     AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL);
-    CopyWindowToVram(gUnknown_203F3D8->unk12, 2);
+    CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX);
     gUnknown_203F3D8->unk14 = 0;
     gUnknown_203F3D8->unkD = 0;
 }
@@ -552,7 +552,7 @@ void sub_814A5B4(u16 itemId)
     DynamicPlaceholderTextUtil_ExpandPlaceholders(gUnknown_203F3D8->strBuff, gText_CantHoldMore);
     gUnknown_203F3D8->unk12 = sub_814A754(4, 9, 22, 2);
     AddTextPrinterParameterized(gUnknown_203F3D8->unk12, 2, gUnknown_203F3D8->strBuff, 0, 2, TEXT_SPEED_FF, NULL);
-    CopyWindowToVram(gUnknown_203F3D8->unk12, 2);
+    CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_GFX);
     gUnknown_203F3D8->unk14 = 0;
     gUnknown_203F3D8->unkD = 0;
 }
@@ -596,7 +596,7 @@ void sub_814A6CC(void)
     if (gUnknown_203F3D8->unk12 != 0xFF)
     {
         rbox_fill_rectangle(gUnknown_203F3D8->unk12);
-        CopyWindowToVram(gUnknown_203F3D8->unk12, 1);
+        CopyWindowToVram(gUnknown_203F3D8->unk12, COPYWIN_MAP);
         gUnknown_203F3D8->unkD = 0;
     }
 }
@@ -857,7 +857,7 @@ static void sub_814AB98(int multiplayerId, u8 clr1, u8 clr2, u8 clr3)
     x = 64 - GetStringWidth(0, sub_81499E0(multiplayerId), -1);
     x /= 2;
     AddTextPrinterParameterized3(gUnknown_203F3D8->unk1C[multiplayerId], 0, x, 2, colors, -1, sub_81499E0(multiplayerId));
-    CopyWindowToVram(gUnknown_203F3D8->unk1C[multiplayerId], 2);
+    CopyWindowToVram(gUnknown_203F3D8->unk1C[multiplayerId], COPYWIN_GFX);
 }
 
 static void sub_814AC30(bool32 arg0)

src/pokemon_jump_6.c

@@ -76,7 +76,7 @@ static void Task_ShowPokemonJumpRecords(u8 taskId)
     case 0:
         data[1] = AddWindow(&gUnknown_846E2CC);
         sub_814B5C4(data[1]);
-        CopyWindowToVram(data[1], 3);
+        CopyWindowToVram(data[1], COPYWIN_BOTH);
         data[0]++;
         break;
     case 1:
@@ -87,7 +87,7 @@ static void Task_ShowPokemonJumpRecords(u8 taskId)
         if (JOY_NEW(A_BUTTON | B_BUTTON))
         {
             rbox_fill_rectangle(data[1]);
-            CopyWindowToVram(data[1], 1);
+            CopyWindowToVram(data[1], COPYWIN_MAP);
             data[0]++;
         }
         break;

src/pokemon_special_anim_scene.c

@@ -341,7 +341,7 @@ void InitPokemonSpecialAnimScene(struct PokemonSpecialAnimScene * buffer, u16 an
     LoadBgGfxByAnimType(animType);
     FillWindowPixelBuffer(0, PIXEL_FILL(0));
     TextWindow_SetUserSelectedFrame(0, 0x000, 0xe0);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
     ShowBg(0);
     ShowBg(3);
     HideBg(1);
@@ -370,14 +370,14 @@ void PSA_ShowMessageWindow(void)
     PutWindowTilemap(0);
     FillWindowPixelBuffer(0, PIXEL_FILL(1));
     DrawTextBorderOuter(0, 0x001, 0xE);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 void PSA_HideMessageWindow(void)
 {
     ClearWindowTilemap(0);
     ClearStdWindowAndFrameToTransparent(0, FALSE);
-    CopyWindowToVram(0, 1);
+    CopyWindowToVram(0, COPYWIN_MAP);
 }
 
 void PSA_PrintMessage(u8 messageId)
@@ -448,7 +448,7 @@ void PSA_PrintMessage(u8 messageId)
 void PSA_AfterPoof_ClearMessageWindow(void)
 {
     FillWindowPixelBuffer(0, PIXEL_FILL(1));
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
 }
 
 bool8 PSA_IsMessagePrintTaskActive(void)
@@ -612,12 +612,12 @@ UNUSED void PSA_DrawLevelUpWindowPg1(u16 *statsBefore, u16 *statsAfter)
     DrawTextBorderOuter(1, 0x001, 0xE);
     DrawLevelUpWindowPg1(1, statsBefore, statsAfter, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY);
     PutWindowTilemap(1);
-    CopyWindowToVram(1, 3);
+    CopyWindowToVram(1, COPYWIN_BOTH);
 }
 UNUSED void PSA_DrawLevelUpWindowPg2(u16 *currStats)
 {
     DrawLevelUpWindowPg2(1, currStats, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
 }
 
 UNUSED bool8 PSA_IsCopyingLevelUpWindowToVram(void)

src/pokemon_storage_system_2.c

@@ -247,8 +247,8 @@ static void Task_PokemonStorageSystemPC(u8 taskId)
         DrawDialogueFrame(0, 0);
         FillWindowPixelBuffer(0, PIXEL_FILL(1));
         AddTextPrinterParameterized2(0, 2, sUnknown_83CDA20[task->data[1]].desc, TEXT_SPEED_FF, NULL, TEXT_COLOR_DARK_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_LIGHT_GREY);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
-        CopyWindowToVram(task->data[15], 3);
+        CopyWindowToVram(task->data[15], COPYWIN_BOTH);
         task->data[0]++;
         break;
     case 1:

src/pokemon_storage_system_3.c

@@ -2309,7 +2309,7 @@ static void PrintCursorMonInfo(void)
         }
     }
 
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
     if (gPSSData->cursorMonSpecies != SPECIES_NONE)
     {
         RequestDma3LoadMonMarking(gPSSData->cursorMonMarkings, gPSSData->monMarkingSpriteTileStart);
@@ -2597,7 +2597,7 @@ static void PrintStorageActionText(u8 id)
     AddTextPrinterParameterized(1, 1, gPSSData->field_2190, 0, 2, TEXT_SPEED_FF, NULL);
     DrawTextBorderOuter(1, 2, 13);
     PutWindowTilemap(1);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
     ScheduleBgCopyTilemapToVram(0);
 }
 

src/pokemon_storage_system_7.c

@@ -128,7 +128,7 @@ static bool8 sub_8095138(void)
         sub_80956A4(sMoveMonsPtr->fromRow, sMoveMonsPtr->fromColumn);
         SetBgAttribute(0, BG_ATTR_PALETTEMODE, 1);
         PutWindowTilemap(gPSSData->field_2200);
-        CopyWindowToVram8Bit(gPSSData->field_2200, 3);
+        CopyWindowToVram8Bit(gPSSData->field_2200, COPYWIN_BOTH);
         BlendPalettes(0x3F00, 8, RGB_WHITE);
         sub_8094D14(2);
         SetGpuRegBits(REG_OFFSET_BG0CNT, BGCNT_256COLOR);
@@ -184,7 +184,7 @@ static bool8 sub_80952A0(void)
             sub_8095520();
             sMoveMonsPtr->toRow = sMoveMonsPtr->field_6;
             sMoveMonsPtr->toColumn = sMoveMonsPtr->field_7;
-            CopyWindowToVram8Bit(gPSSData->field_2200, 2);
+            CopyWindowToVram8Bit(gPSSData->field_2200, COPYWIN_GFX);
             sMoveMonsPtr->state++;
         }
         break;

src/quest_log.c

@@ -503,15 +503,15 @@ void DrawPreviouslyOnQuestHeader(u8 sceneNum)
     AddTextPrinterParameterized4(sQuestLogHeaderWindowIds[0], 2, 2, 2, 1, 2, sTextColors, 0, gStringVar4);
     PutWindowTilemap(sQuestLogHeaderWindowIds[0]);
     PutWindowTilemap(sQuestLogHeaderWindowIds[1]);
-    CopyWindowToVram(sQuestLogHeaderWindowIds[0], 2);
+    CopyWindowToVram(sQuestLogHeaderWindowIds[0], COPYWIN_GFX);
-    CopyWindowToVram(sQuestLogHeaderWindowIds[2], 2);
+    CopyWindowToVram(sQuestLogHeaderWindowIds[2], COPYWIN_GFX);
-    CopyWindowToVram(sQuestLogHeaderWindowIds[1], 3);
+    CopyWindowToVram(sQuestLogHeaderWindowIds[1], COPYWIN_BOTH);
 }
 
 void CommitQuestLogWindow1(void)
 {
     PutWindowTilemap(sQuestLogHeaderWindowIds[1]);
-    CopyWindowToVram(sQuestLogHeaderWindowIds[1], 1);
+    CopyWindowToVram(sQuestLogHeaderWindowIds[1], COPYWIN_MAP);
 }
 
 static void QuestLogPlaybackSetObjectEventTemplates(u8 sceneNum)
@@ -1040,9 +1040,9 @@ static void QuestLog_CloseTextWindow(void)
 {
     ClearWindowTilemap(sQuestLogHeaderWindowIds[2]);
     FillWindowPixelRect(sQuestLogHeaderWindowIds[2], 15, 0, 0, 0xf0, 0x30);
-    CopyWindowToVram(sQuestLogHeaderWindowIds[2], 2);
+    CopyWindowToVram(sQuestLogHeaderWindowIds[2], COPYWIN_GFX);
     PutWindowTilemap(sQuestLogHeaderWindowIds[1]);
-    CopyWindowToVram(sQuestLogHeaderWindowIds[1], 1);
+    CopyWindowToVram(sQuestLogHeaderWindowIds[1], COPYWIN_MAP);
 }
 
 static void QuestLog_SkipToEndOfPlayback(s8 delay)
@@ -1163,7 +1163,7 @@ static void Task_EndQuestLog(u8 taskId)
             for (i = 0; i < 3; i++)
             {
                 ClearWindowTilemap(sQuestLogHeaderWindowIds[i]);
-                CopyWindowToVram(sQuestLogHeaderWindowIds[i], 1);
+                CopyWindowToVram(sQuestLogHeaderWindowIds[i], COPYWIN_MAP);
                 RemoveWindow(sQuestLogHeaderWindowIds[i]);
             }
             tTimer = 0;
@@ -1207,8 +1207,8 @@ static bool8 sub_81121D8(u8 taskId)
     sub_80716F8(gPlttBufferUnfaded + 0x100, gPlttBufferFaded + 0x100, 0x100, 0x0F - data[1]);
     FillWindowPixelRect(sQuestLogHeaderWindowIds[0], 0x00, 0, sQuestLogHeaderWindowTemplates[0].height * 8 - 1 - data[1], sQuestLogHeaderWindowTemplates[0].width * 8, 1);
     FillWindowPixelRect(sQuestLogHeaderWindowIds[1], 0x00, 0, data[1], sQuestLogHeaderWindowTemplates[1].width * 8, 1);
-    CopyWindowToVram(sQuestLogHeaderWindowIds[0], 2);
+    CopyWindowToVram(sQuestLogHeaderWindowIds[0], COPYWIN_GFX);
-    CopyWindowToVram(sQuestLogHeaderWindowIds[1], 2);
+    CopyWindowToVram(sQuestLogHeaderWindowIds[1], COPYWIN_GFX);
     data[1]++;
     return FALSE;
 }

src/region_map.c

@@ -1889,7 +1889,7 @@ static void DisplayCurrentMapName(void)
         GetMapName(sRegionMap->mapName, GetMapsecUnderCursor(), 0);
         AddTextPrinterParameterized3(WIN_MAP_NAME, 2, 2, 2, sTextColor_White, 0, sRegionMap->mapName);
         PutWindowTilemap(WIN_MAP_NAME);
-        CopyWindowToVram(WIN_MAP_NAME, 2);
+        CopyWindowToVram(WIN_MAP_NAME, COPYWIN_GFX);
         SetGpuWindowDims(WIN_MAP_NAME, &sMapsecNameWindowDims[WIN_MAP_NAME]);
     }
 }
@@ -1921,16 +1921,16 @@ static void DisplayCurrentDungeonName(void)
          StringCopy(sRegionMap->dungeonName, sMapNames[descOffset]);
          AddTextPrinterParameterized3(WIN_DUNGEON_NAME, 2, 12, 2, sTextColorTable[GetSelectedMapsecType(LAYER_DUNGEON) - 2], 0, sRegionMap->dungeonName);
          PutWindowTilemap(WIN_DUNGEON_NAME);
-         CopyWindowToVram(WIN_DUNGEON_NAME, 3);
+         CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_BOTH);
     }
 }
 
 static void ClearMapsecNameText(void)
 {
     FillWindowPixelBuffer(WIN_MAP_NAME, PIXEL_FILL(0));
-    CopyWindowToVram(WIN_MAP_NAME, 3);
+    CopyWindowToVram(WIN_MAP_NAME, COPYWIN_BOTH);
     FillWindowPixelBuffer(WIN_DUNGEON_NAME, PIXEL_FILL(0));
-    CopyWindowToVram(WIN_DUNGEON_NAME, 3);
+    CopyWindowToVram(WIN_DUNGEON_NAME, COPYWIN_BOTH);
 }
 
 static void BufferRegionMapBg(u8 bg, u16 *map)
@@ -2493,7 +2493,7 @@ static void Task_DrawDungeonMapPreviewFlavorText(u8 taskId)
         break;
     case 2:
         FillWindowPixelBuffer(WIN_MAP_PREVIEW, PIXEL_FILL(0));
-        CopyWindowToVram(WIN_MAP_PREVIEW, 3);
+        CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_BOTH);
         PutWindowTilemap(WIN_MAP_PREVIEW);
         sDungeonMapPreview->drawState++;
         break;
@@ -2503,7 +2503,7 @@ static void Task_DrawDungeonMapPreviewFlavorText(u8 taskId)
         {
             AddTextPrinterParameterized3(WIN_MAP_PREVIEW, 2, 4, 0, sTextColor_Green, -1, GetDungeonName(GetDungeonMapsecUnderCursor()));
             AddTextPrinterParameterized3(WIN_MAP_PREVIEW, 2, 2, 14, sTextColor_White, -1, GetDungeonFlavorText(GetDungeonMapsecUnderCursor()));
-            CopyWindowToVram(WIN_MAP_PREVIEW, 3);
+            CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_BOTH);
             sDungeonMapPreview->drawState++;
         }
         // Tint image
@@ -2522,7 +2522,7 @@ static void Task_DrawDungeonMapPreviewFlavorText(u8 taskId)
         if (JOY_NEW(B_BUTTON) || JOY_NEW(A_BUTTON))
         {
             FillWindowPixelBuffer(WIN_MAP_PREVIEW, PIXEL_FILL(0));
-            CopyWindowToVram(WIN_MAP_PREVIEW, 3);
+            CopyWindowToVram(WIN_MAP_PREVIEW, COPYWIN_BOTH);
             sDungeonMapPreview->mainState++;
             sDungeonMapPreview->drawState++;
         }
@@ -3002,8 +3002,8 @@ static void Task_MapCloseAnim(u8 taskId)
     {
     case 0:
         ClearOrDrawTopBar(TRUE);
-        CopyWindowToVram(WIN_TOPBAR_LEFT, 3);
+        CopyWindowToVram(WIN_TOPBAR_LEFT, COPYWIN_BOTH);
-        CopyWindowToVram(WIN_TOPBAR_RIGHT, 3);
+        CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_BOTH);
         sMapOpenCloseAnim->closeState++;
         break;
     case 1:
@@ -4285,7 +4285,7 @@ static void PrintTopBarTextLeft(const u8 *str)
     else
         FillWindowPixelBuffer(WIN_TOPBAR_LEFT, PIXEL_FILL(15));
     AddTextPrinterParameterized3(WIN_TOPBAR_LEFT, 0, 0, 0, sTextColors, 0, str);
-    CopyWindowToVram(WIN_TOPBAR_LEFT, 2);
+    CopyWindowToVram(WIN_TOPBAR_LEFT, COPYWIN_GFX);
 }
 
 static void PrintTopBarTextRight(const u8 *str)
@@ -4295,7 +4295,7 @@ static void PrintTopBarTextRight(const u8 *str)
     else
         FillWindowPixelBuffer(WIN_TOPBAR_RIGHT, PIXEL_FILL(15));
     AddTextPrinterParameterized3(WIN_TOPBAR_RIGHT, 0, 0, 0, sTextColors, 0, str);
-    CopyWindowToVram(WIN_TOPBAR_RIGHT, 3);
+    CopyWindowToVram(WIN_TOPBAR_RIGHT, COPYWIN_BOTH);
 }
 
 static void ClearOrDrawTopBar(bool8 clear)

src/scrcmd.c

@@ -1277,7 +1277,7 @@ bool8 ScrCmd_loadhelp(struct ScriptContext * ctx)
     if (msg == NULL)
         msg = (const u8 *)ctx->data[0];
     DrawHelpMessageWindowWithText(msg);
-    CopyWindowToVram(GetStartMenuWindowId(), 1);
+    CopyWindowToVram(GetStartMenuWindowId(), COPYWIN_MAP);
     return FALSE;
 }
 

src/shop.c

@@ -227,7 +227,7 @@ static u8 CreateShopMenu(u8 a0)
     PrintTextArray(sShopMenuWindowId, 2, GetMenuCursorDimensionByFont(2, 0), 2, 16, 3, sShopMenuActions_BuySellQuit);
     Menu_InitCursor(sShopMenuWindowId, 2, 0, 2, 16, 3, 0);
     PutWindowTilemap(sShopMenuWindowId);
-    CopyWindowToVram(sShopMenuWindowId, 1);
+    CopyWindowToVram(sShopMenuWindowId, COPYWIN_MAP);
     return CreateTask(Task_ShopMenu, 8);
 }
 
@@ -657,7 +657,7 @@ static void BuyMenuPrintCursorAtYPosition(u8 y, u8 a1)
     if (a1 == 0xFF)
     {
         FillWindowPixelRect(4, 0, 1, y, GetFontAttribute(2, FONTATTR_MAX_LETTER_WIDTH), GetFontAttribute(2, FONTATTR_MAX_LETTER_HEIGHT));
-        CopyWindowToVram(4, 2);
+        CopyWindowToVram(4, COPYWIN_GFX);
     }
     else
     {

src/slot_machine.c

@@ -2119,7 +2119,7 @@ static bool8 SlotsTask_MessageOutOfCoins(u8 * state, struct SlotMachineSetupTask
     {
     case 0:
         Slot_PrintOnWindow0(gString_OutOfCoins);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -2137,7 +2137,7 @@ static bool8 SlotsTask_AskQuitPlaying(u8 * state, struct SlotMachineSetupTaskDat
     case 0:
         Slot_PrintOnWindow0(gString_QuitPlaying);
         Slot_CreateYesNoMenu(0);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -2155,7 +2155,7 @@ static bool8 SlotsTask_DestroyYesNoMenu(u8 * state, struct SlotMachineSetupTaskD
     case 0:
         Slot_ClearWindow0();
         Slot_DestroyYesNoMenu();
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:

src/start_menu.c

@@ -255,7 +255,7 @@ static void DrawSafariZoneStatsWindow(void)
     ConvertIntToDecimalStringN(gStringVar3, gNumSafariBalls, STR_CONV_MODE_RIGHT_ALIGN, 2);
     StringExpandPlaceholders(gStringVar4, gUnknown_84162A9);
     AddTextPrinterParameterized(sSafariZoneStatsWindowId,2, gStringVar4, 4, 3, 0xFF, NULL);
-    CopyWindowToVram(sSafariZoneStatsWindowId, 2);
+    CopyWindowToVram(sSafariZoneStatsWindowId, COPYWIN_GFX);
 }
 
 static void DestroySafariZoneStatsWindow(void)
@@ -263,7 +263,7 @@ static void DestroySafariZoneStatsWindow(void)
     if (GetSafariZoneFlag())
     {
         ClearStdWindowAndFrameToTransparent(sSafariZoneStatsWindowId, FALSE);
-        CopyWindowToVram(sSafariZoneStatsWindowId, 2);
+        CopyWindowToVram(sSafariZoneStatsWindowId, COPYWIN_GFX);
         RemoveWindow(sSafariZoneStatsWindowId);
     }
 }
@@ -324,7 +324,7 @@ static s8 DoDrawStartMenu(void)
         {
             DrawHelpMessageWindowWithText(sStartMenuDescPointers[sStartMenuOrder[sStartMenuCursorPos]]);
         }
-        CopyWindowToVram(GetStartMenuWindowId(), 1);
+        CopyWindowToVram(GetStartMenuWindowId(), COPYWIN_MAP);
         return TRUE;
     }
     return FALSE;
@@ -913,7 +913,7 @@ static void task50_after_link_battle_save(u8 taskId)
             AddTextPrinterParameterized2(0, 2, gText_SavingDontTurnOffThePower2, 0xFF, NULL, 2, 1, 3);
             DrawTextBorderOuter(0, 0x008, 0x0F);
             PutWindowTilemap(0);
-            CopyWindowToVram(0, 3);
+            CopyWindowToVram(0, COPYWIN_BOTH);
             BeginNormalPaletteFade(0xFFFFFFFF, 0, 16, 0, RGB_BLACK);
             if (gWirelessCommType != 0 && InUnionRoom())
                 data[0] = 5;
@@ -981,7 +981,7 @@ static void PrintSaveStats(void)
     AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 2, y, sTextColor_StatName, -1, gSaveStatName_Time);
     SaveStatToString(SAVE_STAT_TIME, gStringVar4, 2);
     AddTextPrinterParameterized3(sSaveStatsWindowId, 0, 60, y, sTextColor_StatValue, -1, gStringVar4);
-    CopyWindowToVram(sSaveStatsWindowId, 2);
+    CopyWindowToVram(sSaveStatsWindowId, COPYWIN_GFX);
 }
 
 static void CloseSaveStatsWindow(void)

src/teachy_tv.c

@@ -541,7 +541,7 @@ static void TeachyTvCreateAndRenderRbox(void)
     FillWindowPixelBuffer(0, 0xCC);
     PutWindowTilemap(0);
     PutWindowTilemap(1);
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
 }
 
 static u8 TeachyTvSetupWindow(void)
@@ -811,7 +811,7 @@ static void TeachyTvRenderMsgAndSwitchClusterFuncs(u8 taskId)
         sResources->grassAnimDisabled = 1;
         TeachyTvSetSpriteCoordsAndSwitchFrame(data[1], 0, 0, 0);
         FillWindowPixelBuffer(0, 0xCC);
-        CopyWindowToVram(0, 2);
+        CopyWindowToVram(0, COPYWIN_GFX);
         TeachyTvClearBg1EndGraphicText();
         data[2] = 0;
         data[3] = 0;
@@ -937,7 +937,7 @@ static void TTVcmd_EraseTextWindowIfKeyPressed(u8 taskId)
     if (JOY_NEW(A_BUTTON | B_BUTTON))
     {
         FillWindowPixelBuffer(0, 0xCC);
-        CopyWindowToVram(0, 2);
+        CopyWindowToVram(0, COPYWIN_GFX);
         ++data[3];
     }
 }

src/text.c

@@ -876,7 +876,7 @@ u16 RenderText(struct TextPrinter *textPrinter)
                 ScrollWindow(textPrinter->printerTemplate.windowId, 0, sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed], PIXEL_FILL(textPrinter->printerTemplate.bgColor));
                 textPrinter->scrollDistance -= sWindowVerticalScrollSpeeds[gSaveBlock2Ptr->optionsTextSpeed];
             }
-            CopyWindowToVram(textPrinter->printerTemplate.windowId, 2);
+            CopyWindowToVram(textPrinter->printerTemplate.windowId, COPYWIN_GFX);
         }
         else
         {

src/text_printer.c

@@ -108,7 +108,7 @@ bool16 AddTextPrinter(struct TextPrinterTemplate *textSubPrinter, u8 speed, void
         }
 
         if (speed != TEXT_SPEED_FF)
-          CopyWindowToVram(sTempTextPrinter.printerTemplate.windowId, 2);
+          CopyWindowToVram(sTempTextPrinter.printerTemplate.windowId, COPYWIN_GFX);
         sTextPrinters[textSubPrinter->windowId].active = 0;
     }
     return TRUE;
@@ -126,7 +126,7 @@ void RunTextPrinters(void)
             temp = RenderFont(&sTextPrinters[i]);
             switch (temp) {
                 case 0:
-                    CopyWindowToVram(sTextPrinters[i].printerTemplate.windowId, 2);
+                    CopyWindowToVram(sTextPrinters[i].printerTemplate.windowId, COPYWIN_GFX);
                 case 3:
                     if (sTextPrinters[i].callback != 0)
                         sTextPrinters[i].callback(&sTextPrinters[i].printerTemplate, temp);

src/tm_case.c

@@ -602,7 +602,7 @@ static void PrintListMenuCursorAt_WithColorIdx(u8 a0, u8 a1)
     if (a1 == 0xFF)
     {
         FillWindowPixelRect(0, 0, 0, a0, GetFontAttribute(2, 0), GetFontAttribute(2, 1));
-        CopyWindowToVram(0, 2);
+        CopyWindowToVram(0, COPYWIN_GFX);
     }
     else
     {
@@ -797,7 +797,7 @@ static void Task_SelectTMAction_FromFieldBag(u8 taskId)
     if (itemid_is_unique(gSpecialVar_ItemId))
     {
         PlaceHMTileInWindow(2, 0, 2);
-        CopyWindowToVram(2, 2);
+        CopyWindowToVram(2, COPYWIN_GFX);
     }
     ScheduleBgCopyTilemapToVram(0);
     ScheduleBgCopyTilemapToVram(1);
@@ -1341,7 +1341,7 @@ static void DrawMoveInfoUIMarkers(void)
     BlitMoveInfoIcon(4, 20, 0, 12);
     BlitMoveInfoIcon(4, 21, 0, 24);
     BlitMoveInfoIcon(4, 22, 0, 36);
-    CopyWindowToVram(4, 2);
+    CopyWindowToVram(4, COPYWIN_GFX);
 }
 
 static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId)
@@ -1357,7 +1357,7 @@ static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId)
         {
             AddTextPrinterParameterized_ColorByIndex(5, 3, gText_ThreeHyphens, 7, 12 * i, 0, 0, 0xFF, 3);
         }
-        CopyWindowToVram(5, 2);
+        CopyWindowToVram(5, COPYWIN_GFX);
     }
     else
     {
@@ -1381,7 +1381,7 @@ static void TMCase_MoveCursor_UpdatePrintedTMInfo(u16 itemId)
         AddTextPrinterParameterized_ColorByIndex(5, 3, str, 7, 24, 0, 0, 0xFF, 3);
         ConvertIntToDecimalStringN(gStringVar1, gBattleMoves[move].pp, STR_CONV_MODE_RIGHT_ALIGN, 3);
         AddTextPrinterParameterized_ColorByIndex(5, 3, gStringVar1, 7, 36, 0, 0, 0xFF, 3);
-        CopyWindowToVram(5, 2);
+        CopyWindowToVram(5, COPYWIN_GFX);
     }
 }
 

src/trade.c

@@ -1742,7 +1742,7 @@ static void TradeMenuCB_0(void)
             UnionRoomAndTradeMenuPrintOptions(1, 3, 16, 2, sMenuAction_SummaryTrade);
             Menu_InitCursor(1, 3, 0, 0, 16, 2, 0);
             PutWindowTilemap(1);
-            CopyWindowToVram(1, 3);
+            CopyWindowToVram(1, COPYWIN_BOTH);
             sTradeMenuResourcesPtr->tradeMenuCBnum = 1;
         }
         else if (sTradeMenuResourcesPtr->tradeMenuCursorPosition < 12)
@@ -1915,7 +1915,7 @@ static void CommitWindows(void)
     for (i = 0; i < sTradeMenuResourcesPtr->partyCounts[1] - 4; i++)
     {
         PutWindowTilemap(i + 12);
-        CopyWindowToVram(i + 12, 1);
+        CopyWindowToVram(i + 12, COPYWIN_MAP);
     }
 }
 
@@ -2174,9 +2174,9 @@ static void HandleRedrawTradeMenuOnSide(u8 side)
         BuildMovesString(movesString, whichParty, partyIdx);
         AddTextPrinterParameterized4((side * 2) + 15, 1, 0, 0, 0, 0, sTextColor_PartyMonNickname, 0, movesString);
         PutWindowTilemap((side * 2) + 14);
-        CopyWindowToVram((side * 2) + 14, 3);
+        CopyWindowToVram((side * 2) + 14, COPYWIN_BOTH);
         PutWindowTilemap((side * 2) + 15);
-        CopyWindowToVram((side * 2) + 15, 3);
+        CopyWindowToVram((side * 2) + 15, COPYWIN_BOTH);
         sTradeMenuResourcesPtr->menuRedrawState[side]++;
         break;
     case 4:
@@ -2244,7 +2244,7 @@ static void PrintPartyMonNickname(u8 whichParty, u8 windowId, const u8 *str)
     xPos = (64u - GetStringWidth(0, str, GetFontAttribute(0, FONTATTR_LETTER_SPACING))) / 2;
     AddTextPrinterParameterized3(windowId, 0, xPos, 4, sTextColor_PartyMonNickname, speed, str);
     PutWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void PrintPartyNicknames(u8 whichParty)
@@ -2455,7 +2455,7 @@ static void PrintTradeErrorOrStatusMessage(u8 idx)
     AddTextPrinterParameterized(0, 3, sTradeErrorOrStatusMessagePtrs[idx], 0, 2, 0xFF, NULL);
     DrawTextBorderOuter(0, 0x014, 12);
     PutWindowTilemap(0);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 static bool8 LoadUISprites(void)

src/trade_scene.c

@@ -923,7 +923,7 @@ void LinkTradeDrawWindow(void)
 {
     FillWindowPixelBuffer(0, PIXEL_FILL(15));
     PutWindowTilemap(0);
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 static void TradeAnimInit_LoadGfx(void)
@@ -1000,7 +1000,7 @@ static void CB2_InitTradeAnim_InGameTrade(void)
         LoadTradeMonPic(1, 1);
         FillWindowPixelBuffer(0, PIXEL_FILL(15));
         PutWindowTilemap(0);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         gMain.state++;
         break;
     case 9:
@@ -1331,7 +1331,7 @@ static bool8 DoTradeAnim_Cable(void)
         {
             SetTradeSequenceBgGpuRegs(4);
             FillWindowPixelBuffer(0, PIXEL_FILL(15));
-            CopyWindowToVram(0, 3);
+            CopyWindowToVram(0, COPYWIN_BOTH);
             sTradeData->state++;
         }
         break;
@@ -1828,7 +1828,7 @@ static bool8 DoTradeAnim_Wireless(void)
         {
             SetTradeSequenceBgGpuRegs(4);
             FillWindowPixelBuffer(0, PIXEL_FILL(15));
-            CopyWindowToVram(0, 3);
+            CopyWindowToVram(0, COPYWIN_BOTH);
             sTradeData->state++;
         }
         break;
@@ -2769,7 +2769,7 @@ void DrawTextOnTradeWindow(u8 windowId, const u8 *str, s8 speed)
     sTradeData->textColor[1] = 1;
     sTradeData->textColor[2] = 6;
     AddTextPrinterParameterized4(windowId, 2, 0, 2, 0, 2, sTradeData->textColor, speed, str);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static void Task_AnimateWirelessSignal(u8 taskId)

src/trainer_card.c

@@ -624,7 +624,7 @@ static void Task_TrainerCard(u8 taskId)
         Link_TryStartSend5FFF();
         DrawDialogueFrame(0, 1);
         AddTextPrinterParameterized(0, 2, gText_WaitingTrainerFinishReading, 0, 1, TEXT_SPEED_FF, 0);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         sTrainerCardDataPtr->mainState = STATE_CLOSE_CARD_LINK;
         break;
     case STATE_CLOSE_CARD_LINK:
@@ -1467,7 +1467,7 @@ static void LoadStickerGfx(void)
 static void DrawTrainerCardWindow(u8 windowId)
 {
     PutWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
 }
 
 static bool8 SetTrainerCardBgsAndPals(void)

src/trainer_tower.c

@@ -915,7 +915,7 @@ static void ShowResultsBoard(void)
     }
 
     PutWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
     VarSet(VAR_TEMP_1, windowId);
 }
 
@@ -1068,7 +1068,7 @@ void PrintTrainerTowerRecords(void)
     }
 
     PutWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 3);
+    CopyWindowToVram(windowId, COPYWIN_BOTH);
     FreeTrainerTowerDataStruct();
 }
 

src/union_room.c

@@ -687,7 +687,7 @@ static void PrintNumPlayersWaitingForMsg(u8 windowId, u8 capacityCode, u8 count)
         break;
     }
 
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
 }
 
 static void PrintPlayerNameAndIdOnWindow(u8 windowId)
@@ -770,7 +770,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
         FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2));
         UR_AddTextPrinterParameterized(data->bButtonCancelWindowId, 0, gUnknown_845747C, 8, 2, UR_COLOR_WHT_DKE_LTE);
         PutWindowTilemap(data->bButtonCancelWindowId);
-        CopyWindowToVram(data->bButtonCancelWindowId, 2);
+        CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX);
 
         DrawStdWindowFrame(data->listWindowId, FALSE);
         gMultiuseListMenuTemplate = sListMenuTemplate_PossibleGroupMembers;
@@ -779,7 +779,7 @@ static void Task_TryBecomeLinkLeader(u8 taskId)
 
         DrawStdWindowFrame(data->nPlayerModeWindowId, FALSE);
         PutWindowTilemap(data->nPlayerModeWindowId);
-        CopyWindowToVram(data->nPlayerModeWindowId, 2);
+        CopyWindowToVram(data->nPlayerModeWindowId, COPYWIN_GFX);
 
         CopyBgTilemapBufferToVram(0);
         data->playerCount = 1;
@@ -1312,7 +1312,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
         FillWindowPixelBuffer(data->bButtonCancelWindowId, PIXEL_FILL(2));
         UR_AddTextPrinterParameterized(data->bButtonCancelWindowId, 0, gUnknown_8458FC8, 8, 2, UR_COLOR_WHT_DKE_LTE);
         PutWindowTilemap(data->bButtonCancelWindowId);
-        CopyWindowToVram(data->bButtonCancelWindowId, 2);
+        CopyWindowToVram(data->bButtonCancelWindowId, COPYWIN_GFX);
 
         DrawStdWindowFrame(data->listWindowId, FALSE);
         gMultiuseListMenuTemplate = sListMenuTemplate_UnionRoomGroups;
@@ -1322,7 +1322,7 @@ static void Task_TryJoinLinkGroup(u8 taskId)
         DrawStdWindowFrame(data->playerNameAndIdWindowId, FALSE);
         PutWindowTilemap(data->playerNameAndIdWindowId);
         PrintPlayerNameAndIdOnWindow(data->playerNameAndIdWindowId);
-        CopyWindowToVram(data->playerNameAndIdWindowId, 2);
+        CopyWindowToVram(data->playerNameAndIdWindowId, COPYWIN_GFX);
 
         CopyBgTilemapBufferToVram(0);
         data->leaderId = 0;
@@ -2313,7 +2313,7 @@ static void Task_CardOrNewsWithFriend(u8 taskId)
         FillWindowPixelBuffer(data->playerNameAndIdWindowId, PIXEL_FILL(1));
         PutWindowTilemap(data->playerNameAndIdWindowId);
         PrintPlayerNameAndIdOnWindow(data->playerNameAndIdWindowId);
-        CopyWindowToVram(data->playerNameAndIdWindowId, 2);
+        CopyWindowToVram(data->playerNameAndIdWindowId, COPYWIN_GFX);
 
         CopyBgTilemapBufferToVram(0);
         data->leaderId = 0;
@@ -3859,7 +3859,7 @@ static u8 CreateTradeBoardWindow(const struct WindowTemplate * template)
     FillWindowPixelBuffer(windowId, PIXEL_FILL(15));
     UR_AddTextPrinterParameterized(windowId, 0, gUnknown_8459378, 8, 1, UR_COLOR_DN5_DN6_LTB);
     PutWindowTilemap(windowId);
-    CopyWindowToVram(windowId, 2);
+    CopyWindowToVram(windowId, COPYWIN_GFX);
     return windowId;
 }
 

src/union_room_battle.c

@@ -78,7 +78,7 @@ static bool32 UnionRoomBattle_PrintTextOnWindow0(s16 * state, const u8 * str, s3
         DrawTextBorderOuter(0, 0x001, 0xD);
         UnionRoomBattle_CreateTextPrinter(0, str, 0, 2, speed);
         PutWindowTilemap(0);
-        CopyWindowToVram(0, 3);
+        CopyWindowToVram(0, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:

src/union_room_chat_display.c

@@ -488,7 +488,7 @@ static bool32 DisplaySubtask_PrintWin3(u8 *state)
     {
     case 0:
         PrintKeyboardSwapTextsOnWin3();
-        CopyWindowToVram(3, 3);
+        CopyWindowToVram(3, COPYWIN_BOTH);
         break;
     case 1:
         return IsDma3ManagerBusyWithBgCopy();
@@ -504,7 +504,7 @@ static bool32 DisplaySubtask_HideWin3(u8 *state)
     {
     case 0:
         ClearWin3();
-        CopyWindowToVram(3, 3);
+        CopyWindowToVram(3, COPYWIN_BOTH);
         break;
     case 1:
         return IsDma3ManagerBusyWithBgCopy();
@@ -524,7 +524,7 @@ static bool32 DisplaySubtask_SwitchPages(u8 *state)
             return TRUE;
 
         PrintCurrentKeyboardPage();
-        CopyWindowToVram(2, 2);
+        CopyWindowToVram(2, COPYWIN_GFX);
         break;
     case 1:
         if (IsDma3ManagerBusyWithBgCopy())
@@ -557,7 +557,7 @@ static bool32 DisplaySubtask_ShowQuitChattingDialog(u8 *state)
     case 0:
         PlaceStdMessageWindow(STDMESSAGE_QUIT_CHATTING, 0);
         PlaceYesNoMenuAt(23, 11, 1);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         break;
     case 1:
         return IsDma3ManagerBusyWithBgCopy();
@@ -601,7 +601,7 @@ static bool32 DisplaySubtask_UpdateMessageBuffer(u8 *state)
         FillWin1Rect(start, length, PIXEL_FILL(0));
         str = UnionRoomChat_GetMessageEntryBuffer();
         PrintOnWin1Parameterized(0, str, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY);
-        CopyWindowToVram(1, 2);
+        CopyWindowToVram(1, COPYWIN_GFX);
         break;
     case 1:
         if (!IsDma3ManagerBusyWithBgCopy())
@@ -630,13 +630,13 @@ static bool32 DisplaySubtask_PrintRegisterWhere(u8 *state)
         length = StringLength_Multibyte(str);
         FillWin1Rect(var0, length, PIXEL_FILL(6));
         PrintOnWin1Parameterized(var0, str, TEXT_COLOR_TRANSPARENT, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED);
-        CopyWindowToVram(1, 2);
+        CopyWindowToVram(1, COPYWIN_GFX);
         break;
     case 1:
         if (!IsDma3ManagerBusyWithBgCopy())
         {
             PlaceStdMessageWindow(STDMESSAGE_REGISTER_WHERE, 16);
-            CopyWindowToVram(sWork->messageWindowId, 3);
+            CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         }
         else
         {
@@ -671,13 +671,13 @@ static bool32 DisplaySubtask_CancelRegister(u8 *state)
         length = StringLength_Multibyte(str);
         FillWin1Rect(x, length, PIXEL_FILL(0));
         PrintOnWin1Parameterized(x, str, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY);
-        CopyWindowToVram(1, 2);
+        CopyWindowToVram(1, COPYWIN_GFX);
         break;
     case 1:
         if (!IsDma3ManagerBusyWithBgCopy())
         {
             HideStdMessageWindow();
-            CopyWindowToVram(sWork->messageWindowId, 3);
+            CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         }
         else
         {
@@ -709,7 +709,7 @@ static bool32 DisplaySubtask_ReturnToKeyboard(u8 *state)
     {
     case 0:
         PrintCurrentKeyboardPage();
-        CopyWindowToVram(2, 2);
+        CopyWindowToVram(2, COPYWIN_GFX);
         (*state)++;
         break;
     case 1:
@@ -735,7 +735,7 @@ static bool32 DisplaySubtask_ScrollChat(u8 *state)
         str = UnionRoomChat_GetLastReceivedMessage();
         colorIdx = UnionRoomChat_GetReceivedPlayerIndex();
         PrintTextOnWin0Colorized(row, str, colorIdx);
-        CopyWindowToVram(0, 2);
+        CopyWindowToVram(0, COPYWIN_GFX);
         break;
     case 1:
         if (IsDma3ManagerBusyWithBgCopy())
@@ -755,7 +755,7 @@ static bool32 DisplaySubtask_ScrollChat(u8 *state)
         // fall through
     case 2:
         ScrollWindow(0, 0, 5, PIXEL_FILL(1));
-        CopyWindowToVram(0, 2);
+        CopyWindowToVram(0, COPYWIN_GFX);
         sWork->scrollCount++;
         (*state)++;
         // fall through
@@ -800,7 +800,7 @@ static bool32 DisplaySubtask_PrintInputText(u8 *state)
     {
     case 0:
         PlaceStdMessageWindow(STDMESSAGE_INPUT_TEXT, 16);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -816,7 +816,7 @@ static bool32 DisplaySubtask_PrintExitingChat(u8 *state)
     {
     case 0:
         PlaceStdMessageWindow(STDMESSAGE_EXITING_CHAT, 0);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -837,7 +837,7 @@ static bool32 DisplaySubtask_PrintLeaderLeft(u8 *state)
         str = UnionRoomChat_GetNameOfPlayerWhoDisbandedChat();
         DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, str);
         PlaceStdMessageWindow(STDMESSAGE_LEADER_LEFT, 0);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -854,7 +854,7 @@ static bool32 DisplaySubtask_AskSave(u8 *state)
     case 0:
         PlaceStdMessageWindow(STDMESSAGE_ASK_SAVE, 0);
         PlaceYesNoMenuAt(23, 10, 1);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -871,7 +871,7 @@ static bool32 DisplaySubtask_AskOverwriteSave(u8 *state)
     case 0:
         PlaceStdMessageWindow(STDMESSAGE_ASK_OVERWRITE, 0);
         PlaceYesNoMenuAt(23, 10, 1);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -887,7 +887,7 @@ static bool32 DisplaySubtask_PrintSavingDontTurnOffPower(u8 *state)
     {
     case 0:
         PlaceStdMessageWindow(STDMESSAGE_SAVING_NO_OFF, 0);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -905,7 +905,7 @@ static bool32 DisplaySubtask_PrintSavedTheGame(u8 *state)
         DynamicPlaceholderTextUtil_Reset();
         DynamicPlaceholderTextUtil_SetPlaceholderPtr(0, gSaveBlock2Ptr->playerName);
         PlaceStdMessageWindow(STDMESSAGE_SAVED_THE_GAME, 0);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -922,7 +922,7 @@ static bool32 DisplaySubtask_ShowConfirmLeaderLeaveDialog(u8 *state)
     case 0:
         PlaceStdMessageWindow(STDMESSAGE_WARN_LEADER_LEAVE, 0);
         PlaceYesNoMenuAt(23, 10, 1);
-        CopyWindowToVram(sWork->messageWindowId, 3);
+        CopyWindowToVram(sWork->messageWindowId, COPYWIN_BOTH);
         (*state)++;
         break;
     case 1:
@@ -1287,21 +1287,21 @@ static void LoadWin0(void)
     LoadPalette(sWin0PalF, 0xF0, 0x20);
     PutWindowTilemap(0);
     FillWindowPixelBuffer(0, PIXEL_FILL(1));
-    CopyWindowToVram(0, 3);
+    CopyWindowToVram(0, COPYWIN_BOTH);
 }
 
 static void LoadWin2(void)
 {
     PutWindowTilemap(2);
     PrintCurrentKeyboardPage();
-    CopyWindowToVram(2, 3);
+    CopyWindowToVram(2, COPYWIN_BOTH);
 }
 
 static void LoadWin1(void)
 {
     FillWindowPixelBuffer(1, PIXEL_FILL(0));
     PutWindowTilemap(1);
-    CopyWindowToVram(1, 3);
+    CopyWindowToVram(1, COPYWIN_BOTH);
 }
 
 static void LoadWin3(void)

src/window.c

@@ -227,13 +227,13 @@ void CopyWindowToVram(u8 windowId, u8 mode)
 
     switch (mode)
     {
-        case 1:
+        case COPYWIN_MAP:
             CopyBgTilemapBufferToVram(windowLocal.window.bg);
             break;
-        case 2:
+        case COPYWIN_GFX:
             LoadBgTiles(windowLocal.window.bg, windowLocal.tileData, windowSize, windowLocal.window.baseBlock);
             break;
-        case 3:
+        case COPYWIN_BOTH:
             LoadBgTiles(windowLocal.window.bg, windowLocal.tileData, windowSize, windowLocal.window.baseBlock);
             CopyBgTilemapBufferToVram(windowLocal.window.bg);
             break;

src/window_8bpp.c

@@ -101,13 +101,13 @@ void CopyWindowToVram8Bit(u8 windowId, u8 mode)
 
     switch (mode)
     {
-        case 1:
+        case COPYWIN_MAP:
             CopyBgTilemapBufferToVram(sWindowPtr->window.bg);
             break;
-        case 2:
+        case COPYWIN_GFX:
             LoadBgTiles(sWindowPtr->window.bg, sWindowPtr->tileData, sWindowSize, sWindowPtr->window.baseBlock);
             break;
-        case 3:
+        case COPYWIN_BOTH:
             LoadBgTiles(sWindowPtr->window.bg, sWindowPtr->tileData, sWindowSize, sWindowPtr->window.baseBlock);
             CopyBgTilemapBufferToVram(sWindowPtr->window.bg);
             break;

src/wireless_communication_status_screen.c

@@ -254,9 +254,9 @@ static void PrintHeaderTexts(void)
     }
     WCSS_AddTextPrinterParameterized(1, 3, sHeaderTextPtrs[i + 1], 0, 30 * i + 10, 2);
     PutWindowTilemap(0);
-    CopyWindowToVram(0, 2);
+    CopyWindowToVram(0, COPYWIN_GFX);
     PutWindowTilemap(1);
-    CopyWindowToVram(1, 2);
+    CopyWindowToVram(1, COPYWIN_GFX);
 }
 
 static void Task_WirelessCommunicationScreen(u8 taskId)
@@ -292,7 +292,7 @@ static void Task_WirelessCommunicationScreen(u8 taskId)
                     WCSS_AddTextPrinterParameterized(2, 3, gStringVar4, 4, 100, 2);
             }
             PutWindowTilemap(2);
-            CopyWindowToVram(2, 3);
+            CopyWindowToVram(2, COPYWIN_BOTH);
         }
         if (JOY_NEW(A_BUTTON) || JOY_NEW(B_BUTTON))
         {