Identify extern functions in bg_window.h

include/bg_window.h

@@ -104,85 +104,82 @@ typedef struct GraphicsModes {
     GXBG0As bg0As2DOr3D;
 } GraphicsModes;
 
-BgConfig *sub_02018340(u32 param0);
-u32 sub_02018364(BgConfig *param0);
-void sub_02018368(const GraphicsModes *param0);
-void sub_020183A0(const GraphicsModes *param0, u8 param1);
-void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3);
-void sub_02018898(BgConfig *param0, u8 param1, u8 param2, u8 param3);
-void sub_02019044(BgConfig *param0, u8 param1);
-void BGL_SetPriority(u8 param0, u8 param1);
-void sub_02019120(u8 param0, u8 param1);
-void sub_02019184(BgConfig *param0, u8 param1, u8 param2, int param3);
-int sub_020192EC(BgConfig *param0, u32 param1);
-int sub_020192F8(BgConfig *param0, u32 param1);
-void sub_02019348(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4);
-void sub_02019410(const void *param0, void *param1, u32 param2);
-void sub_02019448(BgConfig *param0, u8 param1);
-void sub_02019460(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4);
-void sub_02019574(BgConfig *param0, u8 param1, const void *param2, u32 param3);
-void sub_0201958C(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4);
-void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3);
-void sub_020196C0(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4);
-void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3);
-void sub_0201975C(u8 param0, u16 param1);
-void sub_020198C0(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6);
-void sub_020198E8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10);
-void sub_02019964(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10);
-void sub_02019CB8(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7);
-void sub_02019E2C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
-void sub_02019EBC(BgConfig *param0, u8 param1);
-void sub_02019EE0(BgConfig *param0, u8 param1, u16 param2);
-void sub_02019F04(BgConfig *param0, u8 param1, u16 param2);
-void *sub_02019F28(u8 param0);
-void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3);
-void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3);
-void *sub_02019FE4(BgConfig *param0, u8 param1);
-int sub_02019FF0(BgConfig *param0, u8 param1);
-u16 sub_02019FFC(BgConfig *param0, u8 param1);
-u8 sub_0201A008(BgConfig *param0, u8 param1);
-void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8);
-void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8);
-void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
-void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
-Window *sub_0201A778(u32 param0, u8 param1);
+BgConfig *BgConfig_New(u32 param0);
+u32 BgConfig_GetHeapID(BgConfig *param0);
+void SetAllGraphicsModes(const GraphicsModes *param0);
+void SetScreenGraphicsModes(const GraphicsModes *param0, u8 param1);
+void Bg_InitFromTemplate(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3);
+void Bg_SetControlParam(BgConfig *param0, u8 param1, u8 param2, u8 param3);
+void Bg_FreeTilemapBuffer(BgConfig *param0, u8 param1);
+void Bg_SetPriority(u8 param0, u8 param1);
+void Bg_ToggleLayer(u8 param0, u8 param1);
+void Bg_SetOffset(BgConfig *param0, u8 param1, u8 param2, int param3);
+int Bg_GetXOffset(BgConfig *param0, u32 param1);
+int Bg_GetYOffset(BgConfig *param0, u32 param1);
+void Bg_SetAffineParams(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4);
+void Bg_CopyTilemapBufferToVRAM(BgConfig *param0, u8 param1);
+void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4);
+void Bg_LoadTilemapBuffer(BgConfig *param0, u8 param1, const void *param2, u32 param3);
+void Bg_LoadTiles(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4);
+void Bg_ClearTilesRange(u8 param0, u32 param1, u32 param2, u32 param3);
+void Bg_FillTilesRange(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4);
+void Bg_LoadPalette(u8 param0, void *param1, u16 param2, u16 param3);
+void Bg_MaskPalette(u8 param0, u16 param1);
+void Bg_LoadToTilemapRect(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void Bg_CopyToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10);
+void Bg_CopyRectToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10);
+void Bg_FillTilemapRect(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7);
+void Bg_ChangeTilemapRectPalette(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6);
+void Bg_ClearTilemap(BgConfig *param0, u8 param1);
+void Bg_FillTilemap(BgConfig *param0, u8 param1, u16 param2);
+void Bg_ScheduleFillTilemap(BgConfig *param0, u8 param1, u16 param2);
+void *Bg_GetCharPtr(u8 param0);
+void *Bg_GetTilemapBuffer(BgConfig *param0, u8 param1);
+int Bg_GetXOffset2(BgConfig *param0, u8 param1);
+u16 Bg_GetRotation(BgConfig *param0, u8 param1);
+u8 Bg_GetPriority(BgConfig *param0, u8 param1);
+void Bitmap_BlitRect4bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8);
+void Bitmap_BlitRect8bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8);
+void Bitmap_FillRect4bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
+void Bitmap_FillRect8bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5);
+Window *Window_New(u32 param0, u8 param1);
 void Window_Init(Window *param0);
-u8 BGL_WindowAdded(Window *param0);
-void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8);
-void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5);
-void sub_0201A8D4(BgConfig *param0, Window *param1, const WindowTemplate *param2);
-void BGL_DeleteWindow(Window *param0);
-void sub_0201A928(Window *param0, u8 param1);
-void sub_0201A954(Window *param0);
-void sub_0201A9A4(Window *param0);
-void sub_0201A9F4(Window *param0);
-void sub_0201AA10(Window *param0, u32 param1, u32 param2);
-void sub_0201AA3C(Window *param0);
-void sub_0201ACCC(Window *param0);
-void sub_0201ACF4(Window *param0);
-void sub_0201AD10(Window *param0);
-void BGL_FillWindow(Window *param0, u8 param1);
-void sub_0201ADDC(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9);
-void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10);
-void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5);
-void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6);
-void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3);
-BgConfig *sub_0201C28C(Window *param0);
-u8 sub_0201C290(Window *param0);
-u8 sub_0201C294(Window *param0);
-u8 sub_0201C298(Window *param0);
-u8 sub_0201C29C(Window *param0);
-u8 sub_0201C2A0(Window *param0);
-u16 sub_0201C2A4(Window *param0);
-void sub_0201C2AC(Window *param0, u8 param1);
-void sub_0201C2B0(Window *param0, u8 param1);
-void sub_0201C2B4(Window *param0, u8 param1);
-void sub_0201C2B8(BgConfig *param0);
-void sub_0201C3C0(BgConfig *param0, u8 param1);
-void sub_0201C63C(BgConfig *param0, u8 param1, u8 param2, int param3);
-void sub_0201C660(BgConfig *param0, u8 param1, u8 param2, u16 param3);
-void sub_0201C6A8(BgConfig *param0, u8 param1, u8 param2, fx32 param3);
-void sub_0201C718(BgConfig *param0, u8 param1, u8 param2, int param3);
-u8 sub_0201C784(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4);
+u8 Window_IsInUse(Window *param0);
+void Window_Add(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8);
+void Window_AddToTopLeftCorner(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5);
+void Window_AddFromTemplate(BgConfig *param0, Window *param1, const WindowTemplate *param2);
+void Window_Remove(Window *param0);
+void Windows_Delete(Window *param0, u8 param1);
+void Window_CopyToVRAM(Window *param0);
+void Window_ScheduleCopyToVRAM(Window *param0);
+void Window_PutToTilemap(Window *param0);
+void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2);
+void Window_ClearTilemap(Window *param0);
+void Window_LoadTiles(Window *param0);
+void Window_ClearAndCopyToVRAM(Window *param0);
+void Window_ClearAndScheduleCopyToVRAM(Window *param0);
+void Window_FillTilemap(Window *param0, u8 param1);
+void Window_BlitBitmapRect(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9);
+void Window_BlitBitmapRectWithTransparency(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10);
+void Window_FillRectWithColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5);
+void Window_CopyGlyph(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6);
+void Window_Scroll(Window *param0, u8 param1, u8 param2, u8 param3);
+BgConfig *Window_GetBgConfig(Window *param0);
+u8 Window_GetBgLayer(Window *param0);
+u8 Window_GetWidth(Window *param0);
+u8 Window_GetHeight(Window *param0);
+u8 Window_GetXPos(Window *param0);
+u8 Window_GetYPos(Window *param0);
+u16 Window_GetBaseTile(Window *param0);
+void Window_SetXPos(Window *param0, u8 param1);
+void Window_SetYPos(Window *param0, u8 param1);
+void Window_SetPalette(Window *param0, u8 param1);
+void Bg_RunScheduledUpdates(BgConfig *param0);
+void Bg_ScheduleTilemapTransfer(BgConfig *param0, u8 param1);
+void Bg_ScheduleScroll(BgConfig *param0, u8 param1, u8 param2, int param3);
+void Bg_ScheduleAffineRotation(BgConfig *param0, u8 param1, u8 param2, u16 param3);
+void Bg_ScheduleAffineScale(BgConfig *param0, u8 param1, u8 param2, fx32 param3);
+void Bg_ScheduleAffineRotationCenter(BgConfig *param0, u8 param1, u8 param2, int param3);
+u8 Bg_DoesPixelAtXYMatchVal(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4);
 
 #endif // POKEPLATINUM_BG_WINDOW_H

src/battle/battle_display.c

@@ -531,7 +531,7 @@ void ov16_0225D228(BattleSystem *param0, BattlerData *param1, UnkStruct_ov16_022
     v1->unk_1C = 0;
 
     if ((v1->unk_14 == 0) || (v1->unk_14 == 2)) {
-        sub_02019184(BattleSystem_BGL(param0), 3, 2, 4 * 33);
+        Bg_SetOffset(BattleSystem_BGL(param0), 3, 2, 4 * 33);
     }
 
     SysTask_Start(ov16_0225FA70, v1, 0);
@@ -2315,7 +2315,7 @@ static void ov16_0225FA70(SysTask *param0, void *param1)
     v5 = BattleSystem_BattleType(v0->unk_00);
 
     if ((v0->unk_1C < 33) && (v0->unk_0E >= 2) && ((v0->unk_14 == 0) || (v0->unk_14 == 2))) {
-        sub_02019184(BattleSystem_BGL(v0->unk_00), 3, 1, 4);
+        Bg_SetOffset(BattleSystem_BGL(v0->unk_00), 3, 1, 4);
         v0->unk_1C++;
     }
 
@@ -4182,8 +4182,8 @@ static void ov16_02261E8C(SysTask *param0, void *param1)
     {
         Window *v2 = BattleSystem_Window(v0->unk_00, 0);
 
-        BGL_FillWindow(v2, 0xff);
-        sub_0201ACCC(v2);
+        Window_FillTilemap(v2, 0xff);
+        Window_LoadTiles(v2);
     }
 
         v0->unk_17 = ov16_0226CD08(ov16_0223E02C(v0->unk_00));

src/battle/battle_io_command.c

@@ -1018,8 +1018,8 @@ static void ov16_0225CB80(BattleSystem *param0, BattlerData *param1)
 {
     Window *v0 = BattleSystem_Window(param0, 0);
 
-    BGL_FillWindow(v0, 0xff);
-    sub_0201ACCC(v0);
+    Window_FillTilemap(v0, 0xff);
+    Window_LoadTiles(v0);
 
     ClearCommand(param0, param1->battler, 66);
     ZeroDataBuffer(param1);

src/battle/battle_script.c

@@ -10134,15 +10134,15 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData)
         PaletteData *paletteSys = BattleSystem_PaletteSys(data->battleSys);
 
         G2_SetBG0Priority(1 + 1); // this is the background + 1; could do with a constant
-        BGL_SetPriority(1, 1);
-        BGL_SetPriority(2, 0);
+        Bg_SetPriority(1, 1);
+        Bg_SetPriority(2, 0);
 
         BattleSystem_SetGaugePriority(data->battleSys, 0 + 2); // gauge's default is 0
 
         Window_SetFrame(bgl, 2, 1, 0, HEAP_ID_BATTLE);
         PaletteSys_LoadPalette(paletteSys, NARC_INDEX_GRAPHIC__PL_WINFRAME, Window_FramePalette(), HEAP_ID_BATTLE, 0, 0x20, 8 * 0x10);
-        BGL_AddWindow(bgl, window, 2, 0x11, 0x7, 14, 12, 11, (9 + 1));
-        BGL_FillWindow(window, 0xFF);
+        Window_Add(bgl, window, 2, 0x11, 0x7, 14, 12, 11, (9 + 1));
+        Window_FillTilemap(window, 0xFF);
         Window_Show(window, 0, 1, 8);
 
         data->seqNum = SEQ_GET_EXP_LEVEL_UP_SUMMARY_PRINT_DIFF;
@@ -10193,7 +10193,7 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData)
         };
         Window *window = BattleSystem_Window(data->battleSys, 1);
 
-        BGL_WindowColor(window, 0xF, 80, 0, 36, 96); // clear out the diff section (keep the printed stat names)
+        Window_FillRectWithColor(window, 0xF, 80, 0, 36, 96); // clear out the diff section (keep the printed stat names)
 
         for (i = 0; i < STAT_MAX; i++) {
             msg.id = 949; // just a number
@@ -10220,11 +10220,11 @@ static void BattleScript_GetExpTask(SysTask *task, void *inData)
         Window *window = BattleSystem_Window(data->battleSys, 1);
 
         Window_Clear(window, 0);
-        BGL_DeleteWindow(window);
+        Window_Remove(window);
 
         G2_SetBG0Priority(1);
-        BGL_SetPriority(1, 0);
-        BGL_SetPriority(2, 1);
+        Bg_SetPriority(1, 0);
+        Bg_SetPriority(2, 1);
 
         BattleSystem_SetGaugePriority(data->battleSys, 0);
 
@@ -12261,7 +12261,7 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript
     StringTemplate_Format(v5, v7, v6);
     Strbuf_Free(v6);
     Window_Init(&v9);
-    BGL_AddFramelessWindow(v8, &v9, 12, 4, 0, 0);
+    Window_AddToTopLeftCorner(v8, &v9, 12, 4, 0, 0);
     Text_AddPrinterWithParamsAndColor(&v9, FONT_SYSTEM, v7, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
 
     v10 = sub_02012898(&v9, NNS_G2D_VRAM_TYPE_2DMAIN, 5);
@@ -12284,7 +12284,7 @@ static void BattleScript_LoadPartyLevelUpIcon(BattleSystem *param0, BattleScript
     param1->spriteMgrAlloc = v11;
 
     sub_02012AC0(param1->fontOAM, 1);
-    BGL_DeleteWindow(&v9);
+    Window_Remove(&v9);
 }
 
 static void BattleScript_FreePartyLevelUpIcon(BattleSystem *param0, BattleScriptTaskData *param1)

src/battle/healthbar.c

@@ -1099,7 +1099,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar)
     StringTemplate_SetNickname(strFormatter, 0, boxMon);
     StringTemplate_Format(strFormatter, nickname, template);
 
-    BGL_AddFramelessWindow(bgl, &window, HEALTHBAR_NAME_BLOCK_COUNT_X, HEALTHBAR_NAME_BLOCK_COUNT_Y, HEALTHBAR_NAME_WINDOW_OFFSET, HEALTHBAR_NAME_BACKGROUND_COLOR);
+    Window_AddToTopLeftCorner(bgl, &window, HEALTHBAR_NAME_BLOCK_COUNT_X, HEALTHBAR_NAME_BLOCK_COUNT_Y, HEALTHBAR_NAME_WINDOW_OFFSET, HEALTHBAR_NAME_BACKGROUND_COLOR);
     Text_AddPrinterWithParamsColorAndSpacing(&window, FONT_SYSTEM, nickname, 0, 0, TEXT_SPEED_NO_TRANSFER, HEALTHBAR_NAME_TEXT_COLOR, 0, 0, NULL);
     buf = window.pixels;
 
@@ -1124,7 +1124,7 @@ static void Healthbar_DrawBattlerName(Healthbar *healthbar)
             sBattlerNameVRAMTransfer[healthbar->type][3].size);
     }
 
-    BGL_DeleteWindow(&window);
+    Window_Remove(&window);
     Strbuf_Free(nickname);
     Strbuf_Free(template);
 }
@@ -1312,7 +1312,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1)
         v5 = MessageLoader_GetNewStrbuf(v4, 1220);
     }
 
-    BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf);
+    Window_AddToTopLeftCorner(v0, &v3, 13, 2, 0, 0xf);
     Text_AddPrinterWithParamsColorAndSpacing(&v3, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, HEALTHBAR_NAME_TEXT_COLOR, 0, 0, NULL);
 
     v1 = v3.pixels;
@@ -1333,7 +1333,7 @@ static void Healthbar_DrawBallCount(Healthbar *param0, u32 param1)
         MI_CpuCopy16(&v8[Unk_ov16_0226F33C[1].size], (void *)((u32)v6 + Unk_ov16_0226F33C[3].pos + v2->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F33C[3].size);
     }
 
-    BGL_DeleteWindow(&v3);
+    Window_Remove(&v3);
     Strbuf_Free(v5);
 }
 
@@ -1360,7 +1360,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1)
 
     StringTemplate_SetNumber(v7, 0, param0->unk_27, 2, 1, 1);
     StringTemplate_Format(v7, v5, v6);
-    BGL_AddFramelessWindow(v0, &v3, 13, 2, 0, 0xf);
+    Window_AddToTopLeftCorner(v0, &v3, 13, 2, 0, 0xf);
     Text_AddPrinterWithParamsColorAndSpacing(&v3, FONT_SYSTEM, v5, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(14, 2, 15), 0, 0, NULL);
 
     v1 = v3.pixels;
@@ -1380,7 +1380,7 @@ static void Healthbar_DrawBallsLeftMessage(Healthbar *param0, u32 param1)
         MI_CpuCopy16(&v10[Unk_ov16_0226F34C[1].size], (void *)((u32)v8 + Unk_ov16_0226F34C[3].pos + v2->vramLocation.baseAddrOfVram[NNS_G2D_VRAM_TYPE_2DMAIN]), Unk_ov16_0226F34C[3].size);
     }
 
-    BGL_DeleteWindow(&v3);
+    Window_Remove(&v3);
     Strbuf_Free(v5);
     Strbuf_Free(v6);
 }

src/battle/ov16_0223B140.c

@@ -314,7 +314,7 @@ void ov16_0223B3E4(BattleSystem *param0)
 {
     SetMainCallback(NULL, NULL);
     ov16_02268A14(param0->unk_198);
-    BGL_DeleteWindow(&param0->windows[0]);
+    Window_Remove(&param0->windows[0]);
 
     ov16_0223C288(param0->unk_04);
     ov16_0223C2BC(param0);
@@ -366,12 +366,12 @@ void ov16_0223B430(BattleSystem *param0)
 
 void ov16_0223B53C(BattleSystem *param0)
 {
-    BGL_DeleteWindow(&param0->windows[0]);
+    Window_Remove(&param0->windows[0]);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    sub_02019044(param0->unk_04, 1);
-    sub_02019044(param0->unk_04, 2);
-    sub_02019044(param0->unk_04, 3);
+    Bg_FreeTilemapBuffer(param0->unk_04, 1);
+    Bg_FreeTilemapBuffer(param0->unk_04, 2);
+    Bg_FreeTilemapBuffer(param0->unk_04, 3);
     ov16_0223F3EC(param0);
 }
 
@@ -430,12 +430,12 @@ void ov16_0223B578(BattleSystem *param0)
             },
         };
 
-        sub_020183C4(param0->unk_04, 1, &v0[0], 0);
-        sub_02019EBC(param0->unk_04, 1);
-        sub_020183C4(param0->unk_04, 2, &v0[1], 0);
-        sub_02019EBC(param0->unk_04, 2);
-        sub_020183C4(param0->unk_04, 3, &v0[2], 0);
-        sub_02019EBC(param0->unk_04, 3);
+        Bg_InitFromTemplate(param0->unk_04, 1, &v0[0], 0);
+        Bg_ClearTilemap(param0->unk_04, 1);
+        Bg_InitFromTemplate(param0->unk_04, 2, &v0[1], 0);
+        Bg_ClearTilemap(param0->unk_04, 2);
+        Bg_InitFromTemplate(param0->unk_04, 3, &v0[2], 0);
+        Bg_ClearTilemap(param0->unk_04, 3);
 
         G2_SetBG0Priority(1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
@@ -469,8 +469,8 @@ void ov16_0223B578(BattleSystem *param0)
 
     param0->unk_23FB_1 = 1;
 
-    BGL_AddWindow(param0->unk_04, param0->windows, 1, 0x2, 0x13, 27, 4, 0xb, (18 + 12) + 1);
-    BGL_FillWindow(param0->windows, 0xff);
+    Window_Add(param0->unk_04, param0->windows, 1, 0x2, 0x13, 27, 4, 0xb, (18 + 12) + 1);
+    Window_FillTilemap(param0->windows, 0xff);
     sub_0200E060(&param0->windows[0], 0, 1, 10);
 
     ov16_0223DD4C(param0);
@@ -549,8 +549,8 @@ static void ov16_0223B790(OverlayManager *param0)
     sub_02002F70(v0->unk_28, 2, (((16 - 2) * 16) * sizeof(u16)), 5);
     sub_02002F70(v0->unk_28, 3, 0x200, 5);
 
-    v0->unk_04 = sub_02018340(5);
-    v0->windows = sub_0201A778(5, 3);
+    v0->unk_04 = BgConfig_New(5);
+    v0->windows = Window_New(5, 3);
 
     for (v3 = 0; v3 < 4; v3++) {
         v0->unk_1CC[v3].unk_00 = Heap_AllocFromHeap(5, (32 * 10 * 10));
@@ -570,8 +570,8 @@ static void ov16_0223B790(OverlayManager *param0)
 
     ov16_0223C004(v0, v0->unk_04);
 
-    BGL_AddWindow(v0->unk_04, &v0->windows[0], 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1));
-    BGL_FillWindow(&v0->windows[0], 0xff);
+    Window_Add(v0->unk_04, &v0->windows[0], 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1));
+    Window_FillTilemap(&v0->windows[0], 0xff);
     sub_0200E060(&v0->windows[0], 0, 1, 10);
 
     v0->unk_90 = sub_0200C6E4(5);
@@ -782,7 +782,7 @@ static void ov16_0223BCB4(OverlayManager *param0)
     RenderControlFlags_SetCanABSpeedUpPrint(0);
     RenderControlFlags_SetAutoScrollFlags(0);
     RenderControlFlags_SetSpeedUpOnTouch(0);
-    sub_0201A928(v0->windows, 3);
+    Windows_Delete(v0->windows, 3);
     Heap_FreeToHeap(v0->unk_04);
     Heap_FreeToHeap(v0->unk_21C);
     Heap_FreeToHeap(v0->unk_220);
@@ -855,7 +855,7 @@ static void ov16_0223C004(BattleSystem *param0, BgConfig *param1)
             GX_BG0_AS_3D
         };
 
-        sub_02018368(&v1);
+        SetAllGraphicsModes(&v1);
     }
 
     {
@@ -911,12 +911,12 @@ static void ov16_0223C004(BattleSystem *param0, BgConfig *param1)
             },
         };
 
-        sub_020183C4(param1, 1, &v2[0], 0);
-        sub_02019EBC(param1, 1);
-        sub_020183C4(param1, 2, &v2[1], 0);
-        sub_02019EBC(param1, 2);
-        sub_020183C4(param1, 3, &v2[2], 0);
-        sub_02019EBC(param1, 3);
+        Bg_InitFromTemplate(param1, 1, &v2[0], 0);
+        Bg_ClearTilemap(param1, 1);
+        Bg_InitFromTemplate(param1, 2, &v2[1], 0);
+        Bg_ClearTilemap(param1, 2);
+        Bg_InitFromTemplate(param1, 3, &v2[2], 0);
+        Bg_ClearTilemap(param1, 3);
 
         G2_SetBG0Priority(1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
@@ -980,9 +980,9 @@ static void ov16_0223C288(BgConfig *param0)
 {
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    sub_02019044(param0, 1);
-    sub_02019044(param0, 2);
-    sub_02019044(param0, 3);
+    Bg_FreeTilemapBuffer(param0, 1);
+    Bg_FreeTilemapBuffer(param0, 2);
+    Bg_FreeTilemapBuffer(param0, 3);
 
     ov16_022687A0(param0);
 }
@@ -1525,7 +1525,7 @@ static void ov16_0223CE68(void *param0)
     sub_0201DCAC();
     sub_0200C800();
     sub_02003694(v0->unk_28);
-    sub_0201C2B8(v0->unk_04);
+    Bg_RunScheduledUpdates(v0->unk_04);
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
 }
@@ -1536,7 +1536,7 @@ static void ov16_0223CF1C(void *param0)
 
     sub_02003694(v0->unk_0C);
     sub_0201DCAC();
-    sub_0201C2B8(v0->unk_04);
+    Bg_RunScheduledUpdates(v0->unk_04);
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
 }
@@ -1629,7 +1629,7 @@ static void ov16_0223D0C4(SysTask *param0, void *param1)
     BattleSystem *v0 = param1;
 
     v0->unk_2434 += 3;
-    sub_02019184(v0->unk_04, 1, 3, v0->unk_2434);
+    Bg_SetOffset(v0->unk_04, 1, 3, v0->unk_2434);
 
     if (v0->unk_2434 == 0) {
         SysTask_Done(param0);
@@ -1657,8 +1657,8 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1)
     sub_02002F70(v0->unk_0C, 0, 0x200, 5);
     sub_020038B0(v0->unk_0C, 0, 2, 0x0, 0, 256);
 
-    v0->unk_04 = sub_02018340(5);
-    v0->unk_08 = sub_0201A778(5, 1);
+    v0->unk_04 = BgConfig_New(5);
+    v0->unk_08 = Window_New(5, 1);
 
     sub_0207A744(v0);
     GXLayers_DisableEngineALayers();
@@ -1694,7 +1694,7 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1)
             GX_BG0_AS_3D,
         };
 
-        sub_02018368(&v2);
+        SetAllGraphicsModes(&v2);
     }
 
     {
@@ -1714,8 +1714,8 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1)
             0
         };
 
-        sub_020183C4(v0->unk_04, 1, &v3, 0);
-        sub_02019EBC(v0->unk_04, 1);
+        Bg_InitFromTemplate(v0->unk_04, 1, &v3, 0);
+        Bg_ClearTilemap(v0->unk_04, 1);
     }
 
     {
@@ -1731,8 +1731,8 @@ static void ov16_0223D10C(OverlayManager *param0, BattleParams *param1)
 
     GXLayers_TurnBothDispOn();
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
-    BGL_AddWindow(v0->unk_04, v0->unk_08, 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1));
-    BGL_FillWindow(v0->unk_08, 0xff);
+    Window_Add(v0->unk_04, v0->unk_08, 1, 2, 0x13, 27, 4, 11, ((18 + 12) + 1));
+    Window_FillTilemap(v0->unk_08, 0xff);
     sub_0200E060(v0->unk_08, 0, 1, 10);
 
     {
@@ -1992,9 +1992,9 @@ static void ov16_0223D7B4(OverlayManager *param0)
     sub_0200F344(0, 0x0);
     sub_02002FA0(v0->unk_0C, 0);
     sub_02002F54(v0->unk_0C);
-    sub_0201A928(v0->unk_08, 1);
+    Windows_Delete(v0->unk_08, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    sub_02019044(v0->unk_04, 1);
+    Bg_FreeTilemapBuffer(v0->unk_04, 1);
     Heap_FreeToHeap(v0->unk_04);
     Heap_FreeToHeap(v0);
 }

src/battle/ov16_0223DF00.c

@@ -1203,7 +1203,7 @@ void ov16_0223EF8C(BattleSystem *param0)
         }
     }
 
-    sub_0201958C(param0->unk_04, 3, param0->unk_21C, 0x10000, 0);
+    Bg_LoadTiles(param0->unk_04, 3, param0->unk_21C, 0x10000, 0);
 
     ov16_02268700(&param0->unk_17C[0]);
     ov16_02268700(&param0->unk_17C[1]);
@@ -1746,7 +1746,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p
                     v2 = sub_02014B34(&param0->trainers[param2].loseMsg, 5);
                 }
 
-                BGL_FillWindow(v0, 0xff);
+                Window_FillTilemap(v0, 0xff);
                 v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, v2, 0, 0, param4, BattleMessage_Callback);
                 Strbuf_Free(v2);
             }
@@ -1779,7 +1779,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p
                 v3 = MessageLoader_Init(0, 26, v6, 5);
                 v4 = MessageLoader_GetNewStrbuf(v3, v5);
 
-                BGL_FillWindow(v0, 0xff);
+                Window_FillTilemap(v0, 0xff);
 
                 v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, v4, 0, 0, param4, BattleMessage_Callback);
                 Strbuf_Free(v4);
@@ -1788,7 +1788,7 @@ u8 ov16_0223F9FC(BattleSystem *param0, int param1, int param2, int param3, int p
         }
     } else {
         TrainerData_LoadMessage(param1, param3, param0->msgBuffer, 5);
-        BGL_FillWindow(v0, 0xff);
+        Window_FillTilemap(v0, 0xff);
         v1 = Text_AddPrinterWithParams(v0, FONT_MESSAGE, param0->msgBuffer, 0, 0, param4, BattleMessage_Callback);
     }
 
@@ -1803,7 +1803,7 @@ u8 BattleMessage_Print(BattleSystem *battleSys, MessageLoader *msgLoader, Battle
     BattleMessage_FillFormatBuffers(battleSys, battleMsg);
     BattleMessage_Format(battleSys, msgLoader, battleMsg);
 
-    BGL_FillWindow(textWindow, 0xFF);
+    Window_FillTilemap(textWindow, 0xFF);
 
     return Text_AddPrinterWithParams(textWindow, FONT_MESSAGE, battleSys->msgBuffer, 0, 0, renderDelay, BattleMessage_Callback);
 }
@@ -1817,7 +1817,7 @@ u8 BattleMessage_PrintToWindow(BattleSystem *param0, Window *param1, MessageLoad
     BattleMessage_Format(param0, param2, param3);
 
     if (param6 & 0x1) {
-        BGL_FillWindow(param1, 0xff);
+        Window_FillTilemap(param1, 0xff);
     }
 
     if (param6 & 0x2) {

src/battle/ov16_0226871C.c

@@ -1034,10 +1034,10 @@ void ov16_02268744(BgConfig *param0)
     int v0;
 
     for (v0 = 0; v0 < NELEMS(Unk_ov16_02270540); v0++) {
-        sub_020183C4(param0, 4 + v0, &Unk_ov16_02270540[v0], 0);
-        sub_02019EE0(param0, 4 + v0, (0x6000 / 0x20 - 1));
-        sub_02019184(param0, 4 + v0, 0, 0);
-        sub_02019184(param0, 4 + v0, 3, 0);
+        Bg_InitFromTemplate(param0, 4 + v0, &Unk_ov16_02270540[v0], 0);
+        Bg_FillTilemap(param0, 4 + v0, (0x6000 / 0x20 - 1));
+        Bg_SetOffset(param0, 4 + v0, 0, 0);
+        Bg_SetOffset(param0, 4 + v0, 3, 0);
     }
 }
 
@@ -1046,8 +1046,8 @@ void ov16_022687A0(BgConfig *param0)
     int v0;
 
     for (v0 = 0; v0 < NELEMS(Unk_ov16_02270540); v0++) {
-        sub_02019120(4 + v0, 0);
-        sub_02019044(param0, 4 + v0);
+        Bg_ToggleLayer(4 + v0, 0);
+        Bg_FreeTilemapBuffer(param0, 4 + v0);
     }
 }
 
@@ -1311,8 +1311,8 @@ void ov16_02268C04(NARC *param0, NARC *param1, UnkStruct_ov16_02268A14 *param2,
 
     for (v2 = 0; v2 < 4; v2++) {
         if ((v0->unk_04_val2[v2] != 0xffff) && ((param4 == 1) || (v0->unk_04_val2[v2] != v1->unk_04_val2[v2]))) {
-            sub_02019574(v3, 4 + v2, param2->unk_3C[v0->unk_04_val2[v2]], 0x800);
-            sub_0201C3C0(v3, 4 + v2);
+            Bg_LoadTilemapBuffer(v3, 4 + v2, param2->unk_3C[v0->unk_04_val2[v2]], 0x800);
+            Bg_ScheduleTilemapTransfer(v3, 4 + v2);
         }
     }
 
@@ -1685,13 +1685,13 @@ static void ov16_022694A8(SysTask *param0, void *param1)
         v1 = 1;
     }
 
-    sub_02019184(v2, 6, 0, v0->unk_6AC / 0x100);
+    Bg_SetOffset(v2, 6, 0, v0->unk_6AC / 0x100);
     ov16_0226940C(v0);
 
     if (v1 == 1) {
-        sub_02019EE0(v2, 7, (0x6000 / 0x20 - 1));
-        sub_02019120(7, 0);
-        BGL_SetPriority(7, 0);
+        Bg_FillTilemap(v2, 7, (0x6000 / 0x20 - 1));
+        Bg_ToggleLayer(7, 0);
+        Bg_SetPriority(7, 0);
         GXS_SetVisibleWnd(GX_WNDMASK_NONE);
         SysTask_Done(param0);
         return;
@@ -1833,8 +1833,8 @@ static void ov16_022698BC(UnkStruct_ov16_02268A14 *param0, int param1, int param
 
         v1 = BattleSystem_BGL(param0->unk_00);
 
-        sub_02019CB8(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 32, 8, 17);
-        sub_0201C3C0(v1, 5);
+        Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 32, 8, 17);
+        Bg_ScheduleTilemapTransfer(v1, 5);
     }
 
     sub_020129D0(param0->unk_4CC[1].unk_00, 0);
@@ -1865,9 +1865,9 @@ static void ov16_02269938(UnkStruct_ov16_02268A14 *param0, int param1, int param
 
         v1 = BattleSystem_BGL(param0->unk_00);
 
-        sub_02019CB8(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 10, 8, 17);
-        sub_02019CB8(v1, 4, (0x6000 / 0x20 - 1), 0x16, 0x10, 10, 8, 17);
-        sub_0201C3C0(v1, 5);
+        Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0, 0x10, 10, 8, 17);
+        Bg_FillTilemapRect(v1, 4, (0x6000 / 0x20 - 1), 0x16, 0x10, 10, 8, 17);
+        Bg_ScheduleTilemapTransfer(v1, 5);
     }
 
     sub_020129D0(param0->unk_4CC[1].unk_00, 0);
@@ -2040,16 +2040,16 @@ static void ov16_02269E94(UnkStruct_ov16_02268A14 *param0, int param1, int param
         Heap_FreeToHeap(v4);
 
         v2 = BattleSystem_BGL(param0->unk_00);
-        sub_02019574(v2, 4, param0->unk_3C[6], 0x800);
-        sub_0201C3C0(v2, 4);
+        Bg_LoadTilemapBuffer(v2, 4, param0->unk_3C[6], 0x800);
+        Bg_ScheduleTilemapTransfer(v2, 4);
     }
 
     {
         BgConfig *v5 = BattleSystem_BGL(param0->unk_00);
 
         MI_CpuClear32(param0->unk_3C[4], 0x800);
-        sub_02019574(v5, 5, param0->unk_3C[4], 0x800);
-        sub_0201C3C0(v5, 5);
+        Bg_LoadTilemapBuffer(v5, 5, param0->unk_3C[4], 0x800);
+        Bg_ScheduleTilemapTransfer(v5, 5);
     }
 
     ov16_0226A98C(param0, &param0->unk_4CC[0], v1, FONT_SUBSCREEN, TEXT_COLOR(1, 2, 3), 2, 20023, 128, 178, 1, NULL);
@@ -2392,8 +2392,8 @@ static int ov16_0226A528(UnkStruct_ov16_02268A14 *param0, int param1, int param2
         BgConfig *v2;
 
         v2 = BattleSystem_BGL(param0->unk_00);
-        sub_02019EE0(v2, 5, (0x6000 / 0x20 - 1));
-        sub_0201C3C0(v2, 5);
+        Bg_FillTilemap(v2, 5, (0x6000 / 0x20 - 1));
+        Bg_ScheduleTilemapTransfer(v2, 5);
     }
 
     ov16_0226B314(param0, param1);
@@ -2628,7 +2628,7 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9
 
     if (param10 == NULL) {
         Window_Init(&v1);
-        BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0);
+        Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0);
         Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
     } else {
         v1 = param10->unk_00;
@@ -2662,7 +2662,7 @@ static void ov16_0226A98C(UnkStruct_ov16_02268A14 *param0, UnkStruct_ov16_0226A9
     sub_020128C4(v4, param7, param8);
 
     if (param10 == NULL) {
-        BGL_DeleteWindow(&v1);
+        Window_Remove(&v1);
     }
 
     param1->unk_00 = v4;
@@ -2691,7 +2691,7 @@ static void ov16_0226AAF8(UnkStruct_ov16_02268A14 *param0)
     BgConfig *v6;
 
     v6 = BattleSystem_BGL(param0->unk_00);
-    v4 = sub_02019FE4(v6, 5);
+    v4 = Bg_GetTilemapBuffer(v6, 5);
 
     ov16_0226B20C(param0, v0, 0);
 
@@ -2762,15 +2762,15 @@ static void ov16_0226ABE8(UnkStruct_ov16_02268A14 *param0)
             Heap_FreeToHeap(param0->unk_68[v1].unk_18[v0]);
 
             if (param0->unk_68[v1].unk_28[v0].unk_00.pixels != NULL) {
-                BGL_DeleteWindow(&param0->unk_68[v1].unk_28[v0].unk_00);
+                Window_Remove(&param0->unk_68[v1].unk_28[v0].unk_00);
             }
 
             if (param0->unk_68[v1].unk_78[v0].unk_00.pixels != NULL) {
-                BGL_DeleteWindow(&param0->unk_68[v1].unk_78[v0].unk_00);
+                Window_Remove(&param0->unk_68[v1].unk_78[v0].unk_00);
             }
 
             if (param0->unk_68[v1].unk_C8[v0].unk_00.pixels != NULL) {
-                BGL_DeleteWindow(&param0->unk_68[v1].unk_C8[v0].unk_00);
+                Window_Remove(&param0->unk_68[v1].unk_C8[v0].unk_00);
             }
         }
     }
@@ -2846,11 +2846,11 @@ static void ov16_0226AEA0(UnkStruct_ov16_02268A14 *param0, const Strbuf *param1,
     param3->unk_10 = v1;
 
     if (param3->unk_00.pixels != NULL) {
-        BGL_DeleteWindow(&param3->unk_00);
+        Window_Remove(&param3->unk_00);
     }
 
     Window_Init(&param3->unk_00);
-    BGL_AddFramelessWindow(BattleSystem_BGL(param0->unk_00), &param3->unk_00, v1, 16 / 8, 0, 0);
+    Window_AddToTopLeftCorner(BattleSystem_BGL(param0->unk_00), &param3->unk_00, v1, 16 / 8, 0, 0);
     Text_AddPrinterWithParamsColorAndSpacing(&param3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
 }
 
@@ -2963,9 +2963,9 @@ static void ov16_0226B0DC(UnkStruct_ov16_02268A14 *param0, int param1)
     ov16_0226B31C(param0, &Unk_ov16_022701FC[param1], &Unk_ov16_022702C4[param1], 4, 0);
 
     sub_02002FBC(v0, &param0->unk_58[0xe * 16], 1, v2[param1] * 16, 0x20);
-    sub_0201C3C0(v3, 4);
-    sub_02019CB8(v3, 5, (0x6000 / 0x20 - 1), Unk_ov16_022702C4[param1].unk_02, Unk_ov16_022702C4[param1].unk_00, Unk_ov16_022702C4[param1].unk_03 - Unk_ov16_022702C4[param1].unk_02 + 1, Unk_ov16_022702C4[param1].unk_01 - Unk_ov16_022702C4[param1].unk_00 + 1, 17);
-    sub_0201C3C0(v3, 5);
+    Bg_ScheduleTilemapTransfer(v3, 4);
+    Bg_FillTilemapRect(v3, 5, (0x6000 / 0x20 - 1), Unk_ov16_022702C4[param1].unk_02, Unk_ov16_022702C4[param1].unk_00, Unk_ov16_022702C4[param1].unk_03 - Unk_ov16_022702C4[param1].unk_02 + 1, Unk_ov16_022702C4[param1].unk_01 - Unk_ov16_022702C4[param1].unk_00 + 1, 17);
+    Bg_ScheduleTilemapTransfer(v3, 5);
 }
 
 static void ov16_0226B198(void)
@@ -2974,9 +2974,9 @@ static void ov16_0226B198(void)
 
     for (i = 0; i < 4; i++) {
         if (4 + i != 6) {
-            sub_02019120(4 + i, 0);
+            Bg_ToggleLayer(4 + i, 0);
         } else {
-            sub_02019120(4 + i, 1);
+            Bg_ToggleLayer(4 + i, 1);
         }
     }
 }
@@ -3202,7 +3202,7 @@ static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, co
     int v7;
 
     v2 = BattleSystem_BGL(param0->unk_00);
-    v3 = sub_02019FE4(v2, 4);
+    v3 = Bg_GetTilemapBuffer(v2, 4);
     v5 = param0->unk_3C[param3];
     v7 = param1[param4];
 
@@ -3215,7 +3215,7 @@ static void ov16_0226B31C(UnkStruct_ov16_02268A14 *param0, const s16 *param1, co
         }
     }
 
-    sub_0201C3C0(v2, 4);
+    Bg_ScheduleTilemapTransfer(v2, 4);
 }
 
 static void ov16_0226B390(SysTask *param0, void *param1)
@@ -3542,10 +3542,10 @@ static void ov16_0226B988(SysTask *param0, void *param1)
             break;
         }
 
-        sub_02019184(v1, 4, 0, 0);
-        sub_02019184(v1, 4, 3, 0);
-        sub_02019184(v1, 5, 0, 0);
-        sub_02019184(v1, 5, 3, 0);
+        Bg_SetOffset(v1, 4, 0, 0);
+        Bg_SetOffset(v1, 4, 3, 0);
+        Bg_SetOffset(v1, 5, 0, 0);
+        Bg_SetOffset(v1, 5, 3, 0);
         BattleSystem_SetCommandSelectionFlags(v0->unk_00->unk_00, 1);
         Heap_FreeToHeap(param1);
         SysTask_Done(param0);
@@ -3569,8 +3569,8 @@ static void ov16_0226BA88(SysTask *param0, void *param1)
             v4 = 0;
         }
 
-        sub_02019184(v1, 4, 0, v4);
-        sub_02019184(v1, 5, 0, 255 - v0->unk_0C);
+        Bg_SetOffset(v1, 4, 0, v4);
+        Bg_SetOffset(v1, 5, 0, 255 - v0->unk_0C);
         v2 = -v0->unk_08 / 100;
     } else {
         v4 = v0->unk_0C;
@@ -3579,14 +3579,14 @@ static void ov16_0226BA88(SysTask *param0, void *param1)
             v4 = 0;
         }
 
-        sub_02019184(v1, 4, 0, v4);
-        sub_02019184(v1, 5, 0, v0->unk_0C);
+        Bg_SetOffset(v1, 4, 0, v4);
+        Bg_SetOffset(v1, 5, 0, v0->unk_0C);
 
         v2 = 255 + v0->unk_08 / 100;
     }
 
-    sub_02019184(v1, 4, 3, 0);
-    sub_02019184(v1, 5, 3, 0);
+    Bg_SetOffset(v1, 4, 3, 0);
+    Bg_SetOffset(v1, 5, 3, 0);
 
     v3 = (18 * 8) + (v0->unk_0A) / 100;
 
@@ -3626,10 +3626,10 @@ static void ov16_0226BB94(void *param0)
     if (v1 == (18 * 8)) {
         BgConfig *v3 = BattleSystem_BGL(v0->unk_00->unk_00);
 
-        sub_02019184(v3, 4, 0, 0);
-        sub_02019184(v3, 4, 3, v0->unk_10);
-        sub_02019184(v3, 5, 0, 0);
-        sub_02019184(v3, 5, 3, v0->unk_10);
+        Bg_SetOffset(v3, 4, 0, 0);
+        Bg_SetOffset(v3, 4, 3, v0->unk_10);
+        Bg_SetOffset(v3, 5, 0, 0);
+        Bg_SetOffset(v3, 5, 3, v0->unk_10);
     } else if (v1 > 192) {
         BgConfig *v4 = BattleSystem_BGL(v0->unk_00->unk_00);
 
@@ -3640,8 +3640,8 @@ static void ov16_0226BB94(void *param0)
                 v2 = 0;
             }
 
-            sub_02019184(v4, 4, 0, 255 - v0->unk_0C);
-            sub_02019184(v4, 5, 0, 255 - v0->unk_0C);
+            Bg_SetOffset(v4, 4, 0, 255 - v0->unk_0C);
+            Bg_SetOffset(v4, 5, 0, 255 - v0->unk_0C);
         } else {
             v2 = v0->unk_0C;
 
@@ -3649,12 +3649,12 @@ static void ov16_0226BB94(void *param0)
                 v2 = 0;
             }
 
-            sub_02019184(v4, 4, 0, v0->unk_0C);
-            sub_02019184(v4, 5, 0, v0->unk_0C);
+            Bg_SetOffset(v4, 4, 0, v0->unk_0C);
+            Bg_SetOffset(v4, 5, 0, v0->unk_0C);
         }
 
-        sub_02019184(v4, 4, 3, 0);
-        sub_02019184(v4, 5, 3, 0);
+        Bg_SetOffset(v4, 4, 3, 0);
+        Bg_SetOffset(v4, 5, 3, 0);
     }
 }
 
@@ -3668,14 +3668,14 @@ static void ov16_0226BC50(SysTask *param0, void *param1)
 
     for (v2 = 0; v2 < 4; v2++) {
         if (v1->unk_04_val2[v2] == 0xffff) {
-            sub_02019120(4 + v2, 0);
+            Bg_ToggleLayer(4 + v2, 0);
         } else {
-            sub_02019120(4 + v2, 1);
+            Bg_ToggleLayer(4 + v2, 1);
         }
     }
 
     for (v2 = 0; v2 < 4; v2++) {
-        BGL_SetPriority(4 + v2, v1->unk_0C_val2[v2]);
+        Bg_SetPriority(4 + v2, v1->unk_0C_val2[v2]);
     }
 
     SysTask_Done(param0);
@@ -4595,16 +4595,16 @@ void ov16_0226CEB0(UnkStruct_ov16_02268A14 *param0, int param1)
         v6 = 30;
         v7 = 6;
 
-        sub_02019CB8(v0, 5, v2, v4, v5, 1, 1, v3);
-        sub_02019CB8(v0, 5, v2 + 1, v4 + 1, v5, v6 - 2, 1, v3);
-        sub_02019CB8(v0, 5, v2 + 2, v4 + v6 - 1, v5, 1, 1, v3);
-        sub_02019CB8(v0, 5, v2 + 3, v4, v5 + 1, 1, v7 - 2, v3);
-        sub_02019CB8(v0, 5, v2 + 5, v4 + v6 - 1, v5 + 1, 1, v7 - 2, v3);
-        sub_02019CB8(v0, 5, v2 + 6, v4, v5 + v7 - 1, 1, 1, v3);
-        sub_02019CB8(v0, 5, v2 + 7, v4 + 1, v5 + v7 - 1, v6 - 2, 1, v3);
-        sub_02019CB8(v0, 5, v2 + 8, v4 + v6 - 1, v5 + v7 - 1, 1, 1, v3);
-        sub_02019CB8(v0, 5, v2 + 4, v4 + 1, v5 + 1, v6 - 2, v7 - 2, v3);
-        sub_0201C3C0(v0, 5);
+        Bg_FillTilemapRect(v0, 5, v2, v4, v5, 1, 1, v3);
+        Bg_FillTilemapRect(v0, 5, v2 + 1, v4 + 1, v5, v6 - 2, 1, v3);
+        Bg_FillTilemapRect(v0, 5, v2 + 2, v4 + v6 - 1, v5, 1, 1, v3);
+        Bg_FillTilemapRect(v0, 5, v2 + 3, v4, v5 + 1, 1, v7 - 2, v3);
+        Bg_FillTilemapRect(v0, 5, v2 + 5, v4 + v6 - 1, v5 + 1, 1, v7 - 2, v3);
+        Bg_FillTilemapRect(v0, 5, v2 + 6, v4, v5 + v7 - 1, 1, 1, v3);
+        Bg_FillTilemapRect(v0, 5, v2 + 7, v4 + 1, v5 + v7 - 1, v6 - 2, 1, v3);
+        Bg_FillTilemapRect(v0, 5, v2 + 8, v4 + v6 - 1, v5 + v7 - 1, 1, 1, v3);
+        Bg_FillTilemapRect(v0, 5, v2 + 4, v4 + 1, v5 + 1, v6 - 2, v7 - 2, v3);
+        Bg_ScheduleTilemapTransfer(v0, 5);
     }
 
     {

src/bg_window.c

@@ -44,7 +44,7 @@ static void sub_0201C73C(Background *param0, u8 param1, int param2);
 static void sub_0201C3D0(BgConfig *param0);
 static void sub_0201C2D0(BgConfig *param0);
 
-BgConfig *sub_02018340(u32 param0)
+BgConfig *BgConfig_New(u32 param0)
 {
     BgConfig *v0 = Heap_AllocFromHeap(param0, sizeof(BgConfig));
 
@@ -57,12 +57,12 @@ BgConfig *sub_02018340(u32 param0)
     return v0;
 }
 
-u32 sub_02018364(BgConfig *param0)
+u32 BgConfig_GetHeapID(BgConfig *param0)
 {
     return param0->heapID;
 }
 
-void sub_02018368(const GraphicsModes *param0)
+void SetAllGraphicsModes(const GraphicsModes *param0)
 {
     GX_SetGraphicsMode(param0->displayMode, param0->mainBgMode, param0->bg0As2DOr3D);
     GXS_SetGraphicsMode(param0->subBgMode);
@@ -74,7 +74,7 @@ void sub_02018368(const GraphicsModes *param0)
     GXLayers_DisableEngineBLayers();
 }
 
-void sub_020183A0(const GraphicsModes *param0, u8 param1)
+void SetScreenGraphicsModes(const GraphicsModes *param0, u8 param1)
 {
     if (param1 == 0) {
         GX_SetGraphicsMode(param0->displayMode, param0->mainBgMode, param0->bg0As2DOr3D);
@@ -85,7 +85,7 @@ void sub_020183A0(const GraphicsModes *param0, u8 param1)
     }
 }
 
-void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3)
+void Bg_InitFromTemplate(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 param3)
 {
     u8 v0 = sub_02018F80(param2->screenSize, param3);
 
@@ -221,11 +221,11 @@ void sub_020183C4(BgConfig *param0, u8 param1, const BgTemplate *param2, u8 para
         param0->bgs[param1].tileSize = 0x40;
     }
 
-    sub_02019184(param0, param1, 0, param2->x);
-    sub_02019184(param0, param1, 3, param2->y);
+    Bg_SetOffset(param0, param1, 0, param2->x);
+    Bg_SetOffset(param0, param1, 3, param2->y);
 }
 
-void sub_02018898(BgConfig *param0, u8 param1, u8 param2, u8 param3)
+void Bg_SetControlParam(BgConfig *param0, u8 param1, u8 param2, u8 param3)
 {
     if (param2 == 0) {
         param0->bgs[param1].colorMode = param3;
@@ -523,7 +523,7 @@ static void sub_02018FF4(u8 param0, u8 *param1, u8 *param2)
     }
 }
 
-void sub_02019044(BgConfig *param0, u8 param1)
+void Bg_FreeTilemapBuffer(BgConfig *param0, u8 param1)
 {
     if (param0->bgs[param1].tilemapBuffer == NULL) {
         return;
@@ -533,7 +533,7 @@ void sub_02019044(BgConfig *param0, u8 param1)
     param0->bgs[param1].tilemapBuffer = NULL;
 }
 
-void BGL_SetPriority(u8 param0, u8 param1)
+void Bg_SetPriority(u8 param0, u8 param1)
 {
     switch (param0) {
     case 0:
@@ -563,7 +563,7 @@ void BGL_SetPriority(u8 param0, u8 param1)
     }
 }
 
-void sub_02019120(u8 param0, u8 param1)
+void Bg_ToggleLayer(u8 param0, u8 param1)
 {
     switch (param0) {
     case 0:
@@ -593,7 +593,7 @@ void sub_02019120(u8 param0, u8 param1)
     }
 }
 
-void sub_02019184(BgConfig *param0, u8 param1, u8 param2, int param3)
+void Bg_SetOffset(BgConfig *param0, u8 param1, u8 param2, int param3)
 {
     int v0, v1;
 
@@ -647,12 +647,12 @@ void sub_02019184(BgConfig *param0, u8 param1, u8 param2, int param3)
     }
 }
 
-int sub_020192EC(BgConfig *param0, u32 param1)
+int Bg_GetXOffset(BgConfig *param0, u32 param1)
 {
     return param0->bgs[param1].xOffset;
 }
 
-int sub_020192F8(BgConfig *param0, u32 param1)
+int Bg_GetYOffset(BgConfig *param0, u32 param1)
 {
     return param0->bgs[param1].yOffset;
 }
@@ -681,7 +681,7 @@ static void sub_02019304(Background *param0, u8 param1, int param2)
     }
 }
 
-void sub_02019348(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4)
+void Bg_SetAffineParams(BgConfig *param0, u8 param1, const MtxFx22 *param2, int param3, int param4)
 {
     switch (param1) {
     case 2:
@@ -704,10 +704,10 @@ static void sub_020193E4(BgConfig *param0, u8 param1)
     MtxFx22 v0;
 
     sub_0201D470(&v0, 0, FX32_ONE, FX32_ONE, 0);
-    sub_02019348(param0, param1, &v0, 0, 0);
+    Bg_SetAffineParams(param0, param1, &v0, 0, 0);
 }
 
-void sub_02019410(const void *param0, void *param1, u32 param2)
+static void sub_02019410(const void *param0, void *param1, u32 param2)
 {
     if (param2 == 0) {
         MI_UncompressLZ8(param0, param1);
@@ -720,12 +720,12 @@ void sub_02019410(const void *param0, void *param1, u32 param2)
     }
 }
 
-void sub_02019448(BgConfig *param0, u8 param1)
+void Bg_CopyTilemapBufferToVRAM(BgConfig *param0, u8 param1)
 {
-    sub_02019460(param0, param1, param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize, param0->bgs[param1].baseTile);
+    Bg_CopyTilemapBufferRangeToVRAM(param0, param1, param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize, param0->bgs[param1].baseTile);
 }
 
-void sub_02019460(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4)
+void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4)
 {
     void *v0;
 
@@ -781,12 +781,12 @@ static void sub_020194E0(u8 param0, void *param1, u32 param2, u32 param3)
     }
 }
 
-void sub_02019574(BgConfig *param0, u8 param1, const void *param2, u32 param3)
+void Bg_LoadTilemapBuffer(BgConfig *param0, u8 param1, const void *param2, u32 param3)
 {
     sub_02019410(param2, param0->bgs[param1].tilemapBuffer, param3);
 }
 
-void sub_0201958C(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4)
+void Bg_LoadTiles(BgConfig *param0, u8 param1, const void *param2, u32 param3, u32 param4)
 {
     if (param0->bgs[param1].colorMode == GX_BG_COLORMODE_16) {
         sub_020195B8(param0, param1, param2, param3, param4 * 0x20);
@@ -845,7 +845,7 @@ static void sub_020195FC(u8 param0, void *param1, u32 param2, u32 param3)
     }
 }
 
-void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3)
+void Bg_ClearTilesRange(u8 param0, u32 param1, u32 param2, u32 param3)
 {
     u32 *v0 = (u32 *)Heap_AllocFromHeapAtEnd(param3, param1);
 
@@ -855,7 +855,7 @@ void sub_02019690(u8 param0, u32 param1, u32 param2, u32 param3)
     Heap_FreeToHeapExplicit(param3, v0);
 }
 
-void sub_020196C0(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4)
+void Bg_FillTilesRange(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4)
 {
     u32 *v0;
     u32 v1;
@@ -876,7 +876,7 @@ void sub_020196C0(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 para
     Heap_FreeToHeap(v0);
 }
 
-void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3)
+void Bg_LoadPalette(u8 param0, void *param1, u16 param2, u16 param3)
 {
     DC_FlushRange((void *)param1, param2);
 
@@ -887,9 +887,9 @@ void sub_0201972C(u8 param0, void *param1, u16 param2, u16 param3)
     }
 }
 
-void sub_0201975C(u8 param0, u16 param1)
+void Bg_MaskPalette(u8 param0, u16 param1)
 {
-    sub_0201972C(param0, &param1, 2, 0);
+    Bg_LoadPalette(param0, &param1, 2, 0);
 }
 
 static u16 sub_02019774(u8 param0, u8 param1, u8 param2)
@@ -969,12 +969,12 @@ static u16 sub_020197E0(u8 param0, u8 param1, u8 param2, u8 param3)
     return v1;
 }
 
-void sub_020198C0(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6)
+void Bg_LoadToTilemapRect(BgConfig *param0, u8 param1, const void *param2, u8 param3, u8 param4, u8 param5, u8 param6)
 {
-    sub_020198E8(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6);
+    Bg_CopyToTilemapRect(param0, param1, param3, param4, param5, param6, param2, 0, 0, param5, param6);
 }
 
-void sub_020198E8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10)
+void Bg_CopyToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10)
 {
     if (param0->bgs[param1].type != 1) {
         sub_020199E0(&param0->bgs[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 0);
@@ -983,7 +983,7 @@ void sub_020198E8(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4,
     }
 }
 
-void sub_02019964(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10)
+void Bg_CopyRectToTilemapRect(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, const void *param6, u8 param7, u8 param8, u8 param9, u8 param10)
 {
     if (param0->bgs[param1].type != 1) {
         sub_020199E0(&param0->bgs[param1], param2, param3, param4, param5, (u16 *)param6, param7, param8, param9, param10, 1);
@@ -1080,7 +1080,7 @@ static void sub_02019B54(Background *param0, u8 param1, u8 param2, u8 param3, u8
     }
 }
 
-void sub_02019CB8(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7)
+void Bg_FillTilemapRect(BgConfig *param0, u8 param1, u16 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7)
 {
     if (param0->bgs[param1].type != 1) {
         sub_02019D08(&param0->bgs[param1], param2, param3, param4, param5, param6, param7);
@@ -1155,7 +1155,7 @@ static void sub_02019DB8(Background *param0, u8 param1, u8 param2, u8 param3, u8
     }
 }
 
-void sub_02019E2C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6)
+void Bg_ChangeTilemapRectPalette(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6)
 {
     u16 *v0;
     u8 v1, v2;
@@ -1186,37 +1186,37 @@ void sub_02019E2C(BgConfig *param0, u8 param1, u8 param2, u8 param3, u8 param4,
     }
 }
 
-void sub_02019EBC(BgConfig *param0, u8 param1)
+void Bg_ClearTilemap(BgConfig *param0, u8 param1)
 {
     if (param0->bgs[param1].tilemapBuffer == NULL) {
         return;
     }
 
     MI_CpuClear16(param0->bgs[param1].tilemapBuffer, param0->bgs[param1].bufferSize);
-    sub_02019448(param0, param1);
+    Bg_CopyTilemapBufferToVRAM(param0, param1);
 }
 
-void sub_02019EE0(BgConfig *param0, u8 param1, u16 param2)
+void Bg_FillTilemap(BgConfig *param0, u8 param1, u16 param2)
 {
     if (param0->bgs[param1].tilemapBuffer == NULL) {
         return;
     }
 
     MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize);
-    sub_02019448(param0, param1);
+    Bg_CopyTilemapBufferToVRAM(param0, param1);
 }
 
-void sub_02019F04(BgConfig *param0, u8 param1, u16 param2)
+void Bg_ScheduleFillTilemap(BgConfig *param0, u8 param1, u16 param2)
 {
     if (param0->bgs[param1].tilemapBuffer == NULL) {
         return;
     }
 
     MI_CpuFill16(param0->bgs[param1].tilemapBuffer, param2, param0->bgs[param1].bufferSize);
-    sub_0201C3C0(param0, param1);
+    Bg_ScheduleTilemapTransfer(param0, param1);
 }
 
-void *sub_02019F28(u8 param0)
+void *Bg_GetCharPtr(u8 param0)
 {
     switch (param0) {
     case 0:
@@ -1240,7 +1240,7 @@ void *sub_02019F28(u8 param0)
     return NULL;
 }
 
-void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3)
+static void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3)
 {
     u32 v0;
 
@@ -1261,7 +1261,7 @@ void sub_02019F80(const u8 *param0, u32 param1, u8 *param2, u8 param3)
     }
 }
 
-void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3)
+static void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3)
 {
     void *v0;
 
@@ -1271,22 +1271,22 @@ void *sub_02019FC0(const u8 *param0, u32 param1, u8 param2, u32 param3)
     return v0;
 }
 
-void *sub_02019FE4(BgConfig *param0, u8 param1)
+void *Bg_GetTilemapBuffer(BgConfig *param0, u8 param1)
 {
     return param0->bgs[param1].tilemapBuffer;
 }
 
-int sub_02019FF0(BgConfig *param0, u8 param1)
+int Bg_GetXOffset2(BgConfig *param0, u8 param1)
 {
     return param0->bgs[param1].xOffset;
 }
 
-u16 sub_02019FFC(BgConfig *param0, u8 param1)
+u16 Bg_GetRotation(BgConfig *param0, u8 param1)
 {
     return param0->bgs[param1].rotation;
 }
 
-u8 sub_0201A008(BgConfig *param0, u8 param1)
+u8 Bg_GetPriority(BgConfig *param0, u8 param1)
 {
     switch (param1) {
     case 0: {
@@ -1377,7 +1377,7 @@ u8 sub_0201A008(BgConfig *param0, u8 param1)
     return 0;
 }
 
-void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8)
+void Bitmap_BlitRect4bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8)
 {
     int v0, v1, v2, v3, v4, v5, v6, v7, v8, v9;
     u8 *v10, *v11;
@@ -1425,7 +1425,7 @@ void sub_0201A1E4(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 pa
     }
 }
 
-void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8)
+void Bitmap_BlitRect8bpp(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8)
 {
     int v0, v1, v2, v3, v4, v5, v6, v7;
     u8 *v8;
@@ -1468,7 +1468,7 @@ void sub_0201A424(const Bitmap *param0, const Bitmap *param1, u16 param2, u16 pa
     }
 }
 
-void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5)
+void Bitmap_FillRect4bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5)
 {
     int v0, v1, v2, v3, v4;
     u8 *v5;
@@ -1502,7 +1502,7 @@ void sub_0201A60C(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16
     }
 }
 
-void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5)
+void Bitmap_FillRect8bpp(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16 param4, u8 param5)
 {
     int v0, v1, v2, v3, v4;
     u8 *v5;
@@ -1529,7 +1529,7 @@ void sub_0201A6D0(const Bitmap *param0, u16 param1, u16 param2, u16 param3, u16
     }
 }
 
-Window *sub_0201A778(u32 param0, u8 param1)
+Window *Window_New(u32 param0, u8 param1)
 {
     Window *v0;
     u16 v1;
@@ -1557,7 +1557,7 @@ void Window_Init(Window *param0)
     param0->colorMode = UnkEnum_00;
 }
 
-u8 BGL_WindowAdded(Window *param0)
+u8 Window_IsInUse(Window *param0)
 {
     if ((param0->bgConfig == NULL) || (param0->bgLayer == 0xff) || (param0->pixels == NULL)) {
         return 0;
@@ -1566,7 +1566,7 @@ u8 BGL_WindowAdded(Window *param0)
     return 1;
 }
 
-void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8)
+void Window_Add(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8)
 {
     void *v0;
     u32 v1;
@@ -1594,7 +1594,7 @@ void BGL_AddWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u8 pa
     param1->colorMode = (param0->bgs[param2].colorMode == GX_BG_COLORMODE_16) ? UnkEnum_00 : UnkEnum_01;
 }
 
-void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5)
+void Window_AddToTopLeftCorner(BgConfig *param0, Window *param1, u8 param2, u8 param3, u16 param4, u8 param5)
 {
     void *v0;
     u32 v1;
@@ -1617,13 +1617,13 @@ void BGL_AddFramelessWindow(BgConfig *param0, Window *param1, u8 param2, u8 para
     param1->colorMode = UnkEnum_00;
 }
 
-void sub_0201A8D4(BgConfig *param0, Window *param1, const WindowTemplate *param2)
+void Window_AddFromTemplate(BgConfig *param0, Window *param1, const WindowTemplate *param2)
 {
-    BGL_AddWindow(
+    Window_Add(
         param0, param1, param2->bgLayer, param2->tilemapLeft, param2->tilemapTop, param2->width, param2->height, param2->palette, param2->baseTile);
 }
 
-void BGL_DeleteWindow(Window *param0)
+void Window_Remove(Window *param0)
 {
     Heap_FreeToHeap(param0->pixels);
 
@@ -1638,7 +1638,7 @@ void BGL_DeleteWindow(Window *param0)
     param0->pixels = NULL;
 }
 
-void sub_0201A928(Window *param0, u8 param1)
+void Windows_Delete(Window *param0, u8 param1)
 {
     u16 v0;
 
@@ -1698,7 +1698,7 @@ static const u8 Unk_020E5694[] = {
     0x20
 };
 
-void sub_0201A954(Window *param0)
+void Window_CopyToVRAM(Window *param0)
 {
     GF_ASSERT(param0 != NULL);
     GF_ASSERT(param0->bgConfig != NULL);
@@ -1708,7 +1708,7 @@ void sub_0201A954(Window *param0)
     Unk_020E56CC[param0->bgConfig->bgs[param0->bgLayer].type](param0);
 }
 
-void sub_0201A9A4(Window *param0)
+void Window_ScheduleCopyToVRAM(Window *param0)
 {
     GF_ASSERT(param0 != NULL);
     GF_ASSERT(param0->bgConfig != NULL);
@@ -1718,12 +1718,12 @@ void sub_0201A9A4(Window *param0)
     Unk_020E56C0[param0->bgConfig->bgs[param0->bgLayer].type](param0);
 }
 
-void sub_0201A9F4(Window *param0)
+void Window_PutToTilemap(Window *param0)
 {
     Unk_020E569C[param0->bgConfig->bgs[param0->bgLayer].type](param0);
 }
 
-void sub_0201AA10(Window *param0, u32 param1, u32 param2)
+void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2)
 {
     u32 v0, v1;
 
@@ -1739,7 +1739,7 @@ void sub_0201AA10(Window *param0, u32 param1, u32 param2)
     param0->height = v1;
 }
 
-void sub_0201AA3C(Window *param0)
+void Window_ClearTilemap(Window *param0)
 {
     Unk_020E56D8[param0->bgConfig->bgs[param0->bgLayer].type](param0);
 }
@@ -1828,45 +1828,45 @@ static void sub_0201ABC8(Window *param0)
 static void sub_0201AC20(Window *param0)
 {
     sub_0201AA58(param0);
-    sub_0201ACCC(param0);
-    sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile);
+    Window_LoadTiles(param0);
+    Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile);
 }
 
 static void sub_0201AC4C(Window *param0)
 {
     sub_0201AA58(param0);
-    sub_0201C3C0(param0->bgConfig, param0->bgLayer);
-    sub_0201ACCC(param0);
+    Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer);
+    Window_LoadTiles(param0);
 }
 
 static void sub_0201AC64(Window *param0)
 {
     sub_0201AADC(param0);
 
-    sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile);
-    sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile);
+    Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile);
+    Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile);
 }
 
 static void sub_0201ACA0(Window *param0)
 {
     sub_0201AADC(param0);
 
-    sub_0201C3C0(param0->bgConfig, param0->bgLayer);
-    sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile);
+    Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer);
+    Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, (u32)(param0->width * param0->height * 0x40), (u32)param0->baseTile);
 }
 
-void sub_0201ACCC(Window *param0)
+void Window_LoadTiles(Window *param0)
 {
     u32 v0 = param0->width * param0->height * param0->bgConfig->bgs[param0->bgLayer].tileSize;
-    sub_0201958C(param0->bgConfig, param0->bgLayer, param0->pixels, v0, param0->baseTile);
+    Bg_LoadTiles(param0->bgConfig, param0->bgLayer, param0->pixels, v0, param0->baseTile);
 }
 
-void sub_0201ACF4(Window *param0)
+void Window_ClearAndCopyToVRAM(Window *param0)
 {
     Unk_020E56B4[param0->bgConfig->bgs[param0->bgLayer].type](param0);
 }
 
-void sub_0201AD10(Window *param0)
+void Window_ClearAndScheduleCopyToVRAM(Window *param0)
 {
     Unk_020E56A8[param0->bgConfig->bgs[param0->bgLayer].type](param0);
 }
@@ -1874,28 +1874,28 @@ void sub_0201AD10(Window *param0)
 static void sub_0201AD2C(Window *param0)
 {
     sub_0201AB38(param0);
-    sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile);
+    Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile);
 }
 
 static void sub_0201AD54(Window *param0)
 {
     sub_0201AB38(param0);
-    sub_0201C3C0(param0->bgConfig, param0->bgLayer);
+    Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer);
 }
 
 static void sub_0201AD68(Window *param0)
 {
     sub_0201ABC8(param0);
-    sub_02019460(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile);
+    Bg_CopyTilemapBufferRangeToVRAM(param0->bgConfig, param0->bgLayer, param0->bgConfig->bgs[param0->bgLayer].tilemapBuffer, param0->bgConfig->bgs[param0->bgLayer].bufferSize, param0->bgConfig->bgs[param0->bgLayer].baseTile);
 }
 
 static void sub_0201AD90(Window *param0)
 {
     sub_0201ABC8(param0);
-    sub_0201C3C0(param0->bgConfig, param0->bgLayer);
+    Bg_ScheduleTilemapTransfer(param0->bgConfig, param0->bgLayer);
 }
 
-void BGL_FillWindow(Window *param0, u8 param1)
+void Window_FillTilemap(Window *param0, u8 param1)
 {
     u32 v0;
     u32 v1;
@@ -1910,12 +1910,12 @@ void BGL_FillWindow(Window *param0, u8 param1)
     MI_CpuFillFast(param0->pixels, v1, v0);
 }
 
-void sub_0201ADDC(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9)
+void Window_BlitBitmapRect(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9)
 {
-    sub_0201AE08(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9, 0);
+    Window_BlitBitmapRectWithTransparency(param0, param1, param2, param3, param4, param5, param6, param7, param8, param9, 0);
 }
 
-void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10)
+void Window_BlitBitmapRectWithTransparency(Window *param0, void *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6, u16 param7, u16 param8, u16 param9, u16 param10)
 {
     Bitmap v0;
     Bitmap v1;
@@ -1928,13 +1928,13 @@ void sub_0201AE08(Window *param0, void *param1, u16 param2, u16 param3, u16 para
     v1.height = (u16)(param0->height * 0x8);
 
     if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) {
-        sub_0201A1E4(&v0, &v1, param2, param3, param6, param7, param8, param9, param10);
+        Bitmap_BlitRect4bpp(&v0, &v1, param2, param3, param6, param7, param8, param9, param10);
     } else {
-        sub_0201A424(&v0, &v1, param2, param3, param6, param7, param8, param9, param10);
+        Bitmap_BlitRect8bpp(&v0, &v1, param2, param3, param6, param7, param8, param9, param10);
     }
 }
 
-void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5)
+void Window_FillRectWithColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 param4, u16 param5)
 {
     Bitmap v0;
 
@@ -1943,13 +1943,13 @@ void BGL_WindowColor(Window *param0, u8 param1, u16 param2, u16 param3, u16 para
     v0.height = (u16)(param0->height * 0x8);
 
     if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) {
-        sub_0201A60C((const Bitmap *)&v0, param2, param3, param4, param5, param1);
+        Bitmap_FillRect4bpp((const Bitmap *)&v0, param2, param3, param4, param5, param1);
     } else {
-        sub_0201A6D0((const Bitmap *)&v0, param2, param3, param4, param5, param1);
+        Bitmap_FillRect8bpp((const Bitmap *)&v0, param2, param3, param4, param5, param1);
     }
 }
 
-void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6)
+void Window_CopyGlyph(Window *param0, const u8 *param1, u16 param2, u16 param3, u16 param4, u16 param5, u16 param6)
 {
     u8 *v0;
     u16 v1, v2;
@@ -2972,7 +2972,7 @@ void sub_0201AED0(Window *param0, const u8 *param1, u16 param2, u16 param3, u16
     }
 }
 
-void sub_0201C04C(Window *param0, u8 param1, u8 param2, u8 param3)
+void Window_Scroll(Window *param0, u8 param1, u8 param2, u8 param3)
 {
     if (param0->bgConfig->bgs[param0->bgLayer].colorMode == GX_BG_COLORMODE_16) {
         sub_0201C06C(param0, param1, param2, param3);
@@ -3118,57 +3118,57 @@ static void sub_0201C158(Window *param0, u8 param1, u8 param2, u8 param3)
     }
 }
 
-BgConfig *sub_0201C28C(Window *param0)
+BgConfig *Window_GetBgConfig(Window *param0)
 {
     return param0->bgConfig;
 }
 
-u8 sub_0201C290(Window *param0)
+u8 Window_GetBgLayer(Window *param0)
 {
     return param0->bgLayer;
 }
 
-u8 sub_0201C294(Window *param0)
+u8 Window_GetWidth(Window *param0)
 {
     return param0->width;
 }
 
-u8 sub_0201C298(Window *param0)
+u8 Window_GetHeight(Window *param0)
 {
     return param0->height;
 }
 
-u8 sub_0201C29C(Window *param0)
+u8 Window_GetXPos(Window *param0)
 {
     return param0->tilemapLeft;
 }
 
-u8 sub_0201C2A0(Window *param0)
+u8 Window_GetYPos(Window *param0)
 {
     return param0->tilemapTop;
 }
 
-u16 sub_0201C2A4(Window *param0)
+u16 Window_GetBaseTile(Window *param0)
 {
     return param0->baseTile;
 }
 
-void sub_0201C2AC(Window *param0, u8 param1)
+void Window_SetXPos(Window *param0, u8 param1)
 {
     param0->tilemapLeft = param1;
 }
 
-void sub_0201C2B0(Window *param0, u8 param1)
+void Window_SetYPos(Window *param0, u8 param1)
 {
     param0->tilemapTop = param1;
 }
 
-void sub_0201C2B4(Window *param0, u8 param1)
+void Window_SetPalette(Window *param0, u8 param1)
 {
     param0->palette = param1;
 }
 
-void sub_0201C2B8(BgConfig *param0)
+void Bg_RunScheduledUpdates(BgConfig *param0)
 {
     sub_0201C3D0(param0);
     sub_0201C2D0(param0);
@@ -3212,7 +3212,7 @@ static void sub_0201C2D0(BgConfig *param0)
     }
 }
 
-void sub_0201C3C0(BgConfig *param0, u8 param1)
+void Bg_ScheduleTilemapTransfer(BgConfig *param0, u8 param1)
 {
     param0->bufferTransferScheduled |= (1 << param1);
 }
@@ -3280,13 +3280,13 @@ static void sub_0201C3D0(BgConfig *param0)
     }
 }
 
-void sub_0201C63C(BgConfig *param0, u8 param1, u8 param2, int param3)
+void Bg_ScheduleScroll(BgConfig *param0, u8 param1, u8 param2, int param3)
 {
     sub_02019304(&param0->bgs[param1], param2, param3);
     param0->scrollScheduled |= (1 << param1);
 }
 
-void sub_0201C660(BgConfig *param0, u8 param1, u8 param2, u16 param3)
+void Bg_ScheduleAffineRotation(BgConfig *param0, u8 param1, u8 param2, u16 param3)
 {
     sub_0201C684(&param0->bgs[param1], param2, param3);
     param0->scrollScheduled |= (1 << param1);
@@ -3307,7 +3307,7 @@ static void sub_0201C684(Background *param0, u8 param1, u16 param2)
     }
 }
 
-void sub_0201C6A8(BgConfig *param0, u8 param1, u8 param2, fx32 param3)
+void Bg_ScheduleAffineScale(BgConfig *param0, u8 param1, u8 param2, fx32 param3)
 {
     sub_0201C6CC(&param0->bgs[param1], param2, param3);
     param0->scrollScheduled |= (1 << param1);
@@ -3337,7 +3337,7 @@ static void sub_0201C6CC(Background *param0, u8 param1, fx32 param2)
     }
 }
 
-void sub_0201C718(BgConfig *param0, u8 param1, u8 param2, int param3)
+void Bg_ScheduleAffineRotationCenter(BgConfig *param0, u8 param1, u8 param2, int param3)
 {
     sub_0201C73C(&param0->bgs[param1], param2, param3);
     param0->scrollScheduled |= (1 << param1);
@@ -3367,7 +3367,7 @@ static void sub_0201C73C(Background *param0, u8 param1, int param2)
     }
 }
 
-u8 sub_0201C784(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4)
+u8 Bg_DoesPixelAtXYMatchVal(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4)
 {
     u8 *v0;
     u16 v1;
@@ -3380,7 +3380,7 @@ u8 sub_0201C784(BgConfig *param0, u8 param1, u16 param2, u16 param3, u16 *param4
     }
 
     v1 = sub_02019774((u8)(param2 >> 3), (u8)(param3 >> 3), param0->bgs[param1].screenSize);
-    v0 = (u8 *)sub_02019F28(param1);
+    v0 = (u8 *)Bg_GetCharPtr(param1);
     v2 = (u8)(param2 & 7);
     v3 = (u8)(param3 & 7);
 

src/choose_starter/choose_starter_app.c

@@ -348,12 +348,12 @@ BOOL ChooseStarter_Init(OverlayManager *param0, int *param1)
     SetupDrawing(app, HEAP_ID_CHOOSE_STARTER_APP);
 
     GraphicsModes bglHeader;
-    app->bgl = sub_02018340(HEAP_ID_CHOOSE_STARTER_APP);
+    app->bgl = BgConfig_New(HEAP_ID_CHOOSE_STARTER_APP);
     bglHeader.displayMode = GX_DISPMODE_GRAPHICS;
     bglHeader.mainBgMode = GX_BGMODE_0;
     bglHeader.subBgMode = GX_BGMODE_1;
     bglHeader.bg0As2DOr3D = GX_BG0_AS_3D;
-    sub_02018368(&bglHeader);
+    SetAllGraphicsModes(&bglHeader);
 
     SetupBGL(app->bgl, HEAP_ID_CHOOSE_STARTER_APP);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
@@ -479,7 +479,7 @@ static void ChooseStarterAppMainCallback(void *data)
     ChooseStarterApp *app = data;
 
     sub_0200A858();
-    sub_0201C2B8(app->bgl);
+    Bg_RunScheduledUpdates(app->bgl);
     sub_02008A94(app->spriteManager);
     sub_0201DCAC();
 }
@@ -605,9 +605,9 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID)
             0
         };
 
-        sub_020183C4(bgl, 1, &header, 0);
-        sub_02019690(1, 32, 0, heapID);
-        sub_02019EBC(bgl, 1);
+        Bg_InitFromTemplate(bgl, 1, &header, 0);
+        Bg_ClearTilesRange(1, 32, 0, heapID);
+        Bg_ClearTilemap(bgl, 1);
     }
 
     {
@@ -627,9 +627,9 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID)
             0
         };
 
-        sub_020183C4(bgl, 2, &header, 0);
-        sub_02019690(2, 32, 0, heapID);
-        sub_02019EBC(bgl, 2);
+        Bg_InitFromTemplate(bgl, 2, &header, 0);
+        Bg_ClearTilesRange(2, 32, 0, heapID);
+        Bg_ClearTilemap(bgl, 2);
     }
 
     {
@@ -649,27 +649,27 @@ static void SetupBGL(BgConfig *bgl, enum HeapId heapID)
             0
         };
 
-        sub_020183C4(bgl, 3, &header, 0);
-        sub_02019690(3, 32, 0, heapID);
-        sub_02019EBC(bgl, 3);
+        Bg_InitFromTemplate(bgl, 3, &header, 0);
+        Bg_ClearTilesRange(3, 32, 0, heapID);
+        Bg_ClearTilemap(bgl, 3);
     }
 }
 
 static void ov78_021D12EC(BgConfig *param0)
 {
-    sub_02019044(param0, 1);
-    sub_02019044(param0, 2);
-    sub_02019044(param0, 3);
+    Bg_FreeTilemapBuffer(param0, 1);
+    Bg_FreeTilemapBuffer(param0, 2);
+    Bg_FreeTilemapBuffer(param0, 3);
 }
 
 static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID)
 {
-    app->messageWindow = sub_0201A778(heapID, 1);
+    app->messageWindow = Window_New(heapID, 1);
     Window_Init(app->messageWindow);
 
-    BGL_AddWindow(app->bgl, app->messageWindow, BGL_FRAME_MAIN_1, TEXT_POS_X, TEXT_POS_Y, TEXT_COLUMNS, TEXT_ROWS, FRAME_PALETTE_INDEX, TEXT_WINDOW_SIZE + 1);
+    Window_Add(app->bgl, app->messageWindow, BGL_FRAME_MAIN_1, TEXT_POS_X, TEXT_POS_Y, TEXT_COLUMNS, TEXT_ROWS, FRAME_PALETTE_INDEX, TEXT_WINDOW_SIZE + 1);
 
-    BGL_FillWindow(app->messageWindow, 15);
+    Window_FillTilemap(app->messageWindow, 15);
     sub_0200DD0C(app->bgl, BGL_FRAME_MAIN_1, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX, app->messageFrame, heapID);
     sub_02006E84(NARC_INDEX_GRAPHIC__EV_POKESELECT, 16, 0, FRAME_PALETTE_INDEX * 32, 32, heapID);
     sub_0200E060(app->messageWindow, 0, FRAME_TEXT_START, FRAME_TEXT_PALETTE_INDEX);
@@ -677,7 +677,7 @@ static void MakeMessageWindow(ChooseStarterApp *app, enum HeapId heapID)
 
 static void ov78_021D13A0(ChooseStarterApp *param0)
 {
-    BGL_DeleteWindow(param0->messageWindow);
+    Window_Remove(param0->messageWindow);
     Heap_FreeToHeap(param0->messageWindow);
 }
 
@@ -1295,7 +1295,7 @@ static u8 ov78_021D1FB4(Window *param0, int param1, int param2, int param3, Text
     GF_ASSERT(v0);
     v1 = MessageLoader_GetNewStrbuf(v0, param3);
 
-    BGL_FillWindow(param0, 15);
+    Window_FillTilemap(param0, 15);
     v2 = Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, v1, 0, 0, param5, param4, NULL);
     sub_0200E060(param0, 0, 512, 0);
 
@@ -1316,7 +1316,7 @@ static u8 ov78_021D201C(Window *param0, int param1, int param2, int param3, u32
     GF_ASSERT(v0);
 
     *param6 = MessageLoader_GetNewStrbuf(v0, param3);
-    BGL_FillWindow(param0, 15);
+    Window_FillTilemap(param0, 15);
     v1 = Text_AddPrinterWithParamsAndColor(param0, FONT_MESSAGE, *param6, 0, 0, param5, param4, NULL);
 
     sub_0200E060(param0, 0, 512, 0);
@@ -1733,7 +1733,7 @@ static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1)
     sub_02006E84(82, 17, 0, 5 * 32, 32, param1);
 
     for (v0 = 0; v0 < 3; v0++) {
-        param0->unk_9C[v0] = sub_0201A778(param1, 1);
+        param0->unk_9C[v0] = Window_New(param1, 1);
         Window_Init(param0->unk_9C[v0]);
 
         switch (v0) {
@@ -1751,7 +1751,7 @@ static void MakeSubplaneWindow(ChooseStarterApp *param0, int param1)
             break;
         }
 
-        BGL_AddWindow(param0->bgl, param0->unk_9C[v0], 3, v1, v2, 11, 4, 5, 1 + (64 * v0));
+        Window_Add(param0->bgl, param0->unk_9C[v0], 3, v1, v2, 11, 4, 5, 1 + (64 * v0));
         ov78_021D28A8(param0->unk_9C[v0], param1, 360, 4 + v0, TEXT_COLOR(1, 2, 10));
     }
 }
@@ -1761,7 +1761,7 @@ static void ov78_021D2884(ChooseStarterApp *param0)
     int v0;
 
     for (v0 = 0; v0 < 3; v0++) {
-        BGL_DeleteWindow(param0->unk_9C[v0]);
+        Window_Remove(param0->unk_9C[v0]);
         Heap_FreeToHeap(param0->unk_9C[v0]);
     }
 }
@@ -1775,7 +1775,7 @@ static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, Te
     GF_ASSERT(v0);
     v1 = MessageLoader_GetNewStrbuf(v0, param3);
 
-    BGL_FillWindow(param0, (((param4) >> 0) & 0xff));
+    Window_FillTilemap(param0, (((param4) >> 0) & 0xff));
     Text_AddPrinterWithParamsAndColor(param0, FONT_SYSTEM, v1, 1, 0, TEXT_SPEED_NO_TRANSFER, param4, NULL);
     Strbuf_Free(v1);
     MessageLoader_Free(v0);
@@ -1783,7 +1783,7 @@ static void ov78_021D28A8(Window *param0, int param1, int param2, int param3, Te
 
 static void ov78_021D2904(ChooseStarterApp *param0)
 {
-    sub_0201ACF4(param0->unk_9C[param0->unk_A8]);
+    Window_ClearAndCopyToVRAM(param0->unk_9C[param0->unk_A8]);
 }
 
 static u16 GetSelectedSpecies(u16 cursorPosition)

src/colored_arrow.c

@@ -53,5 +53,5 @@ void ColoredArrow_SetColor(ColoredArrow *arrow, TextColor color)
 void ColoredArrow_Print(const ColoredArrow *arrow, Window *window, u32 xOffset, u32 yOffset)
 {
     Text_AddPrinterWithParamsAndColor(window, FONT_SYSTEM, arrow->strbuf, xOffset, yOffset, TEXT_SPEED_NO_TRANSFER, arrow->color, NULL);
-    sub_0201ACCC(window);
+    Window_LoadTiles(window);
 }

src/error_message_reset.c

@@ -127,24 +127,24 @@ void ErrorMessageReset_PrintErrorAndReset(void)
     GXS_SetVisibleWnd(GX_WNDMASK_NONE);
 
     GXLayers_SetBanks(&sErrorMessageBanksConfig);
-    bgConfig = sub_02018340(v5);
+    bgConfig = BgConfig_New(v5);
 
-    sub_02018368(&sErrorMessageBgModeSet);
-    sub_020183C4(bgConfig, 0, &sErrorMessageBgTemplate, 0);
-    sub_02019EBC(bgConfig, 0);
+    SetAllGraphicsModes(&sErrorMessageBgModeSet);
+    Bg_InitFromTemplate(bgConfig, 0, &sErrorMessageBgTemplate, 0);
+    Bg_ClearTilemap(bgConfig, 0);
     sub_0200DAA4(bgConfig, 0, (512 - 9), 2, 0, v5);
     Font_LoadTextPalette(0, 1 * (2 * 16), v5);
-    sub_02019690(0, 32, 0, v5);
-    sub_0201975C(0, 0x6c21);
-    sub_0201975C(4, 0x6c21);
+    Bg_ClearTilesRange(0, 32, 0, v5);
+    Bg_MaskPalette(0, 0x6c21);
+    Bg_MaskPalette(4, 0x6c21);
 
     errorMsgData = MessageLoader_Init(1, 26, 214, v5);
     errorString = Strbuf_Init(0x180, v5);
 
     Text_ResetAllPrinters();
 
-    sub_0201A8D4(bgConfig, &window, &sErrorMessageWindowTemplate);
-    BGL_WindowColor(&window, 15, 0, 0, 26 * 8, 18 * 8);
+    Window_AddFromTemplate(bgConfig, &window, &sErrorMessageWindowTemplate);
+    Window_FillRectWithColor(&window, 15, 0, 0, 26 * 8, 18 * 8);
     Window_Show(&window, 0, (512 - 9), 2);
     MessageLoader_GetStrbuf(errorMsgData, v4, errorString);
     Text_AddPrinterWithParams(&window, FONT_SYSTEM, errorString, 0, 0, TEXT_SPEED_INSTANT, NULL);
@@ -180,7 +180,7 @@ void ErrorMessageReset_PrintErrorAndReset(void)
     sub_0200F344(0, 0x7fff);
     sub_0200F344(1, 0x7fff);
 
-    BGL_DeleteWindow(&window);
+    Window_Remove(&window);
     MessageLoader_Free(errorMsgData);
     Heap_FreeToHeap(bgConfig);
 

src/field_map_change.c

@@ -1161,12 +1161,12 @@ BOOL FieldTask_MapChangeToUnderground(TaskManager *taskMan)
         switch (sub_02002114(mapChangeUndergroundData->unk_3C, 11)) {
         case 0:
             sub_0200E084(&mapChangeUndergroundData->unk_24, 0);
-            BGL_DeleteWindow(&mapChangeUndergroundData->unk_24);
+            Window_Remove(&mapChangeUndergroundData->unk_24);
             mapChangeUndergroundData->state = 3;
             break;
         case 0xfffffffe:
             sub_0200E084(&mapChangeUndergroundData->unk_24, 0);
-            BGL_DeleteWindow(&mapChangeUndergroundData->unk_24);
+            Window_Remove(&mapChangeUndergroundData->unk_24);
             mapChangeUndergroundData->state = 5;
         }
         break;

src/field_menu.c

@@ -495,9 +495,9 @@ static BOOL sub_0203AC44(TaskManager *taskMan)
         sub_0203B2EC(menu, fieldSystem);
         FieldMenu_Close(menu);
         Window_Clear(&menu->unk_00, 1);
-        BGL_DeleteWindow(&menu->unk_00);
+        Window_Remove(&menu->unk_00);
         sub_0203B200(taskMan);
-        sub_0201C3C0(fieldSystem->unk_08, 3);
+        Bg_ScheduleTilemapTransfer(fieldSystem->unk_08, 3);
         Heap_FreeToHeap(menu);
         MapObjectMan_UnpauseAllMovement(fieldSystem->mapObjMan);
         return TRUE;
@@ -528,7 +528,7 @@ static void sub_0203ADFC(TaskManager *taskMan)
     menu = TaskManager_Environment(taskMan);
     v5 = FieldMenu_MakeList(menu, menu->unk_30);
 
-    BGL_AddWindow(fieldSystem->unk_08, &menu->unk_00, 3, 20, 1, 11, v5 * 3, 12, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22)));
+    Window_Add(fieldSystem->unk_08, &menu->unk_00, 3, 20, 1, 11, v5 * 3, 12, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (11 * 22)));
     sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 1, 11);
     Window_Show(&menu->unk_00, 1, 1024 - (18 + 12) - 9, 11);
 
@@ -583,7 +583,7 @@ static void sub_0203ADFC(TaskManager *taskMan)
 
     menu->unk_20 = sub_02001AF4(&v3, 28, 4, menu->unk_28, 11, PAD_BUTTON_B | PAD_BUTTON_X);
 
-    sub_0201A9A4(&menu->unk_00);
+    Window_ScheduleCopyToVRAM(&menu->unk_00);
     sub_0203B318(menu, menu->unk_30, v5, TrainerInfo_Gender(SaveData_GetTrainerInfo(fieldSystem->saveData)));
 }
 
@@ -669,10 +669,10 @@ static void sub_0203B094(TaskManager *taskMan)
         return;
     }
 
-    BGL_AddWindow(fieldSystem->unk_08, &menu->unk_10, 3, 1, 1, 12, 4, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)));
+    Window_Add(fieldSystem->unk_08, &menu->unk_10, 3, 1, 1, 12, 4, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)));
     sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 1, 11);
     Window_Show(&menu->unk_10, 1, 1024 - (18 + 12) - 9, 11);
-    BGL_FillWindow(&menu->unk_10, 15);
+    Window_FillTilemap(&menu->unk_10, 15);
 
     v2 = MessageLoader_Init(0, 26, 367, 11);
 
@@ -706,7 +706,7 @@ static void sub_0203B094(TaskManager *taskMan)
     Strbuf_Free(v5);
     StringTemplate_Free(v3);
     MessageLoader_Free(v2);
-    sub_0201A9A4(&menu->unk_10);
+    Window_ScheduleCopyToVRAM(&menu->unk_10);
 }
 
 static void sub_0203B200(TaskManager *taskMan)
@@ -722,7 +722,7 @@ static void sub_0203B200(TaskManager *taskMan)
     }
 
     Window_Clear(&menu->unk_10, 1);
-    BGL_DeleteWindow(&menu->unk_10);
+    Window_Remove(&menu->unk_10);
 }
 
 static BOOL FieldMenu_Select(TaskManager *taskMan)
@@ -898,7 +898,7 @@ static void FieldMenu_ApplicationStart(TaskManager *taskMan)
     menu = TaskManager_Environment(taskMan);
 
     FieldMenu_Close(menu);
-    BGL_DeleteWindow(&menu->unk_00);
+    Window_Remove(&menu->unk_00);
     sub_0203B200(taskMan);
 
     menu->unk_22C(taskMan);
@@ -1429,8 +1429,8 @@ static BOOL FieldMenu_SelectSave(TaskManager *taskMan)
 
     FieldMenu_Close(menu);
     Window_Clear(&menu->unk_00, 1);
-    sub_0201C3C0(menu->unk_00.bgConfig, menu->unk_00.bgLayer);
-    BGL_DeleteWindow(&menu->unk_00);
+    Bg_ScheduleTilemapTransfer(menu->unk_00.bgConfig, menu->unk_00.bgLayer);
+    Window_Remove(&menu->unk_00);
     sub_0203B200(taskMan);
 
     menu->state = FIELD_MENU_STATE_SAVE;
@@ -1593,8 +1593,8 @@ static BOOL FieldMenu_SelectRetire(TaskManager *taskMan)
 
     FieldMenu_Close(menu);
     Window_Clear(&menu->unk_00, 1);
-    sub_0201C3C0(menu->unk_00.bgConfig, menu->unk_00.bgLayer);
-    BGL_DeleteWindow(&menu->unk_00);
+    Bg_ScheduleTilemapTransfer(menu->unk_00.bgConfig, menu->unk_00.bgLayer);
+    Window_Remove(&menu->unk_00);
     sub_0203B200(taskMan);
 
     if (sub_0206AE5C(SaveData_GetVarsFlags(fieldSystem->saveData)) == 1) {

src/library_tv/library_tv.c

@@ -160,7 +160,7 @@ static void LibraryTV_VBlank(void *data)
 {
     LibraryTV *ltv = data;
 
-    sub_0201C2B8(ltv->bgl);
+    Bg_RunScheduledUpdates(ltv->bgl);
 }
 
 static void LibraryTV_SetVramBank(LibraryTV *ltv)
@@ -180,7 +180,7 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv)
 
     GXLayers_SetBanks(&vramBank);
 
-    ltv->bgl = sub_02018340(ltv->heapID);
+    ltv->bgl = BgConfig_New(ltv->heapID);
 
     GraphicsModes bgData = {
         GX_DISPMODE_GRAPHICS,
@@ -189,20 +189,20 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv)
         GX_BG0_AS_2D
     };
 
-    sub_02018368(&bgData);
+    SetAllGraphicsModes(&bgData);
     int frame, charSetID, screenID;
 
     BgTemplate bgHeader0 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0000, GX_BG_CHARBASE_0x18000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE };
     frame = 2;
-    sub_020183C4(ltv->bgl, frame, &bgHeader0, 0);
-    sub_02019690(frame, 32, 0, ltv->heapID);
-    sub_02019EBC(ltv->bgl, frame);
+    Bg_InitFromTemplate(ltv->bgl, frame, &bgHeader0, 0);
+    Bg_ClearTilesRange(frame, 32, 0, ltv->heapID);
+    Bg_ClearTilemap(ltv->bgl, frame);
 
     BgTemplate bgHeader1 = { 0, 0, 0x800, 0, 1, GX_BG_COLORMODE_16, GX_BG_SCRBASE_0x0800, GX_BG_CHARBASE_0x14000, GX_BG_EXTPLTT_01, 1, 0, 0, FALSE };
     frame = 0;
     charSetID = 1;
     screenID = 4;
-    sub_020183C4(ltv->bgl, frame, &bgHeader1, 0);
+    Bg_InitFromTemplate(ltv->bgl, frame, &bgHeader1, 0);
     sub_02006E3C(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID);
     sub_02006E60(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID);
 
@@ -210,7 +210,7 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv)
     frame = 1;
     charSetID = 2;
     screenID = 5;
-    sub_020183C4(ltv->bgl, frame, &bgHeader2, 0);
+    Bg_InitFromTemplate(ltv->bgl, frame, &bgHeader2, 0);
     sub_02006E3C(NARC_INDEX_DEMO__INTRO__INTRO_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID);
     sub_02006E60(NARC_INDEX_DEMO__INTRO__INTRO_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID);
 
@@ -218,35 +218,35 @@ static void LibraryTV_SetVramBank(LibraryTV *ltv)
     frame = 3;
     charSetID = 2;
     screenID = 4;
-    sub_020183C4(ltv->bgl, frame, &bgHeader3, 0);
+    Bg_InitFromTemplate(ltv->bgl, frame, &bgHeader3, 0);
     sub_02006E3C(NARC_INDEX_GRAPHIC__LIBRARY_TV, charSetID, ltv->bgl, frame, 0, 0, 0, ltv->heapID);
     sub_02006E60(NARC_INDEX_GRAPHIC__LIBRARY_TV, screenID, ltv->bgl, frame, 0, 0, 0, ltv->heapID);
 
     sub_02006E84(NARC_INDEX_GRAPHIC__LIBRARY_TV, 3, 0, 0, 0, ltv->heapID);
     Font_LoadTextPalette(0, 1 * (2 * 16), ltv->heapID);
-    sub_0201975C(0, 0x0);
-    sub_0201975C(4, 0x0);
+    Bg_MaskPalette(0, 0x0);
+    Bg_MaskPalette(4, 0x0);
 
     G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, (GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3), 0x4, 0xc);
 }
 
 static void LibraryTV_ReleaseVramBank(LibraryTV *ltv)
 {
-    sub_02019120(0, 0);
-    sub_02019120(1, 0);
-    sub_02019120(2, 0);
-    sub_02019120(3, 0);
-    sub_02019120(4, 0);
-    sub_02019120(5, 0);
-    sub_02019120(6, 0);
-    sub_02019120(7, 0);
+    Bg_ToggleLayer(0, 0);
+    Bg_ToggleLayer(1, 0);
+    Bg_ToggleLayer(2, 0);
+    Bg_ToggleLayer(3, 0);
+    Bg_ToggleLayer(4, 0);
+    Bg_ToggleLayer(5, 0);
+    Bg_ToggleLayer(6, 0);
+    Bg_ToggleLayer(7, 0);
 
     G2_BlendNone();
 
-    sub_02019044(ltv->bgl, 3);
-    sub_02019044(ltv->bgl, 1);
-    sub_02019044(ltv->bgl, 0);
-    sub_02019044(ltv->bgl, 2);
+    Bg_FreeTilemapBuffer(ltv->bgl, 3);
+    Bg_FreeTilemapBuffer(ltv->bgl, 1);
+    Bg_FreeTilemapBuffer(ltv->bgl, 0);
+    Bg_FreeTilemapBuffer(ltv->bgl, 2);
 
     Heap_FreeToHeap(ltv->bgl);
 }
@@ -266,5 +266,5 @@ static void LibraryTV_ReleaseMsgLdr(LibraryTV *ltv)
 static void LibraryTV_UpdateScanLines(LibraryTV *ltv)
 {
     ltv->scanLinePos += 0x4;
-    sub_02019184(ltv->bgl, 1, 3, ltv->scanLinePos >> 4);
+    Bg_SetOffset(ltv->bgl, 1, 3, ltv->scanLinePos >> 4);
 }

src/overlay005/encounter_effect.c

@@ -720,10 +720,10 @@ void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4,
 
     v0 = sub_020071D0(param0, param1, 0, &v1, 4);
 
-    sub_020198C0(param6, param7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
-    sub_02019E2C(param6, param7, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, param4);
+    Bg_LoadToTilemapRect(param6, param7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_ChangeTilemapRectPalette(param6, param7, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8, param4);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param6, param7);
+    Bg_ScheduleTilemapTransfer(param6, param7);
 }
 
 void ov5_021DE47C(UnkStruct_ov5_021DE47C *param0, int param1, int param2)
@@ -959,7 +959,7 @@ static void ov5_021DE89C(Window *param0, s32 param1, s32 param2, s32 param3, s32
         param2 = 256;
     }
 
-    BGL_WindowColor(param0, param5, param3, param1, param4 - param3, param2 - param1);
+    Window_FillRectWithColor(param0, param5, param3, param1, param4 - param3, param2 - param1);
 }
 
 UnkStruct_ov5_021DE928 *ov5_021DE8F8(u32 param0)
@@ -1540,7 +1540,7 @@ static void ov5_021DF28C(SysTask *param0, void *param1)
         ov5_021D16F4(v0->fieldSystem, 0);
         ov5_021D1718(v0->fieldSystem, 0);
 
-        BGL_SetPriority(0, 0);
+        Bg_SetPriority(0, 0);
 
         v0->unk_02 = 1;
         SysTask_Done(param0);
@@ -1580,7 +1580,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem)
             GX_BG0_AS_3D
         };
 
-        sub_02018368(&v1);
+        SetAllGraphicsModes(&v1);
     }
 
     {
@@ -1589,7 +1589,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem)
         {
             G2_SetBG3ControlDCBmp(GX_BG_SCRSIZE_DCBMP_256x256, GX_BG_AREAOVER_XLU, GX_BG_BMPSCRBASE_0x20000);
 
-            BGL_SetPriority(3, 3);
+            Bg_SetPriority(3, 3);
             GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
 
             {
@@ -1617,9 +1617,9 @@ static void ov5_021DF30C(FieldSystem *fieldSystem)
                 0
             };
 
-            sub_020183C4(fieldSystem->unk_08, 2, &v3, 0);
-            sub_02019690(2, 32, 0, 4);
-            sub_02019EBC(fieldSystem->unk_08, 2);
+            Bg_InitFromTemplate(fieldSystem->unk_08, 2, &v3, 0);
+            Bg_ClearTilesRange(2, 32, 0, 4);
+            Bg_ClearTilemap(fieldSystem->unk_08, 2);
         }
     }
 
@@ -1628,7 +1628,7 @@ static void ov5_021DF30C(FieldSystem *fieldSystem)
 
 static void ov5_021DF3D4(FieldSystem *fieldSystem)
 {
-    sub_02019044(fieldSystem->unk_08, 2);
+    Bg_FreeTilemapBuffer(fieldSystem->unk_08, 2);
     ov5_021D1434(fieldSystem->unk_08);
 }
 

src/overlay005/encounter_effect_core.c

@@ -1174,17 +1174,17 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
-        v1->unk_270 = sub_0201A778(4, 1);
-        BGL_AddWindow(v0->fieldSystem->unk_08, v1->unk_270, 3, 0, 0, 32, 32, 0, 0);
+        v1->unk_270 = Window_New(4, 1);
+        Window_Add(v0->fieldSystem->unk_08, v1->unk_270, 3, 0, 0, 32, 32, 0, 0);
 
         {
             GXRgb v6 = 0;
 
-            sub_0201972C(3, &v6, sizeof(short), 2 * 15);
+            Bg_LoadPalette(3, &v6, sizeof(short), 2 * 15);
         }
 
-        BGL_FillWindow(v1->unk_270, 0);
-        sub_0201A9A4(v1->unk_270);
+        Window_FillTilemap(v1->unk_270, 0);
+        Window_ScheduleCopyToVRAM(v1->unk_270);
 
         v0->state++;
         break;
@@ -1306,12 +1306,12 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
         ov5_021DE5A4(&v1->unk_00, &v1->unk_1A0);
         ov5_021DE4AC(&v1->unk_00);
 
-        sub_0201ACF4(v1->unk_270);
-        BGL_DeleteWindow(v1->unk_270);
-        sub_0201A928(v1->unk_270, 1);
+        Window_ClearAndCopyToVRAM(v1->unk_270);
+        Window_Remove(v1->unk_270);
+        Windows_Delete(v1->unk_270, 1);
 
-        sub_02019690(3, 32, 0, 4);
-        sub_02019EBC(v0->fieldSystem->unk_08, 3);
+        Bg_ClearTilesRange(3, 32, 0, 4);
+        Bg_ClearTilemap(v0->fieldSystem->unk_08, 3);
 
         EncounterEffect_Finish(v0, param0);
         return;
@@ -1344,7 +1344,7 @@ void EncounterEffect_Trainer_Water_HigherLevel(SysTask *param0, void *param1)
         }
     }
 
-    sub_0201A9A4(v1->unk_270);
+    Window_ScheduleCopyToVRAM(v1->unk_270);
 
     if (v0->state != 7) {
         CellActorCollection_Update(v1->unk_00.unk_00);
@@ -1506,17 +1506,17 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_OBJ, 1);
 
-        v1->unk_264 = sub_0201A778(4, 1);
-        BGL_AddWindow(v0->fieldSystem->unk_08, v1->unk_264, 3, 0, 0, 32, 32, 0, 0);
+        v1->unk_264 = Window_New(4, 1);
+        Window_Add(v0->fieldSystem->unk_08, v1->unk_264, 3, 0, 0, 32, 32, 0, 0);
 
         {
             GXRgb v6 = 0;
 
-            sub_0201972C(3, &v6, sizeof(short), 2 * 15);
+            Bg_LoadPalette(3, &v6, sizeof(short), 2 * 15);
         }
 
-        BGL_FillWindow(v1->unk_264, 0);
-        sub_0201A9A4(v1->unk_264);
+        Window_FillTilemap(v1->unk_264, 0);
+        Window_ScheduleCopyToVRAM(v1->unk_264);
 
         v1->unk_268 = ov5_021DE8F8(4);
 
@@ -1626,7 +1626,7 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
 
     case 8:
         v3 = ov5_021DE988(v1->unk_268);
-        sub_0201A9A4(v1->unk_264);
+        Window_ScheduleCopyToVRAM(v1->unk_264);
 
         QuadraticInterpolationTaskFX32_Update(&v1->unk_270);
         Camera_SetDistance(v1->unk_270.currentValue, v1->camera);
@@ -1653,12 +1653,12 @@ void EncounterEffect_Trainer_Cave_HigherLevel(SysTask *param0, void *param1)
 
         ov5_021DE928(v1->unk_268);
 
-        sub_0201ACF4(v1->unk_264);
-        BGL_DeleteWindow(v1->unk_264);
-        sub_0201A928(v1->unk_264, 1);
+        Window_ClearAndCopyToVRAM(v1->unk_264);
+        Window_Remove(v1->unk_264);
+        Windows_Delete(v1->unk_264, 1);
 
-        sub_02019690(3, 32, 0, 4);
-        sub_02019EBC(v0->fieldSystem->unk_08, 3);
+        Bg_ClearTilesRange(3, 32, 0, 4);
+        Bg_ClearTilemap(v0->fieldSystem->unk_08, 3);
 
         EncounterEffect_Finish(v0, param0);
         break;
@@ -2146,17 +2146,17 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
 
         v1->unk_04 = ov5_021DEBEC(4);
 
-        v1->unk_00 = sub_0201A778(4, 1);
-        BGL_AddWindow(v0->fieldSystem->unk_08, v1->unk_00, 3, 0, 0, 32, 32, 0, 0);
+        v1->unk_00 = Window_New(4, 1);
+        Window_Add(v0->fieldSystem->unk_08, v1->unk_00, 3, 0, 0, 32, 32, 0, 0);
 
         {
             GXRgb v3 = 0;
 
-            sub_0201972C(3, &v3, sizeof(short), 2 * 15);
+            Bg_LoadPalette(3, &v3, sizeof(short), 2 * 15);
         }
 
-        BGL_FillWindow(v1->unk_00, 0);
-        sub_0201A9A4(v1->unk_00);
+        Window_FillTilemap(v1->unk_00, 0);
+        Window_ScheduleCopyToVRAM(v1->unk_00);
 
         v0->state++;
         break;
@@ -2214,7 +2214,7 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
             v0->state++;
         }
 
-        sub_0201A9A4(v1->unk_00);
+        Window_ScheduleCopyToVRAM(v1->unk_00);
         break;
 
     case 7:
@@ -2230,12 +2230,12 @@ void EncounterEffect_GalacticBoss(SysTask *param0, void *param1)
         ov5_021DE5A4(&v1->unk_08, &v1->unk_1A8);
         ov5_021DE4AC(&v1->unk_08);
 
-        sub_0201ACF4(v1->unk_00);
-        BGL_DeleteWindow(v1->unk_00);
-        sub_0201A928(v1->unk_00, 1);
+        Window_ClearAndCopyToVRAM(v1->unk_00);
+        Window_Remove(v1->unk_00);
+        Windows_Delete(v1->unk_00, 1);
 
-        sub_02019690(3, 32, 0, 4);
-        sub_02019EBC(v0->fieldSystem->unk_08, 3);
+        Bg_ClearTilesRange(3, 32, 0, 4);
+        Bg_ClearTilemap(v0->fieldSystem->unk_08, 3);
 
         G2_SetOBJMosaicSize(0, 0);
 
@@ -2900,8 +2900,8 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
         sub_02007130(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID);
 
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
-        BGL_AddWindow(encEffect->fieldSystem->unk_08, &v0->unk_2E0, 2, 0, 10, 16, 2, 2, 1);
-        BGL_FillWindow(&v0->unk_2E0, 0);
+        Window_Add(encEffect->fieldSystem->unk_08, &v0->unk_2E0, 2, 0, 10, 16, 2, 2, 1);
+        Window_FillTilemap(&v0->unk_2E0, 0);
         v7 = EncounterEffect_GetGymLeaderName(param->trainerID, heapID);
         Text_AddPrinterWithParamsAndColor(&v0->unk_2E0, FONT_SYSTEM, v7, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
         Strbuf_Free(v7);
@@ -3029,9 +3029,9 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
 
             sub_0200AB4C(-14, GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BD, 1);
 
-            sub_0201C63C(encEffect->fieldSystem->unk_08, 2, 0, -((v0->unk_00.currentValue >> FX32_SHIFT) + -92));
+            Bg_ScheduleScroll(encEffect->fieldSystem->unk_08, 2, 0, -((v0->unk_00.currentValue >> FX32_SHIFT) + -92));
             GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
-            BGL_SetPriority(2, 0);
+            Bg_SetPriority(2, 0);
             encEffect->state++;
         }
 
@@ -3089,19 +3089,19 @@ static BOOL EncounterEffect_GymLeader(EncounterEffect *encEffect, enum HeapId he
         ov5_021DE5A4(&v0->unk_44, &v0->unk_1E4[1]);
         ov5_021DE4AC(&v0->unk_44);
 
-        BGL_DeleteWindow(&v0->unk_2E0);
+        Window_Remove(&v0->unk_2E0);
 
         GX_SetVisibleWnd(GX_WNDMASK_NONE);
 
         sub_0200AB4C(0, GX_BLEND_PLANEMASK_NONE, 1);
 
-        sub_02019184(encEffect->fieldSystem->unk_08, 2, 0, 0);
+        Bg_SetOffset(encEffect->fieldSystem->unk_08, 2, 0, 0);
 
         return 1;
     }
 
     if (v0->unk_2F0 == 1) {
-        sub_0201C63C(encEffect->fieldSystem->unk_08, 3, 0, v0->unk_2F4);
+        Bg_ScheduleScroll(encEffect->fieldSystem->unk_08, 3, 0, v0->unk_2F4);
 
         v0->unk_2F4 = (v0->unk_2F4 + 30) % 512;
     }
@@ -3335,8 +3335,8 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
             sub_02007130(encEffect->narc, 11, 0, 2 * 0x20, 0x20, heapID);
 
             GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 0);
-            BGL_AddWindow(encEffect->fieldSystem->unk_08, &v0->unk_358, 2, 21, 13, 11, 2, 2, 1);
-            BGL_FillWindow(&v0->unk_358, 0);
+            Window_Add(encEffect->fieldSystem->unk_08, &v0->unk_358, 2, 21, 13, 11, 2, 2, 1);
+            Window_FillTilemap(&v0->unk_358, 0);
             v9 = EncounterEffect_GetGymLeaderName(param->trainerID, heapID);
             Text_AddPrinterWithParamsAndColor(&v0->unk_358, FONT_SYSTEM, v9, 0, 0, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
             Strbuf_Free(v9);
@@ -3426,7 +3426,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
         LinearInterpolationTaskS32_Init(&v0->unk_48, 16, 0, 6);
 
         ov5_021DF17C(4);
-        BGL_SetPriority(0, 1);
+        Bg_SetPriority(0, 1);
 
         encEffect->state++;
         break;
@@ -3545,7 +3545,7 @@ static BOOL EncounterEffect_EliteFourChampion(EncounterEffect *encEffect, enum H
 
         ov5_021E519C(&v0->unk_2F4);
 
-        BGL_DeleteWindow(&v0->unk_358);
+        Window_Remove(&v0->unk_358);
 
         for (v5 = 0; v5 < 4; v5++) {
             CellActor_Delete(v0->unk_2CC[v5]);

src/overlay005/fieldmap.c

@@ -138,7 +138,7 @@ static void ov5_021D0D80(void *param0)
 {
     FieldSystem *fieldSystem = param0;
 
-    sub_0201C2B8(fieldSystem->unk_08);
+    Bg_RunScheduledUpdates(fieldSystem->unk_08);
     sub_0201DCAC();
     sub_0200A858();
 
@@ -198,7 +198,7 @@ static BOOL FieldMap_Init(OverlayManager *overlayMan, int *param1)
         ov5_021D154C();
 
         GXLayers_SwapDisplay();
-        fieldSystem->unk_08 = sub_02018340(4);
+        fieldSystem->unk_08 = BgConfig_New(4);
         ov5_021D1444(fieldSystem->unk_08);
         sub_0205D8CC(0, 1);
         sub_0203F5C0(fieldSystem, 4);
@@ -580,7 +580,7 @@ static void ov5_021D1444(BgConfig *bgl)
             GX_BG0_AS_3D
         };
 
-        sub_02018368(&v0);
+        SetAllGraphicsModes(&v0);
     }
 
     {
@@ -600,9 +600,9 @@ static void ov5_021D1444(BgConfig *bgl)
             0
         };
 
-        sub_020183C4(bgl, 1, &v1, 0);
-        sub_02019690(1, 32, 0, 4);
-        sub_02019EBC(bgl, 1);
+        Bg_InitFromTemplate(bgl, 1, &v1, 0);
+        Bg_ClearTilesRange(1, 32, 0, 4);
+        Bg_ClearTilemap(bgl, 1);
     }
 
     {
@@ -622,9 +622,9 @@ static void ov5_021D1444(BgConfig *bgl)
             0
         };
 
-        sub_020183C4(bgl, 2, &v2, 0);
-        sub_02019690(2, 32, 0, 4);
-        sub_02019EBC(bgl, 2);
+        Bg_InitFromTemplate(bgl, 2, &v2, 0);
+        Bg_ClearTilesRange(2, 32, 0, 4);
+        Bg_ClearTilemap(bgl, 2);
     }
     {
         BgTemplate v3 = {
@@ -643,9 +643,9 @@ static void ov5_021D1444(BgConfig *bgl)
             0
         };
 
-        sub_020183C4(bgl, 3, &v3, 0);
-        sub_02019690(3, 32, 0, 4);
-        sub_02019EBC(bgl, 3);
+        Bg_InitFromTemplate(bgl, 3, &v3, 0);
+        Bg_ClearTilesRange(3, 32, 0, 4);
+        Bg_ClearTilemap(bgl, 3);
     }
 
     {
@@ -659,9 +659,9 @@ static void ov5_021D1444(BgConfig *bgl)
 static void ov5_021D1524(BgConfig *bgl)
 {
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3, 0);
-    sub_02019044(bgl, 1);
-    sub_02019044(bgl, 2);
-    sub_02019044(bgl, 3);
+    Bg_FreeTilemapBuffer(bgl, 1);
+    Bg_FreeTilemapBuffer(bgl, 2);
+    Bg_FreeTilemapBuffer(bgl, 3);
 }
 
 static void ov5_021D154C(void)

src/overlay005/ov5_021D5EB8.c

@@ -1496,7 +1496,7 @@ static void ov5_021D6D84(UnkStruct_ov5_021D6594 *param0, int param1)
 
         NNS_G2dGetUnpackedPaletteData(v0.unk_00, &v0.unk_14);
 
-        sub_0201972C(2, v0.unk_14->pRawData, 32, 32 * 6);
+        Bg_LoadPalette(2, v0.unk_14->pRawData, 32, 32 * 6);
         Heap_FreeToHeap(v0.unk_00);
 
         v0.unk_00 = NULL;
@@ -1512,7 +1512,7 @@ static void ov5_021D6DCC(UnkStruct_ov5_021D6594 *param0, int param1)
 
         NNS_G2dGetUnpackedCharacterData(v0.unk_04, &v0.unk_10);
 
-        sub_0201958C(param0->fieldSystem->unk_08, 2, v0.unk_10->pRawData, v0.unk_10->szByte, 0);
+        Bg_LoadTiles(param0->fieldSystem->unk_08, 2, v0.unk_10->pRawData, v0.unk_10->szByte, 0);
         Heap_FreeToHeap(v0.unk_04);
 
         v0.unk_04 = NULL;
@@ -1531,10 +1531,10 @@ static void ov5_021D6E20(UnkStruct_ov5_021D6594 *param0, int param1)
 
         NNS_G2dGetUnpackedScreenData(v0.unk_08, &v0.unk_0C);
 
-        sub_02019460(param0->fieldSystem->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte, 0);
-        sub_02019574(param0->fieldSystem->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte);
-        sub_02019E2C(param0->fieldSystem->unk_08, 2, 0, 0, 32, 32, 6);
-        sub_02019448(param0->fieldSystem->unk_08, 2);
+        Bg_CopyTilemapBufferRangeToVRAM(param0->fieldSystem->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte, 0);
+        Bg_LoadTilemapBuffer(param0->fieldSystem->unk_08, 2, (void *)v0.unk_0C->rawData, v0.unk_0C->szByte);
+        Bg_ChangeTilemapRectPalette(param0->fieldSystem->unk_08, 2, 0, 0, 32, 32, 6);
+        Bg_CopyTilemapBufferToVRAM(param0->fieldSystem->unk_08, 2);
         Heap_FreeToHeap(v0.unk_08);
 
         v0.unk_08 = NULL;
@@ -5245,8 +5245,8 @@ static void ov5_021DB144(SysTask *param0, void *param1)
 
         v5 = Unk_ov5_02201D38[v1->unk_B4 / 8];
 
-        sub_0201C63C(v0->unk_00->fieldSystem->unk_08, 2, 0, (v1->unk_AC >> FX32_SHIFT) + v5);
-        sub_0201C63C(v0->unk_00->fieldSystem->unk_08, 2, 3, (v1->unk_B0 >> FX32_SHIFT));
+        Bg_ScheduleScroll(v0->unk_00->fieldSystem->unk_08, 2, 0, (v1->unk_AC >> FX32_SHIFT) + v5);
+        Bg_ScheduleScroll(v0->unk_00->fieldSystem->unk_08, 2, 3, (v1->unk_B0 >> FX32_SHIFT));
     }
 }
 

src/overlay005/ov5_021DC018.c

@@ -194,7 +194,7 @@ void ov5_021DC1AC(UnkStruct_ov5_021DC1A4 *param0)
         param0->unk_99 -= param0->unk_9B * 2;
     }
 
-    BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
+    Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
     sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
     Window_Show(&param0->unk_08, 1, 1024 - (18 + 12) - 9, 11);
 
@@ -311,7 +311,7 @@ void ov5_021DC424(UnkStruct_ov5_021DC1A4 *param0)
     Sound_PlayEffect(1500);
     sub_02001BC4(param0->unk_B8, NULL);
     Window_Clear(param0->unk_AC.unk_04, 0);
-    BGL_DeleteWindow(param0->unk_AC.unk_04);
+    Window_Remove(param0->unk_AC.unk_04);
 
     for (v0 = 0; v0 < 28; v0++) {
         Strbuf_Free(param0->unk_1C[v0]);
@@ -379,9 +379,9 @@ void ov5_021DC528(UnkStruct_ov5_021DC1A4 *param0, u16 param1)
 static void ov5_021DC530(UnkStruct_ov5_021DC1A4 *param0, u32 param1)
 {
     if (param0->unk_9B > 8) {
-        BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, param1, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
+        Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, param1, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
     } else {
-        BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, param1, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
+        Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, param1, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
     }
 
     sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
@@ -409,9 +409,9 @@ void ov5_021DC600(UnkStruct_ov5_021DC1A4 *param0, u16 *param1, u16 *param2)
     }
 
     if (param0->unk_9B > 8) {
-        BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, v0, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
+        Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, v0, 8 * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
     } else {
-        BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
+        Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, v0, param0->unk_9B * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
     }
 
     sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
@@ -587,7 +587,7 @@ static void ov5_021DCA28(UnkStruct_ov5_021DC1A4 *param0)
     Sound_PlayEffect(1500);
     sub_02001384(param0->unk_1BC, NULL, NULL);
     Window_Clear(param0->unk_19C.unk_0C, 0);
-    BGL_DeleteWindow(&param0->unk_08);
+    Window_Remove(&param0->unk_08);
 
     for (v0 = 0; v0 < 28; v0++) {
         Strbuf_Free(param0->unk_1C[v0]);
@@ -608,7 +608,7 @@ static void ov5_021DCA90(UnkStruct_ov5_021DC1A4 *param0, u16 param1, u32 param2)
     Strbuf *v0 = Strbuf_Init((40 * 2), 4);
     Strbuf *v1 = Strbuf_Init((40 * 2), 4);
 
-    BGL_FillWindow(param0->unk_18, 15);
+    Window_FillTilemap(param0->unk_18, 15);
     MessageLoader_GetStrbuf(param0->unk_8C, param1, v0);
     StringTemplate_Format(param0->unk_90, v1, v0);
     Text_AddPrinterWithParams(param0->unk_18, FONT_MESSAGE, v1, 0, 0, param2, NULL);
@@ -644,16 +644,16 @@ void ov5_021DCB24(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, S
         v1 = (v1 / 8) + 1;
     }
 
-    BGL_AddWindow(v3->fieldSystem->unk_08, &v3->unk_08, 3, v3->unk_98, v3->unk_99, v1, 4, 13, ((1 + (10 * 4)) + (10 * 2)) + (16 * 10));
+    Window_Add(v3->fieldSystem->unk_08, &v3->unk_08, 3, v3->unk_98, v3->unk_99, v1, 4, 13, ((1 + (10 * 4)) + (10 * 2)) + (16 * 10));
     sub_0200DAA4(v3->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
     Window_Show(&v3->unk_08, 1, 1024 - (18 + 12) - 9, 11);
-    BGL_WindowColor(&v3->unk_08, 15, 0, 0, (v1 * 8), (4 * 8));
+    Window_FillRectWithColor(&v3->unk_08, 15, 0, 0, (v1 * 8), (4 * 8));
 
     ov5_021DCC00(v3, 15, 0, 0);
     ov5_021DCC00(v3, 16, (8 * 4), 16);
 
     v3->unk_AC.unk_04 = &v3->unk_08;
-    sub_0201A954(&v3->unk_08);
+    Window_CopyToVRAM(&v3->unk_08);
     v3->unk_04 = SysTask_Start(ov5_021DCC64, v3, 0);
 
     return;
@@ -682,7 +682,7 @@ static void ov5_021DCC64(SysTask *param0, void *param1)
 
     if (*v1->unk_A0 == 0xffff) {
         Window_Clear(v1->unk_AC.unk_04, 0);
-        BGL_DeleteWindow(v1->unk_AC.unk_04);
+        Window_Remove(v1->unk_AC.unk_04);
 
         for (v0 = 0; v0 < 28; v0++) {
             Strbuf_Free(v1->unk_1C[v0]);
@@ -784,7 +784,7 @@ void ov5_021DCD94(UnkStruct_ov5_021DC1A4 *param0, u8 param1)
         v1++;
     }
 
-    BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, (v0 * param1), v1 * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
+    Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_98, param0->unk_99, (v0 * param1), v1 * 2, 13, ((1 + (10 * 4)) + (10 * 2)));
     sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
     Window_Show(&param0->unk_08, 1, 1024 - (18 + 12) - 9, 11);
 
@@ -811,12 +811,12 @@ static void ov5_021DCE64(UnkStruct_ov5_021DC1A4 *param0, u8 param1, u8 param2)
 
 Window *ov5_021DCEB0(FieldSystem *fieldSystem, u8 param1, u8 param2)
 {
-    Window *v0 = sub_0201A778(4, 1);
+    Window *v0 = Window_New(4, 1);
 
-    BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 4, 13, 1);
+    Window_Add(fieldSystem->unk_08, v0, 3, param1, param2, 10, 4, 13, 1);
     sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
     Window_Show(v0, 1, 1024 - (18 + 12) - 9, 11);
-    BGL_FillWindow(v0, 15);
+    Window_FillTilemap(v0, 15);
 
     {
         MessageLoader *v1;
@@ -838,7 +838,7 @@ Window *ov5_021DCEB0(FieldSystem *fieldSystem, u8 param1, u8 param2)
 void ov5_021DCF58(Window *param0)
 {
     Window_Clear(param0, 0);
-    sub_0201A928(param0, 1);
+    Windows_Delete(param0, 1);
 }
 
 void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1)
@@ -850,7 +850,7 @@ void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1)
     u32 v4;
     u32 v5;
 
-    BGL_WindowColor(param1, 15, 0, 16, 10 * 8, 4 * 8 - 16);
+    Window_FillRectWithColor(param1, 15, 0, 16, 10 * 8, 4 * 8 - 16);
 
     v0 = MessageLoader_Init(0, 26, 543, 4);
     v1 = StringTemplate_Default(4);
@@ -868,14 +868,14 @@ void ov5_021DCF6C(FieldSystem *fieldSystem, Window *param1)
     Strbuf_Free(v2);
     StringTemplate_Free(v1);
     MessageLoader_Free(v0);
-    sub_0201A9A4(param1);
+    Window_ScheduleCopyToVRAM(param1);
 }
 
 Window *ov5_021DD020(FieldSystem *fieldSystem, u8 param1, u8 param2)
 {
-    Window *v0 = sub_0201A778(4, 1);
+    Window *v0 = Window_New(4, 1);
 
-    BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4)));
+    Window_Add(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4)));
     sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
     Window_Show(v0, 1, 1024 - (18 + 12) - 9, 11);
 
@@ -887,7 +887,7 @@ Window *ov5_021DD020(FieldSystem *fieldSystem, u8 param1, u8 param2)
 void ov5_021DD084(Window *param0)
 {
     Window_Clear(param0, 0);
-    sub_0201A928(param0, 1);
+    Windows_Delete(param0, 1);
 }
 
 void ov5_021DD098(FieldSystem *fieldSystem, Window *param1)
@@ -899,7 +899,7 @@ void ov5_021DD098(FieldSystem *fieldSystem, Window *param1)
     u32 v4;
     u32 v5;
 
-    BGL_FillWindow(param1, 15);
+    Window_FillTilemap(param1, 15);
 
     v0 = MessageLoader_Init(0, 26, 361, 4);
     v1 = StringTemplate_Default(4);
@@ -917,14 +917,14 @@ void ov5_021DD098(FieldSystem *fieldSystem, Window *param1)
     Strbuf_Free(v2);
     StringTemplate_Free(v1);
     MessageLoader_Free(v0);
-    sub_0201A9A4(param1);
+    Window_ScheduleCopyToVRAM(param1);
 }
 
 Window *ov5_021DD140(FieldSystem *fieldSystem, u8 param1, u8 param2)
 {
-    Window *v0 = sub_0201A778(4, 1);
+    Window *v0 = Window_New(4, 1);
 
-    BGL_AddWindow(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4)));
+    Window_Add(fieldSystem->unk_08, v0, 3, param1, param2, 10, 2, 13, (1 + (10 * 4)));
     sub_0200DAA4(fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
     Window_Show(v0, 1, 1024 - (18 + 12) - 9, 11);
 
@@ -942,7 +942,7 @@ void ov5_021DD1A4(FieldSystem *fieldSystem, Window *param1)
     u16 v4;
     u32 v5;
 
-    BGL_FillWindow(param1, 15);
+    Window_FillTilemap(param1, 15);
 
     v0 = MessageLoader_Init(0, 26, 361, 4);
     v1 = StringTemplate_Default(4);
@@ -960,7 +960,7 @@ void ov5_021DD1A4(FieldSystem *fieldSystem, Window *param1)
     Strbuf_Free(v2);
     StringTemplate_Free(v1);
     MessageLoader_Free(v0);
-    sub_0201A9A4(param1);
+    Window_ScheduleCopyToVRAM(param1);
 }
 
 UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 param2, u16 *param3, StringTemplate *param4, u8 param5, u8 param6, u8 param7, u8 param8)
@@ -969,10 +969,10 @@ UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 par
 
     v0 = ov5_021DC150(fieldSystem, param1, param2, 0, 0, param3, param4, NULL, NULL);
 
-    BGL_AddWindow(v0->fieldSystem->unk_08, &v0->unk_08, 3, v0->unk_98, v0->unk_99, 10, 16, 13, ((1 + (10 * 4)) + (10 * 2)));
+    Window_Add(v0->fieldSystem->unk_08, &v0->unk_08, 3, v0->unk_98, v0->unk_99, 10, 16, 13, ((1 + (10 * 4)) + (10 * 2)));
     sub_0200DAA4(v0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
     Window_Show(&v0->unk_08, 1, 1024 - (18 + 12) - 9, 11);
-    BGL_WindowColor(&v0->unk_08, 15, 0, 0, (10 * 8), (16 * 8));
+    Window_FillRectWithColor(&v0->unk_08, 15, 0, 0, (10 * 8), (16 * 8));
 
     ov5_021DCC00(v0, 273, 0, 0);
     StringTemplate_SetNumber(param4, 0, param5, 3, 1, 1);
@@ -991,7 +991,7 @@ UnkStruct_ov5_021DC1A4 *ov5_021DD250(FieldSystem *fieldSystem, u8 param1, u8 par
     ov5_021DCC00(v0, 277, 0, (96 + 16));
 
     v0->unk_AC.unk_04 = &v0->unk_08;
-    sub_0201A954(&v0->unk_08);
+    Window_CopyToVRAM(&v0->unk_08);
 
     return v0;
 }
@@ -1001,7 +1001,7 @@ void ov5_021DD3A8(UnkStruct_ov5_021DC1A4 *param0)
     int v0;
 
     Window_Clear(param0->unk_AC.unk_04, 0);
-    BGL_DeleteWindow(param0->unk_AC.unk_04);
+    Window_Remove(param0->unk_AC.unk_04);
 
     for (v0 = 0; v0 < 28; v0++) {
         Strbuf_Free(param0->unk_1C[v0]);

src/overlay005/ov5_021DD42C.c

@@ -138,7 +138,7 @@ static void ov5_021DD610(FieldSystem *fieldSystem, UnkStruct_ov5_021DD648 *param
         *(param1->unk_10) = 1;
     }
 
-    BGL_FillWindow(param1->unk_0C, 15);
+    Window_FillTilemap(param1->unk_0C, 15);
 }
 
 static void ov5_021DD648(UnkStruct_ov5_021DD648 *param0, const MessageLoader *param1, u32 param2)

src/overlay005/ov5_021DD6FC.c

@@ -52,7 +52,7 @@ static void ov5_021DD6FC(void *param0, u16 param1, u16 param2)
 
 static void ov5_021DD718(UnkStruct_ov5_021DD9C8 *param0)
 {
-    BGL_AddWindow(param0->unk_1C, &param0->unk_20, 3, 0, 0, 32, 5, 7, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (32 * 5)));
+    Window_Add(param0->unk_1C, &param0->unk_20, 3, 0, 0, 32, 5, 7, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (32 * 5)));
 }
 
 static void ov5_021DD744(UnkStruct_ov5_021DD9C8 *param0, u8 param1, u16 param2, u8 param3, u8 param4)
@@ -65,7 +65,7 @@ static void ov5_021DD744(UnkStruct_ov5_021DD9C8 *param0, u8 param1, u16 param2,
     v3 = param0->unk_31 * 2;
 
     param0->unk_38 = sub_02006F50(160, v3, 0, &param0->unk_34, 4);
-    sub_0201958C(param0->unk_1C, param1, param0->unk_34->pRawData, param0->unk_34->szByte, param2);
+    Bg_LoadTiles(param0->unk_1C, param1, param0->unk_34->pRawData, param0->unk_34->szByte, param2);
     v0 = sub_02006F88(160, v3 + 1, &v2, 4);
 
     ov5_021DD6FC(v2->pRawData, 1, param3);
@@ -115,13 +115,13 @@ static void ov5_021DD7A0(UnkStruct_ov5_021DD9C8 *param0, const int param1)
         int v9, v10;
 
         ov5_021DD744(param0, 3, (1024 - (18 + 12) - 9 - (32 * 8)), 7, 0);
-        BGL_FillWindow(&param0->unk_20, 0);
+        Window_FillTilemap(&param0->unk_20, 0);
 
         for (v9 = 0; v9 < 85; v9++) {
-            sub_0201ADDC(&param0->unk_20, param0->unk_34->pRawData, v9 * 8, 0, 8, 8, (v9 % 17) * 8, (v9 / 17) * 8, 8, 8);
+            Window_BlitBitmapRect(&param0->unk_20, param0->unk_34->pRawData, v9 * 8, 0, 8, 8, (v9 % 17) * 8, (v9 / 17) * 8, 8, 8);
         }
 
-        sub_0201A954(&param0->unk_20);
+        Window_CopyToVRAM(&param0->unk_20);
         Heap_FreeToHeap(param0->unk_38);
     }
 }
@@ -158,7 +158,7 @@ static void ov5_021DD8A4(SysTask *param0, void *param1)
             v2->unk_0C = 0;
         }
 
-        sub_02019184(v2->unk_1C, 3, 3, v2->unk_0C);
+        Bg_SetOffset(v2->unk_1C, 3, 3, v2->unk_0C);
 
         if (v2->unk_0C == 0) {
             v2->unk_10 = 0;
@@ -182,7 +182,7 @@ static void ov5_021DD8A4(SysTask *param0, void *param1)
             v2->unk_0C = 38;
         }
 
-        sub_02019184(v2->unk_1C, 3, 3, v2->unk_0C);
+        Bg_SetOffset(v2->unk_1C, 3, 3, v2->unk_0C);
 
         if (v2->unk_0C == 38) {
             if (v2->unk_14) {
@@ -237,7 +237,7 @@ UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BgConfig *param0)
 void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 *param0)
 {
     MessageLoader_Free(param0->unk_3C);
-    BGL_DeleteWindow(&param0->unk_20);
+    Window_Remove(&param0->unk_20);
     Strbuf_Free(param0->unk_40);
     Heap_FreeToHeap(param0);
 
@@ -254,7 +254,7 @@ void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 *param0, const int param1, const int pa
     if (param0->unk_00 == 0) {
         param0->unk_00 = 1;
 
-        sub_02019184(param0->unk_1C, 3, 3, 38);
+        Bg_SetOffset(param0->unk_1C, 3, 3, 38);
 
         param0->unk_0C = 38;
         param0->unk_08 = SysTask_Start(ov5_021DD8A4, param0, 0);
@@ -291,8 +291,8 @@ void ov5_021DDA78(UnkStruct_ov5_021DD9C8 *param0)
         SysTask_Done(param0->unk_08);
     }
 
-    sub_0201ACF4(&param0->unk_20);
-    sub_02019184(param0->unk_1C, 3, 3, 0);
+    Window_ClearAndCopyToVRAM(&param0->unk_20);
+    Bg_SetOffset(param0->unk_1C, 3, 3, 0);
 
     {
         BgConfig *v0 = param0->unk_1C;

src/overlay005/ov5_021E1B08.c

@@ -34,7 +34,7 @@ void *ov5_021E1B08(u32 param0)
 void ov5_021E1B20(UnkStruct_ov5_021E1B20 *param0)
 {
     if (param0->unk_13_7 != 0) {
-        BGL_DeleteWindow(&param0->unk_00);
+        Window_Remove(&param0->unk_00);
     }
 
     Heap_FreeToHeap(param0);
@@ -106,7 +106,7 @@ void ov5_021E1BCC(FieldSystem *fieldSystem, u8 param1)
 
 static void ov5_021E1BE0(FieldSystem *fieldSystem)
 {
-    sub_02019184(fieldSystem->unk_08, 3, 3, -48);
+    Bg_SetOffset(fieldSystem->unk_08, 3, 3, -48);
 
     if (fieldSystem->unk_64->unk_13_7 == 0) {
         sub_0205DA1C(fieldSystem->unk_08, &fieldSystem->unk_64->unk_00, fieldSystem->unk_64->unk_12, 3);
@@ -122,47 +122,47 @@ static void ov5_021E1C1C(FieldSystem *fieldSystem)
         return;
     }
 
-    BGL_DeleteWindow(&fieldSystem->unk_64->unk_00);
-    sub_02019CB8(fieldSystem->unk_08, 3, 0, 0, 18, 32, 6, 16);
-    sub_02019448(fieldSystem->unk_08, 3);
-    sub_02019184(fieldSystem->unk_08, 3, 3, 0);
+    Window_Remove(&fieldSystem->unk_64->unk_00);
+    Bg_FillTilemapRect(fieldSystem->unk_08, 3, 0, 0, 18, 32, 6, 16);
+    Bg_CopyTilemapBufferToVRAM(fieldSystem->unk_08, 3);
+    Bg_SetOffset(fieldSystem->unk_08, 3, 3, 0);
 
     fieldSystem->unk_64->unk_13_7 = 0;
 }
 
 static BOOL ov5_021E1C70(FieldSystem *fieldSystem)
 {
-    int v0 = sub_020192F8(fieldSystem->unk_08, 3);
+    int v0 = Bg_GetYOffset(fieldSystem->unk_08, 3);
 
     if (v0 == 0) {
         return 1;
     }
 
     if (!((v0 > -48) && (v0 < 0))) {
-        sub_02019184(fieldSystem->unk_08, 3, 3, -48);
+        Bg_SetOffset(fieldSystem->unk_08, 3, 3, -48);
     }
 
-    sub_02019184(fieldSystem->unk_08, 3, 4, 16);
+    Bg_SetOffset(fieldSystem->unk_08, 3, 4, 16);
 
     return 0;
 }
 
 static BOOL ov5_021E1CB0(FieldSystem *fieldSystem)
 {
-    int v0 = sub_020192F8(fieldSystem->unk_08, 3);
+    int v0 = Bg_GetYOffset(fieldSystem->unk_08, 3);
 
     if (v0 == -48) {
-        sub_02019CB8(fieldSystem->unk_08, 3, 0, 0, 18, 32, 6, 16);
-        sub_02019448(fieldSystem->unk_08, 3);
-        sub_02019184(fieldSystem->unk_08, 3, 3, 0);
+        Bg_FillTilemapRect(fieldSystem->unk_08, 3, 0, 0, 18, 32, 6, 16);
+        Bg_CopyTilemapBufferToVRAM(fieldSystem->unk_08, 3);
+        Bg_SetOffset(fieldSystem->unk_08, 3, 3, 0);
         return 1;
     }
 
     if (!((v0 > -48) && (v0 < 0))) {
-        sub_02019184(fieldSystem->unk_08, 3, 3, 0);
+        Bg_SetOffset(fieldSystem->unk_08, 3, 3, 0);
     }
 
-    sub_02019184(fieldSystem->unk_08, 3, 5, 16);
+    Bg_SetOffset(fieldSystem->unk_08, 3, 5, 16);
 
     return 0;
 }

src/overlay005/ov5_021E1D20.c

@@ -167,9 +167,9 @@ void ov5_021E1F04(UnkStruct_ov5_021E1FF4 *param0)
 {
     param0->unk_10 = Heap_AllocFromHeap(param0->unk_04, sizeof(Window));
 
-    BGL_AddWindow(param0->unk_0C, param0->unk_10, param0->unk_08, 1, 1, param0->unk_2C, param0->unk_30, 13, 393);
+    Window_Add(param0->unk_0C, param0->unk_10, param0->unk_08, 1, 1, param0->unk_2C, param0->unk_30, 13, 393);
     sub_0200DAA4(param0->unk_0C, param0->unk_08, 985, 11, 0, param0->unk_04);
-    BGL_FillWindow(param0->unk_10, Font_GetAttribute(FONT_SYSTEM, FONTATTR_BG_COLOR));
+    Window_FillTilemap(param0->unk_10, Font_GetAttribute(FONT_SYSTEM, FONTATTR_BG_COLOR));
 
     ov5_021E1E20(param0);
     Window_Show(param0->unk_10, 0, 985, 11);
@@ -178,7 +178,7 @@ void ov5_021E1F04(UnkStruct_ov5_021E1FF4 *param0)
 void ov5_021E1F7C(UnkStruct_ov5_021E1FF4 *param0)
 {
     Window_Clear(param0->unk_10, 0);
-    BGL_DeleteWindow(param0->unk_10);
+    Window_Remove(param0->unk_10);
     Heap_FreeToHeap(param0->unk_10);
 }
 

src/overlay005/ov5_021EA874.c

@@ -265,7 +265,7 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0)
 
     param0->unk_00 = sub_02013A04(v2 + 1, 4);
 
-    BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_20, 3, 19, 1, 12, v3 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * (v3 + 2) * 2));
+    Window_Add(param0->fieldSystem->unk_08, &param0->unk_20, 3, 19, 1, 12, v3 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (10 * (v3 + 2) * 2));
     Window_Show(&param0->unk_20, 1, 1024 - (18 + 12) - 9, 11);
 
     {
@@ -292,7 +292,7 @@ static BOOL ov5_021EAB58(UnkStruct_ov5_021EAE78 *param0)
     v1.unk_1C = param0;
 
     param0->unk_04 = sub_0200112C(&v1, 0, 0, 4);
-    sub_0201A954(&param0->unk_20);
+    Window_CopyToVRAM(&param0->unk_20);
     param0->unk_48 = 9;
 
     return 0;
@@ -334,7 +334,7 @@ static BOOL ov5_021EAC44(UnkStruct_ov5_021EAE78 *param0)
     }
 
     Window_Clear(&param0->unk_20, 0);
-    BGL_DeleteWindow(&param0->unk_20);
+    Window_Remove(&param0->unk_20);
     sub_02001384(param0->unk_04, NULL, NULL);
     sub_02013A3C(param0->unk_00);
 
@@ -434,8 +434,8 @@ static BOOL ov5_021EADB4(TaskManager *param0)
 
 static void ov5_021EAE78(UnkStruct_ov5_021EAE78 *param0, int param1)
 {
-    if (BGL_WindowAdded(&param0->unk_10)) {
-        BGL_DeleteWindow(&param0->unk_10);
+    if (Window_IsInUse(&param0->unk_10)) {
+        Window_Remove(&param0->unk_10);
     }
 
     MessageLoader_GetStrbuf(param0->unk_3C, param1, param0->unk_08);
@@ -463,8 +463,8 @@ static void ov5_021EAF1C(UnkStruct_ov5_021EAE78 *param0)
     Strbuf_Free(param0->unk_0C);
     Strbuf_Free(param0->unk_08);
 
-    if (BGL_WindowAdded(&param0->unk_10)) {
-        BGL_DeleteWindow(&param0->unk_10);
+    if (Window_IsInUse(&param0->unk_10)) {
+        Window_Remove(&param0->unk_10);
     }
 }
 

src/overlay005/ov5_021F007C.c

@@ -67,7 +67,7 @@ static void ov5_021F007C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 
     ov5_021F02B8(&v0->unk_28, 0, 8, 19);
 
-    BGL_SetPriority(2, 0);
+    Bg_SetPriority(2, 0);
     GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
     Sound_PlayEffect(1608);
 }
@@ -106,7 +106,7 @@ static void ov5_021F00F0(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
     }
 
     sub_020039F8(v1->unk_04->pRawData, v1->unk_08, 0x1, v1->unk_28.unk_00, (GX_RGB(31, 10, 23)));
-    sub_0201972C(2, v1->unk_08, 32, 6 * 32);
+    Bg_LoadPalette(2, v1->unk_08, 32, 6 * 32);
 }
 
 static void ov5_021F013C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSystem, void *param2)
@@ -120,7 +120,7 @@ static void ov5_021F013C(UnkStruct_ov5_021D1BEC *param0, FieldSystem *fieldSyste
 
     G2_SetBlendAlpha((GX_PLANEMASK_BG2), GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD, 0, 16 - 0);
 
-    BGL_SetPriority(2, 0);
+    Bg_SetPriority(2, 0);
     GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
     Sound_PlayEffect(1608);
 }
@@ -251,14 +251,14 @@ static void ov5_021F0260(BgConfig *param0)
     GXRgb v0 = (GX_RGB(31, 10, 23));
     u8 *v1;
 
-    sub_0201972C(2, &v0, sizeof(short), (6 * 32) + 2);
+    Bg_LoadPalette(2, &v0, sizeof(short), (6 * 32) + 2);
 
     v1 = Heap_AllocFromHeap(4, sizeof(u8) * 32);
     memset(v1, 0x11, sizeof(u8) * 32);
 
-    sub_0201958C(param0, 2, v1, sizeof(u8) * 32, 1);
+    Bg_LoadTiles(param0, 2, v1, sizeof(u8) * 32, 1);
     Heap_FreeToHeap(v1);
-    sub_02019EE0(param0, 2, (6 << 12) | 1);
+    Bg_FillTilemap(param0, 2, (6 << 12) | 1);
 }
 
 static void ov5_021F02B8(UnkStruct_ov5_021F02B8 *param0, int param1, int param2, int param3)
@@ -290,12 +290,12 @@ static BOOL ov5_021F02C8(UnkStruct_ov5_021F02B8 *param0)
 
 static void ov5_021F02F4(FieldSystem *fieldSystem)
 {
-    sub_0201975C(2, 0);
+    Bg_MaskPalette(2, 0);
 }
 
 static void ov5_021F0300(FieldSystem *fieldSystem)
 {
-    sub_0201975C(2, 0x7fff);
+    Bg_MaskPalette(2, 0x7fff);
 }
 
 static void ov5_021F0310(FieldSystem *fieldSystem)
@@ -306,9 +306,9 @@ static void ov5_021F0310(FieldSystem *fieldSystem)
 
     G2_SetBG2Priority(3);
 
-    sub_0201972C(2, &v0, 2, ((6 * 32) + 4));
-    sub_020196C0(fieldSystem->unk_08, 2, 2, 1, 2);
-    sub_02019EE0(fieldSystem->unk_08, 2, ((6 << 12) | 2));
+    Bg_LoadPalette(2, &v0, 2, ((6 * 32) + 4));
+    Bg_FillTilesRange(fieldSystem->unk_08, 2, 2, 1, 2);
+    Bg_FillTilemap(fieldSystem->unk_08, 2, ((6 << 12) | 2));
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
 
     ov5_021F02F4(fieldSystem);
@@ -322,9 +322,9 @@ static void ov5_021F0374(FieldSystem *fieldSystem)
 
     G2_SetBG3Priority(3);
 
-    sub_0201972C(3, &v0, 2, ((6 * 32) + 4));
-    sub_020196C0(fieldSystem->unk_08, 3, 2, 1, 2);
-    sub_02019EE0(fieldSystem->unk_08, 3, ((6 << 12) | 2));
+    Bg_LoadPalette(3, &v0, 2, ((6 * 32) + 4));
+    Bg_FillTilesRange(fieldSystem->unk_08, 3, 2, 1, 2);
+    Bg_FillTilemap(fieldSystem->unk_08, 3, ((6 << 12) | 2));
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG3, 1);
 
     ov5_021F02F4(fieldSystem);
@@ -461,7 +461,7 @@ BOOL ov5_021F0488(TaskManager *param0)
 
         v1->unk_0C = 2;
 
-        BGL_SetPriority(2, 0);
+        Bg_SetPriority(2, 0);
         GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 1);
         break;
     case 2:
@@ -522,11 +522,11 @@ BOOL ov5_021F0488(TaskManager *param0)
             if (v1->unk_08 == 0) {
                 GXLayers_EngineAToggleLayers((GX_PLANEMASK_BG2), 0);
                 G2_BlendNone();
-                BGL_SetPriority(2, 3);
+                Bg_SetPriority(2, 3);
 
-                sub_02019EBC(fieldSystem->unk_08, 2);
+                Bg_ClearTilemap(fieldSystem->unk_08, 2);
             } else {
-                BGL_SetPriority(2, 1);
+                Bg_SetPriority(2, 1);
             }
 
             v1->unk_0C = 8;

src/overlay005/ov5_021F08CC.c

@@ -543,7 +543,7 @@ static int ov5_021F0E24(UnkStruct_ov5_021F0D6C *param0)
 {
     if ((FieldMessage_FinishedPrinting(param0->unk_28) == 1) && (ov5_021F0D54() == 1)) {
         sub_0200E084(&param0->window, 0);
-        BGL_DeleteWindow(&param0->window);
+        Window_Remove(&param0->window);
         return 1;
     }
 

src/overlay005/ov5_021F6454.c

@@ -275,9 +275,9 @@ void ov5_021F6760(UnkStruct_ov5_021F6704 *param0, u32 param1, u32 param2, u32 pa
 static void ov5_021F6768(UnkStruct_ov5_021F6704 *param0)
 {
     if (param0->unk_20B > 8) {
-        BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_208, param0->unk_209, 11, 8 * 2, 13, 1);
+        Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_208, param0->unk_209, 11, 8 * 2, 13, 1);
     } else {
-        BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_208, param0->unk_209, 11, param0->unk_20B * 2, 13, 1);
+        Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_208, param0->unk_209, 11, param0->unk_20B * 2, 13, 1);
     }
 
     sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
@@ -420,7 +420,7 @@ static void ov5_021F6AD4(UnkStruct_ov5_021F6704 *param0)
     Sound_PlayEffect(1500);
     sub_02001384(param0->unk_23C, NULL, NULL);
     Window_Clear(param0->unk_21C.unk_0C, 0);
-    BGL_DeleteWindow(&param0->unk_08);
+    Window_Remove(&param0->unk_08);
 
     for (v0 = 0; v0 < 120; v0++) {
         Strbuf_Free(param0->unk_1C[v0]);

src/overlay005/ov5_021F77A8.c

@@ -474,9 +474,9 @@ void ov5_021F7F2C(UnkStruct_ov5_021F7ED8 *param0, u32 param1, u32 param2, u32 pa
 static void ov5_021F7F34(UnkStruct_ov5_021F7ED8 *param0)
 {
     if (param0->unk_C7 > 8) {
-        BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, 8 * 2, 13, 1);
+        Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, 8 * 2, 13, 1);
     } else {
-        BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, param0->unk_C7 * 2, 13, 1);
+        Window_Add(param0->fieldSystem->unk_08, &param0->unk_08, 3, param0->unk_C4, param0->unk_C5, 11, param0->unk_C7 * 2, 13, 1);
     }
 
     sub_0200DAA4(param0->fieldSystem->unk_08, 3, 1024 - (18 + 12) - 9, 11, 0, 4);
@@ -604,7 +604,7 @@ static void ov5_021F8250(UnkStruct_ov5_021F7ED8 *param0)
     Sound_PlayEffect(1500);
     sub_02001384(param0->unk_F0, NULL, NULL);
     Window_Clear(param0->unk_D0.unk_0C, 0);
-    BGL_DeleteWindow(&param0->unk_08);
+    Window_Remove(&param0->unk_08);
 
     for (v0 = 0; v0 < ((NELEMS(sTeachableMoves)) + 1); v0++) {
         Strbuf_Free(param0->unk_1C[v0]);

src/overlay006/ov6_0223E140.c

@@ -375,7 +375,7 @@ static void ov6_0223E1D0(BgConfig *param0)
             GX_BG0_AS_3D
         };
 
-        sub_02018368(&v0);
+        SetAllGraphicsModes(&v0);
     }
 
     GXLayers_EngineAToggleLayers(
@@ -398,9 +398,9 @@ static void ov6_0223E1D0(BgConfig *param0)
             0
         };
 
-        sub_020183C4(param0, 3, &v1, 0);
-        sub_02019690(3, 32, 0, 4);
-        sub_02019EBC(param0, 3);
+        Bg_InitFromTemplate(param0, 3, &v1, 0);
+        Bg_ClearTilesRange(3, 32, 0, 4);
+        Bg_ClearTilemap(param0, 3);
     }
 }
 
@@ -2064,7 +2064,7 @@ UnkStruct_ov6_022401B8 *ov6_02240104(u32 param0, FieldSystem *fieldSystem)
         sub_02006E3C(172, 74, v1, 2, 0, 0, 0, param0);
         sub_02006E60(172, 76, v1, 2, 0, 0, 0, param0);
         sub_02006E84(172, 75, 0, 0x20 * 6, 0x20, param0);
-        BGL_SetPriority(2, 1);
+        Bg_SetPriority(2, 1);
 
         v0->unk_34.unk_00 = 0;
         v0->unk_34.unk_04 = 31;

src/overlay006/ov6_02243258.c

@@ -1688,8 +1688,8 @@ static void ov6_0224481C(UnkStruct_ov6_02243FFC *param0)
     ov6_02244F80(param0, (FX32_ONE * 0), (FX32_ONE * 192), (FX32_ONE * 1), (FX32_ONE * 192));
     ov6_02244F2C(param0);
 
-    param0->unk_24 = sub_0201A008(param0->fieldSystem->unk_08, 0);
-    param0->unk_26 = sub_0201A008(param0->fieldSystem->unk_08, 3);
+    param0->unk_24 = Bg_GetPriority(param0->fieldSystem->unk_08, 0);
+    param0->unk_26 = Bg_GetPriority(param0->fieldSystem->unk_08, 3);
 
     G2_SetBG1Priority(1);
     G2_SetBG3Priority(0);
@@ -1945,7 +1945,7 @@ static void ov6_02244E54(NARC *param0, u32 param1, NNSG2dPaletteData **param2)
 
     NNS_G2dGetUnpackedPaletteData(v0, param2);
 
-    sub_0201972C(3, (*param2)->pRawData, (32 * 1), (32 * 12));
+    Bg_LoadPalette(3, (*param2)->pRawData, (32 * 1), (32 * 12));
     Heap_FreeToHeap(v0);
 }
 
@@ -1956,7 +1956,7 @@ static void ov6_02244E7C(BgConfig *param0, NARC *param1, u32 param2, NNSG2dChara
     v0 = NARC_AllocAndReadWholeMember(param1, param2, 4);
     NNS_G2dGetUnpackedCharacterData(v0, param3);
 
-    sub_0201958C(param0, 3, (*param3)->pRawData, (*param3)->szByte, 0);
+    Bg_LoadTiles(param0, 3, (*param3)->pRawData, (*param3)->szByte, 0);
     Heap_FreeToHeap(v0);
 }
 
@@ -1964,21 +1964,21 @@ static void ov6_02244EB4(BgConfig *param0, NARC *param1, u32 param2, NNSG2dScree
 {
     void *v0;
 
-    sub_02019184(param0, 3, 0, 0);
-    sub_02019184(param0, 3, 3, 0);
+    Bg_SetOffset(param0, 3, 0, 0);
+    Bg_SetOffset(param0, 3, 3, 0);
 
     v0 = NARC_AllocAndReadWholeMember(param1, param2, 4);
     NNS_G2dGetUnpackedScreenData(v0, param3);
 
-    sub_02019574(param0, 3, (void *)(*param3)->rawData, (*param3)->szByte);
-    sub_02019E2C(param0, 3, 0, 0, 32, 32, 12);
-    sub_02019448(param0, 3);
+    Bg_LoadTilemapBuffer(param0, 3, (void *)(*param3)->rawData, (*param3)->szByte);
+    Bg_ChangeTilemapRectPalette(param0, 3, 0, 0, 32, 32, 12);
+    Bg_CopyTilemapBufferToVRAM(param0, 3);
     Heap_FreeToHeap(v0);
 }
 
 static void ov6_02244F20(BgConfig *param0)
 {
-    sub_02019EBC(param0, 3);
+    Bg_ClearTilemap(param0, 3);
 }
 
 static void ov6_02244F2C(UnkStruct_ov6_02243FFC *param0)

src/overlay006/ov6_02247A0C.c

@@ -141,10 +141,10 @@ void *ov6_02247A90(void *param0)
     v0->unk_10 = MessageLoader_Init(0, 26, 208, 11);
     v0->unk_14 = StringTemplate_Default(11);
 
-    BGL_AddWindow(v1, &v0->unk_00, 3, 1, 3, 30, 17, 12, (1 + 10));
+    Window_Add(v1, &v0->unk_00, 3, 1, 3, 30, 17, 12, (1 + 10));
     sub_0200DAA4(v1, 3, 1, 11, 0, 11);
     Window_Show(&v0->unk_00, 1, 1, 11);
-    BGL_FillWindow(&v0->unk_00, 15);
+    Window_FillTilemap(&v0->unk_00, 15);
 
     v3 = Strbuf_Init(100, 11);
     v2 = MessageLoader_GetNewStrbuf(v0->unk_10, 0);
@@ -190,7 +190,7 @@ void *ov6_02247A90(void *param0)
     }
 
     Strbuf_Free(v3);
-    sub_0201A954(&v0->unk_00);
+    Window_CopyToVRAM(&v0->unk_00);
 
     return v0;
 }
@@ -200,8 +200,8 @@ void ov6_02247CC8(void *param0)
     UnkStruct_ov6_02247A90 *v0 = param0;
 
     Window_Clear(&v0->unk_00, 1);
-    sub_0201ACF4(&v0->unk_00);
-    BGL_DeleteWindow(&v0->unk_00);
+    Window_ClearAndCopyToVRAM(&v0->unk_00);
+    Window_Remove(&v0->unk_00);
     MessageLoader_Free(v0->unk_10);
     StringTemplate_Free(v0->unk_14);
     Heap_FreeToHeap(v0);

src/overlay007/communication_club.c

@@ -165,7 +165,7 @@ static void CommClubMan_PrintMessage(int msgId, BOOL format)
         MessageLoader_GetStrbuf(sCommClubMan->msgLoader, msgId, sCommClubMan->strBuff[5]);
     }
 
-    if (!BGL_WindowAdded(&sCommClubMan->msgWindow)) {
+    if (!Window_IsInUse(&sCommClubMan->msgWindow)) {
         FieldMessage_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->msgWindow, 3);
     }
 
@@ -186,7 +186,7 @@ static inline void CommClubMan_PrintMessageFastSpeed(int msgId, BOOL format)
         MessageLoader_GetStrbuf(sCommClubMan->msgLoader, msgId, sCommClubMan->strBuff[5]);
     }
 
-    if (!BGL_WindowAdded(&sCommClubMan->msgWindow)) {
+    if (!Window_IsInUse(&sCommClubMan->msgWindow)) {
         FieldMessage_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->msgWindow, 3);
     }
 
@@ -199,8 +199,8 @@ static inline void CommClubMan_PrintMessageFastSpeed(int msgId, BOOL format)
 
 static void CommClubMan_CreateList(UnkStruct_ov84_02240FA8 param0, u8 param1, u8 param2, u8 param3, u8 param4, u16 param5)
 {
-    if (!BGL_WindowAdded(&sCommClubMan->unk_20)) {
-        BGL_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_20, 3, param1, param2, param3, param4, 13, param5);
+    if (!Window_IsInUse(&sCommClubMan->unk_20)) {
+        Window_Add(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_20, 3, param1, param2, param3, param4, 13, param5);
     }
 
     Window_Show(&sCommClubMan->unk_20, 1, 1024 - (18 + 12) - 9, 11);
@@ -210,7 +210,7 @@ static void CommClubMan_CreateList(UnkStruct_ov84_02240FA8 param0, u8 param1, u8
     v0.unk_0C = &sCommClubMan->unk_20;
 
     sCommClubMan->unk_5C = sub_0200112C(&v0, 0, 0, 4);
-    sub_0201A954(&sCommClubMan->unk_20);
+    Window_CopyToVRAM(&sCommClubMan->unk_20);
 }
 
 static void CommClubMan_Init(FieldSystem *fieldSystem)
@@ -273,7 +273,7 @@ static void CommClubMan_Delete(void)
     MessageLoader_Free(sCommClubMan->msgLoader);
 
     if (sCommClubMan->msgWindow.pixels != NULL) {
-        BGL_DeleteWindow(&sCommClubMan->msgWindow);
+        Window_Remove(&sCommClubMan->msgWindow);
     }
 
     Heap_FreeToHeap(sCommClubMan);
@@ -334,7 +334,7 @@ static void ov7_02249C94(BmpList *param0, u32 param1, u8 param2)
 
     cnt += param2;
 
-    BGL_WindowColor(&sCommClubMan->unk_20, 15, 8, param2 * 16, sub_0201C294(&sCommClubMan->unk_20) * 8 - 8, 16);
+    Window_FillRectWithColor(&sCommClubMan->unk_20, 15, 8, param2 * 16, Window_GetWidth(&sCommClubMan->unk_20) * 8 - 8, 16);
 
     if (cnt < v0) {
         sub_020339AC(cnt, sCommClubMan->unk_7C);
@@ -363,13 +363,13 @@ static void ov7_02249C94(BmpList *param0, u32 param1, u8 param2)
 
 static void CommClubMan_PrintChooseJoinMsg(CommClubManager *param0)
 {
-    if (!BGL_WindowAdded(&sCommClubMan->unk_30)) {
-        BGL_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 23, 2, 8, 4, 13, (1 + 20 * 5 * 2));
+    if (!Window_IsInUse(&sCommClubMan->unk_30)) {
+        Window_Add(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 23, 2, 8, 4, 13, (1 + 20 * 5 * 2));
     }
 
     Window_Show(&sCommClubMan->unk_30, 1, 1024 - (18 + 12) - 9, 11);
-    BGL_FillWindow(&sCommClubMan->unk_30, 15);
-    sub_0201A954(&sCommClubMan->unk_30);
+    Window_FillTilemap(&sCommClubMan->unk_30, 15);
+    Window_CopyToVRAM(&sCommClubMan->unk_30);
 
     param0->unk_97 = 1;
 
@@ -500,9 +500,9 @@ static void ov7_0224A0C8(CommClubManager *commClubMan)
     if (sub_02033870() || sCommClubMan->unk_98) {
         sCommClubMan->unk_98 = 0;
         sub_02033884();
-        BGL_WindowColor(&sCommClubMan->unk_20, 15, 8, 0, 20 - 8, (5 * 2) * 8);
+        Window_FillRectWithColor(&sCommClubMan->unk_20, 15, 8, 0, 20 - 8, (5 * 2) * 8);
         ov7_02249C64(sCommClubMan->unk_5C, 0, 0);
-        sub_0201A954(&sCommClubMan->unk_20);
+        Window_CopyToVRAM(&sCommClubMan->unk_20);
     }
 }
 
@@ -694,13 +694,13 @@ static void ov7_0224A53C(CommClubManager *man)
     SysTask_Start(CommClubMan_Run, man, 0);
     ov7_0224A5D0();
 
-    if (!BGL_WindowAdded(&sCommClubMan->unk_30)) {
-        BGL_AddWindow(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 22, 2, 9, 4, 13, (1 + 17 * 6 * 2));
+    if (!Window_IsInUse(&sCommClubMan->unk_30)) {
+        Window_Add(sCommClubMan->fieldSystem->unk_08, &sCommClubMan->unk_30, 3, 22, 2, 9, 4, 13, (1 + 17 * 6 * 2));
     }
 
     Window_Show(&sCommClubMan->unk_30, 1, 1024 - (18 + 12) - 9, 11);
-    BGL_FillWindow(&sCommClubMan->unk_30, 15);
-    sub_0201A954(&sCommClubMan->unk_30);
+    Window_FillTilemap(&sCommClubMan->unk_30, 15);
+    Window_CopyToVRAM(&sCommClubMan->unk_30);
 
     man->unk_97 = 1;
 
@@ -774,7 +774,7 @@ static void ov7_0224A64C(CommClubManager *commClubMan)
     }
 
     StringTemplate_SetNumber(sCommClubMan->unk_54, 0, playerCnt, 2, 5, 1);
-    BGL_FillWindow(&sCommClubMan->unk_30, 15);
+    Window_FillTilemap(&sCommClubMan->unk_30, 15);
 
     MessageLoader_GetStrbuf(sCommClubMan->msgLoader, msg, sCommClubMan->strBuff[7]);
     StringTemplate_Format(sCommClubMan->unk_54, sCommClubMan->strBuff[6], sCommClubMan->strBuff[7]);
@@ -1374,17 +1374,17 @@ static void ov7_0224AF84(SysTask *task, void *param1)
 
 static void CommClubMan_DestroyList(SysTask *task, CommClubManager *param1)
 {
-    BGL_FillWindow(&sCommClubMan->msgWindow, 15);
+    Window_FillTilemap(&sCommClubMan->msgWindow, 15);
     Window_Clear(&param1->unk_20, 0);
     sub_02013A3C(param1->unk_64);
     sub_02001384(param1->unk_5C, NULL, NULL);
-    sub_0201ACF4(&param1->unk_20);
-    BGL_DeleteWindow(&param1->unk_20);
+    Window_ClearAndCopyToVRAM(&param1->unk_20);
+    Window_Remove(&param1->unk_20);
 
     if (param1->unk_97) {
         Window_Clear(&sCommClubMan->unk_30, 0);
-        sub_0201ACF4(&sCommClubMan->unk_30);
-        BGL_DeleteWindow(&sCommClubMan->unk_30);
+        Window_ClearAndCopyToVRAM(&sCommClubMan->unk_30);
+        Window_Remove(&sCommClubMan->unk_30);
         param1->unk_97 = 0;
     }
 

src/overlay007/ov7_0224B4E8.c

@@ -89,7 +89,7 @@ static const UnkStruct_ov84_02240FA8 Unk_ov7_0224F188 = {
 
 static void ov7_0224B4E8(UnkStruct_ov7_0224B4E8 *param0, int param1)
 {
-    if (BGL_WindowAdded(&param0->unk_54) == 0) {
+    if (Window_IsInUse(&param0->unk_54) == 0) {
         Window_Init(&param0->unk_54);
         FieldMessage_AddWindow(param0->fieldSystem->unk_08, &param0->unk_54, 3);
         FieldMessage_DrawWindow(&param0->unk_54, SaveData_Options(param0->fieldSystem->saveData));
@@ -107,10 +107,10 @@ static void ov7_0224B558(UnkStruct_ov7_0224B4E8 *param0, BOOL param1)
 {
     if (param1) {
         sub_0200E084(&param0->unk_54, 0);
-        sub_0201ACF4(&param0->unk_54);
+        Window_ClearAndCopyToVRAM(&param0->unk_54);
     }
 
-    BGL_DeleteWindow(&param0->unk_54);
+    Window_Remove(&param0->unk_54);
 }
 
 static void ov7_0224B57C(UnkStruct_ov7_0224B4E8 *param0, int param1)
@@ -130,12 +130,12 @@ static void ov7_0224B5A8(UnkStruct_ov7_0224B4E8 *param0)
         v3++;
     }
 
-    if (BGL_WindowAdded(v1) == 0) {
+    if (Window_IsInUse(v1) == 0) {
         int v4;
 
         param0->unk_08 = sub_02013A04(v3 + 2, 4);
 
-        BGL_AddWindow(param0->fieldSystem->unk_08, v1, 3, 1, 1, 16, (v3 + 2) * 2, 13, 1);
+        Window_Add(param0->fieldSystem->unk_08, v1, 3, 1, 1, 16, (v3 + 2) * 2, 13, 1);
         Window_Show(&param0->unk_34, 1, 1024 - (18 + 12) - 9, 11);
         sub_02013A4C(param0->unk_08, param0->unk_68, 123, 12);
 
@@ -158,7 +158,7 @@ static void ov7_0224B5A8(UnkStruct_ov7_0224B4E8 *param0)
     v0.unk_1C = param0;
 
     param0->unk_00 = sub_0200112C(&v0, 0, param0->unk_78, 4);
-    sub_0201A954(&param0->unk_34);
+    Window_CopyToVRAM(&param0->unk_34);
 }
 
 static void ov7_0224B6AC(UnkStruct_ov7_0224B4E8 *param0)
@@ -166,8 +166,8 @@ static void ov7_0224B6AC(UnkStruct_ov7_0224B4E8 *param0)
     if (param0->unk_00) {
         sub_02001384(param0->unk_00, NULL, NULL);
         Window_Clear(&param0->unk_34, 1);
-        sub_0201C3C0(param0->unk_34.bgConfig, param0->unk_34.bgLayer);
-        BGL_DeleteWindow(&param0->unk_34);
+        Bg_ScheduleTilemapTransfer(param0->unk_34.bgConfig, param0->unk_34.bgLayer);
+        Window_Remove(&param0->unk_34);
         sub_02013A3C(param0->unk_08);
 
         param0->unk_00 = NULL;
@@ -228,7 +228,7 @@ static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0)
 
     param0->unk_0C = sub_02013A04(v1, 4);
 
-    BGL_AddWindow(param0->fieldSystem->unk_08, &param0->unk_44, 3, v5, v3, v4, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - v4 * v1 * 2);
+    Window_Add(param0->fieldSystem->unk_08, &param0->unk_44, 3, v5, v3, v4, v1 * 2, 13, (((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - v4 * v1 * 2);
     Window_Show(&param0->unk_44, 1, 1024 - (18 + 12) - 9, 11);
 
     {
@@ -248,7 +248,7 @@ static void ov7_0224B788(UnkStruct_ov7_0224B4E8 *param0)
     v0.unk_1C = param0;
 
     param0->unk_04 = sub_0200112C(&v0, 0, param0->unk_7A, 4);
-    sub_0201A954(&param0->unk_44);
+    Window_CopyToVRAM(&param0->unk_44);
 }
 
 static int ov7_0224B83C(UnkStruct_ov7_0224B4E8 *param0)
@@ -282,8 +282,8 @@ static int ov7_0224B83C(UnkStruct_ov7_0224B4E8 *param0)
     if (param0->unk_04) {
         sub_02001384(param0->unk_04, NULL, NULL);
         Window_Clear(&param0->unk_44, 1);
-        sub_0201C3C0(param0->unk_44.bgConfig, param0->unk_44.bgLayer);
-        BGL_DeleteWindow(&param0->unk_44);
+        Bg_ScheduleTilemapTransfer(param0->unk_44.bgConfig, param0->unk_44.bgLayer);
+        Window_Remove(&param0->unk_44);
         sub_02013A3C(param0->unk_0C);
 
         param0->unk_04 = NULL;
@@ -335,9 +335,9 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0)
     v3 = Strbuf_Init((90 * 2), 4);
     v4 = &param0->unk_24;
 
-    BGL_AddWindow(param0->fieldSystem->unk_08, v4, 3, 4, 2, 24, 19, 13, 1);
+    Window_Add(param0->fieldSystem->unk_08, v4, 3, 4, 2, 24, 19, 13, 1);
     Window_Show(v4, 1, 1024 - (18 + 12) - 9, 11);
-    BGL_FillWindow(v4, 15);
+    Window_FillTilemap(v4, 15);
 
     ov7_0224B57C(param0, param0->unk_78 - 1);
 
@@ -415,14 +415,14 @@ static void ov7_0224B8DC(UnkStruct_ov7_0224B4E8 *param0)
     Strbuf_Free(v2);
     Strbuf_Free(v3);
     MessageLoader_Free(v0);
-    sub_0201A954(v4);
+    Window_CopyToVRAM(v4);
 }
 
 static void ov7_0224BBA0(UnkStruct_ov7_0224B4E8 *param0)
 {
     Window_Clear(&param0->unk_24, 1);
-    sub_0201C3C0(param0->unk_24.bgConfig, param0->unk_24.bgLayer);
-    BGL_DeleteWindow(&param0->unk_24);
+    Bg_ScheduleTilemapTransfer(param0->unk_24.bgConfig, param0->unk_24.bgLayer);
+    Window_Remove(&param0->unk_24);
 }
 
 static BOOL ov7_0224BBC4(UnkStruct_ov7_0224B4E8 *param0)

src/overlay007/ov7_0224BE9C.c

@@ -243,7 +243,7 @@ BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC *param0)
         v1 = ov7_0224C9A4(&param0->unk_1E8);
 
         if ((v1 != 0xffffffff) && (v1 != 0xfffffffe)) {
-            sub_02019CB8(param0->unk_14, 3, 0, 0, 0, 32, 18, 17);
+            Bg_FillTilemapRect(param0->unk_14, 3, 0, 0, 0, 32, 18, 17);
 
             ov7_0224CA34(&param0->unk_1E8);
             ov7_0224C4E0(&param0->unk_1B8, param0->unk_1AC, param0->unk_18, Unk_ov7_0224F1B4, param0->unk_1E8.unk_12C);
@@ -369,12 +369,12 @@ static void ov7_0224C35C(UnkStruct_ov7_0224BEFC *param0)
     Font_LoadScreenIndicatorsPalette(0, 12 * 32, param0->unk_18);
     sub_0200DAA4(param0->unk_14, 3, (1 + (18 + 12)), 11, 0, param0->unk_18);
     Font_LoadTextPalette(0, 13 * 32, param0->unk_18);
-    sub_02019EBC(param0->unk_14, 3);
+    Bg_ClearTilemap(param0->unk_14, 3);
 }
 
 static void ov7_0224C3B8(UnkStruct_ov7_0224BEFC *param0)
 {
-    sub_02019EBC(param0->unk_14, 3);
+    Bg_ClearTilemap(param0->unk_14, 3);
     sub_0205D8CC(0, 1);
 }
 
@@ -395,10 +395,10 @@ static void ov7_0224C3EC(UnkStruct_ov7_0224C3EC *param0, BgConfig *param1, u32 p
     }
 
     param0->unk_08 = param3;
-    param0->unk_04 = sub_0201A778(param2, 1);
+    param0->unk_04 = Window_New(param2, 1);
 
-    BGL_AddWindow(param1, param0->unk_04, 3, 2, 19, 27, 4, 12, ((1 + (18 + 12)) + 9));
-    BGL_FillWindow(param0->unk_04, 15);
+    Window_Add(param1, param0->unk_04, 3, 2, 19, 27, 4, 12, ((1 + (18 + 12)) + 9));
+    Window_FillTilemap(param0->unk_04, 15);
     sub_0200E060(param0->unk_04, 0, 1, 10);
 
     param0->unk_00 = 1;
@@ -410,9 +410,9 @@ static void ov7_0224C444(UnkStruct_ov7_0224C3EC *param0)
         return;
     }
 
-    sub_0201ACF4(param0->unk_04);
-    BGL_DeleteWindow(param0->unk_04);
-    sub_0201A928(param0->unk_04, 1);
+    Window_ClearAndCopyToVRAM(param0->unk_04);
+    Window_Remove(param0->unk_04);
+    Windows_Delete(param0->unk_04, 1);
 
     param0->unk_00 = 0;
 }
@@ -421,12 +421,12 @@ static void ov7_0224C468(UnkStruct_ov7_0224C3EC *param0, Strbuf *param1, u32 par
 {
     GF_ASSERT(param0->unk_10 == NULL);
 
-    BGL_FillWindow(param0->unk_04, 15);
+    Window_FillTilemap(param0->unk_04, 15);
 
     param0->unk_10 = Strbuf_Clone(param1, param2);
     param0->unk_0C = Text_AddPrinterWithParamsAndColor(param0->unk_04, FONT_MESSAGE, param0->unk_10, 0, 0, param0->unk_08, TEXT_COLOR(1, 2, 15), NULL);
 
-    sub_0201A954(param0->unk_04);
+    Window_CopyToVRAM(param0->unk_04);
 }
 
 static BOOL ov7_0224C4B8(UnkStruct_ov7_0224C3EC *param0)
@@ -505,8 +505,8 @@ static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BgConfig *param1, Messa
         return;
     }
 
-    param0->unk_04 = sub_0201A778(param3, 1);
-    BGL_AddWindow(param1, param0->unk_04, 3, 1, 11, 14, 6, 13, (((1 + (18 + 12)) + 9) + (27 * 4)));
+    param0->unk_04 = Window_New(param3, 1);
+    Window_Add(param1, param0->unk_04, 3, 1, 11, 14, 6, 13, (((1 + (18 + 12)) + 9) + (27 * 4)));
     param0->unk_08 = StringTemplate_Default(param3);
 
     for (v0 = 0; v0 < 3; v0++) {
@@ -514,7 +514,7 @@ static void ov7_0224C620(UnkStruct_ov7_0224C620 *param0, BgConfig *param1, Messa
     }
 
     param0->unk_0C = Strbuf_Init(32, param3);
-    BGL_FillWindow(param0->unk_04, 15);
+    Window_FillTilemap(param0->unk_04, 15);
     param0->unk_00 = 1;
 }
 
@@ -532,9 +532,9 @@ static void ov7_0224C698(UnkStruct_ov7_0224C620 *param0)
 
     Strbuf_Free(param0->unk_0C);
     StringTemplate_Free(param0->unk_08);
-    sub_0201ACF4(param0->unk_04);
-    BGL_DeleteWindow(param0->unk_04);
-    sub_0201A928(param0->unk_04, 1);
+    Window_ClearAndCopyToVRAM(param0->unk_04);
+    Window_Remove(param0->unk_04);
+    Windows_Delete(param0->unk_04, 1);
 
     param0->unk_00 = 0;
 }
@@ -546,7 +546,7 @@ static void ov7_0224C6DC(UnkStruct_ov7_0224C620 *param0, u32 param1, u32 param2,
     StringTemplate_SetItemName(param0->unk_08, 0, param1 + 149);
     StringTemplate_SetNumber(param0->unk_08, 1, param2, 3, 1, 1);
     StringTemplate_SetNumber(param0->unk_08, 2, param3, 3, 1, 1);
-    BGL_FillWindow(param0->unk_04, 15);
+    Window_FillTilemap(param0->unk_04, 15);
 
     for (v0 = 0; v0 < 3; v0++) {
         StringTemplate_Format(param0->unk_08, param0->unk_0C, param0->unk_10[v0]);
@@ -595,9 +595,9 @@ static void ov7_0224C768(UnkStruct_ov7_0224C768 *param0, BgConfig *param1, u32 p
     param0->unk_120 = param4 + 1;
     param0->unk_130 = param6;
     param0->unk_134 = param7;
-    param0->unk_04 = sub_0201A778(param2, 1);
+    param0->unk_04 = Window_New(param2, 1);
 
-    BGL_AddWindow(param1, param0->unk_04, 3, 17, 1, 14, 16, 13, ((((1 + (18 + 12)) + 9) + (27 * 4)) + (14 * 6)));
+    Window_Add(param1, param0->unk_04, 3, 17, 1, 14, 16, 13, ((((1 + (18 + 12)) + 9) + (27 * 4)) + (14 * 6)));
 
     param0->unk_124 = StringTemplate_Default(param2);
     param0->unk_128 = Strbuf_Init(32, param2);
@@ -670,9 +670,9 @@ static void ov7_0224C934(UnkStruct_ov7_0224C768 *param0)
     }
 
     sub_02001384(param0->unk_08, NULL, NULL);
-    sub_0201ACF4(param0->unk_04);
-    BGL_DeleteWindow(param0->unk_04);
-    sub_0201A928(param0->unk_04, 1);
+    Window_ClearAndCopyToVRAM(param0->unk_04);
+    Window_Remove(param0->unk_04);
+    Windows_Delete(param0->unk_04, 1);
 
     param0->unk_00 = 1;
 }
@@ -781,8 +781,8 @@ static void ov7_0224CBE4(void *param0, u32 param1)
         v1 = Bag_GetItemQuantity(v0->unk_10, v0->unk_0C[param1].unk_04 + 149, v0->unk_00);
         ov7_0224C6DC(v0->unk_08, v0->unk_0C[param1].unk_04, v0->unk_0C[param1].unk_08, v1);
     } else {
-        sub_02019CB8(v0->unk_04, 3, 0, 1 - 1, 11 - 1, 14 + 2, 6 + 2, 17);
-        sub_02019448(v0->unk_04, 3);
+        Bg_FillTilemapRect(v0->unk_04, 3, 0, 1 - 1, 11 - 1, 14 + 2, 6 + 2, 17);
+        Bg_CopyTilemapBufferToVRAM(v0->unk_04, 3);
     }
 }
 

src/overlay007/ov7_0224CD28.c

@@ -334,21 +334,21 @@ static void ov7_0224D040(UnkStruct_ov7_0224D008 *param0)
         sub_02013A4C(param0->unk_84, param0->unk_88, 15, 2);
         sub_02013A4C(param0->unk_84, param0->unk_88, 16, 14);
         sub_02013A4C(param0->unk_84, param0->unk_88, 17, 0xfffffffe);
-        BGL_AddWindow(param0->unk_00, &param0->unk_08[0], 3, 1, 1, 13, 6, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
+        Window_Add(param0->unk_00, &param0->unk_08[0], 3, 1, 1, 13, 6, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
     } else if (param0->unk_2A9 == 3) {
         v1 = 2;
         param0->unk_84 = sub_02013A04(v1, 11);
 
         sub_02013A4C(param0->unk_84, param0->unk_88, 29, 2);
         sub_02013A4C(param0->unk_84, param0->unk_88, 30, 0xfffffffe);
-        BGL_AddWindow(param0->unk_00, &param0->unk_08[0], 3, 23, 13, 7, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
+        Window_Add(param0->unk_00, &param0->unk_08[0], 3, 23, 13, 7, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
     } else {
         v1 = 2;
         param0->unk_84 = sub_02013A04(v1, 11);
 
         sub_02013A4C(param0->unk_84, param0->unk_88, 15, 2);
         sub_02013A4C(param0->unk_84, param0->unk_88, 17, 0xfffffffe);
-        BGL_AddWindow(param0->unk_00, &param0->unk_08[0], 3, 1, 1, 13, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
+        Window_Add(param0->unk_00, &param0->unk_08[0], 3, 1, 1, 13, 4, 13, ((((1024 - (18 + 12) - 9 - (32 * 8)) - (18 + 12 + 24)) - (27 * 4)) - (13 * 6)));
     }
 
     v0.unk_00 = param0->unk_84;
@@ -386,10 +386,10 @@ static u8 ov7_0224D1EC(UnkStruct_ov7_0224D008 *param0)
 static void ov7_0224D21C(UnkStruct_ov7_0224D008 *param0)
 {
     Window_Clear(&param0->unk_08[0], 1);
-    sub_0201ACF4(&param0->unk_08[0]);
+    Window_ClearAndCopyToVRAM(&param0->unk_08[0]);
     sub_02001BC4(param0->unk_80, NULL);
     sub_02013A3C(param0->unk_84);
-    BGL_DeleteWindow(&param0->unk_08[0]);
+    Window_Remove(&param0->unk_08[0]);
 }
 
 static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1)
@@ -402,7 +402,7 @@ static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1)
         void *v0;
 
         sub_0200E084(&param1->unk_08[1], 0);
-        BGL_DeleteWindow(&param1->unk_08[1]);
+        Window_Remove(&param1->unk_08[1]);
         MessageLoader_Free(param1->unk_88);
         StringTemplate_Free(param1->unk_8C);
         Strbuf_Free(param1->unk_298);
@@ -440,7 +440,7 @@ static u8 ov7_0224D250(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1)
 
 static void ov7_0224D388(FieldSystem *fieldSystem, UnkStruct_ov7_0224D008 *param1)
 {
-    sub_02019CB8(param1->unk_00, 3, 0, 2 - 2, 19 - 1, 27 + 5, 4 + 2, 0);
+    Bg_FillTilemapRect(param1->unk_00, 3, 0, 2 - 2, 19 - 1, 27 + 5, 4 + 2, 0);
 
     ov7_0224D21C(param1);
     ov7_0224D3E8(param1);
@@ -459,11 +459,11 @@ static void ov7_0224D3E8(UnkStruct_ov7_0224D008 *param0)
 
     for (v0 = 0; v0 < 6; v0++) {
         if ((param0->unk_2A9 != 0) && (param0->unk_2A9 != 3) && (v0 == 1)) {
-            sub_0201A8D4(param0->unk_00, &param0->unk_08[v0], &Unk_ov7_0224F2BC);
+            Window_AddFromTemplate(param0->unk_00, &param0->unk_08[v0], &Unk_ov7_0224F2BC);
         } else if ((param0->unk_2A9 == 3) && (v0 == 2)) {
-            sub_0201A8D4(param0->unk_00, &param0->unk_08[v0], &Unk_ov7_0224F2C4);
+            Window_AddFromTemplate(param0->unk_00, &param0->unk_08[v0], &Unk_ov7_0224F2C4);
         } else {
-            sub_0201A8D4(param0->unk_00, &param0->unk_08[v0], &Unk_ov7_0224F328[v0]);
+            Window_AddFromTemplate(param0->unk_00, &param0->unk_08[v0], &Unk_ov7_0224F328[v0]);
         }
     }
 }
@@ -475,8 +475,8 @@ static void ov7_0224D44C(UnkStruct_ov7_0224D008 *param0)
     Window_Clear(&param0->unk_08[2], 1);
 
     for (v0 = 0; v0 < 6; v0++) {
-        sub_0201ACF4(&param0->unk_08[v0]);
-        BGL_DeleteWindow(&param0->unk_08[v0]);
+        Window_ClearAndCopyToVRAM(&param0->unk_08[v0]);
+        Window_Remove(&param0->unk_08[v0]);
     }
 }
 
@@ -508,15 +508,15 @@ static void ov7_0224D474(UnkStruct_ov7_0224D008 *param0)
 static void ov7_0224D548(UnkStruct_ov7_0224D008 *param0)
 {
     param0->unk_2A0 = GXLayers_EngineAGetLayers();
-    param0->unk_29C[0] = sub_0201A008(param0->unk_00, 0);
-    param0->unk_29C[1] = sub_0201A008(param0->unk_00, 1);
-    param0->unk_29C[2] = sub_0201A008(param0->unk_00, 2);
-    param0->unk_29C[3] = sub_0201A008(param0->unk_00, 3);
+    param0->unk_29C[0] = Bg_GetPriority(param0->unk_00, 0);
+    param0->unk_29C[1] = Bg_GetPriority(param0->unk_00, 1);
+    param0->unk_29C[2] = Bg_GetPriority(param0->unk_00, 2);
+    param0->unk_29C[3] = Bg_GetPriority(param0->unk_00, 3);
 
-    BGL_SetPriority(0, 3);
-    BGL_SetPriority(1, 2);
-    BGL_SetPriority(2, 1);
-    BGL_SetPriority(3, 0);
+    Bg_SetPriority(0, 3);
+    Bg_SetPriority(1, 2);
+    Bg_SetPriority(2, 1);
+    Bg_SetPriority(3, 0);
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 1);
@@ -526,10 +526,10 @@ static void ov7_0224D548(UnkStruct_ov7_0224D008 *param0)
 
 static void ov7_0224D5D8(UnkStruct_ov7_0224D008 *param0)
 {
-    BGL_SetPriority(0, param0->unk_29C[0]);
-    BGL_SetPriority(1, param0->unk_29C[1]);
-    BGL_SetPriority(2, param0->unk_29C[2]);
-    BGL_SetPriority(3, param0->unk_29C[3]);
+    Bg_SetPriority(0, param0->unk_29C[0]);
+    Bg_SetPriority(1, param0->unk_29C[1]);
+    Bg_SetPriority(2, param0->unk_29C[2]);
+    Bg_SetPriority(3, param0->unk_29C[3]);
     GXLayers_EngineASetLayers(param0->unk_2A0);
 }
 
@@ -661,7 +661,7 @@ static void ov7_0224D85C(BmpList *param0, u32 param1, u8 param2)
         Sound_PlayEffect(1592);
     }
 
-    BGL_FillWindow(&v0->unk_08[1], 0);
+    Window_FillTilemap(&v0->unk_08[1], 0);
 
     if (param1 != 0xfffffffe) {
         Strbuf *v1;
@@ -715,7 +715,7 @@ static void ov7_0224D85C(BmpList *param0, u32 param1, u8 param2)
             CellActor_SetDrawFlag(v0->unk_25C[1], 0);
         }
     }
-    sub_0201A9A4(&v0->unk_08[1]);
+    Window_ScheduleCopyToVRAM(&v0->unk_08[1]);
 }
 
 static void ov7_0224D9B8(BmpList *param0, u32 param1, u8 param2)
@@ -757,7 +757,7 @@ static void ov7_0224D9B8(BmpList *param0, u32 param1, u8 param2)
     if (param1 == 0xfffffffe) {
         Strbuf *v6 = MessageLoader_GetNewStrbuf(v0->unk_88, 8);
 
-        BGL_WindowColor(&v0->unk_08[0], 15, 0, param2, 19 * 8, 16);
+        Window_FillRectWithColor(&v0->unk_08[0], 15, 0, param2, 19 * 8, 16);
         Text_AddPrinterWithParamsAndColor(&v0->unk_08[0], FONT_SYSTEM, v6, 0, param2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
         Strbuf_Free(v6);
     }
@@ -772,11 +772,11 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1)
 
     if (param0->unk_2A9 == 3) {
         if (param1 == 0) {
-            BGL_FillWindow(&param0->unk_08[2], 15);
+            Window_FillTilemap(&param0->unk_08[2], 15);
             Window_Show(
                 &param0->unk_08[2], 1, (1 + (18 + 12)), 11);
         } else {
-            BGL_WindowColor(&param0->unk_08[2], 15, 0, 0, (9 * 8), 16);
+            Window_FillRectWithColor(&param0->unk_08[2], 15, 0, 0, (9 * 8), 16);
         }
 
         v0 = Strbuf_Init(16, 11);
@@ -791,7 +791,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1)
         Text_AddPrinterWithParams(&param0->unk_08[2], FONT_SYSTEM, v0, (9 * 8) - v3 - 8, 0, TEXT_SPEED_NO_TRANSFER, NULL);
     } else {
         if (param1 == 0) {
-            BGL_FillWindow(&param0->unk_08[2], 15);
+            Window_FillTilemap(&param0->unk_08[2], 15);
             Window_Show(&param0->unk_08[2], 1, (1 + (18 + 12)), 11);
 
             v1 = MessageLoader_GetNewStrbuf(param0->unk_88, 18);
@@ -799,7 +799,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1)
             Text_AddPrinterWithParams(&param0->unk_08[2], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
             Strbuf_Free(v1);
         } else {
-            BGL_WindowColor(&param0->unk_08[2], 15, 0, 16, (9 * 8), 16);
+            Window_FillRectWithColor(&param0->unk_08[2], 15, 0, 16, (9 * 8), 16);
         }
 
         v0 = Strbuf_Init(16, 11);
@@ -816,7 +816,7 @@ static void ov7_0224DAF8(UnkStruct_ov7_0224D008 *param0, u8 param1)
 
     Strbuf_Free(v1);
     Strbuf_Free(v0);
-    sub_0201A9A4(&param0->unk_08[2]);
+    Window_ScheduleCopyToVRAM(&param0->unk_08[2]);
 }
 
 static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0)
@@ -840,7 +840,7 @@ static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0)
         sub_02013A3C(param0->unk_7C);
         ov7_0224D44C(param0);
         ov7_0224D5D8(param0);
-        sub_02019EBC(param0->unk_00, 1);
+        Bg_ClearTilemap(param0->unk_00, 1);
         Sound_PlayEffect(1500);
         return 12;
 
@@ -856,8 +856,8 @@ static u8 ov7_0224DC84(UnkStruct_ov7_0224D008 *param0)
 
         ov7_0224EC10(param0, 1);
 
-        BGL_FillWindow(&param0->unk_08[5], 15);
-        sub_0201ACF4(&param0->unk_08[1]);
+        Window_FillTilemap(&param0->unk_08[5], 15);
+        Window_ClearAndCopyToVRAM(&param0->unk_08[1]);
         sub_0200E060(&param0->unk_08[5], 0, 1, 10);
 
         param0->unk_2AA = (u16)v0;
@@ -946,7 +946,7 @@ static void ov7_0224DED4(UnkStruct_ov7_0224D008 *param0)
         v2 = 0;
     }
 
-    BGL_FillWindow(&param0->unk_08[4], 15);
+    Window_FillTilemap(&param0->unk_08[4], 15);
     Window_Show(&param0->unk_08[4], 1, (1 + (18 + 12)), 11);
 
     v0 = Strbuf_Init((12 * 2), 11);
@@ -957,7 +957,7 @@ static void ov7_0224DED4(UnkStruct_ov7_0224D008 *param0)
     Text_AddPrinterWithParams(&param0->unk_08[4], FONT_SYSTEM, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v0);
-    sub_0201A9A4(&param0->unk_08[4]);
+    Window_ScheduleCopyToVRAM(&param0->unk_08[4]);
 }
 
 static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0)
@@ -973,7 +973,7 @@ static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0)
         CellActor_SetDrawFlag(param0->unk_25C[1], 0);
         Window_Clear(&param0->unk_08[4], 1);
         Window_Clear(&param0->unk_08[3], 1);
-        BGL_FillWindow(&param0->unk_08[5], 15);
+        Window_FillTilemap(&param0->unk_08[5], 15);
         Sound_PlayEffect(1500);
 
         return ov7_0224E098(param0);
@@ -991,7 +991,7 @@ static u8 ov7_0224DFB0(UnkStruct_ov7_0224D008 *param0)
 
         ov7_0224EC10(param0, 0);
 
-        sub_0201A9A4(&param0->unk_08[1]);
+        Window_ScheduleCopyToVRAM(&param0->unk_08[1]);
         Sound_PlayEffect(1500);
 
         return 4;
@@ -1075,7 +1075,7 @@ static void ov7_0224E28C(UnkStruct_ov7_0224D008 *param0, u8 param1)
     Strbuf *v1;
     u32 v2;
 
-    BGL_FillWindow(&param0->unk_08[3], 15);
+    Window_FillTilemap(&param0->unk_08[3], 15);
 
     if (param1 == 0) {
         Window_Show(&param0->unk_08[3], 1, (1 + (18 + 12)), 11);
@@ -1103,7 +1103,7 @@ static void ov7_0224E28C(UnkStruct_ov7_0224D008 *param0, u8 param1)
     Text_AddPrinterWithParams(&param0->unk_08[3], FONT_SYSTEM, v0, (12 * 8) - v2, 8, TEXT_SPEED_NO_TRANSFER, NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v0);
-    sub_0201A9A4(&param0->unk_08[3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_08[3]);
 }
 
 static u8 ov7_0224E3A0(UnkStruct_ov7_0224D008 *param0)
@@ -1159,7 +1159,7 @@ static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 *param0)
         StringTemplate_Format(param0->unk_8C, param0->unk_298, v0);
         Strbuf_Free(v0);
     }
-        BGL_FillWindow(&param0->unk_08[5], 15);
+        Window_FillTilemap(&param0->unk_08[5], 15);
         param0->unk_2A4 = FieldMessage_Print(&param0->unk_08[5], param0->unk_298, param0->unk_278, 1);
         Sound_PlayEffect(1604);
         return 9;
@@ -1169,7 +1169,7 @@ static u8 ov7_0224E3D8(UnkStruct_ov7_0224D008 *param0)
         CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
         CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
-        sub_0201A9A4(&param0->unk_08[1]);
+        Window_ScheduleCopyToVRAM(&param0->unk_08[1]);
         return 4;
     }
 
@@ -1231,7 +1231,7 @@ static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 *param0)
 
                 StringTemplate_Format(param0->unk_8C, param0->unk_298, v0);
                 Strbuf_Free(v0);
-                BGL_FillWindow(&param0->unk_08[5], 15);
+                Window_FillTilemap(&param0->unk_08[5], 15);
 
                 param0->unk_2A4 = FieldMessage_Print(&param0->unk_08[5], param0->unk_298, param0->unk_278, 1);
 
@@ -1249,7 +1249,7 @@ static u8 ov7_0224E6B8(UnkStruct_ov7_0224D008 *param0)
         CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
         CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
-        sub_0201A9A4(&param0->unk_08[1]);
+        Window_ScheduleCopyToVRAM(&param0->unk_08[1]);
 
         return 4;
     }
@@ -1269,7 +1269,7 @@ static u8 ov7_0224E7C8(UnkStruct_ov7_0224D008 *param0)
         CellActor_SetDrawFlag(param0->unk_25C[0], param0->unk_26C[0]);
         CellActor_SetDrawFlag(param0->unk_25C[1], param0->unk_26C[1]);
         ov7_0224EC10(param0, 0);
-        sub_0201A9A4(&param0->unk_08[1]);
+        Window_ScheduleCopyToVRAM(&param0->unk_08[1]);
 
         return 4;
     }
@@ -1420,7 +1420,7 @@ static u8 ov7_0224EA2C(UnkStruct_ov7_0224D008 *param0)
         return 13;
     }
 
-    BGL_DeleteWindow(&param0->unk_08[1]);
+    Window_Remove(&param0->unk_08[1]);
     ov7_0224D040(param0);
 
     return 1;

src/overlay008/ov8_02249960.c

@@ -2864,7 +2864,7 @@ static BOOL ov8_0224B3D4(TaskManager *param0)
 
             ov8_0224B240(&v2->unk_1C, v9, v10);
             sub_0200E084(v2->unk_44, 0);
-            BGL_DeleteWindow(v2->unk_44);
+            Window_Remove(v2->unk_44);
             v2->unk_04 = 0;
             v2->unk_00 = 5;
             break;

src/overlay009/ov9_02249960.c

@@ -2577,7 +2577,7 @@ static void ov9_0224ADC0(UnkStruct_ov9_02249B04 *param0)
 
         v1 = NARC_AllocAndReadWholeMember(param0->unk_10, 1, 4);
         NNS_G2dGetUnpackedPaletteData(v1, &v2);
-        sub_0201972C(2, v2->pRawData, 32, 32 * 0);
+        Bg_LoadPalette(2, v2->pRawData, 32, 32 * 0);
 
         {
             int v3;
@@ -2602,7 +2602,7 @@ static void ov9_0224ADC0(UnkStruct_ov9_02249B04 *param0)
         v6 = NARC_AllocAndReadWholeMember(param0->unk_10, 0, 4);
         NNS_G2dGetUnpackedCharacterData(v6, &v7);
 
-        sub_0201958C(param0->fieldSystem->unk_08, 2, v7->pRawData, v7->szByte, 0);
+        Bg_LoadTiles(param0->fieldSystem->unk_08, 2, v7->pRawData, v7->szByte, 0);
         Heap_FreeToHeap(v6);
     }
 
@@ -2613,9 +2613,9 @@ static void ov9_0224ADC0(UnkStruct_ov9_02249B04 *param0)
         v8 = NARC_AllocAndReadWholeMember(param0->unk_10, 2, 4);
         NNS_G2dGetUnpackedScreenData(v8, &v9);
 
-        sub_02019460(param0->fieldSystem->unk_08, 2, (void *)v9->rawData, v9->szByte, 0);
-        sub_02019574(param0->fieldSystem->unk_08, 2, (void *)v9->rawData, v9->szByte);
-        sub_02019448(param0->fieldSystem->unk_08, 2);
+        Bg_CopyTilemapBufferRangeToVRAM(param0->fieldSystem->unk_08, 2, (void *)v9->rawData, v9->szByte, 0);
+        Bg_LoadTilemapBuffer(param0->fieldSystem->unk_08, 2, (void *)v9->rawData, v9->szByte);
+        Bg_CopyTilemapBufferToVRAM(param0->fieldSystem->unk_08, 2);
         Heap_FreeToHeap(v8);
     }
 
@@ -7826,7 +7826,7 @@ static void ov9_0224F804(UnkStruct_ov9_02249B04 *param0)
 
     if (v0->unk_04 == 1) {
         {
-            sub_0201972C(
+            Bg_LoadPalette(
                 2, v0->unk_28, 32, 32 * 0);
         }
 

src/overlay010/ov10_0221F800.c

@@ -479,7 +479,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
         ov10_022229D4(param0);
         MessageLoader_GetStrbuf(param0->unk_BA0, 0, param0->unk_BA8);
         param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
-        sub_0201C3C0(param0->unk_0C, 0);
+        Bg_ScheduleTilemapTransfer(param0->unk_0C, 0);
         param0->unk_BB0 = 2;
         break;
     case 2:
@@ -496,13 +496,13 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
             MessageLoader_GetStrbuf(param0->unk_BA0, 1, param0->unk_BA8);
         }
 
-        BGL_WindowColor(&param0->unk_B8C, 15, 0, 0, 27 * 8, 4 * 8);
+        Window_FillRectWithColor(&param0->unk_B8C, 15, 0, 0, 27 * 8, 4 * 8);
         sub_0200E060(&param0->unk_B8C, 0, 1, 15);
 
         param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B8C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
         param0->unk_BB4 = sub_02002054(param0->unk_0C, &Unk_ov10_02222A68, (1 + (18 + 12)), 14, 1, param0->unk_00->unk_24);
 
-        sub_0201C3C0(param0->unk_0C, 0);
+        Bg_ScheduleTilemapTransfer(param0->unk_0C, 0);
         param0->unk_BB0 = 4;
         break;
     case 4: {
@@ -523,7 +523,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
         ov10_022229D4(param0);
         MessageLoader_GetStrbuf(param0->unk_BA0, 5, param0->unk_BA8);
         param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
-        sub_0201C3C0(param0->unk_0C, 0);
+        Bg_ScheduleTilemapTransfer(param0->unk_0C, 0);
         param0->unk_BB0 = 6;
         break;
     case 6:
@@ -535,7 +535,7 @@ static void ov10_0221F930(UnkStruct_ov10_0221FB28 *param0)
         }
 
         sub_0200E084(&param0->unk_B7C, 0);
-        sub_0201C3C0(param0->unk_0C, 0);
+        Bg_ScheduleTilemapTransfer(param0->unk_0C, 0);
         param0->unk_BB0 = 8;
         break;
     case 8:
@@ -559,11 +559,11 @@ static u8 ov10_0221FB28(UnkStruct_ov10_0221FB28 *param0)
 
     ov10_0221F900();
 
-    param0->unk_0C = sub_02018340(param0->unk_00->unk_24);
+    param0->unk_0C = BgConfig_New(param0->unk_00->unk_24);
     param0->unk_08 = sub_02002F38(param0->unk_00->unk_24);
 
     sub_02002F70(param0->unk_08, 0, 32 * 16, param0->unk_00->unk_24);
-    sub_0201975C(4, 0x0);
+    Bg_MaskPalette(4, 0x0);
 
     param0->unk_B76 = 0;
     param0->unk_B75 = 8;
@@ -720,13 +720,13 @@ static u8 ov10_0221FE10(UnkStruct_ov10_0221FB28 *param0)
 
 static u8 ov10_0221FE48(UnkStruct_ov10_0221FB28 *param0)
 {
-    if (sub_020192EC(param0->unk_0C, 3) <= 24) {
+    if (Bg_GetXOffset(param0->unk_0C, 3) <= 24) {
         param0->unk_B76 = 0;
         param0->unk_B6C = 0;
         param0->unk_B6E = 0;
 
-        sub_0201C63C(param0->unk_0C, 3, 0, 24);
-        sub_0201C63C(param0->unk_0C, 2, 0, -24);
+        Bg_ScheduleScroll(param0->unk_0C, 3, 0, 24);
+        Bg_ScheduleScroll(param0->unk_0C, 2, 0, -24);
 
         ov10_02221188(param0, 0, 0, 0);
         ov10_02221188(param0, 1, 0, 0);
@@ -740,8 +740,8 @@ static u8 ov10_0221FE48(UnkStruct_ov10_0221FB28 *param0)
         return 1;
     }
 
-    sub_0201C63C(param0->unk_0C, 3, 2, param0->unk_B68);
-    sub_0201C63C(param0->unk_0C, 2, 1, param0->unk_B68);
+    Bg_ScheduleScroll(param0->unk_0C, 3, 2, param0->unk_B68);
+    Bg_ScheduleScroll(param0->unk_0C, 2, 1, param0->unk_B68);
 
     param0->unk_B76++;
 
@@ -775,10 +775,10 @@ static u8 ov10_02220014(UnkStruct_ov10_0221FB28 *param0)
     }
 
     if (param0->unk_B76 == 24) {
-        sub_0201C63C(param0->unk_0C, 3, 0, 24);
-        sub_0201C63C(param0->unk_0C, 2, 0, -24);
-        sub_0201C63C(param0->unk_0C, 3, 3, 0);
-        sub_0201C63C(param0->unk_0C, 2, 3, 0);
+        Bg_ScheduleScroll(param0->unk_0C, 3, 0, 24);
+        Bg_ScheduleScroll(param0->unk_0C, 2, 0, -24);
+        Bg_ScheduleScroll(param0->unk_0C, 3, 3, 0);
+        Bg_ScheduleScroll(param0->unk_0C, 2, 3, 0);
 
         ov10_02221188(param0, 0, 0, 0);
         ov10_02221188(param0, 1, 0, 0);
@@ -801,10 +801,10 @@ static u8 ov10_02220014(UnkStruct_ov10_0221FB28 *param0)
             v1 *= -1;
         }
 
-        sub_0201C63C(param0->unk_0C, 3, 0, 24 + v0);
-        sub_0201C63C(param0->unk_0C, 2, 0, -24 + v0);
-        sub_0201C63C(param0->unk_0C, 3, 3, v1);
-        sub_0201C63C(param0->unk_0C, 2, 3, v1);
+        Bg_ScheduleScroll(param0->unk_0C, 3, 0, 24 + v0);
+        Bg_ScheduleScroll(param0->unk_0C, 2, 0, -24 + v0);
+        Bg_ScheduleScroll(param0->unk_0C, 3, 3, v1);
+        Bg_ScheduleScroll(param0->unk_0C, 2, 3, v1);
 
         ov10_02221188(param0, 0, v0, v1);
         ov10_02221188(param0, 1, v0, v1);
@@ -840,8 +840,8 @@ static u8 ov10_02220228(UnkStruct_ov10_0221FB28 *param0)
         Sound_PlayEffect(1817);
     }
 
-    sub_0201C63C(param0->unk_0C, 3, 1, 16);
-    sub_0201C63C(param0->unk_0C, 2, 2, 16);
+    Bg_ScheduleScroll(param0->unk_0C, 3, 1, 16);
+    Bg_ScheduleScroll(param0->unk_0C, 2, 2, 16);
 
     param0->unk_B76++;
 
@@ -894,8 +894,8 @@ static u8 ov10_022203A0(UnkStruct_ov10_0221FB28 *param0)
 
 static u8 ov10_022203BC(UnkStruct_ov10_0221FB28 *param0)
 {
-    sub_0201C63C(param0->unk_0C, 2, 2, Unk_ov10_02222A7C[param0->unk_B76][0]);
-    sub_0201C63C(param0->unk_0C, 3, 2, Unk_ov10_02222A7C[param0->unk_B76][0]);
+    Bg_ScheduleScroll(param0->unk_0C, 2, 2, Unk_ov10_02222A7C[param0->unk_B76][0]);
+    Bg_ScheduleScroll(param0->unk_0C, 3, 2, Unk_ov10_02222A7C[param0->unk_B76][0]);
     ov10_02221188(param0, 0, Unk_ov10_02222A7C[param0->unk_B76][1], 0);
     ov10_02221188(param0, 1, Unk_ov10_02222A7C[param0->unk_B76][1], 0);
     ov10_02221188(param0, 2, Unk_ov10_02222A7C[param0->unk_B76][1], 0);
@@ -921,8 +921,8 @@ static u8 ov10_022203BC(UnkStruct_ov10_0221FB28 *param0)
 
 static u8 ov10_022204C0(UnkStruct_ov10_0221FB28 *param0)
 {
-    sub_0201C63C(param0->unk_0C, 2, 1, Unk_ov10_02222A7C[param0->unk_B76][0]);
-    sub_0201C63C(param0->unk_0C, 3, 1, Unk_ov10_02222A7C[param0->unk_B76][0]);
+    Bg_ScheduleScroll(param0->unk_0C, 2, 1, Unk_ov10_02222A7C[param0->unk_B76][0]);
+    Bg_ScheduleScroll(param0->unk_0C, 3, 1, Unk_ov10_02222A7C[param0->unk_B76][0]);
 
     ov10_02221188(param0, 0, -Unk_ov10_02222A7C[param0->unk_B76][1], 0);
     ov10_02221188(param0, 1, -Unk_ov10_02222A7C[param0->unk_B76][1], 0);
@@ -1037,7 +1037,7 @@ static u8 ov10_02220700(UnkStruct_ov10_0221FB28 *param0)
         }
 
         ov10_02222A48(param0);
-        BGL_WindowColor(&param0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8);
+        Window_FillRectWithColor(&param0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8);
 
         param0->unk_BAC = Text_AddPrinterWithParams(&param0->unk_B7C, FONT_MESSAGE, param0->unk_BA8, 0, 0, TEXT_SPEED_INSTANT, NULL);
     }
@@ -1055,13 +1055,13 @@ static u8 ov10_02220700(UnkStruct_ov10_0221FB28 *param0)
         break;
     default:
         sub_0200E084(&param0->unk_B7C, 0);
-        sub_0201C3C0(param0->unk_0C, 0);
+        Bg_ScheduleTilemapTransfer(param0->unk_0C, 0);
         param0->unk_B76 = 0;
         param0->unk_B75 = 64 / 3;
         return 1;
     }
 
-    sub_0201C3C0(param0->unk_0C, 0);
+    Bg_ScheduleTilemapTransfer(param0->unk_0C, 0);
     return 0;
 }
 
@@ -1091,7 +1091,7 @@ static u8 ov10_022208B0(UnkStruct_ov10_0221FB28 *param0)
         break;
     }
 
-    sub_0201C3C0(param0->unk_0C, 0);
+    Bg_ScheduleTilemapTransfer(param0->unk_0C, 0);
     return 0;
 }
 
@@ -1266,7 +1266,7 @@ static void ov10_02220C64(void *param0)
 {
     UnkStruct_ov10_0221FB28 *v0 = param0;
 
-    sub_0201C2B8(v0->unk_0C);
+    Bg_RunScheduledUpdates(v0->unk_0C);
     sub_02003694(v0->unk_08);
     sub_0201DCAC();
     sub_0200C800();
@@ -1287,7 +1287,7 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p
         };
 
         v0.bg0As2DOr3D = param1;
-        sub_02018368(&v0);
+        SetAllGraphicsModes(&v0);
     }
 
     {
@@ -1307,9 +1307,9 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p
             0
         };
 
-        sub_020183C4(param0->unk_0C, 3, &v1, 0);
-        sub_02019EBC(param0->unk_0C, 3);
-        sub_0201C63C(param0->unk_0C, 3, 0, 256);
+        Bg_InitFromTemplate(param0->unk_0C, 3, &v1, 0);
+        Bg_ClearTilemap(param0->unk_0C, 3);
+        Bg_ScheduleScroll(param0->unk_0C, 3, 0, 256);
     }
 
     {
@@ -1329,9 +1329,9 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p
             0
         };
 
-        sub_020183C4(param0->unk_0C, 2, &v2, 0);
-        sub_02019EBC(param0->unk_0C, 2);
-        sub_0201C63C(param0->unk_0C, 2, 0, -256);
+        Bg_InitFromTemplate(param0->unk_0C, 2, &v2, 0);
+        Bg_ClearTilemap(param0->unk_0C, 2);
+        Bg_ScheduleScroll(param0->unk_0C, 2, 0, -256);
     }
 
     {
@@ -1351,12 +1351,12 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p
             0
         };
 
-        sub_020183C4(param0->unk_0C, 1, &v3, 0);
-        sub_02019EBC(param0->unk_0C, 1);
+        Bg_InitFromTemplate(param0->unk_0C, 1, &v3, 0);
+        Bg_ClearTilemap(param0->unk_0C, 1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
 
         if (param2 == 1) {
-            sub_02019184(param0->unk_0C, 1, 3, 24);
+            Bg_SetOffset(param0->unk_0C, 1, 3, 24);
         }
     }
 
@@ -1377,8 +1377,8 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p
             0
         };
 
-        sub_020183C4(param0->unk_0C, 0, &v4, 0);
-        sub_02019EBC(param0->unk_0C, 0);
+        Bg_InitFromTemplate(param0->unk_0C, 0, &v4, 0);
+        Bg_ClearTilemap(param0->unk_0C, 0);
 
         if (param0->unk_BBC == 1) {
             GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
@@ -1391,11 +1391,11 @@ static void ov10_02220C94(UnkStruct_ov10_0221FB28 *param0, GXBG0As param1, int p
 static void ov10_02220DCC(UnkStruct_ov10_0221FB28 *param0)
 {
     if (param0->unk_B7C.pixels != NULL) {
-        BGL_DeleteWindow(&param0->unk_B7C);
+        Window_Remove(&param0->unk_B7C);
     }
 
     if (param0->unk_B8C.pixels != NULL) {
-        BGL_DeleteWindow(&param0->unk_B8C);
+        Window_Remove(&param0->unk_B8C);
     }
 }
 
@@ -1417,12 +1417,12 @@ static void ov10_02220DFC(UnkStruct_ov10_0221FB28 *param0)
 static void ov10_02220E30(UnkStruct_ov10_0221FB28 *param0)
 {
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0);
-    sub_02019044(param0->unk_0C, 3);
-    sub_02019044(param0->unk_0C, 2);
-    sub_02019044(param0->unk_0C, 1);
+    Bg_FreeTilemapBuffer(param0->unk_0C, 3);
+    Bg_FreeTilemapBuffer(param0->unk_0C, 2);
+    Bg_FreeTilemapBuffer(param0->unk_0C, 1);
 
     if (param0->unk_B9C == GX_BG0_AS_2D) {
-        sub_02019044(param0->unk_0C, 0);
+        Bg_FreeTilemapBuffer(param0->unk_0C, 0);
     }
 
     Heap_FreeToHeap(param0->unk_0C);
@@ -1440,7 +1440,7 @@ static void ov10_02220E70(UnkStruct_ov10_0221FB28 *param0)
     sub_0200710C(v0, 3, param0->unk_0C, 3, 0, 0, 0, param0->unk_00->unk_24);
     sub_02007130(v0, 1, 0, 0, 0, param0->unk_00->unk_24);
     sub_02003070(param0->unk_08, 0, 0, 0x20 * 5);
-    sub_0201975C(1, 0x18c6);
+    Bg_MaskPalette(1, 0x18c6);
     NARC_dtor(v0);
 }
 
@@ -1457,8 +1457,8 @@ static void ov10_02220F1C(UnkStruct_ov10_0221FB28 *param0)
     sub_02003070(param0->unk_08, 0, 14 * 16, 0x20 * 1);
     Font_LoadTextPalette(0, 13 * 0x20, param0->unk_00->unk_24);
     sub_02003070(param0->unk_08, 0, 13 * 16, 0x20 * 1);
-    BGL_AddWindow(param0->unk_0C, &param0->unk_B7C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9));
-    BGL_AddWindow(param0->unk_0C, &param0->unk_B8C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9));
+    Window_Add(param0->unk_0C, &param0->unk_B7C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9));
+    Window_Add(param0->unk_0C, &param0->unk_B8C, 0, 0x2, 0x13, 27, 4, 13, ((1 + (18 + 12)) + 9));
 }
 
 static void ov10_02221004(void)
@@ -1572,7 +1572,7 @@ static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *p
 
     v0 = &param0->unk_10[0];
 
-    BGL_AddFramelessWindow(param0->unk_0C, v0, 8, 2, 0, 0);
+    Window_AddToTopLeftCorner(param0->unk_0C, v0, 8, 2, 0, 0);
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL);
 
     v1.unk_00 = param0->unk_B38;
@@ -1591,7 +1591,7 @@ static void ov10_0222130C(UnkStruct_ov10_0221FB28 *param0, u32 param1, Strbuf *p
     param0->unk_B3C[param1] = sub_020127E8(&v1);
 
     sub_02012A60(param0->unk_B3C[param1], 0);
-    BGL_DeleteWindow(v0);
+    Window_Remove(v0);
 }
 
 static void ov10_022213B8(UnkStruct_ov10_0221FB28 *param0)
@@ -1842,7 +1842,7 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0)
             GX_BG0_AS_2D
         };
 
-        sub_02018368(&v0);
+        SetAllGraphicsModes(&v0);
     }
 
     {
@@ -1862,8 +1862,8 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_0C, 1, &v1, 0);
-        sub_02019EBC(param0->unk_0C, 1);
+        Bg_InitFromTemplate(param0->unk_0C, 1, &v1, 0);
+        Bg_ClearTilemap(param0->unk_0C, 1);
     }
 
     {
@@ -1883,8 +1883,8 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_0C, 2, &v2, 0);
-        sub_02019EBC(param0->unk_0C, 2);
+        Bg_InitFromTemplate(param0->unk_0C, 2, &v2, 0);
+        Bg_ClearTilemap(param0->unk_0C, 2);
     }
 
     {
@@ -1904,16 +1904,16 @@ static void ov10_02221970(UnkStruct_ov10_0221FB28 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_0C, 3, &v3, 0);
+        Bg_InitFromTemplate(param0->unk_0C, 3, &v3, 0);
     }
 }
 
 static void ov10_02221A10(UnkStruct_ov10_0221FB28 *param0)
 {
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0);
-    sub_02019044(param0->unk_0C, 3);
-    sub_02019044(param0->unk_0C, 2);
-    sub_02019044(param0->unk_0C, 1);
+    Bg_FreeTilemapBuffer(param0->unk_0C, 3);
+    Bg_FreeTilemapBuffer(param0->unk_0C, 2);
+    Bg_FreeTilemapBuffer(param0->unk_0C, 1);
     Heap_FreeToHeap(param0->unk_0C);
 }
 
@@ -1933,7 +1933,7 @@ static void ov10_02221A3C(UnkStruct_ov10_0221FB28 *param0)
 
         v2 = NARC_AllocAndReadWholeMember(v0, 16, param0->unk_00->unk_24);
         NNS_G2dGetUnpackedPaletteData(v2, &v1);
-        sub_0201972C(3, (void *)v1->pRawData, v1->szByte, 0);
+        Bg_LoadPalette(3, (void *)v1->pRawData, v1->szByte, 0);
 
         v3 = (u16 *)v1->pRawData;
         memcpy(param0->unk_4D8, &v3[3 * 16], 32 * 3);
@@ -1958,23 +1958,23 @@ static void ov10_02221AE4(UnkStruct_ov10_0221FB28 *param0)
             v0 = param0->unk_358;
         }
 
-        sub_020198E8(param0->unk_0C, 2, Unk_ov10_02222A70[v1][0], Unk_ov10_02222A70[v1][1], 16, 6, (const void *)v0, 0, 0, 16, 6);
+        Bg_CopyToTilemapRect(param0->unk_0C, 2, Unk_ov10_02222A70[v1][0], Unk_ov10_02222A70[v1][1], 16, 6, (const void *)v0, 0, 0, 16, 6);
 
         if (param0->unk_214[v1].unk_04 != 0) {
-            sub_02019E2C(
+            Bg_ChangeTilemapRectPalette(
                 param0->unk_0C, 2, Unk_ov10_02222A70[v1][0], Unk_ov10_02222A70[v1][1], 16, 6, 3 + v1);
 
             if (((v1 < 3) && (param0->unk_00->unk_29 == 1)) || ((v1 >= 3) && (param0->unk_00->unk_29 == 0))) {
-                sub_0201972C(
+                Bg_LoadPalette(
                     2, (void *)&param0->unk_4D8[16 * 1], 16 * 2, (3 + v1) * 16 * 2);
             } else {
-                sub_0201972C(
+                Bg_LoadPalette(
                     2, (void *)&param0->unk_4D8[0], 16 * 2, (3 + v1) * 16 * 2);
             }
         }
     }
 
-    sub_0201C3C0(param0->unk_0C, 2);
+    Bg_ScheduleTilemapTransfer(param0->unk_0C, 2);
 }
 
 static void ov10_02221BC8(UnkStruct_ov10_0221FB28 *param0, u16 *param1, u8 param2)
@@ -1982,7 +1982,7 @@ static void ov10_02221BC8(UnkStruct_ov10_0221FB28 *param0, u16 *param1, u8 param
     u16 *v0;
     u16 v1, v2;
 
-    v0 = sub_02019FE4(param0->unk_0C, param2);
+    v0 = Bg_GetTilemapBuffer(param0->unk_0C, param2);
 
     if (param0->unk_00->unk_29 == 0) {
         v1 = 16;
@@ -2001,22 +2001,22 @@ static void ov10_02221C14(UnkStruct_ov10_0221FB28 *param0)
     ov10_02221BC8(param0, &param0->unk_538[0][0], 1);
     ov10_02221BC8(param0, &param0->unk_538[1][0], 2);
 
-    sub_0201C3C0(param0->unk_0C, 1);
-    sub_0201C3C0(param0->unk_0C, 2);
+    Bg_ScheduleTilemapTransfer(param0->unk_0C, 1);
+    Bg_ScheduleTilemapTransfer(param0->unk_0C, 2);
 }
 
 static void ov10_02221C48(UnkStruct_ov10_0221FB28 *param0, u8 param1)
 {
     if (param0->unk_00->unk_29 == 0) {
-        sub_020198E8(param0->unk_0C, 1, 16 + 16 - param1, 0, param1, 24, (const void *)&param0->unk_538[0][0], 0, 0, 16, 24);
-        sub_020198E8(param0->unk_0C, 2, 16 + 16 - param1, 0, param1, 24, (const void *)&param0->unk_538[1][0], 0, 0, 16, 24);
+        Bg_CopyToTilemapRect(param0->unk_0C, 1, 16 + 16 - param1, 0, param1, 24, (const void *)&param0->unk_538[0][0], 0, 0, 16, 24);
+        Bg_CopyToTilemapRect(param0->unk_0C, 2, 16 + 16 - param1, 0, param1, 24, (const void *)&param0->unk_538[1][0], 0, 0, 16, 24);
     } else {
-        sub_020198E8(param0->unk_0C, 1, 0, 0, param1, 24, (const void *)&param0->unk_538[0][0], 16 - param1, 0, 16, 24);
-        sub_020198E8(param0->unk_0C, 2, 0, 0, param1, 24, (const void *)&param0->unk_538[1][0], 16 - param1, 0, 16, 24);
+        Bg_CopyToTilemapRect(param0->unk_0C, 1, 0, 0, param1, 24, (const void *)&param0->unk_538[0][0], 16 - param1, 0, 16, 24);
+        Bg_CopyToTilemapRect(param0->unk_0C, 2, 0, 0, param1, 24, (const void *)&param0->unk_538[1][0], 16 - param1, 0, 16, 24);
     }
 
-    sub_0201C3C0(param0->unk_0C, 1);
-    sub_0201C3C0(param0->unk_0C, 2);
+    Bg_ScheduleTilemapTransfer(param0->unk_0C, 1);
+    Bg_ScheduleTilemapTransfer(param0->unk_0C, 2);
 }
 
 static void ov10_02221D14(UnkStruct_ov10_0221FB28 *param0, Party *param1, u8 param2)
@@ -2236,7 +2236,7 @@ static void ov10_022223C0(UnkStruct_ov10_0221FB28 *param0)
     u32 v0;
 
     for (v0 = 0; v0 < 24; v0++) {
-        sub_0201A8D4(param0->unk_0C, &param0->unk_10[v0], &Unk_ov10_02222CF4[v0]);
+        Window_AddFromTemplate(param0->unk_0C, &param0->unk_10[v0], &Unk_ov10_02222CF4[v0]);
     }
 }
 
@@ -2245,7 +2245,7 @@ static void ov10_022223E8(UnkStruct_ov10_0221FB28 *param0)
     u32 v0;
 
     for (v0 = 0; v0 < 24; v0++) {
-        BGL_DeleteWindow(&param0->unk_10[v0]);
+        Window_Remove(&param0->unk_10[v0]);
     }
 }
 
@@ -2320,24 +2320,24 @@ static void ov10_02222594(UnkStruct_ov10_0221FB28 *param0, u32 param1)
         break;
     case 4:
     case 3:
-        sub_0201972C(
+        Bg_LoadPalette(
             1, &param0->unk_4D8[9], 2 * 2, (v0->palette * 16 + 9) * 2);
         break;
     case 2:
-        sub_0201972C(
+        Bg_LoadPalette(
             1, &param0->unk_4D8[(9 + 16)], 2 * 2, (v0->palette * 16 + 9) * 2);
         break;
     case 1:
-        sub_0201972C(
+        Bg_LoadPalette(
             1, &param0->unk_4D8[(9 + 32)], 2 * 2, (v0->palette * 16 + 9) * 2);
         break;
     }
 
     v1 = App_PixelCount(param0->unk_214[param1].unk_06, param0->unk_214[param1].unk_08, 48);
 
-    BGL_WindowColor(v0, 10, 0, 2, v1, 1);
-    BGL_WindowColor(v0, 9, 0, 3, v1, 2);
-    BGL_WindowColor(v0, 10, 0, 5, v1, 1);
+    Window_FillRectWithColor(v0, 10, 0, 2, v1, 1);
+    Window_FillRectWithColor(v0, 9, 0, 3, v1, 2);
+    Window_FillRectWithColor(v0, 10, 0, 5, v1, 1);
 }
 
 static void ov10_02222684(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1, UnkStruct_0200C440 *param2, StringTemplate *param3, Strbuf *param4, u32 param5)
@@ -2349,20 +2349,20 @@ static void ov10_02222684(UnkStruct_ov10_0221FB28 *param0, MessageLoader *param1
 
     v1 = &param0->unk_10[param5 * 4];
 
-    BGL_FillWindow(&v1[0], 0);
-    BGL_FillWindow(&v1[1], 0);
-    BGL_FillWindow(&v1[2], 0);
-    BGL_FillWindow(&v1[3], 0);
+    Window_FillTilemap(&v1[0], 0);
+    Window_FillTilemap(&v1[1], 0);
+    Window_FillTilemap(&v1[2], 0);
+    Window_FillTilemap(&v1[3], 0);
 
     ov10_02222400(param0, param1, param2, param3, param4, param5);
     ov10_022224F0(param0, param1, param2, param3, param4, param5);
     ov10_02222528(param0, param1, param2, param3, param4, param5);
     ov10_02222594(param0, param5);
 
-    sub_0201A9A4(&v1[0]);
-    sub_0201A9A4(&v1[1]);
-    sub_0201A9A4(&v1[2]);
-    sub_0201A9A4(&v1[3]);
+    Window_ScheduleCopyToVRAM(&v1[0]);
+    Window_ScheduleCopyToVRAM(&v1[1]);
+    Window_ScheduleCopyToVRAM(&v1[2]);
+    Window_ScheduleCopyToVRAM(&v1[3]);
 }
 
 static void ov10_02222720(UnkStruct_ov10_0221FB28 *param0)
@@ -2478,7 +2478,7 @@ static void ov10_022227A4(UnkStruct_ov10_0221F800 *param0)
 
 static void ov10_022229D4(UnkStruct_ov10_0221FB28 *param0)
 {
-    BGL_WindowColor(&param0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8);
+    Window_FillRectWithColor(&param0->unk_B7C, 15, 0, 0, 27 * 8, 4 * 8);
     sub_0200E060(&param0->unk_B7C, 0, 1, 15);
 }
 

src/overlay012/ov12_0221FC20.c

@@ -610,10 +610,10 @@ BOOL ov12_0221FE30(UnkStruct_ov12_0221FCDC *param0, UnkStruct_ov16_02265BBC *par
     }
 
     param0->unk_18 = (u32 *)param0->unk_14;
-    param0->unk_19C[0] = sub_0201A008(param0->unk_C0, 0);
-    param0->unk_19C[1] = sub_0201A008(param0->unk_C0, 1);
-    param0->unk_19C[2] = sub_0201A008(param0->unk_C0, 2);
-    param0->unk_19C[3] = sub_0201A008(param0->unk_C0, 3);
+    param0->unk_19C[0] = Bg_GetPriority(param0->unk_C0, 0);
+    param0->unk_19C[1] = Bg_GetPriority(param0->unk_C0, 1);
+    param0->unk_19C[2] = Bg_GetPriority(param0->unk_C0, 2);
+    param0->unk_19C[3] = Bg_GetPriority(param0->unk_C0, 3);
 
     for (v0 = 0; v0 < 10; v0++) {
         param0->unk_D8[v0] = NULL;
@@ -1323,22 +1323,22 @@ static void ov12_02220798(UnkStruct_ov12_0221FCDC *param0)
     if (ov12_0221FDD4(param0) == 0) {
         Battle_SetDefaultBlend();
 
-        sub_02019690(ov12_022233B0(param0, 1), 0x4000, 0, ov12_0221FDE4(param0));
-        sub_02019EBC(ov12_02220278(param0), ov12_022233B0(param0, 1));
-        sub_02019120(2, 1);
+        Bg_ClearTilesRange(ov12_022233B0(param0, 1), 0x4000, 0, ov12_0221FDE4(param0));
+        Bg_ClearTilemap(ov12_02220278(param0), ov12_022233B0(param0, 1));
+        Bg_ToggleLayer(2, 1);
     } else {
         ov17_022413D8();
     }
 
-    BGL_SetPriority(0, param0->unk_19C[0]);
-    BGL_SetPriority(1, param0->unk_19C[1]);
-    BGL_SetPriority(2, param0->unk_19C[2]);
-    BGL_SetPriority(3, param0->unk_19C[3]);
+    Bg_SetPriority(0, param0->unk_19C[0]);
+    Bg_SetPriority(1, param0->unk_19C[1]);
+    Bg_SetPriority(2, param0->unk_19C[2]);
+    Bg_SetPriority(3, param0->unk_19C[3]);
 
-    sub_02019184(param0->unk_C0, 2, 0, 0);
-    sub_02019184(param0->unk_C0, 2, 3, 0);
-    sub_02019184(param0->unk_C0, 3, 0, 0);
-    sub_02019184(param0->unk_C0, 3, 3, 0);
+    Bg_SetOffset(param0->unk_C0, 2, 0, 0);
+    Bg_SetOffset(param0->unk_C0, 2, 3, 0);
+    Bg_SetOffset(param0->unk_C0, 3, 0, 0);
+    Bg_SetOffset(param0->unk_C0, 3, 3, 0);
 
     param0->unk_10 = 0;
 }
@@ -1977,8 +1977,8 @@ static void ov12_022211D8(SysTask *param0, void *param1)
     v2 = sub_020080C0(v0->unk_04.unk_04, 1);
     v2 -= sub_020080C0(v0->unk_04.unk_04, 41);
 
-    sub_02019184(v0->unk_00, 2, 0, -(v1 - 40));
-    sub_02019184(v0->unk_00, 2, 3, -(v2 - 40));
+    Bg_SetOffset(v0->unk_00, 2, 0, -(v1 - 40));
+    Bg_SetOffset(v0->unk_00, 2, 3, -(v2 - 40));
 }
 
 void ov12_02221238(UnkStruct_ov12_0221FCDC *param0, int param1)
@@ -2040,12 +2040,12 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0)
     }
 
     {
-        u8 *v8 = sub_02019F28(2);
+        u8 *v8 = Bg_GetCharPtr(2);
         MI_CpuFill8(v8, 0, 10 * 10 * 2 * 0x20);
     }
 
-    sub_02019120(2, 0);
-    sub_0201958C(param0->unk_C0, 2, v0, (10 * 10 * ((8 / 2) * 8)), 0);
+    Bg_ToggleLayer(2, 0);
+    Bg_LoadTiles(param0->unk_C0, 2, v0, (10 * 10 * ((8 / 2) * 8)), 0);
     PaletteSys_LoadPalette(param0->unk_C4, v4, v5, param0->unk_00, 0, 0, (8 * 16));
     sub_0200710C(param0->unk_1A0[0], v6, param0->unk_C0, 2, 0, 0, 0, param0->unk_00);
 
@@ -2071,12 +2071,12 @@ static void ov12_0222128C(UnkStruct_ov12_0221FCDC *param0)
         v11 = sub_020080C0(ov12_022232FC(param0, v3), 1);
         v11 -= sub_020080C0(ov12_022232FC(param0, v3), 41);
 
-        sub_02019184(param0->unk_C0, 2, 0, -(v10 - 40));
-        sub_02019184(param0->unk_C0, 2, 3, -(v11 - 40));
+        Bg_SetOffset(param0->unk_C0, 2, 0, -(v10 - 40));
+        Bg_SetOffset(param0->unk_C0, 2, 3, -(v11 - 40));
     }
 
-    sub_02019120(2, 1);
-    BGL_SetPriority(2, ov12_0222339C(param0));
+    Bg_ToggleLayer(2, 1);
+    Bg_SetPriority(2, ov12_0222339C(param0));
 }
 
 static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0)
@@ -2085,7 +2085,7 @@ static void ov12_02221424(UnkStruct_ov12_0221FCDC *param0)
     param0->unk_18 += 1;
 
     {
-        u8 *v0 = sub_02019F28(2);
+        u8 *v0 = Bg_GetCharPtr(2);
         MI_CpuFill8(v0, 0, 10 * 10 * 2 * 0x20);
     }
 
@@ -2520,7 +2520,7 @@ static void ov12_02221AA8(UnkStruct_ov12_02221BBC *param0, UnkStruct_ov12_0221FC
 {
     sub_02006E3C(7, ov12_022234E4(param3, 0), param1->unk_C0, param2, 0, 0, 1, param1->unk_00);
     PaletteSys_LoadPalette(param1->unk_C4, 7, ov12_022234E4(param3, 1), param1->unk_00, 0, 0x20, (9 * 16));
-    sub_02019EBC(param1->unk_C0, param2);
+    Bg_ClearTilemap(param1->unk_C0, param2);
 
     {
         int v0 = 2;
@@ -2637,19 +2637,19 @@ static BOOL ov12_02221C50(SysTask *param0, UnkStruct_ov12_02221BBC *param1)
             int v0 = ov12_02223428(param1->unk_48, 2);
             int v1 = ov12_02223428(param1->unk_48, 1);
 
-            BGL_SetPriority(3, v0);
-            BGL_SetPriority(2, v0);
+            Bg_SetPriority(3, v0);
+            Bg_SetPriority(2, v0);
         }
-        sub_02019120(2, 1);
+        Bg_ToggleLayer(2, 1);
 
         param1->unk_05++;
         break;
 
     case 1: {
-        sub_02018898(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x0c000);
+        Bg_SetControlParam(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x0c000);
 
         if (ov12_0221FDD4(param1->unk_48) != 1) {
-            sub_02018898(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_16);
+            Bg_SetControlParam(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_16);
         }
 
         ov12_02221AA8(param1, param1->unk_48, 3, param1->unk_10);
@@ -2696,14 +2696,14 @@ static BOOL ov12_02221D50(SysTask *param0, UnkStruct_ov12_02221BBC *param1)
 {
     switch (param1->unk_05) {
     case 0:
-        sub_02019120(2, 1);
+        Bg_ToggleLayer(2, 1);
         param1->unk_05++;
     case 1: {
         int v0 = ov12_02223428(param1->unk_48, 2);
         int v1 = ov12_02223428(param1->unk_48, 1);
 
-        BGL_SetPriority(3, v0);
-        BGL_SetPriority(2, v0);
+        Bg_SetPriority(3, v0);
+        Bg_SetPriority(2, v0);
 
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, param1->unk_09, param1->unk_0A);
         ov12_02221B64(param1);
@@ -2742,12 +2742,12 @@ static BOOL ov12_02221D50(SysTask *param0, UnkStruct_ov12_02221BBC *param1)
             ov12_02222338(param1->unk_48);
         }
 
-        sub_02019184(param1->unk_48->unk_C0, 3, 0, 0);
-        sub_02019184(param1->unk_48->unk_C0, 3, 3, 0);
-        sub_02018898(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x10000);
+        Bg_SetOffset(param1->unk_48->unk_C0, 3, 0, 0);
+        Bg_SetOffset(param1->unk_48->unk_C0, 3, 3, 0);
+        Bg_SetControlParam(param1->unk_48->unk_C0, 3, 2, GX_BG_CHARBASE_0x10000);
 
         if (ov12_0221FDD4(param1->unk_48) == 0) {
-            sub_02018898(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_256);
+            Bg_SetControlParam(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_256);
             ov12_02223460(param1->unk_48, 3);
             ov12_02223488(param1->unk_48);
         } else {
@@ -2793,7 +2793,7 @@ static BOOL ov12_02221F44(SysTask *param0, UnkStruct_ov12_02221BBC *param1)
             break;
         }
 
-        sub_02018898(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_16);
+        Bg_SetControlParam(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_16);
         ov12_02221AA8(param1, param1->unk_48, 3, param1->unk_10);
 
         if (param1->unk_0D == 0) {
@@ -2847,10 +2847,10 @@ static BOOL ov12_0222206C(SysTask *param0, UnkStruct_ov12_02221BBC *param1)
             ov12_02222338(param1->unk_48);
         }
 
-        sub_02019120(3, 0);
+        Bg_ToggleLayer(3, 0);
 
         if (ov12_0221FDD4(param1->unk_48) == 0) {
-            sub_02018898(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_256);
+            Bg_SetControlParam(param1->unk_48->unk_C0, 3, 0, GX_BG_COLORMODE_256);
 
             ov12_02223460(param1->unk_48, 3);
             ov12_02223488(param1->unk_48);
@@ -2860,12 +2860,12 @@ static BOOL ov12_0222206C(SysTask *param0, UnkStruct_ov12_02221BBC *param1)
         }
 
         sub_02006E60(param1->unk_48->unk_180.unk_00, param1->unk_48->unk_180.unk_0C, param1->unk_48->unk_C0, 3, 0, 0, 1, param1->unk_48->unk_00);
-        sub_02019120(3, 1);
+        Bg_ToggleLayer(3, 1);
 
         param1->unk_05++;
     case 3:
-        sub_02019184(param1->unk_48->unk_C0, 3, 0, 0);
-        sub_02019184(param1->unk_48->unk_C0, 3, 3, 0);
+        Bg_SetOffset(param1->unk_48->unk_C0, 3, 0, 0);
+        Bg_SetOffset(param1->unk_48->unk_C0, 3, 3, 0);
 
         if (param1->unk_0D == 0) {
             sub_02003178(param1->unk_48->unk_C4, 0x1, param1->unk_48->unk_198, 0, 16, 0, 0);
@@ -2920,11 +2920,11 @@ static void ov12_022222D4(SysTask *param0, void *param1)
     v0->unk_06 += v0->unk_0A;
 
     if (v0->unk_08 != 0) {
-        sub_02019184(v0->unk_00, v0->unk_0C, 0, v0->unk_04);
+        Bg_SetOffset(v0->unk_00, v0->unk_0C, 0, v0->unk_04);
     }
 
     if (v0->unk_0A != 0) {
-        sub_02019184(v0->unk_00, v0->unk_0C, 3, v0->unk_06);
+        Bg_SetOffset(v0->unk_00, v0->unk_0C, 3, v0->unk_06);
     }
 }
 
@@ -3062,17 +3062,17 @@ void ov12_02222590(UnkStruct_ov12_0221FCDC *param0, int param1)
 {
     int v0 = ov12_02223428(param0, 2);
 
-    BGL_SetPriority(param1, v0);
-    sub_02019120(param1, 0);
+    Bg_SetPriority(param1, v0);
+    Bg_ToggleLayer(param1, 0);
 
     if (ov12_0221FDD4(param0) == 1) {
-        sub_02018898(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x10000);
+        Bg_SetControlParam(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x10000);
     } else {
-        sub_02018898(param0->unk_C0, param1, 0, GX_BG_COLORMODE_256);
-        sub_02018898(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x10000);
+        Bg_SetControlParam(param0->unk_C0, param1, 0, GX_BG_COLORMODE_256);
+        Bg_SetControlParam(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x10000);
     }
 
-    sub_02019EBC(param0->unk_C0, param1);
+    Bg_ClearTilemap(param0->unk_C0, param1);
 
     if (ov12_0221FDD4(param0) == 1) {
         sub_02006E3C(param0->unk_180.unk_00, param0->unk_180.unk_04, param0->unk_C0, param1, 0, 0, 1, param0->unk_00);
@@ -3087,16 +3087,16 @@ void ov12_02222664(UnkStruct_ov12_0221FCDC *param0, int param1)
 {
     int v0 = ov12_02223428(param0, 1);
 
-    BGL_SetPriority(param1, v0);
+    Bg_SetPriority(param1, v0);
 
     if (ov12_0221FDD4(param0) == 1) {
-        sub_02018898(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x0c000);
+        Bg_SetControlParam(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x0c000);
     } else {
-        sub_02018898(param0->unk_C0, param1, 0, GX_BG_COLORMODE_16);
-        sub_02018898(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x0c000);
+        Bg_SetControlParam(param0->unk_C0, param1, 0, GX_BG_COLORMODE_16);
+        Bg_SetControlParam(param0->unk_C0, param1, 2, GX_BG_CHARBASE_0x0c000);
     }
 
-    sub_02019EBC(param0->unk_C0, param1);
+    Bg_ClearTilemap(param0->unk_C0, param1);
 }
 
 static BOOL ov12_022226D0(UnkStruct_ov12_02221BBC *param0)
@@ -4089,7 +4089,7 @@ int ov12_02223428(UnkStruct_ov12_0221FCDC *param0, int param1)
 
 void ov12_02223460(UnkStruct_ov12_0221FCDC *param0, int param1)
 {
-    sub_0201958C(param0->unk_C0, param1, param0->unk_BC->unk_110, 0x10000, 0);
+    Bg_LoadTiles(param0->unk_C0, param1, param0->unk_BC->unk_110, 0x10000, 0);
 }
 
 void ov12_02223488(UnkStruct_ov12_0221FCDC *param0)

src/overlay012/ov12_02226B84.c

@@ -477,7 +477,7 @@ static void ov12_02226BA0(SysTask *param0, void *param1)
             }
 
             if (inline_ov12_02235998(v1->unk_20.unk_08, 0x400) == 1) {
-                sub_02019184(v1->unk_04.unk_14, 3, 0, v1->unk_7C.unk_00);
+                Bg_SetOffset(v1->unk_04.unk_14, 3, 0, v1->unk_7C.unk_00);
             }
         }
         break;
@@ -517,7 +517,7 @@ static void ov12_02226D38(SysTask *param0, void *param1)
     switch (v0->unk_1C.unk_00) {
     case 0:
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3, v0->unk_16, v0->unk_18);
-        sub_02019120(2, 1);
+        Bg_ToggleLayer(2, 1);
         v0->unk_1C.unk_00++;
     case 1: {
         int v1 = 0;
@@ -571,7 +571,7 @@ static void ov12_02226D38(SysTask *param0, void *param1)
         G2_ChangeBlendAlpha(v0->unk_16, v0->unk_18);
     } break;
     default:
-        sub_02019120(2, 0);
+        Bg_ToggleLayer(2, 0);
         ov12_02220220(v0->unk_1C.unk_04, param0);
         Heap_FreeToHeap(v0);
         return;
@@ -602,8 +602,8 @@ static void ov12_02226D38(SysTask *param0, void *param1)
         v0->unk_14++;
     }
 
-    sub_02019184(v0->unk_1C.unk_14, 2, 0, v0->unk_0A);
-    sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C);
+    Bg_SetOffset(v0->unk_1C.unk_14, 2, 0, v0->unk_0A);
+    Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C);
 }
 
 void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0)
@@ -640,14 +640,14 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0)
     v0->unk_18 = 31;
     v0->unk_04 = 0;
 
-    sub_02019120(2, 0);
+    Bg_ToggleLayer(2, 0);
 
     {
         int v2 = ov12_02220280(param0, 0);
 
         sub_02006E3C(7, ov12_022234E4(v2, 0), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0));
         PaletteSys_LoadPalette(v0->unk_1C.unk_18, 7, ov12_022234E4(v2, 1), ov12_0221FDE4(param0), 0, 0x20, (9 * 16));
-        sub_02019EBC(v0->unk_1C.unk_14, 2);
+        Bg_ClearTilemap(v0->unk_1C.unk_14, 2);
 
         {
             int v3 = 2;
@@ -662,8 +662,8 @@ void ov12_02226EB0(UnkStruct_ov12_0221FCDC *param0)
         }
     }
 
-    sub_02019184(v0->unk_1C.unk_14, 2, 0, v0->unk_0A);
-    sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C);
+    Bg_SetOffset(v0->unk_1C.unk_14, 2, 0, v0->unk_0A);
+    Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C);
 
     ov12_022201E8(v0->unk_1C.unk_04, ov12_02226D38, v0);
 }
@@ -675,7 +675,7 @@ static void ov12_02227064(SysTask *param0, void *param1)
     switch (v0->unk_1C.unk_00) {
     case 0:
         G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BD | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG3, v0->unk_16, v0->unk_18);
-        sub_02019120(2, 1);
+        Bg_ToggleLayer(2, 1);
         v0->unk_1C.unk_00++;
     case 1: {
         int v1 = 0;
@@ -729,7 +729,7 @@ static void ov12_02227064(SysTask *param0, void *param1)
         G2_ChangeBlendAlpha(v0->unk_16, v0->unk_18);
     } break;
     default:
-        sub_02019120(2, 0);
+        Bg_ToggleLayer(2, 0);
         ov12_02220220(v0->unk_1C.unk_04, param0);
         Heap_FreeToHeap(v0);
         return;
@@ -760,8 +760,8 @@ static void ov12_02227064(SysTask *param0, void *param1)
         v0->unk_14++;
     }
 
-    sub_02019184(v0->unk_1C.unk_14, 2, 0, v0->unk_0A);
-    sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C);
+    Bg_SetOffset(v0->unk_1C.unk_14, 2, 0, v0->unk_0A);
+    Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C);
 }
 
 void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0)
@@ -800,14 +800,14 @@ void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0)
     v0->unk_18 = 16;
     v0->unk_04 = 0;
 
-    sub_02019120(2, 0);
+    Bg_ToggleLayer(2, 0);
 
     {
         int v2 = ov12_02220280(param0, 0);
 
         sub_02006E3C(7, ov12_022234E4(v2, 0), v0->unk_1C.unk_14, 2, 0, 0, 1, ov12_0221FDE4(param0));
         PaletteSys_LoadPalette(v0->unk_1C.unk_18, 7, ov12_022234E4(v2, 1), ov12_0221FDE4(param0), 0, 0x20, (9 * 16));
-        sub_02019EBC(v0->unk_1C.unk_14, 2);
+        Bg_ClearTilemap(v0->unk_1C.unk_14, 2);
 
         {
             int v3 = 2;
@@ -822,8 +822,8 @@ void ov12_022271D8(UnkStruct_ov12_0221FCDC *param0)
         }
     }
 
-    sub_02019184(v0->unk_1C.unk_14, 2, 0, v0->unk_0A);
-    sub_02019184(v0->unk_1C.unk_14, 2, 3, v0->unk_0C);
+    Bg_SetOffset(v0->unk_1C.unk_14, 2, 0, v0->unk_0A);
+    Bg_SetOffset(v0->unk_1C.unk_14, 2, 3, v0->unk_0C);
 
     ov12_022201E8(v0->unk_1C.unk_04, ov12_02227064, v0);
 }
@@ -2694,23 +2694,23 @@ static void ov12_02229738(SysTask *param0, void *param1)
             }
 
             if (v1->unk_20 != 0) {
-                sub_02019184(v1->unk_28, v1->unk_1C, 0, 0);
+                Bg_SetOffset(v1->unk_28, v1->unk_1C, 0, 0);
             }
 
             if (v1->unk_24 != 0) {
-                sub_02019184(v1->unk_28, v1->unk_1C, 3, 0);
+                Bg_SetOffset(v1->unk_28, v1->unk_1C, 3, 0);
             }
 
             v1->unk_01++;
         } else {
             if (v1->unk_D4.unk_00 != 0) {
                 v1->unk_20 = 1;
-                sub_02019184(v1->unk_28, v1->unk_1C, 0, v1->unk_D4.unk_00);
+                Bg_SetOffset(v1->unk_28, v1->unk_1C, 0, v1->unk_D4.unk_00);
             }
 
             if (v1->unk_D4.unk_02 != 0) {
                 v1->unk_24 = 1;
-                sub_02019184(v1->unk_28, v1->unk_1C, 3, v1->unk_D4.unk_02);
+                Bg_SetOffset(v1->unk_28, v1->unk_1C, 3, v1->unk_D4.unk_02);
             }
         }
     } break;

src/overlay012/ov12_0222AC70.c

@@ -1370,7 +1370,7 @@ static void ov12_0222C4A8(SysTask *param0, void *param1)
             sub_02007DEC(v1->unk_14[v0].unk_08, 0, v1->unk_14[v0].unk_00.unk_00 + v1->unk_B4.unk_00);
         }
 
-        sub_02019184(v1->unk_08, 3, 0, v1->unk_B4.unk_00);
+        Bg_SetOffset(v1->unk_08, 3, 0, v1->unk_B4.unk_00);
         break;
     default:
         ov12_02220220(v1->unk_0C, param0);
@@ -1605,8 +1605,8 @@ static void ov12_0222C994(SysTask *param0, void *param1)
                 sub_02007DEC(v1->unk_38[v0], 0, v1->unk_28[v0].unk_00 + v1->unk_4C.unk_00);
             }
 
-            sub_02019184(v1->unk_00.unk_14, 3, 0, v1->unk_4C.unk_00);
-            sub_02019184(v1->unk_00.unk_14, 3, 3, v1->unk_4C.unk_02);
+            Bg_SetOffset(v1->unk_00.unk_14, 3, 0, v1->unk_4C.unk_00);
+            Bg_SetOffset(v1->unk_00.unk_14, 3, 3, v1->unk_4C.unk_02);
         }
         break;
     default:

src/overlay012/ov12_0222D6B0.c

@@ -767,7 +767,7 @@ void ov12_0222E1A8(UnkStruct_ov12_0221FCDC *param0)
     ov12_02226424(&v0->unk_2C, 16, 2, 2, 16, 16);
     ov12_02222590(v0->unk_04.unk_04, 2);
 
-    sub_02019120(2, 1);
+    Bg_ToggleLayer(2, 1);
     ov12_022201E8(v0->unk_04.unk_04, ov12_0222E080, v0);
 }
 

src/overlay012/ov12_0222E91C.c

@@ -672,7 +672,7 @@ void ov12_0222F5EC(UnkStruct_ov12_0221FCDC *param0)
         switch (v1) {
         case 3:
         case 4:
-            BGL_SetPriority(2, (ov12_0222339C(param0) - 1));
+            Bg_SetPriority(2, (ov12_0222339C(param0) - 1));
             break;
         }
     }

src/overlay012/ov12_0222F700.c

@@ -1013,8 +1013,8 @@ static void ov12_0223025C(SysTask *param0, void *param1)
         }
         break;
     case 2:
-        sub_02019184(ov12_02220278(v0->unk_00), 2, 0, -v0->unk_10);
-        sub_02019184(ov12_02220278(v0->unk_00), 2, 3, -v0->unk_12);
+        Bg_SetOffset(ov12_02220278(v0->unk_00), 2, 0, -v0->unk_10);
+        Bg_SetOffset(ov12_02220278(v0->unk_00), 2, 3, -v0->unk_12);
 
         v0->unk_08++;
 
@@ -1032,11 +1032,11 @@ static void ov12_0223025C(SysTask *param0, void *param1)
     case 4:
         ov12_0222669C(v0->unk_18);
 
-        BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1));
-        BGL_SetPriority(0, ov12_0222339C(v0->unk_00));
+        Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1));
+        Bg_SetPriority(0, ov12_0222339C(v0->unk_00));
 
-        sub_02019690(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00));
-        sub_02019EBC(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1));
+        Bg_ClearTilesRange(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00));
+        Bg_ClearTilemap(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1));
 
         ov12_02220220(v0->unk_00, param0);
         Heap_FreeToHeap(v0);
@@ -1089,8 +1089,8 @@ void ov12_022303D0(UnkStruct_ov12_0221FCDC *param0)
     v3 = ov12_02235254(v0->unk_00, ov12_02220240(param0));
 
     if ((v3 == 3) || (v3 == 4)) {
-        BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00));
-        BGL_SetPriority(0, ov12_0222339C(v0->unk_00) + 1);
+        Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00));
+        Bg_SetPriority(0, ov12_0222339C(v0->unk_00) + 1);
     }
 
     ov12_0223025C(v2, v0);
@@ -1333,15 +1333,15 @@ static void ov12_02230994(SysTask *param0, void *param1)
         }
         break;
     case 2:
-        BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1));
-        BGL_SetPriority(0, ov12_0222339C(v0->unk_00));
+        Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1));
+        Bg_SetPriority(0, ov12_0222339C(v0->unk_00));
 
         if (ov12_0222337C(v0->unk_00, ov12_02220248(v0->unk_00)) == 0) {
             sub_02007DEC(v0->unk_10, 6, 0);
         }
 
-        sub_02019690(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00));
-        sub_02019EBC(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1));
+        Bg_ClearTilesRange(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00));
+        Bg_ClearTilemap(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1));
 
         ov12_02220220(v0->unk_00, param0);
         Heap_FreeToHeap(v0);
@@ -1380,8 +1380,8 @@ void ov12_02230A8C(UnkStruct_ov12_0221FCDC *param0)
         SpriteActor_EnableObject(v0->unk_48, 1);
         sub_0200D460(v0->unk_48, 2);
     } else {
-        BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00));
-        BGL_SetPriority(0, ov12_0222339C(v0->unk_00) + 1);
+        Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00));
+        Bg_SetPriority(0, ov12_0222339C(v0->unk_00) + 1);
         SpriteActor_EnableObject(v0->unk_48, 0);
     }
 
@@ -3714,11 +3714,11 @@ static void ov12_02233BD8(SysTask *param0, void *param1)
         ov12_022265F8(v0->unk_04);
         ov12_022265C0(v0->unk_04);
 
-        BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1));
-        BGL_SetPriority(0, ov12_0222339C(v0->unk_00));
+        Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_02223428(v0->unk_00, 1));
+        Bg_SetPriority(0, ov12_0222339C(v0->unk_00));
 
-        sub_02019690(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00));
-        sub_02019EBC(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1));
+        Bg_ClearTilesRange(ov12_022233B0(v0->unk_00, 1), 0x4000, 0, ov12_0221FDE4(v0->unk_00));
+        Bg_ClearTilemap(ov12_02220278(v0->unk_00), ov12_022233B0(v0->unk_00, 1));
 
         Heap_FreeToHeap(v0);
         ov12_02220220(v0->unk_00, param0);
@@ -3757,8 +3757,8 @@ void ov12_02233CD4(UnkStruct_ov12_0221FCDC *param0)
     v4 = ov12_02235254(v0->unk_00, ov12_02220248(param0));
 
     if ((v4 == 3) || (v4 == 4)) {
-        BGL_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00));
-        BGL_SetPriority(0, ov12_0222339C(v0->unk_00) + 1);
+        Bg_SetPriority(ov12_022233B0(v0->unk_00, 1), ov12_0222339C(v0->unk_00));
+        Bg_SetPriority(0, ov12_0222339C(v0->unk_00) + 1);
     }
 
     ov12_022201E8(v0->unk_00, ov12_02233BD8, v0);

src/overlay012/ov12_02234E44.c

@@ -64,10 +64,10 @@ static void ov12_02234E54(UnkStruct_ov12_02234E54 *param0, int param1)
     v0 = ov12_0221FDE4(param0->unk_18.unk_04);
     v1 = ov12_02223428(param0->unk_18.unk_04, 3);
 
-    BGL_SetPriority(param1, v1);
+    Bg_SetPriority(param1, v1);
     sub_02006E3C(param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][0], param0->unk_18.unk_14, param1, 0, 0, 1, v0);
     PaletteSys_LoadPalette(param0->unk_18.unk_18, param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][1], v0, 0, 0x20, (8 * 16));
-    sub_02019EBC(param0->unk_18.unk_14, param1);
+    Bg_ClearTilemap(param0->unk_18.unk_14, param1);
     sub_02006E60(param0->unk_00.unk_00, Unk_ov12_0223A1D8[param0->unk_00.unk_04][2], param0->unk_18.unk_14, param1, 0, 0, 1, v0);
 }
 
@@ -101,7 +101,7 @@ static void ov12_02234EF0(SysTask *param0, void *param1)
         }
 
         if ((v0->unk_00.unk_14 == 0) && (v0->unk_00.unk_16 == 16)) {
-            sub_02019EBC(v0->unk_18.unk_14, 2);
+            Bg_ClearTilemap(v0->unk_18.unk_14, 2);
             SpriteActor_EnableObject(v0->unk_34, 0);
             SpriteActor_EnableObject(v0->unk_38, 0);
             SpriteActor_EnableObject(v0->unk_3C, 0);
@@ -113,8 +113,8 @@ static void ov12_02234EF0(SysTask *param0, void *param1)
     default:
         G2_SetWndOutsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 0);
         G2_SetWndOBJInsidePlane((GX_WND_PLANEMASK_BG0 | GX_WND_PLANEMASK_BG1 | GX_WND_PLANEMASK_BG2 | GX_WND_PLANEMASK_BG3 | GX_WND_PLANEMASK_OBJ), 0);
-        sub_02019184(v0->unk_18.unk_14, 2, 0, 0);
-        sub_02019184(v0->unk_18.unk_14, 2, 3, 0);
+        Bg_SetOffset(v0->unk_18.unk_14, 2, 0, 0);
+        Bg_SetOffset(v0->unk_18.unk_14, 2, 3, 0);
         GX_SetVisibleWnd(GX_WNDMASK_NONE);
         ov12_02220220(v0->unk_18.unk_04, param0);
         ov12_02235E80(v0);
@@ -125,8 +125,8 @@ static void ov12_02234EF0(SysTask *param0, void *param1)
     v0->unk_00.unk_10 += v0->unk_00.unk_0C;
     v0->unk_00.unk_12 += v0->unk_00.unk_0E;
 
-    sub_02019184(v0->unk_18.unk_14, 2, 0, v0->unk_00.unk_10);
-    sub_02019184(v0->unk_18.unk_14, 2, 3, v0->unk_00.unk_12);
+    Bg_SetOffset(v0->unk_18.unk_14, 2, 0, v0->unk_00.unk_10);
+    Bg_SetOffset(v0->unk_18.unk_14, 2, 3, v0->unk_00.unk_12);
 
     sub_0200D330(v0->unk_34);
     sub_0200D330(v0->unk_38);

src/overlay013/ov13_0221FC20.c

@@ -1021,7 +1021,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0)
             GX_BG0_AS_3D,
         };
 
-        sub_020183A0(&v0, 1);
+        SetScreenGraphicsModes(&v0, 1);
     }
 
     {
@@ -1041,7 +1041,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_1E0, 7, &v1, 0);
+        Bg_InitFromTemplate(param0->unk_1E0, 7, &v1, 0);
     }
 
     {
@@ -1061,7 +1061,7 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_1E0, 6, &v2, 0);
+        Bg_InitFromTemplate(param0->unk_1E0, 6, &v2, 0);
     }
 
     {
@@ -1081,8 +1081,8 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_1E0, 5, &v3, 0);
-        sub_02019EBC(param0->unk_1E0, 5);
+        Bg_InitFromTemplate(param0->unk_1E0, 5, &v3, 0);
+        Bg_ClearTilemap(param0->unk_1E0, 5);
     }
 
     {
@@ -1102,23 +1102,23 @@ static void ov13_02220C0C(UnkStruct_ov13_022213F0 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_1E0, 4, &v4, 0);
-        sub_02019EBC(param0->unk_1E0, 4);
+        Bg_InitFromTemplate(param0->unk_1E0, 4, &v4, 0);
+        Bg_ClearTilemap(param0->unk_1E0, 4);
     }
 
-    sub_02019690(5, 32, 0, param0->unk_00->unk_0C);
-    sub_02019690(4, 32, 0, param0->unk_00->unk_0C);
-    sub_0201C3C0(param0->unk_1E0, 5);
-    sub_0201C3C0(param0->unk_1E0, 4);
+    Bg_ClearTilesRange(5, 32, 0, param0->unk_00->unk_0C);
+    Bg_ClearTilesRange(4, 32, 0, param0->unk_00->unk_0C);
+    Bg_ScheduleTilemapTransfer(param0->unk_1E0, 5);
+    Bg_ScheduleTilemapTransfer(param0->unk_1E0, 4);
 }
 
 static void ov13_02220D1C(BgConfig *param0)
 {
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_BG3 | GX_PLANEMASK_OBJ, 0);
-    sub_02019044(param0, 4);
-    sub_02019044(param0, 5);
-    sub_02019044(param0, 6);
-    sub_02019044(param0, 7);
+    Bg_FreeTilemapBuffer(param0, 4);
+    Bg_FreeTilemapBuffer(param0, 5);
+    Bg_FreeTilemapBuffer(param0, 6);
+    Bg_FreeTilemapBuffer(param0, 7);
 }
 
 static void ov13_02220D4C(UnkStruct_ov13_022213F0 *param0)
@@ -1485,20 +1485,20 @@ static void ov13_022214E0(UnkStruct_ov13_022213F0 *param0, u8 param1)
         }
     }
 
-    sub_0201C3C0(param0->unk_1E0, 7);
+    Bg_ScheduleTilemapTransfer(param0->unk_1E0, 7);
 }
 
 static void ov13_02221560(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2, u16 param3)
 {
-    sub_02019CB8(param0->unk_1E0, 7, param1, param2, param3, 1, 1, 16);
+    Bg_FillTilemapRect(param0->unk_1E0, 7, param1, param2, param3, 1, 1, 16);
 }
 
 static void ov13_02221590(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2)
 {
-    sub_02019CB8(param0->unk_1E0, 7, param1, 2 + param2 * 2, 14, 1, 1, 16);
-    sub_02019CB8(param0->unk_1E0, 7, param1 + 1, 2 + param2 * 2 + 1, 14, 1, 1, 16);
-    sub_02019CB8(param0->unk_1E0, 7, param1 + 32, 2 + param2 * 2, 14 + 1, 1, 1, 16);
-    sub_02019CB8(param0->unk_1E0, 7, param1 + 33, 2 + param2 * 2 + 1, 14 + 1, 1, 1, 16);
+    Bg_FillTilemapRect(param0->unk_1E0, 7, param1, 2 + param2 * 2, 14, 1, 1, 16);
+    Bg_FillTilemapRect(param0->unk_1E0, 7, param1 + 1, 2 + param2 * 2 + 1, 14, 1, 1, 16);
+    Bg_FillTilemapRect(param0->unk_1E0, 7, param1 + 32, 2 + param2 * 2, 14 + 1, 1, 1, 16);
+    Bg_FillTilemapRect(param0->unk_1E0, 7, param1 + 33, 2 + param2 * 2 + 1, 14 + 1, 1, 1, 16);
 }
 
 static void ov13_02221630(UnkStruct_ov13_022213F0 *param0)
@@ -1538,15 +1538,15 @@ static void ov13_02221654(UnkStruct_ov13_022213F0 *param0, u8 param1)
         ov13_02221590(param0, 0x140, v1);
     }
 
-    sub_0201C3C0(param0->unk_1E0, 7);
+    Bg_ScheduleTilemapTransfer(param0->unk_1E0, 7);
 }
 
 static void ov13_022216C0(UnkStruct_ov13_022213F0 *param0, u8 param1)
 {
     ov13_02221738(param0, param1);
 
-    sub_02019F04(param0->unk_1E0, 4, 0);
-    sub_02019F04(param0->unk_1E0, 5, 0);
+    Bg_ScheduleFillTilemap(param0->unk_1E0, 4, 0);
+    Bg_ScheduleFillTilemap(param0->unk_1E0, 5, 0);
 
     ov13_02224B7C(param0, param1);
     ov13_02221BB0(param0);
@@ -1583,8 +1583,8 @@ static void ov13_02221738(UnkStruct_ov13_022213F0 *param0, u8 param1)
     for (v2 = 0; v2 < 2; v2++) {
         v1 = NARC_AllocAndReadWholeMemberByIndexPair(NARC_INDEX_BATTLE__GRAPHIC__PL_B_PLIST_GRA, Unk_ov13_02228E50[param1][v2], param0->unk_00->unk_0C);
         NNS_G2dGetUnpackedScreenData(v1, &v0);
-        sub_020198C0(param0->unk_1E0, 6 + v2, (u16 *)v0->rawData, 0, 0, 32, 24);
-        sub_0201C3C0(param0->unk_1E0, 6 + v2);
+        Bg_LoadToTilemapRect(param0->unk_1E0, 6 + v2, (u16 *)v0->rawData, 0, 0, 32, 24);
+        Bg_ScheduleTilemapTransfer(param0->unk_1E0, 6 + v2);
         Heap_FreeToHeap(v1);
     }
 }
@@ -1717,15 +1717,15 @@ static u8 ov13_022219DC(UnkStruct_ov13_022213F0 *param0)
 static void ov13_02221A04(UnkStruct_ov13_022213F0 *param0)
 {
     SpriteActor_EnableObject(param0->unk_1FB4[26], 0);
-    sub_0201AD10(&param0->unk_206C[10]);
-    sub_0201AD10(&param0->unk_206C[6]);
-    sub_0201AD10(&param0->unk_206C[7]);
+    Window_ClearAndScheduleCopyToVRAM(&param0->unk_206C[10]);
+    Window_ClearAndScheduleCopyToVRAM(&param0->unk_206C[6]);
+    Window_ClearAndScheduleCopyToVRAM(&param0->unk_206C[7]);
 }
 
 static void ov13_02221A3C(UnkStruct_ov13_022213F0 *param0)
 {
     ov13_02221630(param0);
-    sub_0201C3C0(param0->unk_1E0, 7);
+    Bg_ScheduleTilemapTransfer(param0->unk_1E0, 7);
 }
 
 static void ov13_02221A54(BattleSystem *param0, u16 param1, u16 param2, u32 param3)

src/overlay013/ov13_02221A88.c

@@ -195,7 +195,7 @@ void ov13_02221A88(UnkStruct_ov13_022213F0 *param0)
     u32 v0;
 
     for (v0 = 0; v0 < 2; v0++) {
-        sub_0201A8D4(param0->unk_1E0, &param0->unk_204C[v0], &Unk_ov13_02228EA0[v0]);
+        Window_AddFromTemplate(param0->unk_1E0, &param0->unk_204C[v0], &Unk_ov13_02228EA0[v0]);
     }
 
     ov13_02221AC4(param0, param0->unk_2076);
@@ -246,26 +246,26 @@ void ov13_02221AC4(UnkStruct_ov13_022213F0 *param0, u32 param1)
         break;
     }
 
-    param0->unk_206C = sub_0201A778(param0->unk_00->unk_0C, param0->unk_2070);
+    param0->unk_206C = Window_New(param0->unk_00->unk_0C, param0->unk_2070);
 
     for (v1 = 0; v1 < param0->unk_2070; v1++) {
-        sub_0201A8D4(param0->unk_1E0, &param0->unk_206C[v1], &v0[v1]);
+        Window_AddFromTemplate(param0->unk_1E0, &param0->unk_206C[v1], &v0[v1]);
     }
 }
 
 void ov13_02221BB0(UnkStruct_ov13_022213F0 *param0)
 {
-    sub_0201A928(param0->unk_206C, param0->unk_2070);
+    Windows_Delete(param0->unk_206C, param0->unk_2070);
 }
 
 void ov13_02221BC8(UnkStruct_ov13_022213F0 *param0)
 {
     u32 v0;
 
-    sub_0201A928(param0->unk_206C, param0->unk_2070);
+    Windows_Delete(param0->unk_206C, param0->unk_2070);
 
     for (v0 = 0; v0 < 2; v0++) {
-        BGL_DeleteWindow(&param0->unk_204C[v0]);
+        Window_Remove(&param0->unk_204C[v0]);
     }
 }
 
@@ -331,7 +331,7 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     if ((v1->unk_16_7 == 0) && (v1->unk_17_7 == 0)) {
         if (v1->unk_17_0 == 0) {
             v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 16);
-            v4 = sub_0201C294(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0);
+            v4 = Window_GetWidth(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0);
 
             if (param2 == 0) {
                 Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v3, v4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 0), NULL);
@@ -342,7 +342,7 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
             Strbuf_Free(v3);
         } else if (v1->unk_17_0 == 1) {
             v3 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 17);
-            v4 = sub_0201C294(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0);
+            v4 = Window_GetWidth(v0) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v3, 0);
 
             if (param2 == 0) {
                 Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v3, v4, param5, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 4, 0), NULL);
@@ -354,7 +354,7 @@ static void ov13_02221C54(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
         }
     }
 
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02221E08(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4)
@@ -362,7 +362,7 @@ static void ov13_02221E08(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param
     UnkStruct_ov13_02221ED0 *v0 = &param0->unk_04[param2];
 
     sub_0200C648(param0->unk_1FA0, 1, v0->unk_16_0, 3, 0, &param0->unk_206C[param1], param3 + 8, param4);
-    sub_0201A9A4(&param0->unk_206C[param1]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
 }
 
 static void ov13_02221E50(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4)
@@ -372,7 +372,7 @@ static void ov13_02221E50(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param
     sub_0200C5BC(param0->unk_1FA0, v0->unk_10, 3, 1, &param0->unk_206C[param1], param3, param4);
     sub_0200C578(param0->unk_1FA0, 0, &param0->unk_206C[param1], param3 + 8 * 3, param4);
     sub_0200C5BC(param0->unk_1FA0, v0->unk_12, 3, 0, &param0->unk_206C[param1], param3 + 8 * 3 + 8, param4);
-    sub_0201A9A4(&param0->unk_206C[param1]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
 }
 
 static void ov13_02221ED0(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param2, u8 param3, u8 param4)
@@ -387,7 +387,7 @@ static void ov13_02221ED0(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param
 
     switch (HealthBar_Color(v0->unk_10, v0->unk_12, 48)) {
     case 0:
-        sub_0201A9A4(&param0->unk_206C[param1]);
+        Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
         return;
     case 4:
     case 3:
@@ -401,10 +401,10 @@ static void ov13_02221ED0(UnkStruct_ov13_022213F0 *param0, u32 param1, u16 param
         break;
     }
 
-    BGL_WindowColor(&param0->unk_206C[param1], v1 + 1, param3, param4 + 1, v2, 1);
-    BGL_WindowColor(&param0->unk_206C[param1], v1, param3, param4 + 2, v2, 2);
-    BGL_WindowColor(&param0->unk_206C[param1], v1 + 1, param3, param4 + 4, v2, 1);
-    sub_0201A9A4(&param0->unk_206C[param1]);
+    Window_FillRectWithColor(&param0->unk_206C[param1], v1 + 1, param3, param4 + 1, v2, 1);
+    Window_FillRectWithColor(&param0->unk_206C[param1], v1, param3, param4 + 2, v2, 2);
+    Window_FillRectWithColor(&param0->unk_206C[param1], v1 + 1, param3, param4 + 4, v2, 1);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
 }
 
 static void ov13_02221FA8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2)
@@ -422,7 +422,7 @@ static void ov13_02221FA8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v2);
     Strbuf_Free(v1);
-    sub_0201A9A4(&param0->unk_206C[param1]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
 }
 
 static void ov13_02222030(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2)
@@ -446,7 +446,7 @@ static void ov13_02222030(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(&param0->unk_206C[param1]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
 }
 
 static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u32 param3, u16 param4, u16 param5, TextColor param6)
@@ -464,7 +464,7 @@ static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     StringTemplate_Format(param0->unk_1FA8, v1, v2);
 
     if (param4 == 2) {
-        v3 = (sub_0201C294(v0) * 8 - Font_CalcStrbufWidth(param4, v1, 0)) / 2;
+        v3 = (Window_GetWidth(v0) * 8 - Font_CalcStrbufWidth(param4, v1, 0)) / 2;
     } else {
         v3 = 0;
     }
@@ -472,7 +472,7 @@ static void ov13_022220CC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     Text_AddPrinterWithParamsAndColor(v0, param4, v1, v3, param5, TEXT_SPEED_NO_TRANSFER, param6, NULL);
     Strbuf_Free(v2);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02222170(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2, u8 param3)
@@ -483,7 +483,7 @@ static void ov13_02222170(UnkStruct_ov13_022213F0 *param0, u16 param1, u8 param2
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[param1], FONT_SYSTEM, v0, param2, param3, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v0);
-    sub_0201A9A4(&param0->unk_206C[param1]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[param1]);
 }
 
 static void ov13_022221C8(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -491,13 +491,13 @@ static void ov13_022221C8(UnkStruct_ov13_022213F0 *param0, u32 param1)
     Strbuf *v0;
 
     sub_0200E060(&param0->unk_204C[0], 1, 1, 14);
-    BGL_FillWindow(&param0->unk_204C[0], 15);
+    Window_FillTilemap(&param0->unk_204C[0], 15);
 
     v0 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param1);
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_204C[0], FONT_MESSAGE, v0, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v0);
-    sub_0201A9A4(&param0->unk_204C[0]);
+    Window_ScheduleCopyToVRAM(&param0->unk_204C[0]);
 }
 
 static void ov13_0222222C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2)
@@ -510,9 +510,9 @@ static void ov13_0222222C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, param2);
     v2 = Font_CalcStrbufWidth(FONT_SUBSCREEN, v1, 0);
 
-    Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v1, (sub_0201C294(v0) * 8 - v2) / 2, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL);
+    Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v1, (Window_GetWidth(v0) * 8 - v2) / 2, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02222290(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -557,15 +557,15 @@ static void ov13_02222290(UnkStruct_ov13_022213F0 *param0, u32 param1)
 
     StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
-    v3 = sub_0201C294(&param0->unk_206C[12 + v4]) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
+    v3 = Window_GetWidth(&param0->unk_206C[12 + v4]) * 8 - Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[12 + v4], FONT_SYSTEM, v2, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(&param0->unk_206C[19]);
-    sub_0201A9A4(&param0->unk_206C[11 + v4]);
-    sub_0201A9A4(&param0->unk_206C[20]);
-    sub_0201A9A4(&param0->unk_206C[12 + v4]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[19]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[11 + v4]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[20]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[12 + v4]);
 }
 
 static void ov13_02222464(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -591,13 +591,13 @@ static void ov13_02222464(UnkStruct_ov13_022213F0 *param0, u32 param1)
     StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
     v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
-    v5 = sub_0201C294(&param0->unk_206C[5 + v3]) * 8 - v4;
+    v5 = Window_GetWidth(&param0->unk_206C[5 + v3]) * 8 - v4;
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[5 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(&param0->unk_206C[14]);
-    sub_0201A9A4(&param0->unk_206C[5 + v3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[14]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[5 + v3]);
 }
 
 static void ov13_02222560(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -623,13 +623,13 @@ static void ov13_02222560(UnkStruct_ov13_022213F0 *param0, u32 param1)
     StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
     v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
-    v5 = sub_0201C294(&param0->unk_206C[6 + v3]) * 8 - v4;
+    v5 = Window_GetWidth(&param0->unk_206C[6 + v3]) * 8 - v4;
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[6 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(&param0->unk_206C[15]);
-    sub_0201A9A4(&param0->unk_206C[6 + v3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[15]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[6 + v3]);
 }
 
 static void ov13_0222265C(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -655,14 +655,14 @@ static void ov13_0222265C(UnkStruct_ov13_022213F0 *param0, u32 param1)
     StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
     v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
-    v5 = sub_0201C294(&param0->unk_206C[7 + v3]) * 8 - v4;
+    v5 = Window_GetWidth(&param0->unk_206C[7 + v3]) * 8 - v4;
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[7 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
 
-    sub_0201A9A4(&param0->unk_206C[16]);
-    sub_0201A9A4(&param0->unk_206C[7 + v3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[16]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[7 + v3]);
 }
 
 static void ov13_0222275C(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -688,13 +688,13 @@ static void ov13_0222275C(UnkStruct_ov13_022213F0 *param0, u32 param1)
     StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
     v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
-    v5 = sub_0201C294(&param0->unk_206C[8 + v3]) * 8 - v4;
+    v5 = Window_GetWidth(&param0->unk_206C[8 + v3]) * 8 - v4;
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[8 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(&param0->unk_206C[17]);
-    sub_0201A9A4(&param0->unk_206C[8 + v3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[17]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[8 + v3]);
 }
 
 static void ov13_0222285C(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -720,13 +720,13 @@ static void ov13_0222285C(UnkStruct_ov13_022213F0 *param0, u32 param1)
     StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
     v4 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
-    v5 = sub_0201C294(&param0->unk_206C[9 + v3]) * 8 - v4;
+    v5 = Window_GetWidth(&param0->unk_206C[9 + v3]) * 8 - v4;
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[9 + v3], FONT_SYSTEM, v2, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(&param0->unk_206C[18]);
-    sub_0201A9A4(&param0->unk_206C[9 + v3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[18]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[9 + v3]);
 }
 
 static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -747,7 +747,7 @@ static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1)
 
     v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 31);
     v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
-    v5 = (sub_0201C294(&param0->unk_206C[4]) * 8 - v3) / 2;
+    v5 = (Window_GetWidth(&param0->unk_206C[4]) * 8 - v3) / 2;
 
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4 + v6], FONT_SYSTEM, v1, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
@@ -772,8 +772,8 @@ static void ov13_0222295C(UnkStruct_ov13_022213F0 *param0, u32 param1)
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[4 + v6], FONT_SYSTEM, v2, v5 + v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(&param0->unk_206C[13]);
-    sub_0201A9A4(&param0->unk_206C[4 + v6]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[13]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[4 + v6]);
 }
 
 static void ov13_02222AF4(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -791,7 +791,7 @@ static void ov13_02222AF4(UnkStruct_ov13_022213F0 *param0, u32 param1)
     Text_AddPrinterWithParamsAndColor(&param0->unk_206C[2 + v3], FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v2);
     MessageLoader_Free(v1);
-    sub_0201A9A4(&param0->unk_206C[2 + v3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[2 + v3]);
 }
 
 static void ov13_02222B6C(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -804,7 +804,7 @@ static void ov13_02222B6C(UnkStruct_ov13_022213F0 *param0, u32 param1)
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2)
@@ -820,7 +820,7 @@ static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     if (param2 == 0) {
         v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 50);
         v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
-        v4 = sub_0201C294(v0) * 8 - v3;
+        v4 = Window_GetWidth(v0) * 8 - v3;
 
         Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
         Strbuf_Free(v1);
@@ -832,14 +832,14 @@ static void ov13_02222BB4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
         StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
         v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
-        v4 = sub_0201C294(v0) * 8 - v3;
+        v4 = Window_GetWidth(v0) * 8 - v3;
 
         Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
         Strbuf_Free(v1);
         Strbuf_Free(v2);
     }
 
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02222C9C(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -852,7 +852,7 @@ static void ov13_02222C9C(UnkStruct_ov13_022213F0 *param0, u32 param1)
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2)
@@ -868,7 +868,7 @@ static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     if (param2 <= 1) {
         v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 50);
         v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
-        v4 = sub_0201C294(v0) * 8 - v3;
+        v4 = Window_GetWidth(v0) * 8 - v3;
 
         Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
         Strbuf_Free(v1);
@@ -880,14 +880,14 @@ static void ov13_02222CE4(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
         StringTemplate_Format(param0->unk_1FA8, v2, v1);
 
         v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v2, 0);
-        v4 = sub_0201C294(v0) * 8 - v3;
+        v4 = Window_GetWidth(v0) * 8 - v3;
 
         Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
         Strbuf_Free(v1);
         Strbuf_Free(v2);
     }
 
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02222DCC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2)
@@ -903,7 +903,7 @@ static void ov13_02222DCC(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, v2, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v2);
     MessageLoader_Free(v0);
-    sub_0201A9A4(v1);
+    Window_ScheduleCopyToVRAM(v1);
 }
 
 static void ov13_02222E2C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2)
@@ -924,7 +924,7 @@ static void ov13_02222E2C(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     Strbuf_Free(v2);
 
     MessageLoader_Free(v0);
-    sub_0201A9A4(v1);
+    Window_ScheduleCopyToVRAM(v1);
 }
 
 static void ov13_02222E94(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -937,11 +937,11 @@ static void ov13_02222E94(UnkStruct_ov13_022213F0 *param0, u32 param1)
     v0 = &param0->unk_206C[param1];
     v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 53);
     v2 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
-    v3 = (sub_0201C294(v0) * 8 - v2) / 2;
+    v3 = (Window_GetWidth(v0) * 8 - v2) / 2;
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02222EF8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2)
@@ -968,7 +968,7 @@ static void ov13_02222EF8(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     }
 
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param2, u32 param3)
@@ -982,7 +982,7 @@ static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     v0 = &param0->unk_206C[param1];
     v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 46);
     v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
-    v5 = (sub_0201C294(v0) * 8 - v3) / 2;
+    v5 = (Window_GetWidth(v0) * 8 - v3) / 2;
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v1);
@@ -1007,7 +1007,7 @@ static void ov13_02222F74(UnkStruct_ov13_022213F0 *param0, u32 param1, u32 param
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, v5 + v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_022230A8(UnkStruct_ov13_022213F0 *param0, u32 param1)
@@ -1028,7 +1028,7 @@ static void ov13_022230A8(UnkStruct_ov13_022213F0 *param0, u32 param1)
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v1, (12 * 8 - v2) / 2, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 void ov13_02223118(UnkStruct_ov13_022213F0 *param0)
@@ -1042,13 +1042,13 @@ void ov13_02223118(UnkStruct_ov13_022213F0 *param0)
         v0 = &param0->unk_206C[5];
     }
 
-    BGL_FillWindow(v0, 0);
+    Window_FillTilemap(v0, 0);
 
     v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 60);
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_0222317C(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236B8 *param1, u32 param2)
@@ -1088,7 +1088,7 @@ static void ov13_0222317C(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, 80 - v3, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_022232C8(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236B8 *param1, u32 param2)
@@ -1104,7 +1104,7 @@ static void ov13_022232C8(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236
     v3 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
 
     Strbuf_Free(v1);
-    BGL_WindowColor(v0, 0, 40 + v3, 24, 80 - (40 + v3), 16);
+    Window_FillRectWithColor(v0, 0, 40 + v3, 24, 80 - (40 + v3), 16);
 
     v1 = MessageLoader_GetNewStrbuf(param0->unk_1FA4, 44);
 
@@ -1116,7 +1116,7 @@ static void ov13_022232C8(UnkStruct_ov13_022213F0 *param0, UnkStruct_ov13_022236
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v2, 80 - v3, 24, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     Strbuf_Free(v1);
     Strbuf_Free(v2);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0)
@@ -1124,7 +1124,7 @@ static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0)
     s32 v0;
 
     for (v0 = 0; v0 < Party_GetCurrentCount(param0->unk_00->unk_00); v0++) {
-        BGL_FillWindow(&param0->unk_206C[0 + v0], 0);
+        Window_FillTilemap(&param0->unk_206C[0 + v0], 0);
 
         if (param0->unk_04[v0].unk_04 == 0) {
             continue;
@@ -1152,8 +1152,8 @@ static void ov13_0222339C(UnkStruct_ov13_022213F0 *param0)
 
 void ov13_02223448(UnkStruct_ov13_022213F0 *param0, u8 param1)
 {
-    BGL_WindowColor(&param0->unk_206C[0 + param1], 0, 56, 32, 24, 8);
-    BGL_WindowColor(&param0->unk_206C[0 + param1], 0, (48 + 16), 24, 64, 8);
+    Window_FillRectWithColor(&param0->unk_206C[0 + param1], 0, 56, 32, 24, 8);
+    Window_FillRectWithColor(&param0->unk_206C[0 + param1], 0, (48 + 16), 24, 64, 8);
 
     ov13_02221E50(param0, 0 + param1, param1, 56, 32);
     ov13_02221ED0(param0, 0 + param1, param1, (48 + 16), 24);
@@ -1168,10 +1168,10 @@ void ov13_022234A8(UnkStruct_ov13_022213F0 *param0, u8 param1)
 
 static void ov13_022234C8(UnkStruct_ov13_022213F0 *param0)
 {
-    BGL_FillWindow(&param0->unk_206C[0], 0);
-    BGL_FillWindow(&param0->unk_206C[1], 0);
-    BGL_FillWindow(&param0->unk_206C[2], 0);
-    BGL_FillWindow(&param0->unk_206C[3], 0);
+    Window_FillTilemap(&param0->unk_206C[0], 0);
+    Window_FillTilemap(&param0->unk_206C[1], 0);
+    Window_FillTilemap(&param0->unk_206C[2], 0);
+    Window_FillTilemap(&param0->unk_206C[3], 0);
 
     ov13_02223550(param0, param0->unk_00->unk_11);
 
@@ -1181,8 +1181,8 @@ static void ov13_022234C8(UnkStruct_ov13_022213F0 *param0)
         ov13_0222222C(param0, 2, 18);
         ov13_0222222C(param0, 3, 19);
     } else {
-        sub_0201A9A4(&param0->unk_206C[2]);
-        sub_0201A9A4(&param0->unk_206C[3]);
+        Window_ScheduleCopyToVRAM(&param0->unk_206C[2]);
+        Window_ScheduleCopyToVRAM(&param0->unk_206C[3]);
     }
 }
 
@@ -1226,7 +1226,7 @@ static void ov13_02223550(UnkStruct_ov13_022213F0 *param0, u32 param1)
         v6 = 8;
     }
 
-    v7 = (sub_0201C294(v0) * 8 - v4 - v5 - v6) / 2;
+    v7 = (Window_GetWidth(v0) * 8 - v4 - v5 - v6) / 2;
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SUBSCREEN, v2, v7, 8, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(7, 8, 9), NULL);
     Strbuf_Free(v2);
@@ -1243,7 +1243,7 @@ static void ov13_02223550(UnkStruct_ov13_022213F0 *param0, u32 param1)
         Strbuf_Free(v3);
     }
 
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0)
@@ -1253,12 +1253,12 @@ static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0)
 
     v2 = 6 * param0->unk_2071;
 
-    BGL_FillWindow(&param0->unk_206C[0 + v2], 0);
-    BGL_FillWindow(&param0->unk_206C[1 + v2], 0);
-    BGL_FillWindow(&param0->unk_206C[2 + v2], 0);
-    BGL_FillWindow(&param0->unk_206C[3 + v2], 0);
-    BGL_FillWindow(&param0->unk_206C[4 + v2], 0);
-    BGL_FillWindow(&param0->unk_206C[5], 0);
+    Window_FillTilemap(&param0->unk_206C[0 + v2], 0);
+    Window_FillTilemap(&param0->unk_206C[1 + v2], 0);
+    Window_FillTilemap(&param0->unk_206C[2 + v2], 0);
+    Window_FillTilemap(&param0->unk_206C[3 + v2], 0);
+    Window_FillTilemap(&param0->unk_206C[4 + v2], 0);
+    Window_FillTilemap(&param0->unk_206C[5], 0);
 
     ov13_02221C54(param0, 0 + v2, 0, param0->unk_00->unk_11, 0, 0);
 
@@ -1275,10 +1275,10 @@ static void ov13_022236B8(UnkStruct_ov13_022213F0 *param0)
 
     ov13_0222222C(param0, 5, 18);
 
-    sub_0201A9A4(&param0->unk_206C[1 + v2]);
-    sub_0201A9A4(&param0->unk_206C[2 + v2]);
-    sub_0201A9A4(&param0->unk_206C[3 + v2]);
-    sub_0201A9A4(&param0->unk_206C[4 + v2]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[1 + v2]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[2 + v2]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[3 + v2]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[4 + v2]);
 
     param0->unk_2071 ^= 1;
 }
@@ -1289,29 +1289,29 @@ static void ov13_022237F8(UnkStruct_ov13_022213F0 *param0)
 
     v0 = 22 * param0->unk_2071;
 
-    BGL_FillWindow(&param0->unk_206C[19], 0);
-    BGL_FillWindow(&param0->unk_206C[20], 0);
-    BGL_FillWindow(&param0->unk_206C[14], 0);
-    BGL_FillWindow(&param0->unk_206C[15], 0);
-    BGL_FillWindow(&param0->unk_206C[16], 0);
-    BGL_FillWindow(&param0->unk_206C[17], 0);
-    BGL_FillWindow(&param0->unk_206C[18], 0);
-    BGL_FillWindow(&param0->unk_206C[13], 0);
-    BGL_FillWindow(&param0->unk_206C[21], 0);
+    Window_FillTilemap(&param0->unk_206C[19], 0);
+    Window_FillTilemap(&param0->unk_206C[20], 0);
+    Window_FillTilemap(&param0->unk_206C[14], 0);
+    Window_FillTilemap(&param0->unk_206C[15], 0);
+    Window_FillTilemap(&param0->unk_206C[16], 0);
+    Window_FillTilemap(&param0->unk_206C[17], 0);
+    Window_FillTilemap(&param0->unk_206C[18], 0);
+    Window_FillTilemap(&param0->unk_206C[13], 0);
+    Window_FillTilemap(&param0->unk_206C[21], 0);
 
-    BGL_FillWindow(&param0->unk_206C[0 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[10 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[11 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[12 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[5 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[6 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[7 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[8 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[9 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[4 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[1 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[2 + v0], 0);
-    BGL_FillWindow(&param0->unk_206C[3 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[0 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[10 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[11 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[12 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[5 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[6 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[7 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[8 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[9 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[4 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[1 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[2 + v0], 0);
+    Window_FillTilemap(&param0->unk_206C[3 + v0], 0);
 
     ov13_02221C54(param0, 0 + v0, 0, param0->unk_00->unk_11, 0, 0);
     ov13_0222295C(param0, param0->unk_00->unk_11);
@@ -1337,17 +1337,17 @@ static void ov13_02223A10(UnkStruct_ov13_022213F0 *param0)
 
     v1 = 11 * param0->unk_2071;
 
-    BGL_FillWindow(&param0->unk_206C[6], 0);
-    BGL_FillWindow(&param0->unk_206C[7], 0);
-    BGL_FillWindow(&param0->unk_206C[8], 0);
-    BGL_FillWindow(&param0->unk_206C[9], 0);
-    BGL_FillWindow(&param0->unk_206C[10], 0);
-    BGL_FillWindow(&param0->unk_206C[1 + v1], 0);
-    BGL_FillWindow(&param0->unk_206C[0 + v1], 0);
-    BGL_FillWindow(&param0->unk_206C[2 + v1], 0);
-    BGL_FillWindow(&param0->unk_206C[3 + v1], 0);
-    BGL_FillWindow(&param0->unk_206C[5 + v1], 0);
-    BGL_FillWindow(&param0->unk_206C[4 + v1], 0);
+    Window_FillTilemap(&param0->unk_206C[6], 0);
+    Window_FillTilemap(&param0->unk_206C[7], 0);
+    Window_FillTilemap(&param0->unk_206C[8], 0);
+    Window_FillTilemap(&param0->unk_206C[9], 0);
+    Window_FillTilemap(&param0->unk_206C[10], 0);
+    Window_FillTilemap(&param0->unk_206C[1 + v1], 0);
+    Window_FillTilemap(&param0->unk_206C[0 + v1], 0);
+    Window_FillTilemap(&param0->unk_206C[2 + v1], 0);
+    Window_FillTilemap(&param0->unk_206C[3 + v1], 0);
+    Window_FillTilemap(&param0->unk_206C[5 + v1], 0);
+    Window_FillTilemap(&param0->unk_206C[4 + v1], 0);
 
     v0 = &param0->unk_04[param0->unk_00->unk_11].unk_30[param0->unk_00->unk_34];
 
@@ -1371,12 +1371,12 @@ static void ov13_02223B74(UnkStruct_ov13_022213F0 *param0)
     UnkStruct_ov13_022236B8 *v0;
     u32 v1;
 
-    BGL_FillWindow(&param0->unk_206C[0], 0);
-    BGL_FillWindow(&param0->unk_206C[1], 0);
-    BGL_FillWindow(&param0->unk_206C[2], 0);
-    BGL_FillWindow(&param0->unk_206C[3], 0);
-    BGL_FillWindow(&param0->unk_206C[4], 0);
-    BGL_FillWindow(&param0->unk_206C[5], 0);
+    Window_FillTilemap(&param0->unk_206C[0], 0);
+    Window_FillTilemap(&param0->unk_206C[1], 0);
+    Window_FillTilemap(&param0->unk_206C[2], 0);
+    Window_FillTilemap(&param0->unk_206C[3], 0);
+    Window_FillTilemap(&param0->unk_206C[4], 0);
+    Window_FillTilemap(&param0->unk_206C[5], 0);
 
     ov13_02221C54(param0, 0, 0, param0->unk_00->unk_11, 0, 0);
 
@@ -1401,27 +1401,27 @@ static void ov13_02223B74(UnkStruct_ov13_022213F0 *param0)
         ov13_0222317C(param0, &v2, 5);
     }
 
-    sub_0201A9A4(&param0->unk_206C[1]);
-    sub_0201A9A4(&param0->unk_206C[2]);
-    sub_0201A9A4(&param0->unk_206C[3]);
-    sub_0201A9A4(&param0->unk_206C[4]);
-    sub_0201A9A4(&param0->unk_206C[5]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[1]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[2]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[4]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[5]);
 }
 
 static void ov13_02223C9C(UnkStruct_ov13_022213F0 *param0)
 {
-    BGL_FillWindow(&param0->unk_206C[0], 0);
-    BGL_FillWindow(&param0->unk_206C[2], 0);
-    BGL_FillWindow(&param0->unk_206C[3], 0);
-    BGL_FillWindow(&param0->unk_206C[1], 0);
-    BGL_FillWindow(&param0->unk_206C[4], 0);
-    BGL_FillWindow(&param0->unk_206C[6], 0);
-    BGL_FillWindow(&param0->unk_206C[5], 0);
-    BGL_FillWindow(&param0->unk_206C[7], 0);
-    BGL_FillWindow(&param0->unk_206C[9], 0);
-    BGL_FillWindow(&param0->unk_206C[10], 0);
-    BGL_FillWindow(&param0->unk_206C[8], 0);
-    BGL_FillWindow(&param0->unk_206C[11], 0);
+    Window_FillTilemap(&param0->unk_206C[0], 0);
+    Window_FillTilemap(&param0->unk_206C[2], 0);
+    Window_FillTilemap(&param0->unk_206C[3], 0);
+    Window_FillTilemap(&param0->unk_206C[1], 0);
+    Window_FillTilemap(&param0->unk_206C[4], 0);
+    Window_FillTilemap(&param0->unk_206C[6], 0);
+    Window_FillTilemap(&param0->unk_206C[5], 0);
+    Window_FillTilemap(&param0->unk_206C[7], 0);
+    Window_FillTilemap(&param0->unk_206C[9], 0);
+    Window_FillTilemap(&param0->unk_206C[10], 0);
+    Window_FillTilemap(&param0->unk_206C[8], 0);
+    Window_FillTilemap(&param0->unk_206C[11], 0);
 
     ov13_02221C54(param0, 0, 0, param0->unk_00->unk_11, 0, 0);
     ov13_02222170(param0, 2, 0, 0);
@@ -1457,11 +1457,11 @@ static void ov13_02223E68(UnkStruct_ov13_022213F0 *param0)
     UnkStruct_ov13_022236B8 *v0;
     u32 v1;
 
-    BGL_FillWindow(&param0->unk_206C[0], 0);
-    BGL_FillWindow(&param0->unk_206C[1], 0);
-    BGL_FillWindow(&param0->unk_206C[2], 0);
-    BGL_FillWindow(&param0->unk_206C[3], 0);
-    BGL_FillWindow(&param0->unk_206C[4], 0);
+    Window_FillTilemap(&param0->unk_206C[0], 0);
+    Window_FillTilemap(&param0->unk_206C[1], 0);
+    Window_FillTilemap(&param0->unk_206C[2], 0);
+    Window_FillTilemap(&param0->unk_206C[3], 0);
+    Window_FillTilemap(&param0->unk_206C[4], 0);
 
     ov13_02221C54(param0, 0, 0, param0->unk_00->unk_11, 0, 0);
 
@@ -1480,10 +1480,10 @@ static void ov13_02223E68(UnkStruct_ov13_022213F0 *param0)
         ov13_022221C8(param0, 94);
     }
 
-    sub_0201A9A4(&param0->unk_206C[1]);
-    sub_0201A9A4(&param0->unk_206C[2]);
-    sub_0201A9A4(&param0->unk_206C[3]);
-    sub_0201A9A4(&param0->unk_206C[4]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[1]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[2]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[3]);
+    Window_ScheduleCopyToVRAM(&param0->unk_206C[4]);
 }
 
 void ov13_02223F5C(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2)
@@ -1494,13 +1494,13 @@ void ov13_02223F5C(UnkStruct_ov13_022213F0 *param0, u16 param1, u16 param2)
 
 static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0)
 {
-    BGL_FillWindow(&param0->unk_206C[0], 0);
-    BGL_FillWindow(&param0->unk_206C[2], 0);
-    BGL_FillWindow(&param0->unk_206C[3], 0);
-    BGL_FillWindow(&param0->unk_206C[1], 0);
-    BGL_FillWindow(&param0->unk_206C[4], 0);
-    BGL_FillWindow(&param0->unk_206C[5], 0);
-    BGL_FillWindow(&param0->unk_206C[6], 0);
+    Window_FillTilemap(&param0->unk_206C[0], 0);
+    Window_FillTilemap(&param0->unk_206C[2], 0);
+    Window_FillTilemap(&param0->unk_206C[3], 0);
+    Window_FillTilemap(&param0->unk_206C[1], 0);
+    Window_FillTilemap(&param0->unk_206C[4], 0);
+    Window_FillTilemap(&param0->unk_206C[5], 0);
+    Window_FillTilemap(&param0->unk_206C[6], 0);
 
     ov13_02221C54(param0, 0, 0, param0->unk_00->unk_11, 0, 0);
     ov13_02222170(param0, 2, 0, 0);
@@ -1516,7 +1516,7 @@ static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0)
         }
 
         Strbuf_Free(v0);
-        sub_0201A9A4(&param0->unk_206C[4]);
+        Window_ScheduleCopyToVRAM(&param0->unk_206C[4]);
     }
 
     if (param0->unk_00->unk_34 < 4) {
@@ -1539,7 +1539,7 @@ static void ov13_02223F7C(UnkStruct_ov13_022213F0 *param0)
 void ov13_022240E0(UnkStruct_ov13_022213F0 *param0)
 {
     sub_0200E060(&param0->unk_204C[1], 1, 1, 14);
-    BGL_FillWindow(&param0->unk_204C[1], 15);
+    Window_FillTilemap(&param0->unk_204C[1], 15);
     ov13_02224108(param0);
 }
 

src/overlay013/ov13_02225710.c

@@ -438,8 +438,8 @@ static void ov13_02225D8C(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2,
 
     ov13_02225C4C(param0, v0, param1, param2, param3);
 
-    sub_020198C0(param0->unk_1E0, 6, v0, Unk_ov13_02229924[param1].unk_00, Unk_ov13_02229924[param1].unk_01, Unk_ov13_02229924[param1].unk_02, Unk_ov13_02229924[param1].unk_03);
-    sub_0201C3C0(param0->unk_1E0, 6);
+    Bg_LoadToTilemapRect(param0->unk_1E0, 6, v0, Unk_ov13_02229924[param1].unk_00, Unk_ov13_02229924[param1].unk_01, Unk_ov13_02229924[param1].unk_02, Unk_ov13_02229924[param1].unk_03);
+    Bg_ScheduleTilemapTransfer(param0->unk_1E0, 6);
     Heap_FreeToHeap(v0);
 }
 
@@ -474,16 +474,16 @@ static void ov13_02225E08(UnkStruct_ov13_022213F0 *param0, u8 param1, u8 param2)
     }
 
     if ((param1 >= 14) && (param1 <= 17)) {
-        sub_0201C04C(&param0->unk_206C[v0[param0->unk_2071]], v2, v3, 0);
-        sub_0201A9A4(&param0->unk_206C[v0[param0->unk_2071]]);
+        Window_Scroll(&param0->unk_206C[v0[param0->unk_2071]], v2, v3, 0);
+        Window_ScheduleCopyToVRAM(&param0->unk_206C[v0[param0->unk_2071]]);
     } else {
         for (v1 = 0; v1 < 8; v1++) {
             if (v0[v1] == 0xff) {
                 break;
             }
 
-            sub_0201C04C(&param0->unk_206C[v0[v1]], v2, v3, 0);
-            sub_0201A9A4(&param0->unk_206C[v0[v1]]);
+            Window_Scroll(&param0->unk_206C[v0[v1]], v2, v3, 0);
+            Window_ScheduleCopyToVRAM(&param0->unk_206C[v0[v1]]);
         }
     }
 }

src/overlay013/ov13_022264F4.c

@@ -642,7 +642,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0)
             GX_BG0_AS_3D,
         };
 
-        sub_020183A0(&v0, 1);
+        SetScreenGraphicsModes(&v0, 1);
     }
 
     {
@@ -662,7 +662,7 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_04, 6, &v1, 0);
+        Bg_InitFromTemplate(param0->unk_04, 6, &v1, 0);
     }
 
     {
@@ -682,8 +682,8 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_04, 5, &v2, 0);
-        sub_02019EBC(param0->unk_04, 5);
+        Bg_InitFromTemplate(param0->unk_04, 5, &v2, 0);
+        Bg_ClearTilemap(param0->unk_04, 5);
     }
 
     {
@@ -703,22 +703,22 @@ static void ov13_02226ED0(UnkStruct_ov13_02227244 *param0)
             0
         };
 
-        sub_020183C4(param0->unk_04, 4, &v3, 0);
-        sub_02019EBC(param0->unk_04, 4);
+        Bg_InitFromTemplate(param0->unk_04, 4, &v3, 0);
+        Bg_ClearTilemap(param0->unk_04, 4);
     }
 
-    sub_02019690(5, 32, 0, param0->unk_00->unk_0C);
-    sub_02019690(4, 32, 0, param0->unk_00->unk_0C);
-    sub_0201C3C0(param0->unk_04, 5);
-    sub_0201C3C0(param0->unk_04, 4);
+    Bg_ClearTilesRange(5, 32, 0, param0->unk_00->unk_0C);
+    Bg_ClearTilesRange(4, 32, 0, param0->unk_00->unk_0C);
+    Bg_ScheduleTilemapTransfer(param0->unk_04, 5);
+    Bg_ScheduleTilemapTransfer(param0->unk_04, 4);
 }
 
 static void ov13_02226F9C(BgConfig *param0)
 {
     GXLayers_EngineBToggleLayers(GX_PLANEMASK_BG0 | GX_PLANEMASK_BG1 | GX_PLANEMASK_BG2 | GX_PLANEMASK_OBJ, 0);
-    sub_02019044(param0, 4);
-    sub_02019044(param0, 5);
-    sub_02019044(param0, 6);
+    Bg_FreeTilemapBuffer(param0, 4);
+    Bg_FreeTilemapBuffer(param0, 5);
+    Bg_FreeTilemapBuffer(param0, 6);
 }
 
 static void ov13_02226FC4(UnkStruct_ov13_02227244 *param0)
@@ -774,16 +774,16 @@ static void ov13_02227118(UnkStruct_ov13_02227244 *param0, u8 param1)
 {
     switch (param1) {
     case 0:
-        sub_0201C63C(param0->unk_04, 6, 0, 0);
-        sub_0201C63C(param0->unk_04, 6, 3, 0);
+        Bg_ScheduleScroll(param0->unk_04, 6, 0, 0);
+        Bg_ScheduleScroll(param0->unk_04, 6, 3, 0);
         break;
     case 1:
-        sub_0201C63C(param0->unk_04, 6, 0, 256);
-        sub_0201C63C(param0->unk_04, 6, 3, 0);
+        Bg_ScheduleScroll(param0->unk_04, 6, 0, 256);
+        Bg_ScheduleScroll(param0->unk_04, 6, 3, 0);
         break;
     case 2:
-        sub_0201C63C(param0->unk_04, 6, 0, 0);
-        sub_0201C63C(param0->unk_04, 6, 3, 256);
+        Bg_ScheduleScroll(param0->unk_04, 6, 0, 0);
+        Bg_ScheduleScroll(param0->unk_04, 6, 3, 256);
         break;
     }
 }
@@ -794,8 +794,8 @@ static void ov13_0222717C(UnkStruct_ov13_02227244 *param0, u8 param1)
         return;
     }
 
-    sub_02019E2C(param0->unk_04, 6, 2, 35, 28, 4, 8 + param0->unk_114D);
-    sub_02019E2C(param0->unk_04, 6, 2, 40, 28, 8, 8 + param0->unk_114D);
+    Bg_ChangeTilemapRectPalette(param0->unk_04, 6, 2, 35, 28, 4, 8 + param0->unk_114D);
+    Bg_ChangeTilemapRectPalette(param0->unk_04, 6, 2, 40, 28, 8, 8 + param0->unk_114D);
 }
 
 static void ov13_022271D0(UnkStruct_ov13_02227244 *param0, u8 param1)
@@ -803,8 +803,8 @@ static void ov13_022271D0(UnkStruct_ov13_02227244 *param0, u8 param1)
     ov13_0222717C(param0, param1);
     ov13_02227118(param0, param1);
 
-    sub_02019F04(param0->unk_04, 4, 0);
-    sub_02019F04(param0->unk_04, 5, 0);
+    Bg_ScheduleFillTilemap(param0->unk_04, 4, 0);
+    Bg_ScheduleFillTilemap(param0->unk_04, 5, 0);
 
     ov13_02227324(param0);
     ov13_022272AC(param0, param1);

src/overlay013/ov13_02227288.c

@@ -76,7 +76,7 @@ static const WindowTemplate Unk_ov13_02229A68[] = {
 
 void ov13_02227288(UnkStruct_ov13_02227244 *param0)
 {
-    sub_0201A8D4(param0->unk_04, &param0->unk_1C, &Unk_ov13_02229A60);
+    Window_AddFromTemplate(param0->unk_04, &param0->unk_1C, &Unk_ov13_02229A60);
     ov13_022272AC(param0, param0->unk_114C);
 }
 
@@ -100,24 +100,24 @@ void ov13_022272AC(UnkStruct_ov13_02227244 *param0, u32 param1)
         break;
     }
 
-    param0->unk_2C = sub_0201A778(param0->unk_00->unk_0C, param0->unk_30);
+    param0->unk_2C = Window_New(param0->unk_00->unk_0C, param0->unk_30);
 
     for (v1 = 0; v1 < param0->unk_30; v1++) {
-        sub_0201A8D4(param0->unk_04, &param0->unk_2C[v1], &v0[v1]);
+        Window_AddFromTemplate(param0->unk_04, &param0->unk_2C[v1], &v0[v1]);
     }
 }
 
 void ov13_02227324(UnkStruct_ov13_02227244 *param0)
 {
-    sub_0201A928(param0->unk_2C, param0->unk_30);
+    Windows_Delete(param0->unk_2C, param0->unk_30);
 }
 
 void ov13_02227334(UnkStruct_ov13_02227244 *param0)
 {
     u32 v0;
 
-    sub_0201A928(param0->unk_2C, param0->unk_30);
-    BGL_DeleteWindow(&param0->unk_1C);
+    Windows_Delete(param0->unk_2C, param0->unk_30);
+    Window_Remove(&param0->unk_1C);
 }
 
 void ov13_02227350(UnkStruct_ov13_02227244 *param0, u32 param1)
@@ -145,11 +145,11 @@ static void ov13_02227374(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param
     v0 = &param0->unk_2C[param1];
     v1 = MessageLoader_GetNewStrbuf(param0->unk_10, param2);
     v2 = Font_CalcStrbufWidth(param3, v1, 0);
-    v3 = (sub_0201C294(v0) * 8 - v2) / 2;
+    v3 = (Window_GetWidth(v0) * 8 - v2) / 2;
 
     Text_AddPrinterWithParamsAndColor(v0, param3, v1, v3, param4, TEXT_SPEED_NO_TRANSFER, param5, NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_022273CC(UnkStruct_ov13_02227244 *param0)
@@ -157,7 +157,7 @@ static void ov13_022273CC(UnkStruct_ov13_02227244 *param0)
     u32 v0;
 
     for (v0 = 0; v0 < 5; v0++) {
-        BGL_FillWindow(&param0->unk_2C[v0], 0);
+        Window_FillTilemap(&param0->unk_2C[v0], 0);
     }
 
     ov13_02227374(param0, 0, 0, FONT_SUBSCREEN, 8, TEXT_COLOR(3, 2, 1));
@@ -172,7 +172,7 @@ static void ov13_022273CC(UnkStruct_ov13_02227244 *param0)
 
         Text_AddPrinterWithParamsAndColor(&param0->unk_2C[4], FONT_SUBSCREEN, v1, 0, 6, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(3, 2, 1), NULL);
         Strbuf_Free(v1);
-        sub_0201A9A4(&param0->unk_2C[4]);
+        Window_ScheduleCopyToVRAM(&param0->unk_2C[4]);
     }
 }
 
@@ -194,7 +194,7 @@ static void ov13_022274A8(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param
 
     v0 = &param0->unk_2C[param3];
 
-    BGL_FillWindow(v0, 0);
+    Window_FillTilemap(v0, 0);
 
     if (param0->unk_3C[param0->unk_114D][param1].item != 0) {
         v1 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[param2][0]);
@@ -203,13 +203,13 @@ static void ov13_022274A8(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param
         StringTemplate_Format(param0->unk_14, param0->unk_18, v1);
 
         v2 = Font_CalcStrbufWidth(param4, param0->unk_18, 0);
-        v3 = (sub_0201C294(v0) * 8 - v2) / 2;
+        v3 = (Window_GetWidth(v0) * 8 - v2) / 2;
 
         Text_AddPrinterWithParamsAndColor(v0, param4, param0->unk_18, v3, 8, TEXT_SPEED_NO_TRANSFER, param5, NULL);
         Strbuf_Free(v1);
     }
 
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, TextColor param6)
@@ -219,7 +219,7 @@ static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param
 
     v1 = &param0->unk_2C[param3];
 
-    BGL_FillWindow(v1, 0);
+    Window_FillTilemap(v1, 0);
 
     if (param0->unk_3C[param0->unk_114D][param1].quantity != 0) {
         v0 = MessageLoader_GetNewStrbuf(param0->unk_10, Unk_ov13_02229AB0[param2][1]);
@@ -230,7 +230,7 @@ static void ov13_0222754C(UnkStruct_ov13_02227244 *param0, u32 param1, u32 param
         Strbuf_Free(v0);
     }
 
-    sub_0201A9A4(v1);
+    Window_ScheduleCopyToVRAM(v1);
 }
 
 static void ov13_022275E0(UnkStruct_ov13_02227244 *param0, u32 param1)
@@ -254,7 +254,7 @@ void ov13_02227650(UnkStruct_ov13_02227244 *param0)
 {
     u16 v0;
 
-    sub_02019CB8(param0->unk_04, 5, 0, 0, 0, 32, 19, 17);
+    Bg_FillTilemapRect(param0->unk_04, 5, 0, 0, 0, 32, 19, 17);
 
     for (v0 = 0; v0 < 6; v0++) {
         ov13_022275E0(param0, v0);
@@ -270,12 +270,12 @@ void ov13_02227698(UnkStruct_ov13_02227244 *param0)
     u32 v2;
     u32 v3;
 
-    BGL_FillWindow(&param0->unk_2C[25], 0);
+    Window_FillTilemap(&param0->unk_2C[25], 0);
 
     v0 = &param0->unk_2C[25];
     v1 = MessageLoader_GetNewStrbuf(param0->unk_10, 28);
     v2 = Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0);
-    v3 = (sub_0201C294(v0) * 8 - v2) / 2;
+    v3 = (Window_GetWidth(v0) * 8 - v2) / 2;
 
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, v3, 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
@@ -293,12 +293,12 @@ void ov13_02227698(UnkStruct_ov13_02227244 *param0)
     v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_18, 0);
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_18, v3 - v2, 4, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_022277C8(UnkStruct_ov13_02227244 *param0)
 {
-    BGL_FillWindow(&param0->unk_2C[24], 0);
+    Window_FillTilemap(&param0->unk_2C[24], 0);
 
     switch (param0->unk_114D) {
     case 0:
@@ -335,10 +335,10 @@ static void ov13_022278A0(UnkStruct_ov13_02227244 *param0, u32 param1)
 
     StringTemplate_SetItemName(param0->unk_14, 0, param0->unk_3C[param0->unk_114D][param1].item);
     StringTemplate_Format(param0->unk_14, param0->unk_18, v1);
-    BGL_FillWindow(v0, 0);
+    Window_FillTilemap(v0, 0);
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, param0->unk_18, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02227910(UnkStruct_ov13_02227244 *param0, u32 param1)
@@ -352,7 +352,7 @@ static void ov13_02227910(UnkStruct_ov13_02227244 *param0, u32 param1)
     Item_LoadDescription(v1, param0->unk_3C[param0->unk_114D][param1].item, param0->unk_00->unk_0C);
     Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1, 4, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
     Strbuf_Free(v1);
-    sub_0201A9A4(v0);
+    Window_ScheduleCopyToVRAM(v0);
 }
 
 static void ov13_02227974(UnkStruct_ov13_02227244 *param0)
@@ -361,7 +361,7 @@ static void ov13_02227974(UnkStruct_ov13_02227244 *param0)
     u32 v1;
 
     for (v0 = 0; v0 < 4; v0++) {
-        BGL_FillWindow(&param0->unk_2C[v0], 0);
+        Window_FillTilemap(&param0->unk_2C[v0], 0);
     }
 
     v1 = param0->unk_00->unk_2C[param0->unk_114D] * 6 + param0->unk_00->unk_27[param0->unk_114D];
@@ -375,7 +375,7 @@ static void ov13_02227974(UnkStruct_ov13_02227244 *param0)
 void ov13_022279F4(UnkStruct_ov13_02227244 *param0)
 {
     sub_0200E060(&param0->unk_1C, 1, 1024 - (18 + 12), 14);
-    BGL_FillWindow(&param0->unk_1C, 15);
+    Window_FillTilemap(&param0->unk_1C, 15);
     ov13_02227A1C(param0);
 }
 

src/overlay013/ov13_02228128.c

@@ -345,8 +345,8 @@ static void ov13_022286B8(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2,
 
     ov13_0222863C(param0, v0, param1, param2, param3);
 
-    sub_020198C0(param0->unk_04, 6, v0, Unk_ov13_02229D7C[param1].unk_00, Unk_ov13_02229D7C[param1].unk_01, Unk_ov13_02229D7C[param1].unk_02, Unk_ov13_02229D7C[param1].unk_03);
-    sub_0201C3C0(param0->unk_04, 6);
+    Bg_LoadToTilemapRect(param0->unk_04, 6, v0, Unk_ov13_02229D7C[param1].unk_00, Unk_ov13_02229D7C[param1].unk_01, Unk_ov13_02229D7C[param1].unk_02, Unk_ov13_02229D7C[param1].unk_03);
+    Bg_ScheduleTilemapTransfer(param0->unk_04, 6);
     Heap_FreeToHeap(v0);
 }
 
@@ -383,8 +383,8 @@ static void ov13_0222872C(UnkStruct_ov13_02227244 *param0, u8 param1, u8 param2)
             break;
         }
 
-        sub_0201C04C(&param0->unk_2C[v0[v1]], v2, v3, 0);
-        sub_0201A9A4(&param0->unk_2C[v0[v1]]);
+        Window_Scroll(&param0->unk_2C[v0[v1]], v2, v3, 0);
+        Window_ScheduleCopyToVRAM(&param0->unk_2C[v0[v1]]);
     }
 }
 

src/overlay017/ov17_0223B140.c

@@ -177,7 +177,7 @@ int ov17_0223B140(OverlayManager *param0, int *param1)
     sub_02002F70(v0->unk_0C.unk_50, 2, (((16 - 2) * 16) * sizeof(u16)), 21);
     sub_02002F70(v0->unk_0C.unk_50, 3, 0x200, 21);
 
-    v0->unk_0C.unk_24 = sub_02018340(21);
+    v0->unk_0C.unk_24 = BgConfig_New(21);
 
     sub_0201DBEC(64, 21);
     SetAutorepeat(4, 8);
@@ -331,14 +331,14 @@ int ov17_0223B580(OverlayManager *param0, int *param1)
     ov17_0223BCE4(v0);
 
     for (v1 = 0; v1 < 1; v1++) {
-        BGL_DeleteWindow(&v0->unk_0C.unk_28[v1]);
+        Window_Remove(&v0->unk_0C.unk_28[v1]);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    sub_02019044(v0->unk_0C.unk_24, 1);
-    sub_02019044(v0->unk_0C.unk_24, 2);
-    sub_02019044(v0->unk_0C.unk_24, 3);
+    Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 1);
+    Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 2);
+    Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 3);
 
     ov17_0223F864(v0->unk_0C.unk_24);
     ov17_0223F960(v0->unk_7E4);
@@ -393,7 +393,7 @@ static void ov17_0223B6BC(void *param0)
     sub_0201DCAC();
     sub_0200C800();
     sub_02003694(v0->unk_0C.unk_50);
-    sub_0201C2B8(v0->unk_0C.unk_24);
+    Bg_RunScheduledUpdates(v0->unk_0C.unk_24);
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
 }
@@ -447,7 +447,7 @@ static void ov17_0223B728(BgConfig *param0)
             GX_BG0_AS_3D
         };
 
-        sub_02018368(&v1);
+        SetAllGraphicsModes(&v1);
     }
 
     {
@@ -499,18 +499,18 @@ static void ov17_0223B728(BgConfig *param0)
             },
         };
 
-        sub_020183C4(param0, 1, &v2[0], 0);
-        sub_02019EBC(param0, 1);
-        sub_02019184(param0, 1, 0, 0);
-        sub_02019184(param0, 1, 3, 0);
-        sub_020183C4(param0, 2, &v2[1], 0);
-        sub_02019EBC(param0, 2);
-        sub_02019184(param0, 2, 0, 0);
-        sub_02019184(param0, 2, 3, 0);
-        sub_020183C4(param0, 3, &v2[2], 0);
-        sub_02019EBC(param0, 3);
-        sub_02019184(param0, 3, 0, 0);
-        sub_02019184(param0, 3, 3, 0);
+        Bg_InitFromTemplate(param0, 1, &v2[0], 0);
+        Bg_ClearTilemap(param0, 1);
+        Bg_SetOffset(param0, 1, 0, 0);
+        Bg_SetOffset(param0, 1, 3, 0);
+        Bg_InitFromTemplate(param0, 2, &v2[1], 0);
+        Bg_ClearTilemap(param0, 2);
+        Bg_SetOffset(param0, 2, 0, 0);
+        Bg_SetOffset(param0, 2, 3, 0);
+        Bg_InitFromTemplate(param0, 3, &v2[2], 0);
+        Bg_ClearTilemap(param0, 3);
+        Bg_SetOffset(param0, 3, 0, 0);
+        Bg_SetOffset(param0, 3, 3, 0);
 
         G2_SetBG0Priority(2);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
@@ -523,7 +523,7 @@ static void ov17_0223B728(BgConfig *param0)
 
 static void ov17_0223B858(UnkStruct_ov17_02246F24 *param0)
 {
-    BGL_AddWindow(param0->unk_0C.unk_24, &param0->unk_0C.unk_28[0], 1, 11, 0x13, 20, 4, 0xd, ((0x8000 - 0x2000) / 32));
+    Window_Add(param0->unk_0C.unk_24, &param0->unk_0C.unk_28[0], 1, 11, 0x13, 20, 4, 0xd, ((0x8000 - 0x2000) / 32));
 }
 
 static void ov17_0223B884(void)
@@ -640,8 +640,8 @@ void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2)
     if (param1 == 0) {
         sub_02006E3C(45, 3, param0->unk_0C.unk_24, 2, 0, 0x4000, 1, 21);
         sub_02006E60(45, 5, param0->unk_0C.unk_24, 2, 0, 0, 1, 21);
-        BGL_SetPriority(1, 1);
-        BGL_SetPriority(2, 0);
+        Bg_SetPriority(1, 1);
+        Bg_SetPriority(2, 0);
 
         ov17_02241428(param0);
 
@@ -649,10 +649,10 @@ void ov17_0223BB14(UnkStruct_ov17_02246F24 *param0, int param1, int param2)
             GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG2, 1);
         }
     } else {
-        sub_02019690(2, 0x4000, 0, 21);
-        sub_02019EBC(param0->unk_0C.unk_24, 2);
-        BGL_SetPriority(1, 0);
-        BGL_SetPriority(2, 1);
+        Bg_ClearTilesRange(2, 0x4000, 0, 21);
+        Bg_ClearTilemap(param0->unk_0C.unk_24, 2);
+        Bg_SetPriority(1, 0);
+        Bg_SetPriority(2, 1);
     }
 }
 

src/overlay017/ov17_0223CB1C.c

@@ -157,7 +157,7 @@ int ov17_0223CB1C(OverlayManager *param0, int *param1)
     sub_02002F70(v0->unk_0C.unk_44, 2, (((16 - 2) * 16) * sizeof(u16)), 22);
     sub_02002F70(v0->unk_0C.unk_44, 3, 0x200, 22);
 
-    v0->unk_0C.unk_24 = sub_02018340(22);
+    v0->unk_0C.unk_24 = BgConfig_New(22);
 
     sub_0201DBEC(64, 22);
     SetAutorepeat(4, 8);
@@ -298,16 +298,16 @@ int ov17_0223CF8C(OverlayManager *param0, int *param1)
     ov17_0223D608(v0);
 
     for (v1 = 0; v1 < 1; v1++) {
-        BGL_DeleteWindow(&v0->unk_0C.unk_28[v1]);
+        Window_Remove(&v0->unk_0C.unk_28[v1]);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    sub_02019044(v0->unk_0C.unk_24, 1);
-    sub_02019044(v0->unk_0C.unk_24, 2);
-    sub_02019044(v0->unk_0C.unk_24, 3);
-    sub_02019120(4, 0);
-    sub_02019044(v0->unk_0C.unk_24, 4);
+    Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 1);
+    Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 2);
+    Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 3);
+    Bg_ToggleLayer(4, 0);
+    Bg_FreeTilemapBuffer(v0->unk_0C.unk_24, 4);
     sub_0200D0B0(v0->unk_0C.unk_1C, v0->unk_0C.unk_20);
     sub_0200C8D4(v0->unk_0C.unk_1C);
     sub_0201DC3C();
@@ -374,7 +374,7 @@ static void ov17_0223D0C8(void *param0)
     sub_0201DCAC();
     sub_0200C800();
     sub_02003694(v0->unk_0C.unk_44);
-    sub_0201C2B8(v0->unk_0C.unk_24);
+    Bg_RunScheduledUpdates(v0->unk_0C.unk_24);
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
 }
@@ -440,7 +440,7 @@ static void ov17_0223D1B8(BgConfig *param0)
             GX_BG0_AS_3D
         };
 
-        sub_02018368(&v1);
+        SetAllGraphicsModes(&v1);
     }
 
     {
@@ -492,18 +492,18 @@ static void ov17_0223D1B8(BgConfig *param0)
             },
         };
 
-        sub_020183C4(param0, 1, &v2[0], 0);
-        sub_02019EBC(param0, 1);
-        sub_02019184(param0, 1, 0, 0);
-        sub_02019184(param0, 1, 3, 0);
-        sub_020183C4(param0, 2, &v2[1], 0);
-        sub_02019EBC(param0, 2);
-        sub_02019184(param0, 2, 0, 0);
-        sub_02019184(param0, 2, 3, 0);
-        sub_020183C4(param0, 3, &v2[2], 0);
-        sub_02019EBC(param0, 3);
-        sub_02019184(param0, 3, 0, 0);
-        sub_02019184(param0, 3, 3, 0);
+        Bg_InitFromTemplate(param0, 1, &v2[0], 0);
+        Bg_ClearTilemap(param0, 1);
+        Bg_SetOffset(param0, 1, 0, 0);
+        Bg_SetOffset(param0, 1, 3, 0);
+        Bg_InitFromTemplate(param0, 2, &v2[1], 0);
+        Bg_ClearTilemap(param0, 2);
+        Bg_SetOffset(param0, 2, 0, 0);
+        Bg_SetOffset(param0, 2, 3, 0);
+        Bg_InitFromTemplate(param0, 3, &v2[2], 0);
+        Bg_ClearTilemap(param0, 3);
+        Bg_SetOffset(param0, 3, 0, 0);
+        Bg_SetOffset(param0, 3, 3, 0);
 
         G2_SetBG0Priority(1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
@@ -528,16 +528,16 @@ static void ov17_0223D1B8(BgConfig *param0)
             },
         };
 
-        sub_020183C4(param0, 4, &v3[0], 0);
-        sub_02019EBC(param0, 4);
-        sub_02019184(param0, 4, 0, 0);
-        sub_02019184(param0, 4, 3, 0);
+        Bg_InitFromTemplate(param0, 4, &v3[0], 0);
+        Bg_ClearTilemap(param0, 4);
+        Bg_SetOffset(param0, 4, 0, 0);
+        Bg_SetOffset(param0, 4, 3, 0);
     }
 }
 
 static void ov17_0223D324(UnkStruct_ov17_02247A48 *param0)
 {
-    BGL_AddWindow(param0->unk_0C.unk_24, &param0->unk_0C.unk_28[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1));
+    Window_Add(param0->unk_0C.unk_24, &param0->unk_0C.unk_28[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1));
 }
 
 static void ov17_0223D350(void)
@@ -605,7 +605,7 @@ static void ov17_0223D4A8(UnkStruct_ov17_02247A48 *param0, NARC *param1)
 
     sub_020070E8(param1, 23, param0->unk_0C.unk_24, 3, 0, 0, 1, 22);
     sub_0200710C(param1, 22, param0->unk_0C.unk_24, 3, 0, 0, 1, 22);
-    sub_02019EBC(param0->unk_0C.unk_24, 1);
+    Bg_ClearTilemap(param0->unk_0C.unk_24, 1);
     PaletteSys_LoadPalette(param0->unk_0C.unk_44, 45, 35, 22, 0, 0, 0);
     PaletteSys_LoadPalette(param0->unk_0C.unk_44, 45, 36, 22, 0, 0x20, 13 * 16);
 

src/overlay017/ov17_0223DAD0.c

@@ -257,7 +257,7 @@ int ov17_0223DAD0(OverlayManager *param0, int *param1)
 
     v0->unk_1050.unk_00 = Heap_AllocFromHeap(23, 0x200);
     ov17_0224CDB4(v0, 1);
-    v0->unk_14.unk_60 = sub_02018340(23);
+    v0->unk_14.unk_60 = BgConfig_New(23);
 
     sub_0201DBEC(64, 23);
     SetAutorepeat(4, 8);
@@ -408,14 +408,14 @@ int ov17_0223DF0C(OverlayManager *param0, int *param1)
     ov17_0223E774(v0);
 
     for (v1 = 0; v1 < 2; v1++) {
-        BGL_DeleteWindow(&v0->unk_14.unk_64[v1]);
+        Window_Remove(&v0->unk_14.unk_64[v1]);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    sub_02019044(v0->unk_14.unk_60, 1);
-    sub_02019044(v0->unk_14.unk_60, 2);
-    sub_02019044(v0->unk_14.unk_60, 3);
+    Bg_FreeTilemapBuffer(v0->unk_14.unk_60, 1);
+    Bg_FreeTilemapBuffer(v0->unk_14.unk_60, 2);
+    Bg_FreeTilemapBuffer(v0->unk_14.unk_60, 3);
 
     ov17_02249358(v0->unk_14.unk_60);
     ov17_022493A4(v0->unk_1074);
@@ -499,7 +499,7 @@ static void ov17_0223E09C(void *param0)
     sub_0201DCAC();
     sub_0200C800();
     sub_02003694(v0->unk_14.unk_90);
-    sub_0201C2B8(v0->unk_14.unk_60);
+    Bg_RunScheduledUpdates(v0->unk_14.unk_60);
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
 }
@@ -600,7 +600,7 @@ static void ov17_0223E250(BgConfig *param0)
             GX_BG0_AS_3D
         };
 
-        sub_02018368(&v1);
+        SetAllGraphicsModes(&v1);
     }
 
     {
@@ -652,18 +652,18 @@ static void ov17_0223E250(BgConfig *param0)
             },
         };
 
-        sub_020183C4(param0, 1, &v2[0], 0);
-        sub_02019EBC(param0, 1);
-        sub_02019184(param0, 1, 0, 0);
-        sub_02019184(param0, 1, 3, 0);
-        sub_020183C4(param0, 2, &v2[1], 0);
-        sub_02019EBC(param0, 2);
-        sub_02019184(param0, 2, 0, 0);
-        sub_02019184(param0, 2, 3, 0);
-        sub_020183C4(param0, 3, &v2[2], 0);
-        sub_02019EBC(param0, 3);
-        sub_02019184(param0, 3, 0, 0);
-        sub_02019184(param0, 3, 3, 0);
+        Bg_InitFromTemplate(param0, 1, &v2[0], 0);
+        Bg_ClearTilemap(param0, 1);
+        Bg_SetOffset(param0, 1, 0, 0);
+        Bg_SetOffset(param0, 1, 3, 0);
+        Bg_InitFromTemplate(param0, 2, &v2[1], 0);
+        Bg_ClearTilemap(param0, 2);
+        Bg_SetOffset(param0, 2, 0, 0);
+        Bg_SetOffset(param0, 2, 3, 0);
+        Bg_InitFromTemplate(param0, 3, &v2[2], 0);
+        Bg_ClearTilemap(param0, 3);
+        Bg_SetOffset(param0, 3, 0, 0);
+        Bg_SetOffset(param0, 3, 3, 0);
 
         G2_SetBG0Priority(2);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
@@ -676,8 +676,8 @@ static void ov17_0223E250(BgConfig *param0)
 
 static void ov17_0223E380(UnkStruct_ov17_0224DF54 *param0)
 {
-    BGL_AddWindow(param0->unk_14.unk_60, &param0->unk_14.unk_64[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1));
-    BGL_AddWindow(param0->unk_14.unk_60, &param0->unk_14.unk_64[1], 1, 0x2, 0xb, 27, 2, 13, ((18 + 12) + 1));
+    Window_Add(param0->unk_14.unk_60, &param0->unk_14.unk_64[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1));
+    Window_Add(param0->unk_14.unk_60, &param0->unk_14.unk_64[1], 1, 0x2, 0xb, 27, 2, 13, ((18 + 12) + 1));
 }
 
 static BOOL ov17_0223E3CC(UnkStruct_ov17_0224DF54 *param0, int *param1, int *param2)

src/overlay017/ov17_0223F118.c

@@ -130,7 +130,7 @@ void ov17_0223F1E8(int param0, BgConfig *param1, SpriteGfxHandler *param2, UnkSt
 
     {
         Window_Init(&v1);
-        BGL_AddFramelessWindow(param1, &v1, v6, 16 / 8, 0, 0);
+        Window_AddToTopLeftCorner(param1, &v1, v6, 16 / 8, 0, 0);
         Text_AddPrinterWithParamsColorAndSpacing(&v1, param6, param5, 0, 0, TEXT_SPEED_NO_TRANSFER, param7, v7, 0, NULL);
     }
 
@@ -163,7 +163,7 @@ void ov17_0223F1E8(int param0, BgConfig *param1, SpriteGfxHandler *param2, UnkSt
     }
 
     sub_020128C4(v4, param10, param11);
-    BGL_DeleteWindow(&v1);
+    Window_Remove(&v1);
 
     param4->unk_00 = v4;
     param4->unk_04 = v2;

src/overlay017/ov17_0223F7E4.c

@@ -545,10 +545,10 @@ void ov17_0223F80C(BgConfig *param0)
     int v0;
 
     for (v0 = 0; v0 < NELEMS(Unk_ov17_02253448); v0++) {
-        sub_020183C4(param0, 4 + v0, &Unk_ov17_02253448[v0], 0);
-        sub_02019EE0(param0, 4 + v0, 0);
-        sub_02019184(param0, 4 + v0, 0, 0);
-        sub_02019184(param0, 4 + v0, 3, 0);
+        Bg_InitFromTemplate(param0, 4 + v0, &Unk_ov17_02253448[v0], 0);
+        Bg_FillTilemap(param0, 4 + v0, 0);
+        Bg_SetOffset(param0, 4 + v0, 0, 0);
+        Bg_SetOffset(param0, 4 + v0, 3, 0);
     }
 }
 
@@ -557,8 +557,8 @@ void ov17_0223F864(BgConfig *param0)
     int v0;
 
     for (v0 = 0; v0 < NELEMS(Unk_ov17_02253448); v0++) {
-        sub_02019120(4 + v0, 0);
-        sub_02019044(param0, 4 + v0);
+        Bg_ToggleLayer(4 + v0, 0);
+        Bg_FreeTilemapBuffer(param0, 4 + v0);
     }
 }
 
@@ -655,7 +655,7 @@ void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void
 
     {
         for (v2 = 0; v2 < 4; v2++) {
-            BGL_SetPriority(4 + v2, v0->unk_0C_val2[v2]);
+            Bg_SetPriority(4 + v2, v0->unk_0C_val2[v2]);
         }
     }
 
@@ -665,8 +665,8 @@ void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void
 
     for (v2 = 0; v2 < 4; v2++) {
         if ((v0->unk_04_val2[v2] != 0xffff) && ((param2 == 1) || (v0->unk_04_val2[v2] != v1->unk_04_val2[v2]))) {
-            sub_02019574(v3, 4 + v2, param0->unk_20[v0->unk_04_val2[v2]], 0x800);
-            sub_0201C3C0(v3, 4 + v2);
+            Bg_LoadTilemapBuffer(v3, 4 + v2, param0->unk_20[v0->unk_04_val2[v2]], 0x800);
+            Bg_ScheduleTilemapTransfer(v3, 4 + v2);
         }
     }
 
@@ -971,7 +971,7 @@ static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_022401
 
     if (param10 == NULL) {
         Window_Init(&v1);
-        BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0);
+        Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0);
         Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
     } else {
         v1 = param10->unk_00;
@@ -1005,7 +1005,7 @@ static void ov17_02240138(UnkStruct_ov17_0223F7E4 *param0, UnkStruct_ov17_022401
     sub_020128C4(v4, param7, param8);
 
     if (param10 == NULL) {
-        BGL_DeleteWindow(&v1);
+        Window_Remove(&v1);
     }
 
     param1->unk_00 = v4;
@@ -1102,7 +1102,7 @@ static void ov17_022403B0(UnkStruct_ov17_0223F7E4 *param0, const s16 *param1, co
     int v7;
 
     v2 = param0->unk_04->unk_24;
-    v3 = sub_02019FE4(v2, 4);
+    v3 = Bg_GetTilemapBuffer(v2, 4);
     v5 = param0->unk_20[param3];
     v7 = param1[param4];
 
@@ -1115,7 +1115,7 @@ static void ov17_022403B0(UnkStruct_ov17_0223F7E4 *param0, const s16 *param1, co
         }
     }
 
-    sub_0201C3C0(v2, 4);
+    Bg_ScheduleTilemapTransfer(v2, 4);
 }
 
 static void ov17_02240424(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2)
@@ -1427,21 +1427,21 @@ static void ov17_022409F4(UnkStruct_ov17_0223F7E4 *param0)
 
     for (v0 = 0; v0 < 4; v0++) {
         if (param0->unk_18C.unk_00[v0].unk_00.pixels != NULL) {
-            BGL_DeleteWindow(&param0->unk_18C.unk_00[v0].unk_00);
+            Window_Remove(&param0->unk_18C.unk_00[v0].unk_00);
         }
 
         if (param0->unk_18C.unk_50[v0].unk_00.pixels != NULL) {
-            BGL_DeleteWindow(&param0->unk_18C.unk_50[v0].unk_00);
+            Window_Remove(&param0->unk_18C.unk_50[v0].unk_00);
         }
 
         if (param0->unk_18C.unk_A0[v0].unk_00.pixels != NULL) {
-            BGL_DeleteWindow(&param0->unk_18C.unk_A0[v0].unk_00);
+            Window_Remove(&param0->unk_18C.unk_A0[v0].unk_00);
         }
     }
 
     for (v0 = 0; v0 < (1 + 2); v0++) {
         if (param0->unk_18C.unk_F0[v0].unk_00.pixels != NULL) {
-            BGL_DeleteWindow(&param0->unk_18C.unk_F0[v0].unk_00);
+            Window_Remove(&param0->unk_18C.unk_F0[v0].unk_00);
         }
     }
 }
@@ -1503,11 +1503,11 @@ static void ov17_02240BF4(UnkStruct_ov17_0223F7E4 *param0, const Strbuf *param1,
     param3->unk_10 = v1;
 
     if (param3->unk_00.pixels != NULL) {
-        BGL_DeleteWindow(&param3->unk_00);
+        Window_Remove(&param3->unk_00);
     }
 
     Window_Init(&param3->unk_00);
-    BGL_AddFramelessWindow(param0->unk_04->unk_24, &param3->unk_00, v1, 16 / 8, 0, 0);
+    Window_AddToTopLeftCorner(param0->unk_04->unk_24, &param3->unk_00, v1, 16 / 8, 0, 0);
     Text_AddPrinterWithParamsColorAndSpacing(&param3->unk_00, param2, param1, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
 }
 
@@ -1811,7 +1811,7 @@ static void ov17_022411E4(SysTask *param0, void *param1)
 {
     UnkStruct_ov17_0223F7E4 *v0 = param1;
 
-    sub_0201958C(v0->unk_04->unk_24, 4, v0->unk_2C4->pRawData, 0x6000, 0);
+    Bg_LoadTiles(v0->unk_04->unk_24, 4, v0->unk_2C4->pRawData, 0x6000, 0);
     Heap_FreeToHeap(v0->unk_2C0);
 
     v0->unk_2C0 = NULL;
@@ -1829,9 +1829,9 @@ static void ov17_02241220(SysTask *param0, void *param1)
 
     for (v2 = 0; v2 < 4; v2++) {
         if (v1->unk_04_val2[v2] == 0xffff) {
-            sub_02019120(4 + v2, 0);
+            Bg_ToggleLayer(4 + v2, 0);
         } else {
-            sub_02019120(4 + v2, 1);
+            Bg_ToggleLayer(4 + v2, 1);
         }
     }
 

src/overlay017/ov17_022413D8.c

@@ -396,7 +396,7 @@ void ov17_022413E4(UnkStruct_ov17_02246F24 *param0, int param1, int param2)
     u16 *v0;
     int v1, v2;
 
-    v0 = sub_02019FE4(param0->unk_0C.unk_24, 2);
+    v0 = Bg_GetTilemapBuffer(param0->unk_0C.unk_24, 2);
     v0 = &v0[32 * (param1 * 6) + 0];
 
     for (v2 = 0; v2 < 6; v2++) {
@@ -414,7 +414,7 @@ void ov17_02241428(UnkStruct_ov17_02246F24 *param0)
         ov17_022413E4(param0, v0, Unk_ov17_022536B4[param0->unk_220.unk_01[v0]]);
     }
 
-    sub_0201C3C0(param0->unk_0C.unk_24, 2);
+    Bg_ScheduleTilemapTransfer(param0->unk_0C.unk_24, 2);
 }
 
 UnkStruct_ov17_0224145C *ov17_0224145C(UnkStruct_ov17_02246F24 *param0, int param1)
@@ -1504,8 +1504,8 @@ static void ov17_0224290C(UnkStruct_ov17_02246F24 *param0, int param1, const Unk
 
 void ov17_02242DA8(UnkStruct_ov17_02246F24 *param0)
 {
-    BGL_FillWindow(&param0->unk_0C.unk_28[0], 0xff);
-    sub_0201A954(&param0->unk_0C.unk_28[0]);
+    Window_FillTilemap(&param0->unk_0C.unk_28[0], 0xff);
+    Window_CopyToVRAM(&param0->unk_0C.unk_28[0]);
 }
 
 static void ov17_02242DC0(UnkStruct_ov17_02246F24 *param0, MessageLoader *param1, u32 param2, int param3, const UnkStruct_ov17_022449B8 *param4, const void *param5, int param6)
@@ -1527,16 +1527,16 @@ static void ov17_02242DC0(UnkStruct_ov17_02246F24 *param0, MessageLoader *param1
     ov17_0224290C(param0, param3, param4, param5);
 
     StringTemplate_Format(param0->unk_0C.unk_48, param0->unk_0C.unk_4C, v0);
-    BGL_FillWindow(&param0->unk_0C.unk_28[0], 0xff);
+    Window_FillTilemap(&param0->unk_0C.unk_28[0], 0xff);
 
     param0->unk_0C.unk_210 = Text_AddPrinterWithParams(&param0->unk_0C.unk_28[0], FONT_MESSAGE, param0->unk_0C.unk_4C, 0, 0, v1, NULL);
 
     if (v1 == 0) {
         param0->unk_0C.unk_210 = 0xff;
-        sub_0201A954(&param0->unk_0C.unk_28[0]);
+        Window_CopyToVRAM(&param0->unk_0C.unk_28[0]);
     }
 
-    if (sub_020192EC(param0->unk_0C.unk_24, 1) == 0) {
+    if (Bg_GetXOffset(param0->unk_0C.unk_24, 1) == 0) {
         (void)0;
     }
 

src/overlay017/ov17_022476F8.c

@@ -218,7 +218,7 @@ static void ov17_02247990(UnkStruct_ov17_02247A48 *param0, MessageLoader *param1
     ov17_0224792C(param0, param3, param4);
 
     StringTemplate_Format(param0->unk_0C.unk_3C, param0->unk_0C.unk_40, v0);
-    BGL_FillWindow(&param0->unk_0C.unk_28[0], 0xff);
+    Window_FillTilemap(&param0->unk_0C.unk_28[0], 0xff);
 
     param0->unk_0C.unk_C4 = Text_AddPrinterWithParams(&param0->unk_0C.unk_28[0], FONT_MESSAGE, param0->unk_0C.unk_40, 0, 0, v1, NULL);
     Strbuf_Free(v0);

src/overlay017/ov17_02247A48.c

@@ -625,7 +625,7 @@ static void ov17_022482B0(SysTask *param0, void *param1)
             u16 *v1, *v2;
             int v3, v4, v5, v6, v7;
 
-            v1 = sub_02019FE4(v0->unk_00->unk_0C.unk_24, 2);
+            v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_0C.unk_24, 2);
 
             for (v4 = 0; v4 < 4; v4++) {
                 if (Unk_ov17_02254468[v0->unk_11] + v4 < 0) {
@@ -656,7 +656,7 @@ static void ov17_022482B0(SysTask *param0, void *param1)
                 }
             }
 
-            sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 2);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 2);
         }
 
         v0->unk_12++;
@@ -727,7 +727,7 @@ static void ov17_02248464(SysTask *param0, void *param1)
             int v3, v4, v5, v6, v7;
             int v8;
 
-            v1 = sub_02019FE4(v0->unk_00->unk_0C.unk_24, 2);
+            v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_0C.unk_24, 2);
 
             for (v4 = 0; v4 < 4; v4++) {
                 v8 = Unk_ov17_02254468[NELEMS(Unk_ov17_02254468) - 1 - v0->unk_11];
@@ -763,7 +763,7 @@ static void ov17_02248464(SysTask *param0, void *param1)
                 }
             }
 
-            sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 2);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 2);
         }
 
         v0->unk_12++;
@@ -1194,7 +1194,7 @@ static void ov17_02248DA4(SysTask *param0, void *param1)
     case 0:
         if (v0->unk_17 != 0) {
             sub_0200E060(&v0->unk_00->unk_0C.unk_28[0], 1, 1, 14);
-            sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 1);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 1);
             ov17_02247A08(v0->unk_00, v0->unk_17, &v0->unk_13);
             v0->unk_10++;
         } else {
@@ -1213,7 +1213,7 @@ static void ov17_02248DA4(SysTask *param0, void *param1)
             v0->unk_10++;
         } else if (v0->unk_12 >= v0->unk_18) {
             sub_0200E084(&v0->unk_00->unk_0C.unk_28[0], 1);
-            sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 1);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 1);
             v0->unk_10++;
         }
         break;
@@ -1362,7 +1362,7 @@ static void ov17_02249014(SysTask *param0, void *param1)
             u16 *v2, *v3;
             int v4, v5, v6, v7, v8;
 
-            v2 = sub_02019FE4(v0->unk_00->unk_0C.unk_24, 2);
+            v2 = Bg_GetTilemapBuffer(v0->unk_00->unk_0C.unk_24, 2);
 
             for (v5 = 0; v5 < 4; v5++) {
                 if (Unk_ov17_02254468[v0->unk_11] + v5 < 0) {
@@ -1393,7 +1393,7 @@ static void ov17_02249014(SysTask *param0, void *param1)
                 }
             }
 
-            sub_0201C3C0(v0->unk_00->unk_0C.unk_24, 2);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_0C.unk_24, 2);
         }
 
         {

src/overlay017/ov17_022492DC.c

@@ -289,10 +289,10 @@ void ov17_02249300(BgConfig *param0)
     int v0;
 
     for (v0 = 0; v0 < NELEMS(Unk_ov17_022545C0); v0++) {
-        sub_020183C4(param0, 4 + v0, &Unk_ov17_022545C0[v0], 0);
-        sub_02019EE0(param0, 4 + v0, 0);
-        sub_02019184(param0, 4 + v0, 0, 0);
-        sub_02019184(param0, 4 + v0, 3, 0);
+        Bg_InitFromTemplate(param0, 4 + v0, &Unk_ov17_022545C0[v0], 0);
+        Bg_FillTilemap(param0, 4 + v0, 0);
+        Bg_SetOffset(param0, 4 + v0, 0, 0);
+        Bg_SetOffset(param0, 4 + v0, 3, 0);
     }
 }
 
@@ -301,8 +301,8 @@ void ov17_02249358(BgConfig *param0)
     int v0;
 
     for (v0 = 0; v0 < NELEMS(Unk_ov17_022545C0); v0++) {
-        sub_02019120(4 + v0, 0);
-        sub_02019044(param0, 4 + v0);
+        Bg_ToggleLayer(4 + v0, 0);
+        Bg_FreeTilemapBuffer(param0, 4 + v0);
     }
 }
 
@@ -430,7 +430,7 @@ void ov17_02249640(UnkStruct_ov17_022492DC *param0, int param1, int param2, void
 
     {
         for (v2 = 0; v2 < 4; v2++) {
-            BGL_SetPriority(4 + v2, v0->unk_0C_val2[v2]);
+            Bg_SetPriority(4 + v2, v0->unk_0C_val2[v2]);
         }
     }
 
@@ -445,8 +445,8 @@ void ov17_02249640(UnkStruct_ov17_022492DC *param0, int param1, int param2, void
 
     for (v2 = 0; v2 < 4; v2++) {
         if ((v0->unk_04_val2[v2] != 0xffff) && ((param2 == 1) || (v0->unk_04_val2[v2] != v1->unk_04_val2[v2]))) {
-            sub_02019574(v3, 4 + v2, param0->unk_D0[v0->unk_04_val2[v2]], 0x800);
-            sub_0201C3C0(v3, 4 + v2);
+            Bg_LoadTilemapBuffer(v3, 4 + v2, param0->unk_D0[v0->unk_04_val2[v2]], 0x800);
+            Bg_ScheduleTilemapTransfer(v3, 4 + v2);
         }
     }
 
@@ -626,7 +626,7 @@ static UnkStruct_ov17_02249B30 *ov17_02249AAC(UnkStruct_ov17_022492DC *param0, i
 
     v0->unk_1C = param5 * 0x20;
     v0->unk_10 = *param4;
-    v0->unk_04 = sub_02019F28(param1);
+    v0->unk_04 = Bg_GetCharPtr(param1);
 
     return v0;
 }
@@ -700,7 +700,7 @@ static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249B
 
     {
         Window_Init(&v1);
-        BGL_AddFramelessWindow(v5, &v1, v8, 16 / 8, 0, 0);
+        Window_AddToTopLeftCorner(v5, &v1, v8, 16 / 8, 0, 0);
         Text_AddPrinterWithParamsColorAndSpacing(&v1, param3, param2, 0, 0, TEXT_SPEED_NO_TRANSFER, param4, 0, 0, NULL);
     }
 
@@ -730,7 +730,7 @@ static void ov17_02249BC4(UnkStruct_ov17_022492DC *param0, UnkStruct_ov17_02249B
 
     sub_02012AC0(v4, param5);
     sub_020128C4(v4, param7, param8);
-    BGL_DeleteWindow(&v1);
+    Window_Remove(&v1);
 
     param1->unk_00 = v4;
     param1->unk_04 = v2;
@@ -917,9 +917,9 @@ static void ov17_0224A038(SysTask *param0, void *param1)
 
     for (v2 = 0; v2 < 4; v2++) {
         if (v1->unk_04_val2[v2] == 0xffff) {
-            sub_02019120(4 + v2, 0);
+            Bg_ToggleLayer(4 + v2, 0);
         } else {
-            sub_02019120(4 + v2, 1);
+            Bg_ToggleLayer(4 + v2, 1);
         }
     }
 
@@ -931,7 +931,7 @@ static void ov17_0224A088(SysTask *param0, void *param1)
     UnkStruct_ov17_022492DC *v0 = param1;
 
     if (v0->unk_88 != 0xffff) {
-        sub_0201958C(v0->unk_04->unk_60, 4, v0->unk_C4[v0->unk_88], (0x8000 - (0x800 * 4)), 0);
+        Bg_LoadTiles(v0->unk_04->unk_60, 4, v0->unk_C4[v0->unk_88], (0x8000 - (0x800 * 4)), 0);
         v0->unk_88 = 0xffff;
     }
 

src/overlay017/ov17_0224A0FC.c

@@ -448,7 +448,7 @@ void ov17_0224A214(UnkStruct_ov17_0224A1EC *param0, int param1, int param2)
     {
         u16 *v6;
 
-        v6 = sub_02019FE4(param0->unk_60, 3);
+        v6 = Bg_GetTilemapBuffer(param0->unk_60, 3);
         v6 = &v6[32 * 0x13 + v5];
 
         if (param2 == 0) {
@@ -492,7 +492,7 @@ void ov17_0224A214(UnkStruct_ov17_0224A1EC *param0, int param1, int param2)
             }
         }
 
-        sub_0201C3C0(param0->unk_60, 3);
+        Bg_ScheduleTilemapTransfer(param0->unk_60, 3);
     }
 }
 
@@ -1941,7 +1941,7 @@ static void ov17_0224C244(UnkStruct_ov17_0224DF54 *param0, MessageLoader *param1
     ov17_0224C0C0(param0, param3, param4);
 
     StringTemplate_Format(param0->unk_14.unk_88, param0->unk_14.unk_8C, v0);
-    BGL_FillWindow(&param0->unk_14.unk_64[0], 0xff);
+    Window_FillTilemap(&param0->unk_14.unk_64[0], 0xff);
 
     param0->unk_14.unk_A18 = Text_AddPrinterWithParams(&param0->unk_14.unk_64[0], FONT_MESSAGE, param0->unk_14.unk_8C, 0, 0, v1, NULL);
     Strbuf_Free(v0);
@@ -2105,7 +2105,7 @@ void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_
     }
 
     sub_0200E060(&param0->unk_14.unk_64[1], 1, 1, 14);
-    sub_0201C3C0(param0->unk_14.unk_60, 1);
+    Bg_ScheduleTilemapTransfer(param0->unk_14.unk_60, 1);
 
     v0 = Unk_ov17_0225470C[param1].unk_00;
     v1 = Unk_ov17_0225470C[param1].unk_02;
@@ -2114,7 +2114,7 @@ void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_
     ov17_0224C0C0(param0, v1, param2);
 
     StringTemplate_Format(param0->unk_14.unk_88, param0->unk_14.unk_8C, v2);
-    BGL_FillWindow(&param0->unk_14.unk_64[1], 0xff);
+    Window_FillTilemap(&param0->unk_14.unk_64[1], 0xff);
     Text_AddPrinterWithParams(&param0->unk_14.unk_64[1], FONT_MESSAGE, param0->unk_14.unk_8C, 0, 0, TEXT_SPEED_INSTANT, NULL);
     Strbuf_Free(v2);
 
@@ -2124,7 +2124,7 @@ void ov17_0224C5A0(UnkStruct_ov17_0224DF54 *param0, u32 param1, const UnkStruct_
 void ov17_0224C640(UnkStruct_ov17_0224DF54 *param0)
 {
     sub_0200E084(&param0->unk_14.unk_64[1], 1);
-    sub_0201C3C0(param0->unk_14.unk_60, 1);
+    Bg_ScheduleTilemapTransfer(param0->unk_14.unk_60, 1);
     param0->unk_1B25 = 0;
 }
 

src/overlay017/ov17_0224CFB8.c

@@ -209,7 +209,7 @@ static void ov17_0224D078(SysTask *param0, void *param1)
             u16 *v1, *v2;
             int v3, v4, v5, v6, v7;
 
-            v1 = sub_02019FE4(v0->unk_00->unk_14.unk_60, 2);
+            v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_14.unk_60, 2);
 
             for (v4 = 0; v4 < 4; v4++) {
                 if (Unk_ov17_022549C4[v0->unk_11] + v4 < 0) {
@@ -240,7 +240,7 @@ static void ov17_0224D078(SysTask *param0, void *param1)
                 }
             }
 
-            sub_0201C3C0(v0->unk_00->unk_14.unk_60, 2);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_14.unk_60, 2);
         }
 
         v0->unk_12++;
@@ -312,7 +312,7 @@ static void ov17_0224D240(SysTask *param0, void *param1)
             int v3, v4, v5, v6, v7;
             int v8;
 
-            v1 = sub_02019FE4(v0->unk_00->unk_14.unk_60, 2);
+            v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_14.unk_60, 2);
 
             for (v4 = 0; v4 < 4; v4++) {
                 v8 = Unk_ov17_022549C4[NELEMS(Unk_ov17_022549C4) - 1 - v0->unk_11];
@@ -348,7 +348,7 @@ static void ov17_0224D240(SysTask *param0, void *param1)
                 }
             }
 
-            sub_0201C3C0(v0->unk_00->unk_14.unk_60, 2);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_14.unk_60, 2);
         }
 
         v0->unk_12++;
@@ -1404,7 +1404,7 @@ static void ov17_0224E6C8(SysTask *param0, void *param1)
     case 0:
         if (v0->unk_1A != 0) {
             sub_0200E060(&v0->unk_00->unk_14.unk_64[0], 1, 1, 14);
-            sub_0201C3C0(v0->unk_00->unk_14.unk_60, 1);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_14.unk_60, 1);
 
             ov17_0224C2CC(v0->unk_00, v0->unk_1A, &v0->unk_14);
             v0->unk_10++;
@@ -1424,7 +1424,7 @@ static void ov17_0224E6C8(SysTask *param0, void *param1)
             v0->unk_10++;
         } else if (v0->unk_12 >= v0->unk_1B) {
             sub_0200E084(&v0->unk_00->unk_14.unk_64[0], 1);
-            sub_0201C3C0(v0->unk_00->unk_14.unk_60, 1);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_14.unk_60, 1);
             v0->unk_10++;
         }
         break;

src/overlay017/ov17_0224F4D4.c

@@ -168,7 +168,7 @@ int ov17_0224F4D4(OverlayManager *param0, int *param1)
     sub_02002F70(v0->unk_10.unk_C0, 2, (((16 - 2) * 16) * sizeof(u16)), 24);
     sub_02002F70(v0->unk_10.unk_C0, 3, 0x200, 24);
 
-    v0->unk_10.unk_20 = sub_02018340(24);
+    v0->unk_10.unk_20 = BgConfig_New(24);
 
     sub_0201DBEC(64, 24);
     SetAutorepeat(4, 8);
@@ -288,16 +288,16 @@ int ov17_0224F86C(OverlayManager *param0, int *param1)
     ov17_0224FEC8(v0);
 
     for (v1 = 0; v1 < 9; v1++) {
-        BGL_DeleteWindow(&v0->unk_10.unk_24[v1]);
+        Window_Remove(&v0->unk_10.unk_24[v1]);
     }
 
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 0);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG1, 0);
-    sub_02019044(v0->unk_10.unk_20, 1);
-    sub_02019044(v0->unk_10.unk_20, 2);
-    sub_02019044(v0->unk_10.unk_20, 3);
-    sub_02019120(4, 0);
-    sub_02019044(v0->unk_10.unk_20, 4);
+    Bg_FreeTilemapBuffer(v0->unk_10.unk_20, 1);
+    Bg_FreeTilemapBuffer(v0->unk_10.unk_20, 2);
+    Bg_FreeTilemapBuffer(v0->unk_10.unk_20, 3);
+    Bg_ToggleLayer(4, 0);
+    Bg_FreeTilemapBuffer(v0->unk_10.unk_20, 4);
     sub_0200D0B0(v0->unk_10.unk_18, v0->unk_10.unk_1C);
     sub_0200C8D4(v0->unk_10.unk_18);
     sub_0201DC3C();
@@ -362,7 +362,7 @@ static void ov17_0224FA24(void *param0)
     sub_0201DCAC();
     sub_0200C800();
     sub_02003694(v0->unk_10.unk_C0);
-    sub_0201C2B8(v0->unk_10.unk_20);
+    Bg_RunScheduledUpdates(v0->unk_10.unk_20);
 
     OS_SetIrqCheckFlag(OS_IE_V_BLANK);
 }
@@ -376,9 +376,9 @@ static void ov17_0224FAAC(void *param0)
         v1 = GX_GetVCount();
 
         if ((v1 >= (0x13 - 1) * 8) && (v1 <= (0x13 - 0) * 8)) {
-            BGL_SetPriority(1, 0);
+            Bg_SetPriority(1, 0);
         } else if (v1 < (0x13 - 1) * 8) {
-            BGL_SetPriority(1, 2);
+            Bg_SetPriority(1, 2);
         }
     }
 }
@@ -388,7 +388,7 @@ static void ov17_0224FAE4(SysTask *param0, void *param1)
     UnkStruct_ov17_0224FCA0 *v0 = param1;
 
     if (v0->unk_127B == 1) {
-        BGL_SetPriority(1, 2);
+        Bg_SetPriority(1, 2);
     }
 }
 
@@ -441,7 +441,7 @@ static void ov17_0224FB34(BgConfig *param0)
             GX_BG0_AS_3D
         };
 
-        sub_02018368(&v1);
+        SetAllGraphicsModes(&v1);
     }
 
     {
@@ -493,18 +493,18 @@ static void ov17_0224FB34(BgConfig *param0)
             },
         };
 
-        sub_020183C4(param0, 1, &v2[0], 0);
-        sub_02019EBC(param0, 1);
-        sub_02019184(param0, 1, 0, 0);
-        sub_02019184(param0, 1, 3, 0);
-        sub_020183C4(param0, 2, &v2[1], 0);
-        sub_02019EBC(param0, 2);
-        sub_02019184(param0, 2, 0, 0);
-        sub_02019184(param0, 2, 3, 0);
-        sub_020183C4(param0, 3, &v2[2], 0);
-        sub_02019EBC(param0, 3);
-        sub_02019184(param0, 3, 0, 0);
-        sub_02019184(param0, 3, 3, 0);
+        Bg_InitFromTemplate(param0, 1, &v2[0], 0);
+        Bg_ClearTilemap(param0, 1);
+        Bg_SetOffset(param0, 1, 0, 0);
+        Bg_SetOffset(param0, 1, 3, 0);
+        Bg_InitFromTemplate(param0, 2, &v2[1], 0);
+        Bg_ClearTilemap(param0, 2);
+        Bg_SetOffset(param0, 2, 0, 0);
+        Bg_SetOffset(param0, 2, 3, 0);
+        Bg_InitFromTemplate(param0, 3, &v2[2], 0);
+        Bg_ClearTilemap(param0, 3);
+        Bg_SetOffset(param0, 3, 0, 0);
+        Bg_SetOffset(param0, 3, 3, 0);
 
         G2_SetBG0Priority(1);
         GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
@@ -529,24 +529,24 @@ static void ov17_0224FB34(BgConfig *param0)
             },
         };
 
-        sub_020183C4(param0, 4, &v3[0], 0);
-        sub_02019EBC(param0, 4);
-        sub_02019184(param0, 4, 0, 0);
-        sub_02019184(param0, 4, 3, 0);
+        Bg_InitFromTemplate(param0, 4, &v3[0], 0);
+        Bg_ClearTilemap(param0, 4);
+        Bg_SetOffset(param0, 4, 0, 0);
+        Bg_SetOffset(param0, 4, 3, 0);
     }
 }
 
 static void ov17_0224FCA0(UnkStruct_ov17_0224FCA0 *param0)
 {
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1));
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[1], 1, 6, 1 + 4 * 0, 8, 3, 13, (((18 + 12) + 1) + (27 * 4)));
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[2], 1, 6, 1 + 4 * 1, 8, 3, 13, ((((18 + 12) + 1) + (27 * 4)) + (8 * 3)));
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[3], 1, 6, 1 + 4 * 2, 8, 3, 13, (((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)));
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[4], 1, 6, 1 + 4 * 3, 8, 3, 13, ((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[5], 1, 0x10, 1 + 4 * 0, 8, 3, 13, (((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[6], 1, 0x10, 1 + 4 * 1, 8, 3, 13, ((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[7], 1, 0x10, 1 + 4 * 2, 8, 3, 13, (((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
-    BGL_AddWindow(param0->unk_10.unk_20, &param0->unk_10.unk_24[8], 1, 0x10, 1 + 4 * 3, 8, 3, 13, ((((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[0], 1, 0x2, 0x13, 27, 4, 13, ((18 + 12) + 1));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[1], 1, 6, 1 + 4 * 0, 8, 3, 13, (((18 + 12) + 1) + (27 * 4)));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[2], 1, 6, 1 + 4 * 1, 8, 3, 13, ((((18 + 12) + 1) + (27 * 4)) + (8 * 3)));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[3], 1, 6, 1 + 4 * 2, 8, 3, 13, (((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[4], 1, 6, 1 + 4 * 3, 8, 3, 13, ((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[5], 1, 0x10, 1 + 4 * 0, 8, 3, 13, (((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[6], 1, 0x10, 1 + 4 * 1, 8, 3, 13, ((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[7], 1, 0x10, 1 + 4 * 2, 8, 3, 13, (((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
+    Window_Add(param0->unk_10.unk_20, &param0->unk_10.unk_24[8], 1, 0x10, 1 + 4 * 3, 8, 3, 13, ((((((((((18 + 12) + 1) + (27 * 4)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)) + (8 * 3)));
 }
 
 static void ov17_0224FDDC(void)

src/overlay017/ov17_02250744.c

@@ -252,7 +252,7 @@ static void ov17_022508E4(UnkStruct_ov17_0224FCA0 *param0, MessageLoader *param1
     ov17_022507F0(param0, param3, param4);
 
     StringTemplate_Format(param0->unk_10.unk_B8, param0->unk_10.unk_BC, v0);
-    BGL_FillWindow(&param0->unk_10.unk_24[0], 0xff);
+    Window_FillTilemap(&param0->unk_10.unk_24[0], 0xff);
 
     param0->unk_10.unk_388 = Text_AddPrinterWithParams(&param0->unk_10.unk_24[0], FONT_MESSAGE, param0->unk_10.unk_BC, 0, 0, v1, NULL);
 
@@ -285,7 +285,7 @@ void ov17_022509AC(UnkStruct_ov17_0224FCA0 *param0)
 
     sub_020070E8(v1, 23, param0->unk_10.unk_20, 3, 0, 0, 1, 24);
     sub_0200710C(v1, 22, param0->unk_10.unk_20, 3, 0, 0, 1, 24);
-    sub_02019EBC(param0->unk_10.unk_20, 1);
+    Bg_ClearTilemap(param0->unk_10.unk_20, 1);
     PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 35, 24, 0, 0, 0);
     PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16);
 
@@ -293,7 +293,7 @@ void ov17_022509AC(UnkStruct_ov17_0224FCA0 *param0)
 
     sub_0200DD0C(param0->unk_10.unk_20, 1, 1, 15, v0, 24);
     PaletteSys_LoadPalette(param0->unk_10.unk_C0, 38, sub_0200DD08(v0), 24, 0, 0x20, 14 * 16);
-    sub_02019EBC(param0->unk_10.unk_20, 2);
+    Bg_ClearTilemap(param0->unk_10.unk_20, 2);
     NARC_dtor(v1);
 }
 
@@ -324,7 +324,7 @@ void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0)
     sub_020070E8(v1, 27, param0->unk_10.unk_20, 3, 0, 0, 1, 24);
     sub_0200710C(v1, 25, param0->unk_10.unk_20, 3, 0, 0, 1, 24);
     sub_0200710C(v1, 26, param0->unk_10.unk_20, 2, 0, 0, 1, 24);
-    sub_02019EBC(param0->unk_10.unk_20, 1);
+    Bg_ClearTilemap(param0->unk_10.unk_20, 1);
     PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 39, 24, 0, 0, 0);
     PaletteSys_LoadPalette(param0->unk_10.unk_C0, 45, 36, 24, 0, 0x20, 13 * 16);
 
@@ -342,8 +342,8 @@ void ov17_02250B00(UnkStruct_ov17_0224FCA0 *param0)
         for (v3 = 0; v3 < 4; v3++) {
             v4 = param0->unk_39A.unk_30[v3];
             Pokemon_GetValue(param0->unk_10.unk_00->unk_00[v4], MON_DATA_NICKNAME_STRBUF, v2);
-            BGL_FillWindow(&param0->unk_10.unk_24[1 + v3], 0x0);
-            BGL_FillWindow(&param0->unk_10.unk_24[5 + v3], 0x0);
+            Window_FillTilemap(&param0->unk_10.unk_24[1 + v3], 0x0);
+            Window_FillTilemap(&param0->unk_10.unk_24[5 + v3], 0x0);
             Text_AddPrinterWithParamsAndColor(&param0->unk_10.unk_24[1 + v3], FONT_SYSTEM, v2, 0, 3, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
             Text_AddPrinterWithParamsAndColor(&param0->unk_10.unk_24[5 + v3], FONT_SYSTEM, param0->unk_00->unk_00.unk_D8[v4], 0, 3, TEXT_SPEED_INSTANT, TEXT_COLOR(1, 2, 0), NULL);
         }

src/overlay017/ov17_02251D6C.c

@@ -208,7 +208,7 @@ static void ov17_02251EAC(SysTask *param0, void *param1)
             u16 *v1, *v2;
             int v3, v4, v5, v6, v7;
 
-            v1 = sub_02019FE4(v0->unk_00->unk_10.unk_20, 2);
+            v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_10.unk_20, 2);
 
             for (v4 = 0; v4 < 4; v4++) {
                 if (Unk_ov17_02254CF8[v0->unk_11] + v4 < 0) {
@@ -239,7 +239,7 @@ static void ov17_02251EAC(SysTask *param0, void *param1)
                 }
             }
 
-            sub_0201C3C0(v0->unk_00->unk_10.unk_20, 2);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_10.unk_20, 2);
         }
 
         v0->unk_12++;
@@ -309,7 +309,7 @@ static void ov17_02252060(SysTask *param0, void *param1)
             int v3, v4, v5, v6, v7;
             int v8;
 
-            v1 = sub_02019FE4(v0->unk_00->unk_10.unk_20, 2);
+            v1 = Bg_GetTilemapBuffer(v0->unk_00->unk_10.unk_20, 2);
 
             for (v4 = 0; v4 < 4; v4++) {
                 v8 = Unk_ov17_02254CF8[NELEMS(Unk_ov17_02254CF8) - 1 - v0->unk_11];
@@ -345,7 +345,7 @@ static void ov17_02252060(SysTask *param0, void *param1)
                 }
             }
 
-            sub_0201C3C0(v0->unk_00->unk_10.unk_20, 2);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_10.unk_20, 2);
         }
 
         v0->unk_12++;
@@ -426,7 +426,7 @@ static void ov17_0225228C(SysTask *param0, void *param1)
         if (v0->unk_1A != 0) {
             if (v0->unk_1D == 0) {
                 sub_0200E060(&v0->unk_00->unk_10.unk_24[0], 1, 1, 14);
-                sub_0201C3C0(v0->unk_00->unk_10.unk_20, 1);
+                Bg_ScheduleTilemapTransfer(v0->unk_00->unk_10.unk_20, 1);
             }
 
             ov17_02250968(v0->unk_00, v0->unk_1A, &v0->unk_14);
@@ -447,7 +447,7 @@ static void ov17_0225228C(SysTask *param0, void *param1)
             v0->unk_10++;
         } else if (v0->unk_12 >= v0->unk_1B) {
             sub_0200E084(&v0->unk_00->unk_10.unk_24[0], 1);
-            sub_0201C3C0(v0->unk_00->unk_10.unk_20, 1);
+            Bg_ScheduleTilemapTransfer(v0->unk_00->unk_10.unk_20, 1);
             v0->unk_10++;
         }
         break;
@@ -520,8 +520,8 @@ static void ov17_022523AC(SysTask *param0, void *param1)
 
         sub_0200E060(&v0->unk_00->unk_10.unk_24[0], 0, 1, 14);
 
-        BGL_FillWindow(&v0->unk_00->unk_10.unk_24[0], 0xff);
-        sub_0201A954(&v0->unk_00->unk_10.unk_24[0]);
+        Window_FillTilemap(&v0->unk_00->unk_10.unk_24[0], 0xff);
+        Window_CopyToVRAM(&v0->unk_00->unk_10.unk_24[0]);
 
         {
             int v1;

src/overlay019/ov19_021D61B0.c

@@ -156,7 +156,7 @@ BOOL ov19_021D61B0(UnkStruct_ov19_021D61B0 **param0, const UnkStruct_ov19_021D4D
 
     if (v0 != NULL) {
         v0->unk_1C4 = param1;
-        v0->unk_1C0 = sub_02018340(10);
+        v0->unk_1C0 = BgConfig_New(10);
 
         if (v0->unk_1C0 != NULL) {
             u32 v1;
@@ -253,10 +253,10 @@ void ov19_021D64A0(UnkStruct_ov19_021D61B0 *param0)
     ov19_021DA384(&(param0->unk_1C8));
 
     CellActorCollection_Delete(param0->unk_18);
-    sub_02019044(param0->unk_1C0, 3);
-    sub_02019044(param0->unk_1C0, 2);
-    sub_02019044(param0->unk_1C0, 1);
-    sub_02019044(param0->unk_1C0, 4);
+    Bg_FreeTilemapBuffer(param0->unk_1C0, 3);
+    Bg_FreeTilemapBuffer(param0->unk_1C0, 2);
+    Bg_FreeTilemapBuffer(param0->unk_1C0, 1);
+    Bg_FreeTilemapBuffer(param0->unk_1C0, 4);
     sub_02007B6C(param0->unk_1BC);
     Font_UseLazyGlyphAccess(FONT_SYSTEM);
     Heap_FreeToHeap(param0->unk_1C0);
@@ -1774,21 +1774,21 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_
     GX_SetDispSelect(GX_DISP_SELECT_MAIN_SUB);
     GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D);
 
-    sub_02018368(&v1);
-    sub_020183C4(param0->unk_1C0, 1, &v3, 0);
-    sub_020183C4(param0->unk_1C0, 2, &v4, 0);
-    sub_020183C4(param0->unk_1C0, 3, &v5, 0);
+    SetAllGraphicsModes(&v1);
+    Bg_InitFromTemplate(param0->unk_1C0, 1, &v3, 0);
+    Bg_InitFromTemplate(param0->unk_1C0, 2, &v4, 0);
+    Bg_InitFromTemplate(param0->unk_1C0, 3, &v5, 0);
 
     if (ov19_021D5E08(param1) != 4) {
-        sub_020183C4(param0->unk_1C0, 4, &v6, 0);
-        sub_020183C4(param0->unk_1C0, 5, &v7, 0);
-        sub_020183C4(param0->unk_1C0, 6, &v8, 0);
-        sub_020183C4(param0->unk_1C0, 7, &v9, 0);
+        Bg_InitFromTemplate(param0->unk_1C0, 4, &v6, 0);
+        Bg_InitFromTemplate(param0->unk_1C0, 5, &v7, 0);
+        Bg_InitFromTemplate(param0->unk_1C0, 6, &v8, 0);
+        Bg_InitFromTemplate(param0->unk_1C0, 7, &v9, 0);
     } else {
-        sub_020183C4(param0->unk_1C0, 4, &v6, 0);
-        sub_020183C4(param0->unk_1C0, 5, &v10, 0);
-        sub_020183C4(param0->unk_1C0, 6, &v11, 0);
-        sub_020183C4(param0->unk_1C0, 7, &v9, 0);
+        Bg_InitFromTemplate(param0->unk_1C0, 4, &v6, 0);
+        Bg_InitFromTemplate(param0->unk_1C0, 5, &v10, 0);
+        Bg_InitFromTemplate(param0->unk_1C0, 6, &v11, 0);
+        Bg_InitFromTemplate(param0->unk_1C0, 7, &v9, 0);
     }
 
     ov19_021D76FC();
@@ -1797,8 +1797,8 @@ static void ov19_021D74B4(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_
 static void ov19_021D75CC(UnkStruct_ov19_021D61B0 *param0, const UnkStruct_ov19_021D4DF0 *param1, NARC *param2)
 {
     sub_020070E8(param2, 4, param0->unk_1C0, 1, 0, 0, 1, 10);
-    sub_02019CB8(param0->unk_1C0, 1, 0x0, 0, 0, 32, 32, 17);
-    sub_02019448(param0->unk_1C0, 1);
+    Bg_FillTilemapRect(param0->unk_1C0, 1, 0x0, 0, 0, 32, 32, 17);
+    Bg_CopyTilemapBufferToVRAM(param0->unk_1C0, 1);
     sub_020070E8(param2, 1, param0->unk_1C0, 2, 0, 0, 1, 10);
     sub_02007130(param2, 5, 0, 0, 0x20 * 7, 10);
 

src/overlay019/ov19_021D79F8.c

@@ -132,12 +132,12 @@ void ov19_021D7A74(UnkStruct_ov19_021D8318 *param0)
 
 void ov19_021D7A9C(UnkStruct_ov19_021D8318 *param0)
 {
-    param0->unk_0C = sub_020192EC(param0->unk_58F4, 3);
+    param0->unk_0C = Bg_GetXOffset(param0->unk_58F4, 3);
     param0->unk_0C -= param0->unk_585C;
     param0->unk_0C &= (REG_G2_BG3HOFS_OFFSET_MASK);
 
-    sub_02019184(param0->unk_58F4, 3, 0, param0->unk_0C);
-    sub_02019CB8(param0->unk_58F4, 3, 0x18, 0, 0, 64, 32, 9);
+    Bg_SetOffset(param0->unk_58F4, 3, 0, param0->unk_0C);
+    Bg_FillTilemapRect(param0->unk_58F4, 3, 0x18, 0, 0, 64, 32, 9);
 }
 
 static void ov19_021D7AF4(const UnkStruct_ov19_021D8318 *param0, int param1, u32 *param2, u32 *param3, u32 *param4)
@@ -208,7 +208,7 @@ static void ov19_021D7C58(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_
         if (NNS_G2dGetUnpackedBGCharacterData(v0, &v1)) {
             Window *v2;
 
-            v2 = sub_0201A778(10, 1);
+            v2 = Window_New(10, 1);
 
             if (v2) {
                 u32 v3, v4;
@@ -225,7 +225,7 @@ static void ov19_021D7C58(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_
                 Heap_FreeToHeap(v2);
             }
 
-            sub_0201958C(param0->unk_58F4, 3, v1->pRawData, v1->szByte, param2);
+            Bg_LoadTiles(param0->unk_58F4, 3, v1->pRawData, v1->szByte, param2);
         }
 
         Heap_FreeToHeap(v0);
@@ -243,20 +243,20 @@ static void ov19_021D7D00(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_
         NNSG2dScreenData *v2;
 
         NNS_G2dGetUnpackedScreenData(v0, &v2);
-        v1 = sub_02019FE4(param0->unk_58F4, 3);
+        v1 = Bg_GetTilemapBuffer(param0->unk_58F4, 3);
 
         if (v1) {
             ov19_021D8764(v1, (const u16 *)(v2->rawData), param2, param3, param4);
         }
 
         Heap_FreeToHeap(v0);
-        sub_02019460(param0->unk_58F4, 3, v1, 0x1000, 0);
+        Bg_CopyTilemapBufferRangeToVRAM(param0->unk_58F4, 3, v1, 0x1000, 0);
     }
 }
 
 void ov19_021D7D70(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2)
 {
-    param0->unk_08 = (sub_020192EC(param0->unk_58F4, 3) & (REG_G2_BG3HOFS_OFFSET_MASK)) << FX32_SHIFT;
+    param0->unk_08 = (Bg_GetXOffset(param0->unk_58F4, 3) & (REG_G2_BG3HOFS_OFFSET_MASK)) << FX32_SHIFT;
     param0->unk_14 = param0->unk_08 + ((((21 + 2) * 8) * param2) << FX32_SHIFT);
     param0->unk_10 = (param0->unk_14 - param0->unk_08) / (15 * 2);
     param0->unk_14 >>= FX32_SHIFT;
@@ -322,11 +322,11 @@ static void ov19_021D7E6C(SysTask *param0, void *param1)
             v0->unk_98++;
             v0->unk_0C = (v0->unk_08 >> FX32_SHIFT) & (REG_G2_BG3HOFS_OFFSET_MASK);
             v0->unk_08 += v0->unk_10;
-            sub_02019184(v0->unk_58F4, 3, 0, v0->unk_0C);
+            Bg_SetOffset(v0->unk_58F4, 3, 0, v0->unk_0C);
             v0->unk_04--;
         }
     } else {
-        sub_02019184(v0->unk_58F4, 3, 0, v0->unk_14);
+        Bg_SetOffset(v0->unk_58F4, 3, 0, v0->unk_14);
         ov19_021D870C(v0, v0->unk_A8[v2]);
         SysTask_Done(param0);
     }

src/overlay019/ov19_021DA92C.c

@@ -41,7 +41,7 @@ u32 sub_0207C924(void);
 u32 sub_0207C928(void);
 u8 sub_0207C92C(int param0);
 u32 sub_0207C944(void);
-void sub_0201AA10(Window *param0, u32 param1, u32 param2);
+void Window_PutRectToTilemap(Window *param0, u32 param1, u32 param2);
 static void ov19_021DAB44(UnkStruct_ov19_021DA9E0 *param0);
 static void ov19_021DAC4C(UnkStruct_ov19_021DA9E0 *param0);
 static void ov19_021DAC90(UnkStruct_ov19_021DA9E0 *param0);
@@ -99,7 +99,7 @@ void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0)
 
     if (param0->unk_04) {
         for (v0 = 0; v0 < 4; v0++) {
-            BGL_DeleteWindow(&param0->unk_04[v0]);
+            Window_Remove(&param0->unk_04[v0]);
         }
 
         Heap_FreeToHeap(param0->unk_04);
@@ -187,22 +187,22 @@ void ov19_021DAADC(UnkStruct_ov19_021DA9E0 *param0)
         return;
     }
 
-    param0->unk_04 = sub_0201A778(10, 4);
+    param0->unk_04 = Window_New(10, 4);
 
     if (param0->unk_04) {
         int v1;
 
         for (v1 = 0; v1 < 4; v1++) {
-            sub_0201A8D4(param0->unk_08, &param0->unk_04[v1], &v0[v1]);
+            Window_AddFromTemplate(param0->unk_08, &param0->unk_04[v1], &v0[v1]);
 
             if (v1 != 3) {
-                sub_0201A9F4(&param0->unk_04[v1]);
+                Window_PutToTilemap(&param0->unk_04[v1]);
             } else {
-                sub_0201AA10(&param0->unk_04[v1], 12, 2);
+                Window_PutRectToTilemap(&param0->unk_04[v1], 12, 2);
             }
         }
 
-        sub_02019448(param0->unk_08, 2);
+        Bg_CopyTilemapBufferToVRAM(param0->unk_08, 2);
     }
 
     ov19_021DAB44(param0);
@@ -303,7 +303,7 @@ static void ov19_021DACF8(SysTask *param0, void *param1)
         v0->unk_00 = 1;
     case 1:
         ov19_021DAE60(&v1->unk_04[3], v1, v0->unk_02, 0);
-        sub_0201ACCC(&v1->unk_04[3]);
+        Window_LoadTiles(&v1->unk_04[3]);
         v0->unk_04 = 0;
         v0->unk_00 = 2;
         break;
@@ -321,8 +321,8 @@ static void ov19_021DACF8(SysTask *param0, void *param1)
         v0->unk_06 += 4;
 
         ov19_021DADCC(v1, 4 << FX32_SHIFT);
-        sub_0201C04C(&v1->unk_04[3], 0, 4, 0x0);
-        sub_0201ACCC(&v1->unk_04[3]);
+        Window_Scroll(&v1->unk_04[3], 0, 4, 0x0);
+        Window_LoadTiles(&v1->unk_04[3]);
 
         if (v0->unk_06 >= 16) {
             if (v0->unk_02 == 1) {
@@ -379,7 +379,7 @@ static void ov19_021DAE2C(UnkStruct_ov19_021DAE2C *param0)
 
     v1 = &(param0->unk_08->unk_04[3]);
 
-    BGL_FillWindow(v1, 0);
+    Window_FillTilemap(v1, 0);
     ov19_021DAE60(v1, param0->unk_08, param0->unk_02, 0);
 
     v0 = param0->unk_02 + 1;
@@ -451,19 +451,19 @@ void ov19_021DAF98(UnkStruct_ov19_021DA9E0 *param0)
         return;
     }
 
-    BGL_FillWindow(&param0->unk_04[0], 15);
-    BGL_FillWindow(&param0->unk_04[1], 15);
-    BGL_FillWindow(&param0->unk_04[2], 15);
-    BGL_FillWindow(&param0->unk_04[3], 0);
+    Window_FillTilemap(&param0->unk_04[0], 15);
+    Window_FillTilemap(&param0->unk_04[1], 15);
+    Window_FillTilemap(&param0->unk_04[2], 15);
+    Window_FillTilemap(&param0->unk_04[3], 0);
 
     if (ov19_021D5E4C(param0->unk_10)) {
         ov19_021DB0E4(param0);
     }
 
-    sub_0201ACCC(&param0->unk_04[0]);
-    sub_0201ACCC(&param0->unk_04[1]);
-    sub_0201ACCC(&param0->unk_04[2]);
-    sub_0201ACCC(&param0->unk_04[3]);
+    Window_LoadTiles(&param0->unk_04[0]);
+    Window_LoadTiles(&param0->unk_04[1]);
+    Window_LoadTiles(&param0->unk_04[2]);
+    Window_LoadTiles(&param0->unk_04[3]);
 }
 
 void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0)
@@ -472,10 +472,10 @@ void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0)
         return;
     }
 
-    BGL_FillWindow(&param0->unk_04[0], 15);
-    BGL_FillWindow(&param0->unk_04[1], 15);
-    BGL_FillWindow(&param0->unk_04[2], 15);
-    BGL_FillWindow(&param0->unk_04[3], 0);
+    Window_FillTilemap(&param0->unk_04[0], 15);
+    Window_FillTilemap(&param0->unk_04[1], 15);
+    Window_FillTilemap(&param0->unk_04[2], 15);
+    Window_FillTilemap(&param0->unk_04[3], 0);
 
     if (param0->unk_24) {
         sub_02007DC8(param0->unk_24);
@@ -488,10 +488,10 @@ void ov19_021DAFF8(UnkStruct_ov19_021DA9E0 *param0)
         ov19_021DB24C(param0, 0);
     }
 
-    sub_0201ACCC(&param0->unk_04[0]);
-    sub_0201ACCC(&param0->unk_04[1]);
-    sub_0201ACCC(&param0->unk_04[2]);
-    sub_0201ACCC(&param0->unk_04[3]);
+    Window_LoadTiles(&param0->unk_04[0]);
+    Window_LoadTiles(&param0->unk_04[1]);
+    Window_LoadTiles(&param0->unk_04[2]);
+    Window_LoadTiles(&param0->unk_04[3]);
 
     ov19_021DACB0(param0);
 }
@@ -502,10 +502,10 @@ void ov19_021DB078(UnkStruct_ov19_021DA9E0 *param0)
         return;
     }
 
-    BGL_FillWindow(&param0->unk_04[0], 15);
-    BGL_FillWindow(&param0->unk_04[1], 15);
-    BGL_FillWindow(&param0->unk_04[2], 15);
-    BGL_FillWindow(&param0->unk_04[3], 0);
+    Window_FillTilemap(&param0->unk_04[0], 15);
+    Window_FillTilemap(&param0->unk_04[1], 15);
+    Window_FillTilemap(&param0->unk_04[2], 15);
+    Window_FillTilemap(&param0->unk_04[3], 0);
 
     if (param0->unk_24) {
         sub_02007DC8(param0->unk_24);
@@ -514,10 +514,10 @@ void ov19_021DB078(UnkStruct_ov19_021DA9E0 *param0)
 
     ov19_021DB24C(param0, 0);
 
-    sub_0201ACCC(&param0->unk_04[0]);
-    sub_0201ACCC(&param0->unk_04[1]);
-    sub_0201ACCC(&param0->unk_04[2]);
-    sub_0201ACCC(&param0->unk_04[3]);
+    Window_LoadTiles(&param0->unk_04[0]);
+    Window_LoadTiles(&param0->unk_04[1]);
+    Window_LoadTiles(&param0->unk_04[2]);
+    Window_LoadTiles(&param0->unk_04[3]);
 
     ov19_021DACDC(param0);
 }
@@ -587,7 +587,7 @@ static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 *param0, u8 param1)
     int v2;
 
     v1 = (19 * 32) + 4;
-    v0 = sub_02019FE4(param0->unk_08, 2);
+    v0 = Bg_GetTilemapBuffer(param0->unk_08, 2);
     v0 += v1;
 
     for (v2 = 0; v2 < 6; v2++) {
@@ -598,7 +598,7 @@ static void ov19_021DB24C(UnkStruct_ov19_021DA9E0 *param0, u8 param1)
         }
     }
 
-    sub_02019460(param0->unk_08, 2, v0, 6 * sizeof(u16), v1);
+    Bg_CopyTilemapBufferRangeToVRAM(param0->unk_08, 2, v0, 6 * sizeof(u16), v1);
 }
 
 void ov19_021DB2B0(UnkStruct_ov19_021DA9E0 *param0)
@@ -610,7 +610,7 @@ void ov19_021DB2B0(UnkStruct_ov19_021DA9E0 *param0)
     }
 
     v0 = ov19_021D5E70(param0->unk_10);
-    BGL_FillWindow(&param0->unk_04[3], 0);
+    Window_FillTilemap(&param0->unk_04[3], 0);
 
     if (v0->unk_0F == 0) {
         Text_AddPrinterWithParamsAndColor(&param0->unk_04[3], FONT_SYSTEM, v0->unk_1C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(9, 6, 0), NULL);

src/overlay019/ov19_021DB2FC.c

@@ -58,7 +58,7 @@ void ov19_021DB370(UnkStruct_ov19_021DB6F0 *param0)
         int v0;
 
         for (v0 = 0; v0 < 2; v0++) {
-            BGL_DeleteWindow(&(param0->unk_18[v0]));
+            Window_Remove(&(param0->unk_18[v0]));
         }
 
         if (param0->unk_24) {
@@ -89,13 +89,13 @@ void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0)
         { 1, 19, 3, 12, 16, 4, 593 }
     };
 
-    param0->unk_18 = sub_0201A778(10, 2);
+    param0->unk_18 = Window_New(10, 2);
 
     if (param0->unk_18) {
         int v1;
 
         for (v1 = 0; v1 < 2; v1++) {
-            sub_0201A8D4(param0->unk_00, &param0->unk_18[v1], &v0[v1]);
+            Window_AddFromTemplate(param0->unk_00, &param0->unk_18[v1], &v0[v1]);
         }
     }
 
@@ -106,14 +106,14 @@ void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0)
 
 void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1)
 {
-    sub_0201A9F4(&param0->unk_18[0]);
+    Window_PutToTilemap(&param0->unk_18[0]);
     ov19_021DB4B4(param0->unk_00, param0->unk_18[0].bgLayer, param0->unk_18[0].tilemapLeft, param0->unk_18[0].tilemapTop, param0->unk_18[0].width, param0->unk_18[0].height);
-    BGL_FillWindow(&param0->unk_18[0], 15);
+    Window_FillTilemap(&param0->unk_18[0], 15);
     MessageLoader_GetStrbuf(param0->unk_10, param1, param0->unk_30);
     StringTemplate_Format(param0->unk_2C, param0->unk_34, param0->unk_30);
     Text_AddPrinterWithParams(&(param0->unk_18[0]), FONT_MESSAGE, param0->unk_34, 0, 0, TEXT_SPEED_NO_TRANSFER, NULL);
-    sub_0201ACCC(&(param0->unk_18[0]));
-    sub_02019448(param0->unk_00, 1);
+    Window_LoadTiles(&(param0->unk_18[0]));
+    Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1);
 
     param0->unk_1C = 1;
 }
@@ -123,7 +123,7 @@ static void ov19_021DB4B4(BgConfig *param0, u32 param1, u32 param2, u32 param3,
     u16 *v0;
     u32 v1, v2;
 
-    v0 = sub_02019FE4(param0, param1);
+    v0 = Bg_GetTilemapBuffer(param0, param1);
     v0 += (((param3 - 1) * 32) + (param2 - 2));
 
     v0[0] = (8 << 12) | 521;
@@ -170,7 +170,7 @@ void ov19_021DB57C(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96
     }
 
     v0 = &(param0->unk_18[1]);
-    BGL_FillWindow(v0, 15);
+    Window_FillTilemap(v0, 15);
     v1 = (8 - param1->unk_21) * 16;
 
     for (v2 = 0; v2 < param1->unk_21; v2++) {
@@ -187,15 +187,15 @@ void ov19_021DB57C(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96
     ov19_021DB748(param0, param1);
     ov19_021DB684(param0, param1->unk_21);
 
-    sub_0201ACCC(v0);
-    sub_02019448(param0->unk_00, 1);
+    Window_LoadTiles(v0);
+    Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1);
 
     param0->unk_1E = 1;
 }
 
 static void ov19_021DB638(UnkStruct_ov19_021DB6F0 *param0, Window *param1, u8 param2, u32 param3)
 {
-    sub_0201AE08(param1, param0->unk_28->pRawData, param3 * 8, ((param2 & (1 << param3)) ? 0 : 8), 48, 16, 44, param3 * 16 + 4, 8, 8, 0xff);
+    Window_BlitBitmapRectWithTransparency(param1, param0->unk_28->pRawData, param3 * 8, ((param2 & (1 << param3)) ? 0 : 8), 48, 16, 44, param3 * 16 + 4, 8, 8, 0xff);
 }
 
 static void ov19_021DB684(UnkStruct_ov19_021DB6F0 *param0, u32 param1)
@@ -203,7 +203,7 @@ static void ov19_021DB684(UnkStruct_ov19_021DB6F0 *param0, u32 param1)
     u16 *v0;
     u32 v1, v2, v3, v4;
 
-    v0 = sub_02019FE4(param0->unk_00, 1);
+    v0 = Bg_GetTilemapBuffer(param0->unk_00, 1);
     v0 += (3 * 32 + 19);
     v3 = 593;
     v4 = 8 - param1;
@@ -234,7 +234,7 @@ void ov19_021DB6F0(UnkStruct_ov19_021DB6F0 *param0)
         param0->unk_1E = 0;
     }
 
-    sub_02019448(param0->unk_00, 1);
+    Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1);
 }
 
 void ov19_021DB724(UnkStruct_ov19_021DB6F0 *param0)
@@ -244,7 +244,7 @@ void ov19_021DB724(UnkStruct_ov19_021DB6F0 *param0)
         param0->unk_1E = 0;
     }
 
-    sub_02019448(param0->unk_00, 1);
+    Bg_CopyTilemapBufferToVRAM(param0->unk_00, 1);
 }
 
 void ov19_021DB748(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1)
@@ -255,9 +255,9 @@ void ov19_021DB748(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96
     v0 = &(param0->unk_18[1]);
     v1 = (8 - param1->unk_21) * 16;
 
-    BGL_WindowColor(v0, 15, 0, v1, 10, param1->unk_21 * 16);
+    Window_FillRectWithColor(v0, 15, 0, v1, 10, param1->unk_21 * 16);
     sub_02002180(v0, 0, v1 + (param1->unk_20 * 16));
-    sub_0201ACCC(v0);
+    Window_LoadTiles(v0);
 }
 
 void ov19_021DB790(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF964 *param1)
@@ -271,7 +271,7 @@ void ov19_021DB790(UnkStruct_ov19_021DB6F0 *param0, const UnkStruct_ov19_021DF96
         ov19_021DB638(param0, v0, param1->unk_22, v1);
     }
 
-    sub_0201ACCC(v0);
+    Window_LoadTiles(v0);
 }
 
 static void ov19_021DB7BC(BgConfig *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5)
@@ -279,7 +279,7 @@ static void ov19_021DB7BC(BgConfig *param0, u32 param1, u32 param2, u32 param3,
     u16 *v0;
     u32 v1;
 
-    v0 = sub_02019FE4(param0, param1);
+    v0 = Bg_GetTilemapBuffer(param0, param1);
     v0 += (((param3 - 1) * 32) + (param2 - 1));
     *v0 = (7 << 12) | 512;
 
@@ -310,7 +310,7 @@ static void ov19_021DB84C(BgConfig *param0, Window *param1)
     u16 *v0;
     u32 v1, v2, v3, v4;
 
-    v0 = sub_02019FE4(param0, param1->bgLayer);
+    v0 = Bg_GetTilemapBuffer(param0, param1->bgLayer);
     v0 += (((param1->tilemapTop - 1) * 32) + (param1->tilemapLeft - 1));
 
     for (v2 = 0; v2 < (param1->height + 2); v2++) {
@@ -327,7 +327,7 @@ static void ov19_021DB898(BgConfig *param0, Window *param1)
     u16 *v0;
     u32 v1, v2, v3, v4;
 
-    v0 = sub_02019FE4(param0, param1->bgLayer);
+    v0 = Bg_GetTilemapBuffer(param0, param1->bgLayer);
     v0 += (((param1->tilemapTop - 1) * 32) + (param1->tilemapLeft - 2));
 
     for (v2 = 0; v2 < (param1->height + 2); v2++) {

src/overlay019/ov19_021DB8E4.c

@@ -140,13 +140,13 @@ void ov19_021DBA9C(UnkStruct_ov19_021DBA9C *param0)
         { 1, 5, 25, 27, 6, 2, 178 }
     };
 
-    param0->unk_10 = sub_0201A778(10, NELEMS(v0));
+    param0->unk_10 = Window_New(10, NELEMS(v0));
 
     if (param0->unk_10) {
         int v1;
 
         for (v1 = 0; v1 < NELEMS(v0); v1++) {
-            sub_0201A8D4(param0->unk_04, &param0->unk_10[v1], &v0[v1]);
+            Window_AddFromTemplate(param0->unk_04, &param0->unk_10[v1], &v0[v1]);
         }
     }
 }
@@ -185,7 +185,7 @@ void ov19_021DBAD0(UnkStruct_ov19_021DBA9C *param0)
         int v0;
 
         for (v0 = 0; v0 < 3; v0++) {
-            BGL_DeleteWindow(&(param0->unk_10[v0]));
+            Window_Remove(&(param0->unk_10[v0]));
         }
 
         Heap_FreeToHeap(param0->unk_10);
@@ -239,7 +239,7 @@ void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_
     }
 
     v6 = 13 * 0x10 + v8;
-    sub_0201A6D0(&(param0->unk_3C), 9, 10, 14, 12, v6);
+    Bitmap_FillRect8bpp(&(param0->unk_3C), 9, 10, 14, 12, v6);
 
     for (v3 = 0, v4 = 0; v3 < 5; v3++) {
         for (v2 = 0; v2 < 6; v2++) {
@@ -273,7 +273,7 @@ void ov19_021DBBA8(UnkStruct_ov19_021DBA9C *param0, u32 param1, u32 param2, NNS_
                     v6 = 14 * 0x10 + v10[v6];
                 }
 
-                sub_0201A6D0(&(param0->unk_3C), 10 + v2 * 2, 11 + v3 * 2, 2, 2, v6);
+                Bitmap_FillRect8bpp(&(param0->unk_3C), 10 + v2 * 2, 11 + v3 * 2, 2, 2, v6);
             }
 
             BoxPokemon_ExitDecryptionContext(v1, v7);
@@ -431,17 +431,17 @@ static void ov19_021DBF4C(UnkStruct_ov19_021DBA9C *param0)
     v2 = Font_CalcStrbufWidth(FONT_SYSTEM, param0->unk_4BFC, 0);
     v3 = 48 - (v2 / 2);
 
-    BGL_FillWindow(v1, 7);
+    Window_FillTilemap(v1, 7);
     Text_AddPrinterWithParamsAndColor(v1, FONT_SYSTEM, param0->unk_4BFC, v3, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 8, 7), NULL);
-    sub_0201ACCC(v1);
+    Window_LoadTiles(v1);
 }
 
 static void ov19_021DBFB0(UnkStruct_ov19_021DBA9C *param0)
 {
     Window *v0 = &param0->unk_10[0];
 
-    BGL_FillWindow(v0, 7);
-    sub_0201ACCC(v0);
+    Window_FillTilemap(v0, 7);
+    Window_LoadTiles(v0);
 }
 
 static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C *param0)
@@ -450,7 +450,7 @@ static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C *param0)
     Window *v2;
 
     v2 = &param0->unk_10[1];
-    BGL_FillWindow(v2, 4);
+    Window_FillTilemap(v2, 4);
     v0 = ov19_021DBD40(param0);
 
     for (v1 = 0; v1 < 7; v1++) {
@@ -461,15 +461,15 @@ static void ov19_021DBFC4(UnkStruct_ov19_021DBA9C *param0)
         }
     }
 
-    sub_0201ACCC(v2);
+    Window_LoadTiles(v2);
 }
 
 static void ov19_021DC01C(UnkStruct_ov19_021DBA9C *param0)
 {
     Window *v0 = &param0->unk_10[1];
 
-    BGL_FillWindow(v0, 4);
-    sub_0201ACCC(v0);
+    Window_FillTilemap(v0, 4);
+    Window_LoadTiles(v0);
 }
 
 static void ov19_021DC034(UnkStruct_ov19_021DBA9C *param0, int param1)
@@ -520,14 +520,14 @@ static void ov19_021DC0A0(SysTask *param0, void *param1)
         if ((v0->unk_05 * 2) < 10) {
             u32 v2 = 5 + (10 / 2);
 
-            sub_020198C0(v1->unk_04, 1, v1->unk_30->rawData, 0, v2 - v0->unk_05, 32, v0->unk_05);
-            sub_020198E8(v1->unk_04, 1, 0, v2, 32, v0->unk_05, v1->unk_30->rawData, 0, 10 - v0->unk_05, 32, 10);
+            Bg_LoadToTilemapRect(v1->unk_04, 1, v1->unk_30->rawData, 0, v2 - v0->unk_05, 32, v0->unk_05);
+            Bg_CopyToTilemapRect(v1->unk_04, 1, 0, v2, 32, v0->unk_05, v1->unk_30->rawData, 0, 10 - v0->unk_05, 32, 10);
         } else {
-            sub_020198C0(v1->unk_04, 1, v1->unk_30->rawData, 0, 5, 32, 10);
+            Bg_LoadToTilemapRect(v1->unk_04, 1, v1->unk_30->rawData, 0, 5, 32, 10);
             v0->unk_04++;
         }
 
-        sub_02019448(v1->unk_04, 1);
+        Bg_CopyTilemapBufferToVRAM(v1->unk_04, 1);
         v0->unk_05 = 8 - 1;
         break;
     case 1:
@@ -543,11 +543,11 @@ static void ov19_021DC0A0(SysTask *param0, void *param1)
         GX_LoadOBJPltt(v1->unk_E4[v0->unk_05], 13 * 0x20, 96);
 
         if (v0->unk_05 == 0) {
-            sub_0201A9F4(&v1->unk_10[0]);
-            sub_0201A9F4(&v1->unk_10[1]);
+            Window_PutToTilemap(&v1->unk_10[0]);
+            Window_PutToTilemap(&v1->unk_10[1]);
             ov19_021DBF4C(v1);
             ov19_021DBFC4(v1);
-            sub_02019448(v1->unk_04, 1);
+            Bg_CopyTilemapBufferToVRAM(v1->unk_04, 1);
             v0->unk_04++;
         }
         break;
@@ -570,19 +570,19 @@ static void ov19_021DC1CC(SysTask *param0, void *param1)
         v0->unk_04++;
         break;
     case 1:
-        sub_02019CB8(v1->unk_04, 1, 0x0, 0, 5, 32, 10, 17);
+        Bg_FillTilemapRect(v1->unk_04, 1, 0x0, 0, 5, 32, 10, 17);
         v0->unk_05 += 1;
 
         if ((v0->unk_05 * 2) < 10) {
             u32 v2 = 5 + (10 / 2);
 
-            sub_020198C0(v1->unk_04, 1, v1->unk_30->rawData, 0, 5 + v0->unk_05, 32, (10 / 2) - v0->unk_05);
-            sub_020198E8(v1->unk_04, 1, 0, v2, 32, (10 / 2) - v0->unk_05, v1->unk_30->rawData, 0, 10 - v0->unk_05, 32, 10);
+            Bg_LoadToTilemapRect(v1->unk_04, 1, v1->unk_30->rawData, 0, 5 + v0->unk_05, 32, (10 / 2) - v0->unk_05);
+            Bg_CopyToTilemapRect(v1->unk_04, 1, 0, v2, 32, (10 / 2) - v0->unk_05, v1->unk_30->rawData, 0, 10 - v0->unk_05, 32, 10);
         } else {
             v0->unk_04++;
         }
 
-        sub_02019448(v1->unk_04, 1);
+        Bg_CopyTilemapBufferToVRAM(v1->unk_04, 1);
         break;
     case 2:
         ov19_021DC074(param0, v0);
@@ -596,12 +596,12 @@ void ov19_021DC29C(UnkStruct_ov19_021DBA9C *param0)
     if (v0) {
         u32 v1 = ov19_021D5F88(param0->unk_0C);
 
-        sub_02019184(param0->unk_04, 1, 3, 0);
-        sub_020198C0(param0->unk_04, 1, param0->unk_38->rawData, 0, 24, 32, 7);
-        BGL_FillWindow(&param0->unk_10[2], 4);
+        Bg_SetOffset(param0->unk_04, 1, 3, 0);
+        Bg_LoadToTilemapRect(param0->unk_04, 1, param0->unk_38->rawData, 0, 24, 32, 7);
+        Window_FillTilemap(&param0->unk_10[2], 4);
         MessageLoader_GetStrbuf(param0->unk_4BF8, v1, param0->unk_4BFC);
         Text_AddPrinterWithParamsAndColor(&param0->unk_10[2], FONT_SYSTEM, param0->unk_4BFC, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(2, 1, 4), NULL);
-        sub_0201A954(&param0->unk_10[2]);
+        Window_CopyToVRAM(&param0->unk_10[2]);
 
         ov19_021DC4F8(param0, v1);
 
@@ -640,10 +640,10 @@ static void ov19_021DC37C(SysTask *param0, void *param1)
         if (v0->unk_14) {
             v0->unk_14--;
             v0->unk_08 += v0->unk_10;
-            sub_02019184(v0->unk_04, 1, 3, (v0->unk_08 >> FX32_SHIFT));
+            Bg_SetOffset(v0->unk_04, 1, 3, (v0->unk_08 >> FX32_SHIFT));
             ov19_021DC5B8(v0->unk_00, (224 << FX32_SHIFT) - v0->unk_08);
         } else {
-            sub_02019184(v0->unk_04, 1, 3, (v0->unk_0C >> FX32_SHIFT));
+            Bg_SetOffset(v0->unk_04, 1, 3, (v0->unk_0C >> FX32_SHIFT));
             ov19_021DC5B8(v0->unk_00, (224 << FX32_SHIFT) - v0->unk_0C);
             ov19_021D79B8(v0, ov19_021DC374, v0->unk_00);
             SysTask_Done(param0);
@@ -671,7 +671,7 @@ void ov19_021DC3F4(UnkStruct_ov19_021DBA9C *param0)
 BOOL ov19_021DC43C(UnkStruct_ov19_021DBA9C *param0)
 {
     if (param0->unk_DC == NULL) {
-        sub_02019184(param0->unk_04, 1, 3, 0);
+        Bg_SetOffset(param0->unk_04, 1, 3, 0);
         ov19_021DC5E0(param0);
         return 1;
     }
@@ -692,13 +692,13 @@ static void ov19_021DC46C(SysTask *param0, void *param1)
     if (v0->unk_14) {
         v0->unk_14--;
         v0->unk_08 += v0->unk_10;
-        sub_02019184(v0->unk_04, 1, 3, (v0->unk_08 >> FX32_SHIFT));
+        Bg_SetOffset(v0->unk_04, 1, 3, (v0->unk_08 >> FX32_SHIFT));
         ov19_021DC5B8(v0->unk_00, (224 << FX32_SHIFT) - v0->unk_08);
     } else {
-        sub_02019184(v0->unk_04, 1, 3, (v0->unk_0C >> FX32_SHIFT));
+        Bg_SetOffset(v0->unk_04, 1, 3, (v0->unk_0C >> FX32_SHIFT));
         ov19_021DC5B8(v0->unk_00, (224 << FX32_SHIFT) - v0->unk_0C);
-        sub_02019CB8(v0->unk_04, 1, 0x0, 0, 0, 32, 32, 17);
-        sub_02019448(v0->unk_04, 1);
+        Bg_FillTilemapRect(v0->unk_04, 1, 0x0, 0, 0, 32, 32, 17);
+        Bg_CopyTilemapBufferToVRAM(v0->unk_04, 1);
         ov19_021D79B8(v0, ov19_021DC464, v0->unk_00);
         SysTask_Done(param0);
     }

src/overlay019/ov19_021DC5F0.c

@@ -98,7 +98,7 @@ void ov19_021DC6A0(UnkStruct_ov19_021DC680 *param0)
     param0->unk_2B = 0;
     ov19_021DCD64(param0, param0->unk_2B);
     ov19_021DCEB8(param0, 1);
-    sub_02019448(param0->unk_04, 2);
+    Bg_CopyTilemapBufferToVRAM(param0->unk_04, 2);
 }
 
 void ov19_021DC6C8(UnkStruct_ov19_021DC680 *param0)
@@ -128,7 +128,7 @@ static void ov19_021DC708(SysTask *param0, void *param1)
     }
 
     ov19_021DCD64(v0, v0->unk_2B);
-    sub_02019448(v0->unk_04, 2);
+    Bg_CopyTilemapBufferToVRAM(v0->unk_04, 2);
     ov19_021DCE50(v0, v1);
 
     if (v0->unk_2B == 0) {
@@ -171,11 +171,11 @@ static void ov19_021DC79C(SysTask *param0, void *param1)
         v3 = (u32)((v1) >> FX32_SHIFT) / 8;
         v2 = v0->unk_2B - 2 - v3;
 
-        sub_02019CB8(v0->unk_04, 2, 0x0, v0->unk_30, v2, 15, v3, 17);
+        Bg_FillTilemapRect(v0->unk_04, 2, 0x0, v0->unk_30, v2, 15, v3, 17);
     }
 
     ov19_021DCD64(v0, v0->unk_2B);
-    sub_02019448(v0->unk_04, 2);
+    Bg_CopyTilemapBufferToVRAM(v0->unk_04, 2);
     ov19_021DCE50(v0, v1);
 
     if (v0->unk_2B == 26) {
@@ -458,7 +458,7 @@ static void ov19_021DCD64(UnkStruct_ov19_021DC680 *param0, u32 param1)
         v2 = 24 - v1;
     }
 
-    sub_020198C0(param0->unk_04, 2, ((u8 *)param0->unk_18->rawData) + v0, param0->unk_30, v2, 15, v1);
+    Bg_LoadToTilemapRect(param0->unk_04, 2, ((u8 *)param0->unk_18->rawData) + v0, param0->unk_30, v2, 15, v1);
 }
 
 static void ov19_021DCDB4(UnkStruct_ov19_021DC680 *param0, VecFx32 *param1)

src/overlay019/ov19_021DCF88.c

@@ -370,7 +370,7 @@ void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0)
     if (param0) {
         int v0;
 
-        BGL_DeleteWindow(&(param0->unk_88));
+        Window_Remove(&(param0->unk_88));
 
         if (param0->unk_98) {
             Heap_FreeToHeap(param0->unk_98);
@@ -423,13 +423,13 @@ void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1)
         sub_0200710C(param1, 124, param0->unk_08, 7, 0, 0, 1, 10);
         sub_0200710C(param1, 125, param0->unk_08, 6, 0, 0, 1, 10);
         sub_0200710C(param1, 126, param0->unk_08, 5, 0, 0, 1, 10);
-        sub_020196C0(param0->unk_08, 4, 0x0, 1, 0);
-        sub_02019CB8(param0->unk_08, 4, 0x0, 0, 0, 32, 32, 17);
-        sub_02019448(param0->unk_08, 4);
-        sub_02019184(param0->unk_08, 5, 0, Unk_ov19_021E0258[param0->unk_10]);
-        BGL_AddWindow(param0->unk_08, &(param0->unk_88), 4, 0, 0, 32, 24, 2, 0);
-        BGL_FillWindow(&(param0->unk_88), 0x0);
-        sub_0201A954(&param0->unk_88);
+        Bg_FillTilesRange(param0->unk_08, 4, 0x0, 1, 0);
+        Bg_FillTilemapRect(param0->unk_08, 4, 0x0, 0, 0, 32, 32, 17);
+        Bg_CopyTilemapBufferToVRAM(param0->unk_08, 4);
+        Bg_SetOffset(param0->unk_08, 5, 0, Unk_ov19_021E0258[param0->unk_10]);
+        Window_Add(param0->unk_08, &(param0->unk_88), 4, 0, 0, 32, 24, 2, 0);
+        Window_FillTilemap(&(param0->unk_88), 0x0);
+        Window_CopyToVRAM(&param0->unk_88);
         ov19_021DE324(param0);
         sub_02007130(param1, 128, 4, 0, 0x20 * 3, 10);
         ov19_021DD224(param0, param1);
@@ -540,7 +540,7 @@ void ov19_021DD378(UnkStruct_ov19_021DCF88 *param0)
             }
 
             param0->unk_10 = v0;
-            v2->unk_10 = (sub_020192EC(param0->unk_08, 5) * FX32_ONE);
+            v2->unk_10 = (Bg_GetXOffset(param0->unk_08, 5) * FX32_ONE);
             v2->unk_14 = (Unk_ov19_021E0258[v0] - v2->unk_10) / v2->unk_0C;
             v2->unk_18 = Unk_ov19_021E0258[v0] >> FX32_SHIFT;
 
@@ -576,16 +576,16 @@ static void ov19_021DD46C(SysTask *param0, void *param1)
     case 1:
         if (v0->unk_0C) {
             v0->unk_10 += v0->unk_14;
-            sub_02019184(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT));
+            Bg_SetOffset(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT));
             v0->unk_0C--;
         } else {
-            sub_02019184(v1->unk_08, 5, 0, v0->unk_18);
+            Bg_SetOffset(v1->unk_08, 5, 0, v0->unk_18);
             G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 0, 16);
             v0->unk_04++;
         }
         break;
     case 2:
-        sub_02019184(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]);
+        Bg_SetOffset(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]);
         v0->unk_0E = 0;
         v0->unk_04++;
         break;
@@ -618,23 +618,23 @@ static void ov19_021DD544(SysTask *param0, void *param1)
         G2S_ChangeBlendAlpha(v1->unk_D4[v0->unk_0E], v1->unk_E4[v0->unk_0E]);
 
         if (v0->unk_0E == 0) {
-            sub_02019184(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]);
+            Bg_SetOffset(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]);
             v0->unk_04++;
         }
         break;
     case 2:
         if (v0->unk_0C) {
             v0->unk_10 += v0->unk_14;
-            sub_02019184(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT));
+            Bg_SetOffset(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT));
             v0->unk_0C--;
         } else {
-            sub_02019184(v1->unk_08, 5, 0, v0->unk_18);
+            Bg_SetOffset(v1->unk_08, 5, 0, v0->unk_18);
             G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_PLANEMASK_BG3, 0, 16);
             v0->unk_04++;
         }
         break;
     case 3:
-        sub_02019184(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]);
+        Bg_SetOffset(v1->unk_08, 6, 0, Unk_ov19_021E024C[v1->unk_10]);
         v0->unk_0E = 0;
         v0->unk_04++;
         break;
@@ -663,17 +663,17 @@ static void ov19_021DD670(SysTask *param0, void *param1)
         G2S_ChangeBlendAlpha(v1->unk_D4[v0->unk_0E], v1->unk_E4[v0->unk_0E]);
 
         if (v0->unk_0E == 0) {
-            sub_02019184(v1->unk_08, 6, 0, Unk_ov19_021E024C[0]);
+            Bg_SetOffset(v1->unk_08, 6, 0, Unk_ov19_021E024C[0]);
             v0->unk_04++;
         }
         break;
     case 2:
         if (v0->unk_0C) {
             v0->unk_10 += v0->unk_14;
-            sub_02019184(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT));
+            Bg_SetOffset(v1->unk_08, 5, 0, (v0->unk_10 >> FX32_SHIFT));
             v0->unk_0C--;
         } else {
-            sub_02019184(v1->unk_08, 5, 0, v0->unk_18);
+            Bg_SetOffset(v1->unk_08, 5, 0, v0->unk_18);
             v0->unk_04++;
         }
         break;
@@ -1479,13 +1479,13 @@ void ov19_021DE2F4(UnkStruct_ov19_021DCF88 *param0)
 
 static void ov19_021DE324(UnkStruct_ov19_021DCF88 *param0)
 {
-    sub_02019120(4, 0);
+    Bg_ToggleLayer(4, 0);
 }
 
 static void ov19_021DE330(UnkStruct_ov19_021DCF88 *param0)
 {
     G2S_SetBlendAlpha(GX_BLEND_PLANEMASK_BG0, GX_BLEND_ALL, 14, 2);
-    sub_02019120(4, 1);
+    Bg_ToggleLayer(4, 1);
 }
 
 static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0)
@@ -1511,7 +1511,7 @@ static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0)
 
     for (v1 = 0; v1 < NELEMS(v0); v1++) {
         sub_02079AF4(param0->unk_04->unk_00, v2, param0->unk_84);
-        BGL_WindowColor(&param0->unk_88, 0, v0[v1].unk_00, v0[v1].unk_02, 104, 17);
+        Window_FillRectWithColor(&param0->unk_88, 0, v0[v1].unk_00, v0[v1].unk_02, 104, 17);
         Text_AddPrinterWithParamsAndColor(&param0->unk_88, FONT_SYSTEM, param0->unk_84, v0[v1].unk_00 + 4, v0[v1].unk_02 + 2, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
 
         if (--v2 < 0) {
@@ -1519,6 +1519,6 @@ static void ov19_021DE350(UnkStruct_ov19_021DCF88 *param0)
         }
     }
 
-    sub_0201ACCC(&param0->unk_88);
+    Window_LoadTiles(&param0->unk_88);
     ov19_021DE330(param0);
 }

src/overlay019/ov19_021DEC04.c

@@ -134,15 +134,15 @@ void ov19_021DECE8(UnkStruct_ov19_021DEC04 *param0, NARC *param1)
         sub_0200710C(param1, 131, param0->unk_0C, 7, 0, 0, 1, 10);
         sub_02007130(param1, 133, 4, 0, 0x20 * 4, 10);
         sub_02006E84(19, PokeIconPalettesFileIndex(), 5, 4 * 0x20, 4 * 0x20, 10);
-        sub_02019690(4, 0x20, 0, 10);
-        sub_02019CB8(param0->unk_0C, 4, 0x0, 0, 0, 32, 32, 17);
+        Bg_ClearTilesRange(4, 0x20, 0, 10);
+        Bg_FillTilemapRect(param0->unk_0C, 4, 0x0, 0, 0, 32, 32, 17);
 
         ov19_021DEF64(param0);
         ov19_021DEFC8(param0);
 
         param0->unk_378 = ov19_021D5FA4(param0->unk_08);
 
-        sub_02019448(param0->unk_0C, 4);
+        Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 4);
         ov19_021DF5D0(param0, param1);
     }
 }
@@ -197,7 +197,7 @@ void ov19_021DEE88(UnkStruct_ov19_021DEC04 *param0)
     if (param0) {
         param0->unk_37C = 0;
         ov19_021DF0CC(param0, param0->unk_378);
-        sub_02019448(param0->unk_0C, 4);
+        Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 4);
     }
 }
 
@@ -212,7 +212,7 @@ BOOL ov19_021DEEA8(UnkStruct_ov19_021DEC04 *param0)
         case 1:
             ov19_021DF2E0(param0);
             ov19_021DF064(param0);
-            sub_02019448(param0->unk_0C, 4);
+            Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 4);
             param0->unk_37C++;
             break;
         case 2:
@@ -228,28 +228,28 @@ static void ov19_021DEEFC(UnkStruct_ov19_021DEC04 *param0)
 {
     NNSG2dScreenData *v0 = (ov19_021D5F9C(param0->unk_08) == 0) ? param0->unk_368 : param0->unk_36C;
 
-    sub_020198E8(param0->unk_0C, 2, 0, 0, 6, 32, v0->rawData, 0, 0, 32, 32);
-    sub_020198E8(param0->unk_0C, 2, 26, 0, 6, 32, v0->rawData, 26, 0, 32, 32);
-    sub_02019448(param0->unk_0C, 2);
+    Bg_CopyToTilemapRect(param0->unk_0C, 2, 0, 0, 6, 32, v0->rawData, 0, 0, 32, 32);
+    Bg_CopyToTilemapRect(param0->unk_0C, 2, 26, 0, 6, 32, v0->rawData, 26, 0, 32, 32);
+    Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 2);
 }
 
 static void ov19_021DEF64(UnkStruct_ov19_021DEC04 *param0)
 {
     switch (ov19_021D5FA4(param0->unk_08)) {
     case 0:
-        sub_02019120(5, 1);
-        sub_02019120(6, 0);
-        sub_02019120(7, 0);
+        Bg_ToggleLayer(5, 1);
+        Bg_ToggleLayer(6, 0);
+        Bg_ToggleLayer(7, 0);
         break;
     case 1:
-        sub_02019120(6, 1);
-        sub_02019120(5, 0);
-        sub_02019120(7, 0);
+        Bg_ToggleLayer(6, 1);
+        Bg_ToggleLayer(5, 0);
+        Bg_ToggleLayer(7, 0);
         break;
     case 2:
-        sub_02019120(7, 1);
-        sub_02019120(5, 0);
-        sub_02019120(6, 0);
+        Bg_ToggleLayer(7, 1);
+        Bg_ToggleLayer(5, 0);
+        Bg_ToggleLayer(6, 0);
         break;
     }
 }
@@ -268,16 +268,16 @@ static void ov19_021DEFC8(UnkStruct_ov19_021DEC04 *param0)
     }
 
     for (v1 = 0; v1 < NELEMS(v0); v1++) {
-        sub_0201A8D4(param0->unk_0C, &param0->unk_78[0 + v1], &v0[v1]);
-        sub_0201A9F4(&param0->unk_78[0 + v1]);
+        Window_AddFromTemplate(param0->unk_0C, &param0->unk_78[0 + v1], &v0[v1]);
+        Window_PutToTilemap(&param0->unk_78[0 + v1]);
     }
 
     ov19_021DF2E0(param0);
-    BGL_FillWindow(&param0->unk_78[0], 0);
-    BGL_FillWindow(&param0->unk_78[1], 0);
+    Window_FillTilemap(&param0->unk_78[0], 0);
+    Window_FillTilemap(&param0->unk_78[1], 0);
 
     for (v1 = 0; v1 < NELEMS(v0); v1++) {
-        sub_0201ACCC(&param0->unk_78[0 + v1]);
+        Window_LoadTiles(&param0->unk_78[0 + v1]);
     }
 
     ov19_021DF064(param0);
@@ -289,7 +289,7 @@ static void ov19_021DF03C(UnkStruct_ov19_021DEC04 *param0)
 
     for (v0 = 0; v0 < 7; v0++) {
         if (param0->unk_78[v0].pixels) {
-            BGL_DeleteWindow(&(param0->unk_78[v0]));
+            Window_Remove(&(param0->unk_78[v0]));
         }
     }
 }
@@ -345,9 +345,9 @@ static void ov19_021DF108(UnkStruct_ov19_021DEC04 *param0)
     int v1;
 
     for (v1 = 0; v1 < NELEMS(v0); v1++) {
-        sub_0201A8D4(param0->unk_0C, &param0->unk_78[3 + v1], &v0[v1]);
-        sub_0201A9F4(&param0->unk_78[3 + v1]);
-        BGL_FillWindow(&param0->unk_78[3 + v1], 0);
+        Window_AddFromTemplate(param0->unk_0C, &param0->unk_78[3 + v1], &v0[v1]);
+        Window_PutToTilemap(&param0->unk_78[3 + v1]);
+        Window_FillTilemap(&param0->unk_78[3 + v1], 0);
     }
 }
 
@@ -357,8 +357,8 @@ static void ov19_021DF140(UnkStruct_ov19_021DEC04 *param0)
 
     for (v0 = 3; v0 <= 4; v0++) {
         if (param0->unk_78[v0].pixels) {
-            sub_0201AA3C(&(param0->unk_78[v0]));
-            BGL_DeleteWindow(&(param0->unk_78[v0]));
+            Window_ClearTilemap(&(param0->unk_78[v0]));
+            Window_Remove(&(param0->unk_78[v0]));
             param0->unk_78[v0].pixels = NULL;
         }
     }
@@ -432,9 +432,9 @@ static void ov19_021DF270(UnkStruct_ov19_021DEC04 *param0)
     int v1;
 
     for (v1 = 0; v1 < NELEMS(v0); v1++) {
-        sub_0201A8D4(param0->unk_0C, &param0->unk_78[5 + v1], &v0[v1]);
-        sub_0201A9F4(&param0->unk_78[5 + v1]);
-        BGL_FillWindow(&param0->unk_78[5 + v1], 0);
+        Window_AddFromTemplate(param0->unk_0C, &param0->unk_78[5 + v1], &v0[v1]);
+        Window_PutToTilemap(&param0->unk_78[5 + v1]);
+        Window_FillTilemap(&param0->unk_78[5 + v1], 0);
     }
 }
 
@@ -444,8 +444,8 @@ static void ov19_021DF2A8(UnkStruct_ov19_021DEC04 *param0)
 
     for (v0 = 5; v0 <= 6; v0++) {
         if (param0->unk_78[v0].pixels) {
-            sub_0201AA3C(&(param0->unk_78[v0]));
-            BGL_DeleteWindow(&(param0->unk_78[v0]));
+            Window_ClearTilemap(&(param0->unk_78[v0]));
+            Window_Remove(&(param0->unk_78[v0]));
             param0->unk_78[v0].pixels = NULL;
         }
     }
@@ -471,7 +471,7 @@ static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 *param0)
     Window *v1 = &param0->unk_78[2];
     int v2;
 
-    BGL_FillWindow(v1, 0);
+    Window_FillTilemap(v1, 0);
 
     switch (ov19_021D5FA4(param0->unk_08)) {
     case 0:
@@ -486,15 +486,15 @@ static void ov19_021DF2E0(UnkStruct_ov19_021DEC04 *param0)
         break;
     }
 
-    sub_0201ACCC(v1);
+    Window_LoadTiles(v1);
 }
 
 static void ov19_021DF394(UnkStruct_ov19_021DEC04 *param0)
 {
     Window *v0 = &param0->unk_78[2];
 
-    BGL_FillWindow(v0, 0);
-    sub_0201ACCC(v0);
+    Window_FillTilemap(v0, 0);
+    Window_LoadTiles(v0);
 }
 
 static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1)
@@ -509,7 +509,7 @@ static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1)
     v3 = ov19_021D5F9C(param0->unk_08) == param1;
     v4 = ov19_021D5FB8(param0->unk_08, param1);
 
-    BGL_FillWindow(v0, 0);
+    Window_FillTilemap(v0, 0);
 
     if (((v2 == 1) && (v3 == 1)) || ((v3 == 0) && (v4 == 1))) {
         int v5;
@@ -532,7 +532,7 @@ static void ov19_021DF3AC(UnkStruct_ov19_021DEC04 *param0, int param1)
         }
     }
 
-    sub_0201ACCC(v0);
+    Window_LoadTiles(v0);
 }
 
 static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1)
@@ -547,7 +547,7 @@ static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1)
     v3 = (ov19_021D5F9C(param0->unk_08) == param1);
     v4 = ov19_021D5FB8(param0->unk_08, param1);
 
-    BGL_FillWindow(v0, 0);
+    Window_FillTilemap(v0, 0);
 
     if (((v2 == 1) && (v3 == 1)) || ((v3 == 0) && (v4 == 1))) {
         int v5;
@@ -568,7 +568,7 @@ static void ov19_021DF4D0(UnkStruct_ov19_021DEC04 *param0, int param1)
         }
     }
 
-    sub_0201ACCC(v0);
+    Window_LoadTiles(v0);
 }
 
 static void ov19_021DF5D0(UnkStruct_ov19_021DEC04 *param0, NARC *param1)
@@ -693,14 +693,14 @@ static void ov19_021DF8C8(UnkStruct_ov19_021DEC04 *param0, int param1)
     param1 = ov19_021D5F9C(param0->unk_08);
     v0 = &(param0->unk_78[0 + param1]);
 
-    BGL_FillWindow(v0, 0);
+    Window_FillTilemap(v0, 0);
 
     if (ov19_021D5E34(param0->unk_08)) {
         const UnkStruct_ov19_021D5FAC *v1 = ov19_021D5FAC(param0->unk_08, param1);
         Text_AddPrinterWithParamsAndColor(v0, FONT_SYSTEM, v1->unk_28, inline_ov19_021DF3AC(v0, 0, v1->unk_28), 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(15, 14, 0), NULL);
     }
 
-    sub_0201ACCC(v0);
+    Window_LoadTiles(v0);
 }
 
 static void ov19_021DF930(SysTask *param0, void *param1)

src/overlay020/ov20_021D2098.c

@@ -117,7 +117,7 @@ UnkStruct_ov20_021D2128 *ov20_021D2098(const UnkStruct_ov20_021D16E8 *param0, co
         sub_0200A784(0, 128, 0, 32, 0, 128, 0, 32, 35);
 
         v0->unk_24 = sub_020095C4(128, &v0->unk_28, 35);
-        v0->unk_20 = sub_02018340(35);
+        v0->unk_20 = BgConfig_New(35);
         v0->unk_00 = SysTask_Start(ov20_021D2178, v0, 2);
         v0->unk_04 = ov20_021D2170(ov20_021D217C, v0, 1);
 
@@ -360,11 +360,11 @@ static void ov20_021D2414(SysTask *param0, void *param1)
                 }
             }
 
-            sub_02019044(v1->unk_20, 0);
-            sub_02019044(v1->unk_20, 1);
-            sub_02019044(v1->unk_20, 2);
-            sub_02019044(v1->unk_20, 3);
-            sub_02019044(v1->unk_20, 4);
+            Bg_FreeTilemapBuffer(v1->unk_20, 0);
+            Bg_FreeTilemapBuffer(v1->unk_20, 1);
+            Bg_FreeTilemapBuffer(v1->unk_20, 2);
+            Bg_FreeTilemapBuffer(v1->unk_20, 3);
+            Bg_FreeTilemapBuffer(v1->unk_20, 4);
 
             ov20_021D2238(v0);
         }
@@ -473,14 +473,14 @@ static void ov20_021D24EC(UnkStruct_ov20_021D2238 *param0)
     GX_SetGraphicsMode(GX_DISPMODE_GRAPHICS, GX_BGMODE_0, GX_BG0_AS_3D);
 
     GXLayers_SetBanks(&v0);
-    sub_02018368(&v1);
+    SetAllGraphicsModes(&v1);
 
-    sub_020183C4(v7->unk_20, 0, &v2, 0);
-    sub_020183C4(v7->unk_20, 1, &v3, 0);
-    sub_020183C4(v7->unk_20, 2, &v4, 0);
-    sub_020183C4(v7->unk_20, 3, &v5, 0);
+    Bg_InitFromTemplate(v7->unk_20, 0, &v2, 0);
+    Bg_InitFromTemplate(v7->unk_20, 1, &v3, 0);
+    Bg_InitFromTemplate(v7->unk_20, 2, &v4, 0);
+    Bg_InitFromTemplate(v7->unk_20, 3, &v5, 0);
 
-    sub_020183C4(v7->unk_20, 4, &v6, 0);
+    Bg_InitFromTemplate(v7->unk_20, 4, &v6, 0);
 }
 
 static void ov20_021D2570(SysTask *param0, void *param1)

src/overlay020/ov20_021D2EA4.c

@@ -113,9 +113,9 @@ void ov20_021D2EF0(UnkStruct_ov20_021D30F8 *param0)
         Strbuf_Free(param0->unk_4C);
     }
 
-    BGL_DeleteWindow(&param0->unk_0C);
-    BGL_DeleteWindow(&param0->unk_1C);
-    BGL_DeleteWindow(&param0->unk_2C);
+    Window_Remove(&param0->unk_0C);
+    Window_Remove(&param0->unk_1C);
+    Window_Remove(&param0->unk_2C);
     Heap_FreeToHeap(param0);
 }
 
@@ -132,13 +132,13 @@ void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1)
     v1 = sub_020070E8(param1, 1, v0, 0, 0, 0, 1, 35);
     v1 /= 0x20;
 
-    BGL_AddWindow(v0, &param0->unk_0C, 0, 3, 1, 27, 4, 0, v1);
+    Window_Add(v0, &param0->unk_0C, 0, 3, 1, 27, 4, 0, v1);
     v1 += 108;
 
-    BGL_AddWindow(v0, &param0->unk_1C, 0, 2, 21, 27, 2, 11, v1);
+    Window_Add(v0, &param0->unk_1C, 0, 2, 21, 27, 2, 11, v1);
     v1 += 54;
 
-    BGL_AddWindow(v0, &param0->unk_2C, 0, 23, 15, 8, 4, 11, v1);
+    Window_Add(v0, &param0->unk_2C, 0, 23, 15, 8, 4, 11, v1);
     v1 += 32;
 
     sub_02006E3C(38, 0, v0, 0, v1, 0, 0, 35);
@@ -148,15 +148,15 @@ void ov20_021D2F50(UnkStruct_ov20_021D30F8 *param0, NARC *param1)
     sub_02006E84(38, 24, 0, 14 * 0x20, 0x20, 35);
     sub_0200DD0C(v0, 0, v1, 15, ov20_021D2080(param0->unk_04), 35);
     sub_0200E010(&param0->unk_1C, v1, 15);
-    sub_0201A9F4(&param0->unk_0C);
-    sub_0201A9F4(&param0->unk_1C);
+    Window_PutToTilemap(&param0->unk_0C);
+    Window_PutToTilemap(&param0->unk_1C);
 
     ov20_021D312C(param0);
     ov20_021D3228(param0);
     ov20_021D3578(param0, 0);
     ov20_021D3184(param0);
 
-    sub_02019448(v0, 0);
+    Bg_CopyTilemapBufferToVRAM(v0, 0);
 }
 
 static void ov20_021D30A4(UnkStruct_ov20_021D30F8 *param0, NARC *param1)
@@ -237,7 +237,7 @@ static void ov20_021D3184(UnkStruct_ov20_021D30F8 *param0)
 void ov20_021D3228(UnkStruct_ov20_021D30F8 *param0)
 {
     ov20_021D30F8(param0);
-    BGL_FillWindow(&param0->unk_0C, 13);
+    Window_FillTilemap(&param0->unk_0C, 13);
 
     switch (ov20_021D1F84(param0->unk_04)) {
     case 0:
@@ -255,7 +255,7 @@ void ov20_021D3228(UnkStruct_ov20_021D30F8 *param0)
         break;
     }
 
-    sub_0201ACCC(&param0->unk_0C);
+    Window_LoadTiles(&param0->unk_0C);
 }
 
 static u32 ov20_021D32D0(UnkStruct_ov20_021D30F8 *param0)
@@ -397,7 +397,7 @@ static void ov20_021D34F4(Window *param0, const UnkStruct_ov20_021D34CC *param1)
     UnkStruct_ov20_021D34CC v0;
 
     ov20_021D34CC(param1, &v0);
-    BGL_WindowColor(param0, 14, v0.unk_00, v0.unk_02, 96, 16);
+    Window_FillRectWithColor(param0, 14, v0.unk_00, v0.unk_02, 96, 16);
 }
 
 static void ov20_021D351C(UnkStruct_ov20_021D30F8 *param0, Window *param1, const UnkStruct_ov20_021D34CC *param2, u16 param3)
@@ -422,7 +422,7 @@ u32 ov20_021D3574(const UnkStruct_ov20_021D30F8 *param0)
 
 void ov20_021D3578(UnkStruct_ov20_021D30F8 *param0, u32 param1)
 {
-    BGL_FillWindow(&param0->unk_1C, 9);
+    Window_FillTilemap(&param0->unk_1C, 9);
 
     switch (param1) {
     case 0:
@@ -453,7 +453,7 @@ void ov20_021D3578(UnkStruct_ov20_021D30F8 *param0, u32 param1)
         break;
     }
 
-    sub_0201ACCC(&param0->unk_1C);
+    Window_LoadTiles(&param0->unk_1C);
 }
 
 void ov20_021D3684(UnkStruct_ov20_021D30F8 *param0)
@@ -533,7 +533,7 @@ static void ov20_021D375C(UnkStruct_ov20_021D30F8 *param0, BOOL param1)
 
 void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1)
 {
-    BGL_FillWindow(&param0->unk_2C, 9);
+    Window_FillTilemap(&param0->unk_2C, 9);
 
     MessageLoader_GetStrbuf(param0->unk_48, 9, param0->unk_4C);
     Text_AddPrinterWithParamsAndColor(&param0->unk_2C, FONT_SYSTEM, param0->unk_4C, 14, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 9), NULL);
@@ -544,17 +544,17 @@ void ov20_021D3790(UnkStruct_ov20_021D30F8 *param0, int param1)
     Window_Show(&param0->unk_2C, 0, param0->unk_60, 14);
     ColoredArrow_Print(param0->unk_50, &param0->unk_2C, 0, 0 + (param1 * 16));
 
-    sub_0201A954(&param0->unk_2C);
+    Window_CopyToVRAM(&param0->unk_2C);
 }
 
 void ov20_021D381C(UnkStruct_ov20_021D30F8 *param0, int param1)
 {
-    BGL_WindowColor(&param0->unk_2C, 9, 0, 0, 14, 4 * 8);
+    Window_FillRectWithColor(&param0->unk_2C, 9, 0, 0, 14, 4 * 8);
     ColoredArrow_Print(param0->unk_50, &param0->unk_2C, 0, 0 + (param1 * 16));
 }
 
 void ov20_021D384C(UnkStruct_ov20_021D30F8 *param0)
 {
     Window_Clear(&param0->unk_2C, 0);
-    sub_0201ACF4(&param0->unk_2C);
+    Window_ClearAndCopyToVRAM(&param0->unk_2C);
 }

src/overlay020/ov20_021D3864.c

@@ -69,7 +69,7 @@ void ov20_021D3898(UnkStruct_ov20_021D3980 *param0, NARC *param1)
     ov20_021D390C(v2, &v1, 1);
     ov20_021D3980(param0);
 
-    sub_02019448(v2, 3);
+    Bg_CopyTilemapBufferToVRAM(v2, 3);
 }
 
 static void ov20_021D390C(BgConfig *param0, const WindowTemplate *param1, u32 param2)
@@ -78,17 +78,17 @@ static void ov20_021D390C(BgConfig *param0, const WindowTemplate *param1, u32 pa
     Strbuf *v1;
     u32 v2;
 
-    sub_0201A8D4(param0, &v0, param1);
-    sub_0201A9F4(&v0);
-    BGL_FillWindow(&v0, 14);
+    Window_AddFromTemplate(param0, &v0, param1);
+    Window_PutToTilemap(&v0);
+    Window_FillTilemap(&v0, 14);
 
     v1 = MessageBank_GetNewStrbufFromNARC(26, 438, param2, 35);
     v2 = ((param1->width * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v1, 0)) / 2;
 
     Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, v2, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 14), NULL);
-    sub_0201ACCC(&v0);
+    Window_LoadTiles(&v0);
     Strbuf_Free(v1);
-    BGL_DeleteWindow(&v0);
+    Window_Remove(&v0);
 }
 
 static void ov20_021D3980(UnkStruct_ov20_021D3980 *param0)
@@ -146,10 +146,10 @@ void ov20_021D39EC(UnkStruct_ov20_021D3980 *param0, int param1)
 
 void ov20_021D3A2C(UnkStruct_ov20_021D3980 *param0)
 {
-    sub_02019184(ov20_021D2E04(param0->unk_00), 3, 3, 64);
+    Bg_SetOffset(ov20_021D2E04(param0->unk_00), 3, 3, 64);
 }
 
 void ov20_021D3A40(UnkStruct_ov20_021D3980 *param0)
 {
-    sub_02019184(ov20_021D2E04(param0->unk_00), 3, 3, 0);
+    Bg_SetOffset(ov20_021D2E04(param0->unk_00), 3, 3, 0);
 }

src/overlay020/ov20_021D3A54.c

@@ -84,8 +84,8 @@ void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1)
     v1 = ov20_021D3C78(param0, v0, v1);
 
     ov20_021D3D44(param0, v0, v1);
-    sub_02019184(v0, 1, 0, -4);
-    sub_02019184(v0, 1, 3, 2);
+    Bg_SetOffset(v0, 1, 0, -4);
+    Bg_SetOffset(v0, 1, 3, 2);
     ov20_021D3E0C(param0);
 
     G2_SetBlendBrightness(GX_BLEND_PLANEMASK_BG1, -10);
@@ -94,7 +94,7 @@ void ov20_021D3A98(UnkStruct_ov20_021D3E0C *param0, NARC *param1)
     G2_SetWnd0Position(0, 0, 255, 160);
     GX_SetVisibleWnd(GX_WNDMASK_W0);
 
-    sub_02019448(v0, 1);
+    Bg_CopyTilemapBufferToVRAM(v0, 1);
 }
 
 static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32 param2)
@@ -126,16 +126,16 @@ static u32 ov20_021D3B74(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32
 
         GF_ASSERT(param2 < (1024 - 18));
 
-        BGL_AddWindow(param1, &v3, 1, v1, v2, 9, 2, 11, param2);
-        BGL_FillWindow(&v3, 15);
+        Window_Add(param1, &v3, 1, v1, v2, 9, 2, 11, param2);
+        Window_FillTilemap(&v3, 15);
 
         v7 = ((9 * 8) - Font_CalcStrbufWidth(FONT_SYSTEM, v5, 0)) / 2;
 
         Text_AddPrinterWithParamsAndColor(&v3, FONT_SYSTEM, v5, v7, 0, TEXT_SPEED_NO_TRANSFER, v6, NULL);
-        sub_0201A9F4(&v3);
-        sub_0201ACCC(&v3);
+        Window_PutToTilemap(&v3);
+        Window_LoadTiles(&v3);
         Strbuf_Free(v5);
-        BGL_DeleteWindow(&v3);
+        Window_Remove(&v3);
 
         param2 += 18;
         v1 += (9 + 1);
@@ -154,12 +154,12 @@ static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32
 
     GF_ASSERT(param2 < (1024 - 200));
 
-    BGL_AddWindow(param1, &v0, 1, 34, 10, 25, 8, 11, param2);
+    Window_Add(param1, &v0, 1, 34, 10, 25, 8, 11, param2);
     param2 += 200;
 
     v1 = Strbuf_Init(4, 35);
 
-    BGL_FillWindow(&v0, 15);
+    Window_FillTilemap(&v0, 15);
 
     v3 = ov20_021D5044();
 
@@ -176,11 +176,11 @@ static u32 ov20_021D3C78(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32
         Text_AddPrinterWithParamsAndColor(&v0, FONT_SYSTEM, v1, v5 + 3, v6, TEXT_SPEED_NO_TRANSFER, v2, NULL);
     }
 
-    sub_0201ACCC(&v0);
-    sub_0201A9F4(&v0);
+    Window_LoadTiles(&v0);
+    Window_PutToTilemap(&v0);
 
     Strbuf_Free(v1);
-    BGL_DeleteWindow(&v0);
+    Window_Remove(&v0);
 
     return param2;
 }
@@ -206,12 +206,12 @@ static u32 ov20_021D3D44(UnkStruct_ov20_021D3E0C *param0, BgConfig *param1, u32
     for (v4 = 0; v4 < NELEMS(v0); v4++) {
         GF_ASSERT(param2 < (1024 - 16));
 
-        BGL_AddWindow(param1, &v1, 1, v0[v4].unk_00, v0[v4].unk_02, 8, 2, 11, param2);
-        BGL_FillWindow(&v1, 15);
+        Window_Add(param1, &v1, 1, v0[v4].unk_00, v0[v4].unk_02, 8, 2, 11, param2);
+        Window_FillTilemap(&v1, 15);
         Text_AddPrinterWithParamsAndColor(&v1, FONT_SYSTEM, v3, v5, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 15), NULL);
-        sub_0201A9F4(&v1);
-        sub_0201ACCC(&v1);
-        BGL_DeleteWindow(&v1);
+        Window_PutToTilemap(&v1);
+        Window_LoadTiles(&v1);
+        Window_Remove(&v1);
 
         param2 += 16;
     }
@@ -326,7 +326,7 @@ BOOL ov20_021D3F84(UnkStruct_ov20_021D3E0C *param0)
 
 void ov20_021D3FD0(UnkStruct_ov20_021D3E0C *param0)
 {
-    sub_02019184(param0->unk_0C, 1, 3, 2);
+    Bg_SetOffset(param0->unk_0C, 1, 3, 2);
 }
 
 void ov20_021D3FE0(UnkStruct_ov20_021D3E0C *param0)
@@ -347,7 +347,7 @@ void ov20_021D4004(UnkStruct_ov20_021D3E0C *param0)
 BOOL ov20_021D4020(UnkStruct_ov20_021D3E0C *param0)
 {
     if (ov20_021D4F4C(&param0->unk_1C)) {
-        sub_02019120(1, 0);
+        Bg_ToggleLayer(1, 0);
         return 1;
     }
 
@@ -357,7 +357,7 @@ BOOL ov20_021D4020(UnkStruct_ov20_021D3E0C *param0)
 void ov20_021D403C(UnkStruct_ov20_021D3E0C *param0)
 {
     G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG1, GX_BLEND_ALL, 0, 16);
-    sub_02019120(1, 1);
+    Bg_ToggleLayer(1, 1);
     ov20_021D4F1C(&param0->unk_1C, GX_BLEND_PLANEMASK_BG1, GX_BLEND_ALL, 0, 124, (6 * 2));
 }
 
@@ -376,7 +376,7 @@ void ov20_021D4084(UnkStruct_ov20_021D3E0C *param0)
         v0 = 252;
     }
 
-    sub_02019184(param0->unk_0C, 1, 0, v0);
+    Bg_SetOffset(param0->unk_0C, 1, 0, v0);
 }
 
 void ov20_021D40A8(UnkStruct_ov20_021D3E0C *param0)

src/overlay020/ov20_021D40E8.c

@@ -55,8 +55,8 @@ UnkStruct_ov20_021D4210 *ov20_021D40E8(UnkStruct_ov20_021D2128 *param0, const Un
     v0->unk_0C = ov20_021D2E04(param0);
     v0->unk_3C = Strbuf_Init(32, 35);
 
-    BGL_AddWindow(v0->unk_0C, &v0->unk_10, 2, 4, 0, 26, 32, 12, 1);
-    BGL_AddWindow(v0->unk_0C, &v0->unk_20, 2, 0, 0, 12, 4, 12, 1);
+    Window_Add(v0->unk_0C, &v0->unk_10, 2, 4, 0, 26, 32, 12, 1);
+    Window_Add(v0->unk_0C, &v0->unk_20, 2, 0, 0, 12, 4, 12, 1);
 
     v0->unk_30 = NULL;
     v0->unk_34 = NULL;
@@ -83,8 +83,8 @@ void ov20_021D4164(UnkStruct_ov20_021D4210 *param0)
         Strbuf_Free(param0->unk_3C);
     }
 
-    BGL_DeleteWindow(&(param0->unk_20));
-    BGL_DeleteWindow(&(param0->unk_10));
+    Window_Remove(&(param0->unk_20));
+    Window_Remove(&(param0->unk_10));
     Heap_FreeToHeap(param0);
 }
 
@@ -95,17 +95,17 @@ void ov20_021D41A8(UnkStruct_ov20_021D4210 *param0)
 
     v0 = ov20_021D2E04(param0->unk_00);
 
-    sub_02019690(2, 0x20, 0 * 0x20, 35);
-    sub_02019CB8(v0, 2, 0, 0, 0, 32, 32, 12);
+    Bg_ClearTilesRange(2, 0x20, 0 * 0x20, 35);
+    Bg_FillTilemapRect(v0, 2, 0, 0, 0, 32, 32, 12);
 
-    BGL_FillWindow(&param0->unk_10, 0);
-    sub_0201A9F4(&param0->unk_10);
-    sub_0201ACCC(&param0->unk_10);
-    sub_02019448(v0, 2);
+    Window_FillTilemap(&param0->unk_10, 0);
+    Window_PutToTilemap(&param0->unk_10);
+    Window_LoadTiles(&param0->unk_10);
+    Bg_CopyTilemapBufferToVRAM(v0, 2);
 
     ov20_021D4210(param0);
 
-    sub_02019120(2, 0);
+    Bg_ToggleLayer(2, 0);
 }
 
 static void ov20_021D4210(UnkStruct_ov20_021D4210 *param0)
@@ -131,7 +131,7 @@ void ov20_021D4294(UnkStruct_ov20_021D4210 *param0)
 {
     u32 v0, v1, v2;
 
-    BGL_FillWindow(&param0->unk_10, 0);
+    Window_FillTilemap(&param0->unk_10, 0);
     ov20_021D4638(param0);
 
     v0 = ov20_021D1FE4(param0->unk_04);
@@ -150,13 +150,13 @@ void ov20_021D4294(UnkStruct_ov20_021D4210 *param0)
         }
     }
 
-    sub_0201ACCC(&param0->unk_10);
+    Window_LoadTiles(&param0->unk_10);
 }
 
 void ov20_021D42E4(UnkStruct_ov20_021D4210 *param0)
 {
     G2_SetBlendAlpha(GX_BLEND_PLANEMASK_BG2, GX_BLEND_ALL, 0, 16);
-    sub_02019120(2, 1);
+    Bg_ToggleLayer(2, 1);
     G2_SetWnd1InsidePlane(GX_WND_PLANEMASK_ALL, 1);
 
     param0->unk_84 = G2_GetWndOutsidePlane();
@@ -196,7 +196,7 @@ BOOL ov20_021D43D8(UnkStruct_ov20_021D4210 *param0)
     switch (param0->unk_80) {
     case 0:
         if (ov20_021D4F4C(&param0->unk_40)) {
-            sub_02019120(2, 0);
+            Bg_ToggleLayer(2, 0);
             G2_SetWndOutsidePlane(param0->unk_84.planeMask, param0->unk_84.effect);
             GX_SetVisibleWnd(param0->unk_88);
             return 1;
@@ -275,7 +275,7 @@ void ov20_021D44BC(UnkStruct_ov20_021D4210 *param0, int param1)
     param0->unk_8C = v0;
     param0->unk_90 = v1;
 
-    sub_0201ACCC(&param0->unk_10);
+    Window_LoadTiles(&param0->unk_10);
     ov20_021D4E38(&(param0->unk_60), param0->unk_0C, 2, 1, param1 * 24, v6);
 }
 
@@ -303,10 +303,10 @@ static void ov20_021D45AC(UnkStruct_ov20_021D4210 *param0, int param1)
     }
 
     if (v0 < v1) {
-        BGL_WindowColor(&param0->unk_10, 0, 0, v0, 26 * 8, (v1 - v0));
+        Window_FillRectWithColor(&param0->unk_10, 0, 0, v0, 26 * 8, (v1 - v0));
     } else {
-        BGL_WindowColor(&param0->unk_10, 0, 0, v0, 26 * 8, 256 - v0);
-        BGL_WindowColor(&param0->unk_10, 0, 0, 0, 26 * 8, v1);
+        Window_FillRectWithColor(&param0->unk_10, 0, 0, v0, 26 * 8, 256 - v0);
+        Window_FillRectWithColor(&param0->unk_10, 0, 0, 0, 26 * 8, v1);
     }
 }
 
@@ -315,7 +315,7 @@ static void ov20_021D4638(UnkStruct_ov20_021D4210 *param0)
     param0->unk_8C = 48;
     param0->unk_90 = 0;
 
-    sub_02019184(param0->unk_0C, 2, 3, 0);
+    Bg_SetOffset(param0->unk_0C, 2, 3, 0);
 }
 
 static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param2)
@@ -327,9 +327,9 @@ static void ov20_021D4658(UnkStruct_ov20_021D4210 *param0, u32 param1, u32 param
     } else {
         u32 v0 = 256 - param2;
 
-        BGL_FillWindow(&param0->unk_20, 0);
+        Window_FillTilemap(&param0->unk_20, 0);
         Text_AddPrinterWithParamsAndColor(&param0->unk_20, FONT_SYSTEM, param0->unk_3C, 0, 0, TEXT_SPEED_NO_TRANSFER, TEXT_COLOR(1, 2, 0), NULL);
-        sub_0201ADDC(&param0->unk_10, param0->unk_20.pixels, 0, 0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, param2, 12 * 8, v0);
-        sub_0201ADDC(&param0->unk_10, param0->unk_20.pixels, 0, v0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, 0, 12 * 8, (2 * 8) - v0);
+        Window_BlitBitmapRect(&param0->unk_10, param0->unk_20.pixels, 0, 0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, param2, 12 * 8, v0);
+        Window_BlitBitmapRect(&param0->unk_10, param0->unk_20.pixels, 0, v0, 12 * 8, 2 * 8, 0 + (param1 & 1) * 112, 0, 12 * 8, (2 * 8) - v0);
     }
 }

src/overlay020/ov20_021D4728.c

@@ -98,15 +98,15 @@ void ov20_021D4774(UnkStruct_ov20_021D4AD4 *param0, NARC *param1)
     ov20_021D48C4(param0, param1);
 
     if (ov20_021D1F94(param0->unk_04) == 0) {
-        sub_020198E8(param0->unk_0C, 4, 3, 3, 11, 7, param0->unk_2C[3], 0, 0, 11, 7);
-        sub_020198E8(param0->unk_0C, 4, 3, 14, 11, 7, param0->unk_2C[4], 0, 0, 11, 7);
+        Bg_CopyToTilemapRect(param0->unk_0C, 4, 3, 3, 11, 7, param0->unk_2C[3], 0, 0, 11, 7);
+        Bg_CopyToTilemapRect(param0->unk_0C, 4, 3, 14, 11, 7, param0->unk_2C[4], 0, 0, 11, 7);
     } else {
-        sub_020198E8(param0->unk_0C, 4, 3, 3, 11, 7, param0->unk_2C[0], 0, 0, 11, 7);
-        sub_020198E8(param0->unk_0C, 4, 3, 14, 11, 7, param0->unk_2C[7], 0, 0, 11, 7);
+        Bg_CopyToTilemapRect(param0->unk_0C, 4, 3, 3, 11, 7, param0->unk_2C[0], 0, 0, 11, 7);
+        Bg_CopyToTilemapRect(param0->unk_0C, 4, 3, 14, 11, 7, param0->unk_2C[7], 0, 0, 11, 7);
     }
 
     ov20_021D4A24(param0, param1);
-    sub_02019448(param0->unk_0C, 4);
+    Bg_CopyTilemapBufferToVRAM(param0->unk_0C, 4);
 }
 
 static void ov20_021D4874(UnkStruct_ov20_021D4AD4 *param0, NARC *param1)
@@ -159,7 +159,7 @@ static void ov20_021D48C4(UnkStruct_ov20_021D4AD4 *param0, NARC *param1)
         v4.pixels = (u8 *)(v3->pRawData) + (11 * 7 * 4 * 0x20);
         ov20_021D498C(&v4, param0->unk_0C, v1, 0);
         DC_FlushRange(v3->pRawData, v3->szByte);
-        sub_0201958C(param0->unk_0C, 4, v3->pRawData, v3->szByte, 0);
+        Bg_LoadTiles(param0->unk_0C, 4, v3->pRawData, v3->szByte, 0);
         Heap_FreeToHeap(v2);
     }
 
@@ -326,17 +326,17 @@ static void ov20_021D4C40(SysTask *param0, void *param1)
 
     switch (v0->unk_04) {
     case 0:
-        sub_020198E8(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7);
-        sub_020198E8(v0->unk_00->unk_0C, 4, v0->unk_14, v0->unk_16, 11, 7, v0->unk_00->unk_2C[v0->unk_12], 0, 0, 11, 7);
-        sub_02019448(v0->unk_00->unk_0C, 4);
+        Bg_CopyToTilemapRect(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7);
+        Bg_CopyToTilemapRect(v0->unk_00->unk_0C, 4, v0->unk_14, v0->unk_16, 11, 7, v0->unk_00->unk_2C[v0->unk_12], 0, 0, 11, 7);
+        Bg_CopyTilemapBufferToVRAM(v0->unk_00->unk_0C, 4);
 
         v0->unk_0A++;
         v0->unk_04++;
         break;
     case 1:
         if (++(v0->unk_08) >= 2) {
-            sub_020198E8(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7);
-            sub_02019448(v0->unk_00->unk_0C, 4);
+            Bg_CopyToTilemapRect(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7);
+            Bg_CopyTilemapBufferToVRAM(v0->unk_00->unk_0C, 4);
 
             v0->unk_08 = 0;
             v0->unk_0A++;
@@ -345,8 +345,8 @@ static void ov20_021D4C40(SysTask *param0, void *param1)
         break;
     case 2:
         if (++(v0->unk_08) >= 4) {
-            sub_020198E8(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7);
-            sub_02019448(v0->unk_00->unk_0C, 4);
+            Bg_CopyToTilemapRect(v0->unk_00->unk_0C, 4, v0->unk_0E, v0->unk_10, 11, 7, v0->unk_00->unk_2C[v0->unk_0A], 0, 0, 11, 7);
+            Bg_CopyTilemapBufferToVRAM(v0->unk_00->unk_0C, 4);
             v0->unk_04++;
         }
         break;

src/overlay020/ov20_021D4E38.c

@@ -21,10 +21,10 @@ void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BgConfig *param1, u32 param2
     param0->unk_04 = param2;
 
     if (param3 == 0) {
-        param0->unk_0C = sub_020192EC(param1, param2);
+        param0->unk_0C = Bg_GetXOffset(param1, param2);
         param0->unk_08 = 0;
     } else {
-        param0->unk_0C = sub_020192F8(param1, param2);
+        param0->unk_0C = Bg_GetYOffset(param1, param2);
         param0->unk_08 = 3;
     }
 
@@ -62,10 +62,10 @@ static void ov20_021D4ED8(SysTask *param0, void *param1)
 
     if (v0->unk_18) {
         v0->unk_0C += v0->unk_14;
-        sub_02019184(v0->unk_00, v0->unk_04, v0->unk_08, (v0->unk_0C >> FX32_SHIFT));
+        Bg_SetOffset(v0->unk_00, v0->unk_04, v0->unk_08, (v0->unk_0C >> FX32_SHIFT));
         v0->unk_18--;
     } else {
-        sub_02019184(v0->unk_00, v0->unk_04, v0->unk_08, v0->unk_10);
+        Bg_SetOffset(v0->unk_00, v0->unk_04, v0->unk_08, v0->unk_10);
     }
 }
 

src/overlay021/ov21_021D0D80.c

@@ -629,7 +629,7 @@ BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0)
     int v1;
 
     if (param0->unk_1C <= param0->unk_20) {
-        sub_02019CB8(param0->unk_00, param0->unk_08, 0, 0, 0, 32, 24, 16);
+        Bg_FillTilemapRect(param0->unk_00, param0->unk_08, 0, 0, 0, 32, 24, 16);
 
         v0 = (param0->unk_14 * param0->unk_1C) / param0->unk_20;
         v1 = (param0->unk_18 * param0->unk_1C) / param0->unk_20;
@@ -637,14 +637,14 @@ BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0)
         v1 += param0->unk_10;
 
         if (v0 > 0) {
-            sub_020198E8(param0->unk_00, param0->unk_08, 0, 0, 32, v0, param0->unk_04->rawData, 0, 32 - v0, 32, 32);
+            Bg_CopyToTilemapRect(param0->unk_00, param0->unk_08, 0, 0, 32, v0, param0->unk_04->rawData, 0, 32 - v0, 32, 32);
         }
 
         if ((32 - v1) > 0) {
-            sub_020198E8(param0->unk_00, param0->unk_08, 0, 32 - v1, 32, v1, param0->unk_04->rawData, 0, 0, 32, 32);
+            Bg_CopyToTilemapRect(param0->unk_00, param0->unk_08, 0, 32 - v1, 32, v1, param0->unk_04->rawData, 0, 0, 32, 32);
         }
 
-        sub_0201C3C0(param0->unk_00, param0->unk_08);
+        Bg_ScheduleTilemapTransfer(param0->unk_00, param0->unk_08);
         param0->unk_1C++;
 
         return 0;

src/overlay021/ov21_021D1FA4.c

@@ -65,14 +65,14 @@ void ov21_021D1FA4(UnkStruct_ov21_021D13FC *param0, int param1)
     UnkStruct_ov21_021D1FA4 v1;
 
     param0->unk_278 = NARC_ctor(NARC_INDEX_RESOURCE__ENG__ZUKAN__ZUKAN, param1);
-    param0->unk_00 = sub_02018340(param1);
+    param0->unk_00 = BgConfig_New(param1);
 
     v0.displayMode = GX_DISPMODE_GRAPHICS;
     v0.mainBgMode = GX_BGMODE_0;
     v0.subBgMode = GX_BGMODE_1;
     v0.bg0As2DOr3D = GX_BG0_AS_3D;
 
-    sub_02018368(&v0);
+    SetAllGraphicsModes(&v0);
 
     ov21_021D2830(param0->unk_00, param1);
     ov21_021D29D0(param0, param1);
@@ -138,7 +138,7 @@ void ov21_021D2124(UnkStruct_ov21_021D13FC *param0)
 
 void ov21_021D214C(UnkStruct_ov21_021D13FC *param0)
 {
-    sub_0201C2B8(param0->unk_00);
+    Bg_RunScheduledUpdates(param0->unk_00);
     sub_02008A94(param0->unk_150);
 }
 
@@ -506,7 +506,7 @@ u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BgConfig *param2,
                 param5 = v1->szByte;
             }
 
-            sub_0201958C(param2, param3, v1->pRawData, param5, param4);
+            Bg_LoadTiles(param2, param3, v1->pRawData, param5, param4);
         }
 
         Heap_FreeToHeap(v0);
@@ -607,9 +607,9 @@ static void ov21_021D2830(BgConfig *param0, int param1)
             0
         };
 
-        sub_020183C4(param0, 1, &v0, 0);
-        sub_02019690(1, 32, 0, param1);
-        sub_02019EBC(param0, 1);
+        Bg_InitFromTemplate(param0, 1, &v0, 0);
+        Bg_ClearTilesRange(1, 32, 0, param1);
+        Bg_ClearTilemap(param0, 1);
     }
 
     {
@@ -629,12 +629,12 @@ static void ov21_021D2830(BgConfig *param0, int param1)
             0
         };
 
-        sub_020183C4(param0, 2, &v1, 0);
-        sub_02019690(2, 32, 0, param1);
-        sub_02019EBC(param0, 2);
+        Bg_InitFromTemplate(param0, 2, &v1, 0);
+        Bg_ClearTilesRange(2, 32, 0, param1);
+        Bg_ClearTilemap(param0, 2);
     }
 
-    BGL_SetPriority(0, 2);
+    Bg_SetPriority(0, 2);
     GXLayers_EngineAToggleLayers(GX_PLANEMASK_BG0, 1);
 
     {
@@ -654,9 +654,9 @@ static void ov21_021D2830(BgConfig *param0, int param1)
             0
         };
 
-        sub_020183C4(param0, 3, &v2, 0);
-        sub_02019690(3, 32, 0, param1);
-        sub_02019EBC(param0, 3);
+        Bg_InitFromTemplate(param0, 3, &v2, 0);
+        Bg_ClearTilesRange(3, 32, 0, param1);
+        Bg_ClearTilemap(param0, 3);
     }
 
     {
@@ -676,9 +676,9 @@ static void ov21_021D2830(BgConfig *param0, int param1)
             0
         };
 
-        sub_020183C4(param0, 5, &v3, 0);
-        sub_02019690(5, 32, 0, param1);
-        sub_02019EBC(param0, 5);
+        Bg_InitFromTemplate(param0, 5, &v3, 0);
+        Bg_ClearTilesRange(5, 32, 0, param1);
+        Bg_ClearTilemap(param0, 5);
     }
 
     {
@@ -698,9 +698,9 @@ static void ov21_021D2830(BgConfig *param0, int param1)
             0
         };
 
-        sub_020183C4(param0, 6, &v4, 0);
-        sub_02019690(6, 32, 0, param1);
-        sub_02019EBC(param0, 6);
+        Bg_InitFromTemplate(param0, 6, &v4, 0);
+        Bg_ClearTilesRange(6, 32, 0, param1);
+        Bg_ClearTilemap(param0, 6);
     }
 
     {
@@ -720,32 +720,32 @@ static void ov21_021D2830(BgConfig *param0, int param1)
             0
         };
 
-        sub_020183C4(param0, 7, &v5, 1);
-        sub_02019690(7, 64, 0, param1);
-        sub_02019EBC(param0, 7);
+        Bg_InitFromTemplate(param0, 7, &v5, 1);
+        Bg_ClearTilesRange(7, 64, 0, param1);
+        Bg_ClearTilemap(param0, 7);
     }
 }
 
 static void ov21_021D299C(BgConfig *param0)
 {
-    sub_02019044(param0, 1);
-    sub_02019044(param0, 2);
-    sub_02019044(param0, 3);
-    sub_02019044(param0, 5);
-    sub_02019044(param0, 7);
-    sub_02019044(param0, 6);
+    Bg_FreeTilemapBuffer(param0, 1);
+    Bg_FreeTilemapBuffer(param0, 2);
+    Bg_FreeTilemapBuffer(param0, 3);
+    Bg_FreeTilemapBuffer(param0, 5);
+    Bg_FreeTilemapBuffer(param0, 7);
+    Bg_FreeTilemapBuffer(param0, 6);
 }
 
 static void ov21_021D29D0(UnkStruct_ov21_021D13FC *param0, int param1)
 {
-    BGL_AddWindow(param0->unk_00, &param0->unk_04, 1, 0, 0, 32, 32, 0, 0);
-    BGL_FillWindow(&param0->unk_04, 0);
-    sub_0201A954(&param0->unk_04);
+    Window_Add(param0->unk_00, &param0->unk_04, 1, 0, 0, 32, 32, 0, 0);
+    Window_FillTilemap(&param0->unk_04, 0);
+    Window_CopyToVRAM(&param0->unk_04);
 }
 
 static void ov21_021D2A00(UnkStruct_ov21_021D13FC *param0)
 {
-    BGL_DeleteWindow(&param0->unk_04);
+    Window_Remove(&param0->unk_04);
 }
 
 static void ov21_021D2A0C(UnkStruct_ov21_021D13FC *param0, int param1)

src/overlay021/ov21_021D4C0C.c

@@ -127,17 +127,17 @@ Window *ov21_021D4D6C(UnkStruct_ov21_021D4C0C *param0, int param1, int param2)
 {
     Window *v0;
 
-    v0 = sub_0201A778(param0->unk_14, 1);
+    v0 = Window_New(param0->unk_14, 1);
 
     Window_Init(v0);
-    BGL_AddFramelessWindow(param0->unk_08, v0, param1, param2, 0, 0);
+    Window_AddToTopLeftCorner(param0->unk_08, v0, param1, param2, 0, 0);
 
     return v0;
 }
 
 void ov21_021D4DA0(Window *param0)
 {
-    sub_0201A928(param0, 1);
+    Windows_Delete(param0, 1);
 }
 
 u32 ov21_021D4DAC(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2, u32 param3, int param4, int param5)
@@ -171,7 +171,7 @@ void ov21_021D4E10(UnkStruct_ov21_021D4C0C *param0, Window *param1, u32 param2,
 
     v1 = MessageLoader_GetNewStrbuf(v0, param3);
     v2 = Font_CalcStrbufWidth(FONT_SUBSCREEN, v1, 0);
-    v3 = sub_0201C294(param1) * 8;
+    v3 = Window_GetWidth(param1) * 8;
     v3 = v3 - v2;
     v3 /= 2;
 

src/overlay021/ov21_021D517C.c

@@ -43,7 +43,7 @@ static void ov21_021D5248(Window *param0, u8 *param1, u16 param2, u16 param3, in
         v1 = v0 / param2;
         v0 = v0 % param2;
 
-        sub_0201ADDC(param0, param1, v0, v1, param2, param3, param6, param7, param4, param4);
+        Window_BlitBitmapRect(param0, param1, v0, v1, param2, param3, param6, param7, param4, param4);
     }
 }
 

src/overlay021/ov21_021D5AEC.c

@@ -700,14 +700,14 @@ static void ov21_021D62E4(UnkStruct_ov21_021D13FC *param0, int param1)
 
     v0 = ov21_021D27B8(param0, 38, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0, 39, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00, 3, v1->rawData, 1, 4, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00, 3, v1->rawData, 1, 4, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00, 3);
 }
 
 static void ov21_021D637C(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D13FC *param1, int param2, int param3)
@@ -751,7 +751,7 @@ static void ov21_021D63DC(UnkStruct_ov21_021D13FC *param0, int param1, int param
 
     Strbuf_Free(v0);
     MessageLoader_Free(v1);
-    sub_0201C3C0(param0->unk_00, 1);
+    Bg_ScheduleTilemapTransfer(param0->unk_00, 1);
 }
 
 static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int param1, int param2)
@@ -765,7 +765,7 @@ static void ov21_021D64B0(UnkStruct_ov21_021D13FC *param0, int param1, int param
     Text_AddPrinterWithParamsAndColor(&param0->unk_04, FONT_SYSTEM, v0, 48, 170, TEXT_SPEED_INSTANT, TEXT_COLOR(2, 1, 0), NULL);
     Strbuf_Free(v0);
     MessageLoader_Free(v1);
-    sub_0201C3C0(param0->unk_00, 1);
+    Bg_ScheduleTilemapTransfer(param0->unk_00, 1);
 }
 
 static void ov21_021D6538(UnkStruct_ov21_021D71A8 *param0, int param1)
@@ -1394,7 +1394,7 @@ static void ov21_021D6FB4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C
             v3 = 14;
             v4 = 4;
 
-            sub_02019184(param1->unk_00->unk_00, 1, 3, 192);
+            Bg_SetOffset(param1->unk_00->unk_00, 1, 3, 192);
         } else {
             v0 = 3;
             v2 = 14;
@@ -1439,7 +1439,7 @@ static BOOL ov21_021D7044(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C
             v1 = -48;
         }
 
-        sub_0201C63C(param1->unk_00->unk_00, 1, 3, v1);
+        Bg_ScheduleScroll(param1->unk_00->unk_00, 1, 3, v1);
     }
 
     return v0;
@@ -1449,7 +1449,7 @@ static void ov21_021D7094(UnkStruct_ov21_021D5C08 *param0, const UnkStruct_ov21_
 {
     if (param1->unk_10 == 0) {
         if (param2 == 0) {
-            sub_02019184(param0->unk_00->unk_00, 1, 3, 0);
+            Bg_SetOffset(param0->unk_00->unk_00, 1, 3, 0);
         }
     }
 
@@ -1542,8 +1542,8 @@ static BOOL ov21_021D71E4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C
         if (param2->unk_10 != 1) {
             if (param3 == 0) {
                 sub_0200AB4C(-16, (GX_BLEND_PLANEMASK_BG0 | GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_OBJ | GX_BLEND_PLANEMASK_BD), 1);
-                BGL_FillWindow(&param1->unk_00->unk_04, 0);
-                sub_02019EBC(param1->unk_00->unk_00, 1);
+                Window_FillTilemap(&param1->unk_00->unk_04, 0);
+                Bg_ClearTilemap(param1->unk_00->unk_00, 1);
             }
         }
 
@@ -1603,8 +1603,8 @@ static BOOL ov21_021D72D4(UnkStruct_ov21_021D71A8 *param0, UnkStruct_ov21_021D5C
         if (param3 == 0) {
             if (param2->unk_10 != 1) {
                 G2_SetBlendBrightnessExt((GX_BLEND_PLANEMASK_BG1 | GX_BLEND_PLANEMASK_BG2 | GX_BLEND_PLANEMASK_BG3 | GX_BLEND_PLANEMASK_BD), GX_BLEND_PLANEMASK_BG3, 0, 0, -16);
-                BGL_FillWindow(&param1->unk_00->unk_04, 0);
-                sub_02019EBC(param1->unk_00->unk_00, 1);
+                Window_FillTilemap(&param1->unk_00->unk_04, 0);
+                Bg_ClearTilemap(param1->unk_00->unk_00, 1);
             }
         } else {
             ov21_021D7124(param0);

src/overlay021/ov21_021D76B0.c

@@ -517,7 +517,7 @@ static void ov21_021D7C64(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
     ov21_021D7E80(param0, param1, param2, param3);
     ov21_021D8018(param0, param1, param2, param3);
 
-    BGL_SetPriority(7, 3);
+    Bg_SetPriority(7, 3);
 }
 
 static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2)
@@ -527,7 +527,7 @@ static void ov21_021D7CAC(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
     ov21_021D7E3C(param0, param1);
     ov21_021D828C(param1, param2);
 
-    BGL_SetPriority(7, 1);
+    Bg_SetPriority(7, 1);
 }
 
 static void ov21_021D7CD8(UnkStruct_ov21_021D77E8 *param0, const UnkStruct_ov21_021D77D4 *param1, int param2)
@@ -550,9 +550,9 @@ static void ov21_021D7CD8(UnkStruct_ov21_021D77E8 *param0, const UnkStruct_ov21_
 
     v0 = ov21_021D27B8(param0->unk_00, 41, 1, &v1, param2);
 
-    sub_020198C0(v2, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(v2, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(v2, 6);
+    Bg_ScheduleTilemapTransfer(v2, 6);
 }
 
 static void ov21_021D7D8C(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77E8 *param1, int param2)
@@ -764,19 +764,19 @@ static void ov21_021D820C(UnkStruct_ov21_021D77E8 *param0, int param1)
 
     v0 = ov21_021D27B8(param0->unk_00, 37, 1, &v1, param1);
 
-    sub_020198C0(v2, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(v2, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(v2, 7);
-    sub_02019184(v2, 7, 0, -120);
-    sub_02019184(v2, 7, 3, 0);
+    Bg_ScheduleTilemapTransfer(v2, 7);
+    Bg_SetOffset(v2, 7, 0, -120);
+    Bg_SetOffset(v2, 7, 3, 0);
 }
 
 static void ov21_021D828C(UnkStruct_ov21_021D77E8 *param0, int param1)
 {
     BgConfig *v0 = param0->unk_00->unk_00;
 
-    sub_02019690(7, 64, 0, param1);
-    sub_02019EBC(v0, 7);
+    Bg_ClearTilesRange(7, 64, 0, param1);
+    Bg_ClearTilemap(v0, 7);
 }
 
 static void ov21_021D82A8(UnkStruct_ov21_021D7A64 *param0, UnkStruct_ov21_021D77D4 *param1)
@@ -844,9 +844,9 @@ static void ov21_021D8354(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
     param0->unk_28 += v0;
     param0->unk_28 &= 0xffff;
 
-    sub_0201C660(param1->unk_00->unk_00, 7, 0, param0->unk_28 / 182);
-    sub_0201C718(param1->unk_00->unk_00, 7, 9, 128);
-    sub_0201C718(param1->unk_00->unk_00, 7, 12, 104);
+    Bg_ScheduleAffineRotation(param1->unk_00->unk_00, 7, 0, param0->unk_28 / 182);
+    Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 9, 128);
+    Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 12, 104);
 
     param0->unk_2A = param0->unk_28;
 }
@@ -867,9 +867,9 @@ static void ov21_021D83C0(UnkStruct_ov21_021D7C64 *param0, UnkStruct_ov21_021D77
     param0->unk_28 = param0->unk_2A + v0;
     param0->unk_28 &= 0xffff;
 
-    sub_0201C660(param1->unk_00->unk_00, 7, 0, param0->unk_28 / 182);
-    sub_0201C718(param1->unk_00->unk_00, 7, 9, 128);
-    sub_0201C718(param1->unk_00->unk_00, 7, 12, 104);
+    Bg_ScheduleAffineRotation(param1->unk_00->unk_00, 7, 0, param0->unk_28 / 182);
+    Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 9, 128);
+    Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 12, 104);
 
     if (param2->unk_1C->unk_0C == 0) {
         param0->unk_2A = param0->unk_28;

src/overlay021/ov21_021D85B0.c

@@ -534,10 +534,10 @@ static int ov21_021D89F4(void *param0, UnkStruct_ov21_021E6B20 *param1, const vo
 
 static void ov21_021D8A7C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1, const UnkStruct_ov21_021D8788 *param2, const UnkStruct_ov21_021D87CC *param3, int param4)
 {
-    sub_02019EBC(param1->unk_00->unk_00, 2);
-    sub_02019EBC(param1->unk_00->unk_00, 1);
-    BGL_FillWindow(&param1->unk_00->unk_04, 0);
-    sub_0201C2B4(&param1->unk_00->unk_04, 7);
+    Bg_ClearTilemap(param1->unk_00->unk_00, 2);
+    Bg_ClearTilemap(param1->unk_00->unk_00, 1);
+    Window_FillTilemap(&param1->unk_00->unk_04, 0);
+    Window_SetPalette(&param1->unk_00->unk_04, 7);
 
     ov21_021D8C00(param1);
     ov21_021D8B8C(param1, param2, param4);
@@ -553,8 +553,8 @@ static void ov21_021D8A7C(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D87
     ov21_021D9240(param1, param2->unk_1C, param4);
     ov21_021D924C(param0, param2->unk_20);
 
-    BGL_SetPriority(1, 1);
-    BGL_SetPriority(2, 0);
+    Bg_SetPriority(1, 1);
+    Bg_SetPriority(2, 0);
 }
 
 static void ov21_021D8B40(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D879C *param1)
@@ -563,11 +563,11 @@ static void ov21_021D8B40(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D87
     ov21_021D8CC8(param0, param1);
     ov21_021D8BEC(param0, param1);
 
-    sub_02019EBC(param1->unk_00->unk_00, 1);
-    BGL_FillWindow(&param1->unk_00->unk_04, 0);
-    sub_0201C2B4(&param1->unk_00->unk_04, 0);
-    BGL_SetPriority(1, 0);
-    BGL_SetPriority(2, 1);
+    Bg_ClearTilemap(param1->unk_00->unk_00, 1);
+    Window_FillTilemap(&param1->unk_00->unk_04, 0);
+    Window_SetPalette(&param1->unk_00->unk_04, 0);
+    Bg_SetPriority(1, 0);
+    Bg_SetPriority(2, 1);
 }
 
 static void ov21_021D8B8C(UnkStruct_ov21_021D879C *param0, const UnkStruct_ov21_021D8788 *param1, int param2)
@@ -681,7 +681,7 @@ static void ov21_021D8DD4(UnkStruct_ov21_021D879C *param0, int param1, int param
     Strbuf *v1;
     int v2;
 
-    BGL_WindowColor(&v0->unk_04, 0, 24, 8, 208, 32);
+    Window_FillRectWithColor(&v0->unk_04, 0, 24, 8, 208, 32);
 
     switch (param1) {
     case 0:
@@ -716,7 +716,7 @@ static void ov21_021D8E68(UnkStruct_ov21_021D879C *param0, int param1)
     UnkStruct_ov21_021D13FC *v0 = param0->unk_00;
     Strbuf *v1;
 
-    BGL_WindowColor(&v0->unk_04, 0, 24, 8, 208, 32);
+    Window_FillRectWithColor(&v0->unk_04, 0, 24, 8, 208, 32);
 
     v1 = ov21_021D1CE0(93, param1);
 
@@ -788,7 +788,7 @@ static void ov21_021D8F98(UnkStruct_ov21_021D879C *param0, int param1, int param
 
     v0 = ov21_021D27B8(param0->unk_00, 43, 1, &v1, param2);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v2 = 6;
@@ -816,9 +816,9 @@ static void ov21_021D8F98(UnkStruct_ov21_021D879C *param0, int param1, int param
 
     v0 = ov21_021D27B8(param0->unk_00, v4, 1, &v1, param2);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, v2, v3, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, v2, v3, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3);
 }
 
 static void ov21_021D9054(UnkStruct_ov21_021D879C *param0, int param1, int param2)
@@ -827,7 +827,7 @@ static void ov21_021D9054(UnkStruct_ov21_021D879C *param0, int param1, int param
     Strbuf *v1;
     int v2;
 
-    BGL_WindowColor(&v0->unk_04, 0, 88, 52, 80, 16);
+    Window_FillRectWithColor(&v0->unk_04, 0, 88, 52, 80, 16);
 
     v2 = 81 + param1;
     v1 = ov21_021D1CE0(v2, param2);
@@ -847,7 +847,7 @@ static void ov21_021D90B4(UnkStruct_ov21_021D879C *param0, int param1, int param
     int v2;
     int v3;
 
-    BGL_WindowColor(&v0->unk_04, 0, 88, 77, 80, 16);
+    Window_FillRectWithColor(&v0->unk_04, 0, 88, 77, 80, 16);
 
     switch (param1) {
     case 0:
@@ -899,7 +899,7 @@ static void ov21_021D915C(UnkStruct_ov21_021D879C *param0, int param1, int param
     int v2;
     int v3;
 
-    BGL_WindowColor(&v0->unk_04, 0, 88, param3, 80, 16);
+    Window_FillRectWithColor(&v0->unk_04, 0, 88, param3, 80, 16);
 
     switch (param1) {
     case 0:
@@ -1059,8 +1059,8 @@ static void ov21_021D9390(UnkStruct_ov21_021D9320 *param0, UnkStruct_ov21_021D87
         ov21_021D93F4(param1, param3);
     } else if (param2->unk_34 == 0) {
         CellActor_SetDrawFlag(param0->unk_58, 0);
-        BGL_FillWindow(&param1->unk_00->unk_04, 0);
-        sub_0201A9A4(&param1->unk_00->unk_04);
+        Window_FillTilemap(&param1->unk_00->unk_04, 0);
+        Window_ScheduleCopyToVRAM(&param1->unk_00->unk_04);
     }
 
     v1 = 4 - param2->unk_34;
@@ -1076,7 +1076,7 @@ static void ov21_021D93F4(UnkStruct_ov21_021D879C *param0, int param1)
     Strbuf *v1;
     int v2;
 
-    BGL_FillWindow(&param0->unk_00->unk_04, 0);
+    Window_FillTilemap(&param0->unk_00->unk_04, 0);
 
     v1 = ov21_021D1CE0(94, param1);
 
@@ -1087,15 +1087,15 @@ static void ov21_021D93F4(UnkStruct_ov21_021D879C *param0, int param1)
     }
 
     Strbuf_Free(v1);
-    BGL_SetPriority(1, 0);
-    BGL_SetPriority(2, 1);
+    Bg_SetPriority(1, 0);
+    Bg_SetPriority(2, 1);
 }
 
 static void ov21_021D9454(UnkStruct_ov21_021D879C *param0, UnkStruct_ov21_021D9320 *param1, int param2)
 {
-    BGL_SetPriority(1, 1);
-    BGL_SetPriority(2, 0);
-    BGL_FillWindow(&param0->unk_00->unk_04, 0);
+    Bg_SetPriority(1, 1);
+    Bg_SetPriority(2, 0);
+    Window_FillTilemap(&param0->unk_00->unk_04, 0);
 
     ov21_021D8F98(param0, param1->unk_00, param2);
     ov21_021D8DD4(param0, param1->unk_00, param2);

src/overlay021/ov21_021D94BC.c

@@ -597,9 +597,9 @@ static void ov21_021D9A74(UnkStruct_ov21_021D95CC *param0, const UnkStruct_ov21_
 
     v0 = ov21_021D27B8(param0->unk_00, 75, 1, &v1, param2);
 
-    sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 6);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6);
 }
 
 static void ov21_021D9ADC(UnkStruct_ov21_021D9B24 *param0, UnkStruct_ov21_021D95B8 *param1, int param2)

src/overlay021/ov21_021DC9BC.c

@@ -492,38 +492,38 @@ static void ov21_021DCE40(UnkStruct_ov21_021DCAE0 *param0, const UnkStruct_ov21_
 
     v0 = ov21_021D27B8(param0->unk_00, 64, 1, &v1, param2);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     if (param1->unk_00->unk_1764) {
         v0 = ov21_021D27B8(param0->unk_00, 65, 1, &v1, param2);
 
-        sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 13, 8, v1->screenWidth / 8, v1->screenHeight / 8);
+        Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 13, 8, v1->screenWidth / 8, v1->screenHeight / 8);
         Heap_FreeToHeap(v0);
     }
 
     if (param1->unk_00->unk_176C) {
         v0 = ov21_021D27B8(param0->unk_00, 66, 1, &v1, param2);
 
-        sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 28, 7, v1->screenWidth / 8, v1->screenHeight / 8);
+        Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 28, 7, v1->screenWidth / 8, v1->screenHeight / 8);
         Heap_FreeToHeap(v0);
     }
 
     if (param1->unk_00->unk_1760) {
         v0 = ov21_021D27B8(param0->unk_00, 67, 1, &v1, param2);
 
-        sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 11, 8, v1->screenWidth / 8, v1->screenHeight / 8);
+        Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 11, 8, v1->screenWidth / 8, v1->screenHeight / 8);
         Heap_FreeToHeap(v0);
     }
 
     if (param1->unk_00->unk_1768) {
         v0 = ov21_021D27B8(param0->unk_00, 68, 1, &v1, param2);
 
-        sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 25, 16, v1->screenWidth / 8, v1->screenHeight / 8);
+        Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 25, 16, v1->screenWidth / 8, v1->screenHeight / 8);
         Heap_FreeToHeap(v0);
     }
 
-    sub_0201C3C0(param0->unk_00->unk_00, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3);
 }
 
 static void ov21_021DCFC8(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2)
@@ -796,18 +796,18 @@ static BOOL ov21_021DD5E4(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCA
 
 static void ov21_021DD668(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1, int param2)
 {
-    BGL_FillWindow(&param1->unk_00->unk_04, 0);
+    Window_FillTilemap(&param1->unk_00->unk_04, 0);
 
     param0->unk_7F4 = ov21_021D2808(param1->unk_00, 30, 1, &param0->unk_7F8, param2);
     param0->unk_7FC = ov21_021D2808(param1->unk_00, 31, 1, &param0->unk_800, param2);
 
-    sub_0201C2B4(&param1->unk_00->unk_04, 8);
+    Window_SetPalette(&param1->unk_00->unk_04, 8);
 }
 
 static void ov21_021DD6C0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1)
 {
-    BGL_FillWindow(&param1->unk_00->unk_04, 0);
-    sub_02019EBC(param1->unk_00->unk_00, 1);
+    Window_FillTilemap(&param1->unk_00->unk_04, 0);
+    Bg_ClearTilemap(param1->unk_00->unk_00, 1);
     Heap_FreeToHeap(param0->unk_7F4);
 
     param0->unk_7F4 = NULL;
@@ -818,7 +818,7 @@ static void ov21_021DD6C0(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCA
     param0->unk_7FC = NULL;
     param0->unk_800 = NULL;
 
-    sub_0201C2B4(&param1->unk_00->unk_04, 0);
+    Window_SetPalette(&param1->unk_00->unk_04, 0);
 }
 
 static void ov21_021DD710(UnkStruct_ov21_021DD420 *param0, const UnkStruct_ov21_021DCACC *param1, const UnkStruct_ov21_021DDABC *param2, int param3)
@@ -1091,12 +1091,12 @@ static u8 *ov21_021DD908(u32 param0, const UnkStruct_ov21_021DCACC *param1, u32
 
 static void ov21_021DD964(UnkStruct_ov21_021DD420 *param0, UnkStruct_ov21_021DCAE0 *param1)
 {
-    BGL_FillWindow(&param1->unk_00->unk_04, 0);
+    Window_FillTilemap(&param1->unk_00->unk_04, 0);
 
     ov21_021D517C(&param1->unk_00->unk_04, param0->unk_800->pRawData, param0->unk_800->W * 8, param0->unk_800->H * 8, 5, param0->unk_470, 30, 30, 89, 30);
     ov21_021D517C(&param1->unk_00->unk_04, param0->unk_7F8->pRawData, param0->unk_7F8->W * 8, param0->unk_7F8->H * 8, 5, param0->unk_EC, 30, 30, 89, 30);
 
-    sub_0201A954(&param1->unk_00->unk_04);
+    Window_CopyToVRAM(&param1->unk_00->unk_04);
 }
 
 static void ov21_021DD9E8(UnkStruct_ov21_021DD420 *param0, const UnkStruct_ov21_021DDABC *param1)

src/overlay021/ov21_021DDD2C.c

@@ -396,9 +396,9 @@ static void ov21_021DE13C(UnkStruct_ov21_021DDDF0 *param0, int param1)
 
     v0 = ov21_021D27B8(param0->unk_00, 69, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 6);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6);
 }
 
 static void ov21_021DE1A4(UnkStruct_ov21_021DDEC8 *param0, UnkStruct_ov21_021DDDF0 *param1, int param2)

src/overlay021/ov21_021DE668.c

@@ -378,13 +378,13 @@ static void ov21_021DEA0C(UnkStruct_ov21_021DF374 *param0, UnkStruct_ov21_021DE7
 {
     ov21_021DF35C(param0);
 
-    BGL_FillWindow(&param1->unk_00->unk_04, 0);
+    Window_FillTilemap(&param1->unk_00->unk_04, 0);
 
     ov21_021DED68(param0, param1);
     ov21_021DF1F8(param0);
     ov21_021DF054(param0, param1);
 
-    sub_02019EBC(param1->unk_00->unk_00, 1);
+    Bg_ClearTilemap(param1->unk_00->unk_00, 1);
 }
 
 static void ov21_021DEA44(UnkStruct_ov21_021DE760 *param0, int param1)
@@ -395,21 +395,21 @@ static void ov21_021DEA44(UnkStruct_ov21_021DE760 *param0, int param1)
     ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param1);
 
     v0 = ov21_021D27B8(param0->unk_00, 50, 1, &v1, param1);
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0->unk_00, 51, 1, &v1, param1);
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0->unk_00, 52, 1, &v1, param1);
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0->unk_00, 54, 1, &v1, param1);
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3);
 }
 
 static void ov21_021DEB58(UnkStruct_ov21_021DE760 *param0, const UnkStruct_ov21_021DE6D4 *param1, int param2)

src/overlay021/ov21_021DF734.c

@@ -433,9 +433,9 @@ static void ov21_021DFAE8(UnkStruct_ov21_021DF858 *param0, int param1)
 
     v0 = ov21_021D27B8(param0->unk_00, 50, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3);
 }
 
 static void ov21_021DFB50(UnkStruct_ov21_021DFFF8 *param0, UnkStruct_ov21_021DF858 *param1, const UnkStruct_ov21_021DF844 *param2)

src/overlay021/ov21_021E0C68.c

@@ -380,10 +380,10 @@ static void ov21_021E0F4C(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D
 static void ov21_021E0F94(UnkStruct_ov21_021E14D4 *param0, UnkStruct_ov21_021E0D7C *param1)
 {
     ov21_021E14BC(param0);
-    BGL_FillWindow(&param1->unk_00->unk_04, 0);
+    Window_FillTilemap(&param1->unk_00->unk_04, 0);
 
     ov21_021E1328(param0, param1);
-    sub_02019EBC(param1->unk_00->unk_00, 1);
+    Bg_ClearTilemap(param1->unk_00->unk_00, 1);
 }
 
 static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1)
@@ -394,24 +394,24 @@ static void ov21_021E0FBC(UnkStruct_ov21_021E0D7C *param0, int param1)
     ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param1);
 
     v0 = ov21_021D27B8(param0->unk_00, 50, 1, &v1, param1);
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0->unk_00, 51, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 3, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0->unk_00, 55, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 16, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0->unk_00, 56, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 12, 8, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3);
 }
 
 static void ov21_021E10D0(UnkStruct_ov21_021E0D7C *param0, const UnkStruct_ov21_021E0D68 *param1, int param2)

src/overlay021/ov21_021E1924.c

@@ -647,19 +647,19 @@ static void ov21_021E20A4(UnkStruct_ov21_021E1A90 *param0, int param1)
 
     v0 = ov21_021D27B8(param0->unk_00, 62, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0->unk_00, 60, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((132 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((132 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
 
     v0 = ov21_021D27B8(param0->unk_00, 63, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((76 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, ((128 - (160 / 2)) / 8), ((76 - (40 / 2)) / 8), v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 6);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6);
 }
 
 static void ov21_021E2180(UnkStruct_ov21_021E2588 *param0, UnkStruct_ov21_021E1A90 *param1, int param2)

src/overlay021/ov21_021E29DC.c

@@ -643,7 +643,7 @@ static void ov21_021E30BC(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E32
     ov21_021E3224(param0, param1);
     ov21_021E3304(param1);
 
-    sub_02019EBC(param0->unk_00->unk_00, 2);
+    Bg_ClearTilemap(param0->unk_00->unk_00, 2);
 }
 
 static void ov21_021E30E4(UnkStruct_ov21_021E2BBC *param0, const UnkStruct_ov21_021E2BA8 *param1, int param2)
@@ -661,9 +661,9 @@ static void ov21_021E30E4(UnkStruct_ov21_021E2BBC *param0, const UnkStruct_ov21_
 
     v0 = ov21_021D27B8(param0->unk_00, 57, 1, &v1, param2);
 
-    sub_020198C0(param0->unk_00->unk_00, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 2, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 2);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 2);
 }
 
 static void ov21_021E3178(UnkStruct_ov21_021E2BBC *param0, UnkStruct_ov21_021E326C *param1, int param2)
@@ -1213,7 +1213,7 @@ static void ov21_021E393C(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E34
     ov21_021E3BDC(param0);
     ov21_021E3BC0(param0);
     ov21_021E3AAC(param0, param1);
-    sub_02019EBC(param1->unk_00->unk_00, 5);
+    Bg_ClearTilemap(param1->unk_00->unk_00, 5);
 }
 
 static void ov21_021E3960(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_021E342C *param1, int param2)
@@ -1233,9 +1233,9 @@ static void ov21_021E3960(UnkStruct_ov21_021E3440 *param0, const UnkStruct_ov21_
 
     v0 = ov21_021D27B8(param0->unk_00, 59, 1, &v1, param2);
 
-    sub_020198C0(param0->unk_00->unk_00, 5, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 5, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 5);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 5);
 }
 
 static void ov21_021E39FC(UnkStruct_ov21_021E3900 *param0, UnkStruct_ov21_021E3440 *param1, int param2)

src/overlay021/ov21_021E3FFC.c

@@ -521,17 +521,17 @@ static void ov21_021E45FC(UnkStruct_ov21_021E4108 *param0, const UnkStruct_ov21_
     ov21_021D2724(param0->unk_00, 33, param0->unk_00->unk_00, 3, 0, 0, 1, param2);
     v0 = ov21_021D27B8(param0->unk_00, 70, 1, &v1, param2);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3);
 }
 
 static void ov21_021E4664(UnkStruct_ov21_021E4108 *param0)
 {
-    sub_0201C63C(param0->unk_00->unk_00, 1, 0, 0);
-    BGL_WindowColor(&param0->unk_00->unk_04, 0, 0, 0, 256, 192);
-    sub_02019EBC(param0->unk_00->unk_00, 1);
-    sub_0201C2B4(&param0->unk_00->unk_04, 0);
+    Bg_ScheduleScroll(param0->unk_00->unk_00, 1, 0, 0);
+    Window_FillRectWithColor(&param0->unk_00->unk_04, 0, 0, 0, 256, 192);
+    Bg_ClearTilemap(param0->unk_00->unk_00, 1);
+    Window_SetPalette(&param0->unk_00->unk_04, 0);
 }
 
 static void ov21_021E46A8(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1, int param2)
@@ -628,7 +628,7 @@ static void ov21_021E48B0(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41
     int v2;
     int v3;
 
-    BGL_WindowColor(&param1->unk_00->unk_04, 0, param6, param7 - 32, 1 * (param5), 32 * 2);
+    Window_FillRectWithColor(&param1->unk_00->unk_04, 0, param6, param7 - 32, 1 * (param5), 32 * 2);
 
     v3 = param4 - param3;
 
@@ -674,7 +674,7 @@ static void ov21_021E495C(Window *param0, u8 param1, int param2, int param3, int
     v2++;
     v2 *= 1;
 
-    BGL_WindowColor(param0, 6, param2, v1, 1, v2);
+    Window_FillRectWithColor(param0, 6, param2, v1, 1, v2);
 
     *param4 = v0;
 }
@@ -683,7 +683,7 @@ static void ov21_021E49D0(UnkStruct_ov21_021E4108 *param0, int param1, int param
 {
     int v0;
 
-    BGL_WindowColor(&param0->unk_00->unk_04, 0, param3, param4 - 32, 1 * (param2 - param1), 32 * 2);
+    Window_FillRectWithColor(&param0->unk_00->unk_04, 0, param3, param4 - 32, 1 * (param2 - param1), 32 * 2);
 
     for (v0 = param1; v0 < param2; v0++) {
         ov21_021E495C(&param0->unk_00->unk_04, 0, param3, param4, param5);
@@ -710,17 +710,17 @@ static void ov21_021E4A28(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E41
         ov21_021E49D0(param1, 0, 4, v0, 151, &param0->unk_328);
     }
 
-    sub_0201C63C(param1->unk_00->unk_00, 1, 0, param0->unk_324);
-    sub_0201A9A4(&param1->unk_00->unk_04);
+    Bg_ScheduleScroll(param1->unk_00->unk_00, 1, 0, param0->unk_324);
+    Window_ScheduleCopyToVRAM(&param1->unk_00->unk_04);
 
     param0->unk_32C = param2->unk_04;
 }
 
 static void ov21_021E4ABC(UnkStruct_ov21_021E4360 *param0, UnkStruct_ov21_021E4108 *param1)
 {
-    sub_0201C2B4(&param1->unk_00->unk_04, 9);
+    Window_SetPalette(&param1->unk_00->unk_04, 9);
     ov21_021E49D0(param1, 0, 256, 0, 151, &param0->unk_328);
-    sub_0201A954(&param1->unk_00->unk_04);
+    Window_CopyToVRAM(&param1->unk_00->unk_04);
 }
 
 static void ov21_021E4AF4(UnkStruct_ov21_021E4360 *param0)

src/overlay021/ov21_021E4CA4.c

@@ -782,26 +782,26 @@ static void ov21_021E5538(UnkStruct_ov21_021E4DA4 *param0, int param1)
     ov21_021D2724(param0->unk_00, 34, param0->unk_00->unk_00, 6, 0, 0, 1, param1);
     v0 = ov21_021D27B8(param0->unk_00, 71, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 6);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6);
 
     ov21_021D2724(param0->unk_00, 35, param0->unk_00->unk_00, 7, 0, 0, 1, param1);
     v0 = ov21_021D27B8(param0->unk_00, 72, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 7, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 7);
-    sub_02019184(param0->unk_00->unk_00, 7, 0, -48);
-    sub_02019184(param0->unk_00->unk_00, 7, 3, -16);
-    BGL_SetPriority(7, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 7);
+    Bg_SetOffset(param0->unk_00->unk_00, 7, 0, -48);
+    Bg_SetOffset(param0->unk_00->unk_00, 7, 3, -16);
+    Bg_SetPriority(7, 3);
 }
 
 static void ov21_021E5620(UnkStruct_ov21_021E4DA4 *param0)
 {
-    sub_02019EBC(param0->unk_00->unk_00, 6);
-    sub_02019EBC(param0->unk_00->unk_00, 7);
-    BGL_SetPriority(7, 1);
+    Bg_ClearTilemap(param0->unk_00->unk_00, 6);
+    Bg_ClearTilemap(param0->unk_00->unk_00, 7);
+    Bg_SetPriority(7, 1);
 }
 
 static void ov21_021E5644(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4DA4 *param1, int param2)
@@ -1115,9 +1115,9 @@ static void ov21_021E5B6C(UnkStruct_ov21_021E5004 *param0, UnkStruct_ov21_021E4D
     param0->unk_4C += (v0 - param0->unk_48) * -16;
     param0->unk_4C &= 0xffff;
 
-    sub_0201C660(param1->unk_00->unk_00, 7, 0, param0->unk_4C / 182);
-    sub_0201C718(param1->unk_00->unk_00, 7, 9, 131);
-    sub_0201C718(param1->unk_00->unk_00, 7, 12, 99);
+    Bg_ScheduleAffineRotation(param1->unk_00->unk_00, 7, 0, param0->unk_4C / 182);
+    Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 9, 131);
+    Bg_ScheduleAffineRotationCenter(param1->unk_00->unk_00, 7, 12, 99);
 
     param0->unk_48 = v0;
 }

src/overlay021/ov21_021E6014.c

@@ -349,8 +349,8 @@ static void ov21_021E638C(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E61
     ov21_021E65EC(param0);
     ov21_021E64D4(param0, param1);
 
-    BGL_FillWindow(&param1->unk_00->unk_04, 0);
-    sub_02019EBC(param1->unk_00->unk_00, 1);
+    Window_FillTilemap(&param1->unk_00->unk_04, 0);
+    Bg_ClearTilemap(param1->unk_00->unk_00, 1);
 
     ov21_021E6844(param1);
 }
@@ -364,9 +364,9 @@ static void ov21_021E63C0(UnkStruct_ov21_021E6118 *param0, const UnkStruct_ov21_
 
     v0 = ov21_021D27B8(param0->unk_00, 74, 1, &v1, param2);
 
-    sub_020198C0(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 3, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 3);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 3);
 }
 
 static void ov21_021E6428(UnkStruct_ov21_021E6274 *param0, UnkStruct_ov21_021E6118 *param1, int param2)

src/overlay021/ov21_021E68F4.c

@@ -528,9 +528,9 @@ static void ov21_021E6EF0(UnkStruct_ov21_021E6A34 *param0, int param1)
 
     v0 = ov21_021D27B8(param0->unk_00, 61, 1, &v1, param1);
 
-    sub_020198C0(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
+    Bg_LoadToTilemapRect(param0->unk_00->unk_00, 6, v1->rawData, 0, 0, v1->screenWidth / 8, v1->screenHeight / 8);
     Heap_FreeToHeap(v0);
-    sub_0201C3C0(param0->unk_00->unk_00, 6);
+    Bg_ScheduleTilemapTransfer(param0->unk_00->unk_00, 6);
 }
 
 static void ov21_021E6F58(UnkStruct_ov21_021E6C60 *param0, UnkStruct_ov21_021E6A34 *param1, int param2)