Merge pull request #275 from lhearachel/bg-window

Document bg_window.c

docs/2d_rendering.md

@@ -0,0 +1,196 @@
+# 2D Rendering
+
+This document aims to outline and summarize the functionality of the Nintendo DS's
+2D rendering system and the wrapping APIs around that system as used in Pokemon
+Platinum.
+
+Much of the underlying systems from the Game Boy Advance still applies to the
+DS. Thus, this document will aim to only highlight the differences.
+
+## Backgrounds
+
+Backgrounds are rendered in layers; the SDK provides support for 8 total layers
+evenly split across the Main and Sub screens. For simplicity, this document will
+refer to layers by the indices `0`, `1`, `2`, and `3` to refer to the set of
+layers accessible to each of the displays.
+
+### Tiling
+
+Like its predecessors, the DS makes use of a basic tiling system with access
+to 656 KB of VRAM. This VRAM chunk is split into 9 total banks of varying sizes:
+
+- Four banks of size 128 KB
+- One bank of size 64 KB
+- One bank of size 32 KB
+- Three banks of size 16 KB
+
+Both the 2D and 3D processing engines can access any of these banks, but
+are not permitted to access the same bank concurrently. The 2D processing engine
+will access these banks to render each of the various backgrounds, while the 3D
+processing engine will fetch textures from these banks during rendering.
+
+Some restrictions apply to accessing each of these banks:
+
+1. The ARM7 co-processor can only access two of the four 128 KB banks.
+2. Sprite graphics are not permitted to be stored in this section of VRAM.
+3. The main screen is not permitted to access the third 16 KB bank.
+
+### Background Types
+
+The console's 2D engine can generate various types of backgrounds, each with
+different supported functions. There are, effectively, three groups of these
+types.
+
+#### Character-type Groups
+
+These background types utilize a traditional tiling system, rendering frames by
+mapping them from VRAM to simple indexing buffer.
+
+##### Static Backgrounds
+
+This is the most ordinary background type. It supports screen resolutions up to
+512x512, 256 on-screen colors, and 16 total palettes (of 16 colors each). It
+also supports all the usual effects:
+
+- Horizontal and vertical flipping flags
+- Horizontal and vertical scrolling
+- Mosaic effects
+- Alpha blending
+- Priority rendering (which permits "layering" backgrounds atop one another)
+- Palette fading
+
+The VRAM buffer supports up to 1024 total tiles for each background of this type.
+
+##### Affine Backgrounds
+
+This background type supports screen resolutions up to 1024x1024, as well as the
+usual set of basic affine transformations:
+
+- Translations
+- Rotations
+- Scaling
+- Reflection
+- Shearing
+
+However, to support these transformations, the flipping flags are disabled, and
+the VRAM buffer supports up to 256 tiles rather than 1024.
+
+##### Affine Extended with Static Functions
+
+This background type is an extension of the Affine type; it supports the same
+screen resolutions and set of affine transformations, but restores support for
+flipping flags and 1024 tiles.
+
+#### Bitmap-type Groups
+
+Rather than rendering frames from tiles mapped onto an indexing buffer, types
+in this group treat VRAM as a true bitmap frame buffer.
+
+##### Affine Extended with 256 Colors
+
+Functionally, this type is identical to a Static with Affine background, but
+effects are applied on the full 512x512 bitmap.
+
+##### Affine Extended with Direct Color
+
+This type is similar to the 256 color extension, but the frame buffer now
+supports direct 15-bit color, permitting up to 32,768 total on-screen colors.
+
+##### Large Screen
+
+This type treats a single 128KB chunk of VRAM as a frame-buffer of size 1024x512.
+
+#### 3D Background
+
+Backgrounds of this type (which is the only member of its group) treat the
+rendering result of the 3D graphics engine as a background layer. Thus,
+backgrounds of this type do not support *most* of the previous 2D effects,
+but do retain support for horizontal scrolling and alpha blending. In addition,
+backgrounds of this type support direct 18-bit color, permitting up to 262,144
+total on-screen colors.
+
+### Background Modes
+
+Background types are restricted to various "modes", as controlled by the SDK.
+The SDK supports 7 total modes:
+
+| Mode | Layer 0 Type  | Layer 1 Type | Layer 2 Type    | Layer 3 Type    |
+| ---: | ------------- | ------------ | --------------- | --------------- |
+|    0 | Static / 3D   | Static       | Static          | Static          |
+|    1 | Static / 3D   | Static       | Static          | Affine          |
+|    2 | Static / 3D   | Static       | Affine          | Affine          |
+|    3 | Static / 3D   | Static       | Static          | Affine Extended |
+|    4 | Static / 3D   | Static       | Affine          | Affine Extended |
+|    5 | Static / 3D   | Static       | Affine Extended | Affine Extended |
+|    6 | 3D Background | N/A          | Large Screen    | N/A             |
+
+Each of the displays can be set to its own background mode; this permits, for
+example, having affine transformations apply to the main screen, but showing
+a simple static HUD on the sub screen.
+
+### The Game Freak API
+
+Game Freak built a minimal wrapping API around the SDK's internals, much of
+which is identical to the similar wrapping API built for the Advance generation.
+This wrapping API restricts the available background types to the following:
+
+```c
+enum BgType {
+    BG_TYPE_STATIC = 0,
+    BG_TYPE_AFFINE,
+    BG_TYPE_STATIC_WITH_AFFINE,
+};
+```
+
+Backgrounds can be quickly constructed via a simple template system, which allows
+storing common properties in ROM:
+
+```c
+typedef struct BgTemplate {
+    u32 x;
+    u32 y;
+    u32 bufferSize;
+    u32 baseTile;
+    u8 screenSize;
+    u8 colorMode;
+    u8 screenBase;
+    u8 charBase;
+    u8 bgExtPltt;
+    u8 priority;
+    u8 areaOver;
+    u8 dummy;
+    BOOL mosaic;
+} BgTemplate;
+```
+
+The wrapping API's primary feature is support for scheduling scroll and VRAM
+transfer operations for future bulk transformation. Most background update
+operations provide `Schedule` alternative, which will perform the operation,
+but delay committing the result to VRAM until the next invocation of
+`Bg_RunScheduledUpdates`. To illustrate, consider the following functions:
+
+```c
+void Bg_FillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal)
+{
+    if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) {
+        return;
+    }
+
+    MI_CpuFill16(bgConfig->bgs[bgLayer].tilemapBuffer, fillVal, bgConfig->bgs[bgLayer].bufferSize);
+    Bg_CopyTilemapBufferToVRAM(bgConfig, bgLayer);
+}
+
+void Bg_ScheduleFillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal)
+{
+    if (bgConfig->bgs[bgLayer].tilemapBuffer == NULL) {
+        return;
+    }
+
+    MI_CpuFill16(bgConfig->bgs[bgLayer].tilemapBuffer, fillVal, bgConfig->bgs[bgLayer].bufferSize);
+    Bg_ScheduleTilemapTransfer(bgConfig, bgLayer);
+}
+```
+
+Note that each of these operations perform the same `MI_CpuFill16` operation,
+but the latter invokes `Bg_ScheduleTilemapTransfer`, which flags the background
+layer for VRAM transfer, usually on the next VBlank callback.

docs/index.md

@@ -9,4 +9,5 @@ For more detailed information about the project as a whole, please refer to its
 
 ## Subsystems
 
+- [2D Graphics](2d_rendering.md)
 - [3D Graphics](3d_rendering.md)

include/battle/ov16_0223DF00.h

@@ -12,11 +12,9 @@
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
 #include "struct_decls/struct_party_decl.h"
 #include "struct_defs/chatot_cry.h"
-#include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/trainer_data.h"
 
 #include "battle/battle_context.h"
@@ -31,6 +29,7 @@
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
 #include "bag.h"
+#include "bg_window.h"
 #include "game_options.h"
 #include "message.h"
 #include "pokemon.h"
@@ -41,7 +40,7 @@
 #define ENEMY_IN_SLOT_RIGHT 0
 #define ENEMY_IN_SLOT_LEFT  2
 
-BGL *BattleSystem_BGL(BattleSystem *param0);
+BgConfig *BattleSystem_BGL(BattleSystem *param0);
 
 /**
  * @brief Get one of the allocated windows for the battle display.

include/battle/ov16_0226871C.h

@@ -3,14 +3,15 @@
 
 #include "struct_decls/battle_system.h"
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_0209C370.h"
 
 #include "battle/struct_ov16_02268A14_decl.h"
 #include "battle/struct_ov16_0226AC98.h"
 
-void ov16_02268744(BGL *param0);
-void ov16_022687A0(BGL *param0);
+#include "bg_window.h"
+
+void ov16_02268744(BgConfig *param0);
+void ov16_022687A0(BgConfig *param0);
 void *ov16_022687C8(NARC *param0, NARC *param1, BattleSystem *param2, int param3, UnkStruct_0209C370 *param4);
 void ov16_02268A14(UnkStruct_ov16_02268A14 *param0);
 void ov16_02268A88(UnkStruct_ov16_02268A14 *param0);

include/battle/struct_ov16_0225BFFC_t.h

@@ -4,7 +4,6 @@
 #include "struct_decls/cell_actor_data.h"
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "battle/struct_ov16_0225BFFC_sub1.h"
 #include "battle/struct_ov16_022674C4.h"
@@ -12,6 +11,7 @@
 #include "overlay012/struct_ball_rotation_decl.h"
 #include "overlay012/struct_ov12_02223764.h"
 
+#include "bg_window.h"
 #include "sys_task_manager.h"
 
 #define DATA_BUF_SIZE 256

include/battle/struct_ov16_02264408.h

@@ -4,15 +4,16 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/chatot_cry.h"
 
 #include "battle/struct_ov16_0223E0C8.h"
 #include "battle/struct_ov16_02264408_sub1.h"
 
+#include "bg_window.h"
+
 typedef struct {
     SpriteRenderer *unk_00;
-    BGL *unk_04;
+    BgConfig *unk_04;
     PaletteData *unk_08;
     UnkStruct_ov16_0223E0C8 *unk_0C[4];
     u8 unk_1C[4];

include/battle/struct_ov16_022674C4.h

@@ -3,8 +3,8 @@
 
 #include "struct_decls/battle_system.h"
 #include "struct_decls/cell_actor_data.h"
-#include "struct_defs/struct_0205AA50.h"
 
+#include "bg_window.h"
 #include "sys_task_manager.h"
 
 typedef struct {

include/bg_window.h

@@ -0,0 +1,257 @@
+#ifndef POKEPLATINUM_BG_WINDOW_H
+#define POKEPLATINUM_BG_WINDOW_H
+
+#include <nitro/fx/fx.h>
+#include <nitro/gx.h>
+
+#define TILE_SIZE_4BPP 0x20
+#define TILE_SIZE_8BPP 0x40
+
+#define TILEMAP_COPY_SRC_FLAT 0 // source dimensions are equal to dest dimensions
+#define TILEMAP_COPY_SRC_RECT 1 // dest dimensions carve a window from source
+
+#define TILEMAP_FILL_VAL_KEEP_PALETTE     16 // do not replace the selected palette index
+#define TILEMAP_FILL_VAL_INCLUDES_PALETTE 17
+
+enum DSScreen {
+    DS_SCREEN_MAIN = 0,
+    DS_SCREEN_SUB,
+};
+
+enum BgLayer {
+    BG_LAYER_MAIN_0 = 0,
+    BG_LAYER_MAIN_1,
+    BG_LAYER_MAIN_2,
+    BG_LAYER_MAIN_3,
+    BG_LAYER_SUB_0,
+    BG_LAYER_SUB_1,
+    BG_LAYER_SUB_2,
+    BG_LAYER_SUB_3,
+
+    BG_LAYER_MAX,
+};
+
+enum BgType {
+    BG_TYPE_STATIC = 0,
+    BG_TYPE_AFFINE,
+    BG_TYPE_STATIC_WITH_AFFINE,
+};
+
+enum BgControlParam {
+    BG_CONTROL_PARAM_COLOR_MODE = 0,
+    BG_CONTROL_PARAM_SCREEN_BASE,
+    BG_CONTROL_PARAM_CHAR_BASE,
+    BG_CONTROL_PARAM_SCREEN_SIZE,
+};
+
+enum BgOffsetUpdateOp {
+    BG_OFFSET_UPDATE_SET_X = 0,
+    BG_OFFSET_UPDATE_ADD_X,
+    BG_OFFSET_UPDATE_SUB_X,
+    BG_OFFSET_UPDATE_SET_Y,
+    BG_OFFSET_UPDATE_ADD_Y,
+    BG_OFFSET_UPDATE_SUB_Y,
+};
+
+enum BgAffineUpdateOp {
+    BG_AFFINE_UPDATE_SET_ROTATION = 0,
+    BG_AFFINE_UPDATE_ADD_ROTATION,
+    BG_AFFINE_UPDATE_SUB_ROTATION,
+    BG_AFFINE_UPDATE_SET_X_SCALE,
+    BG_AFFINE_UPDATE_ADD_X_SCALE,
+    BG_AFFINE_UPDATE_SUB_X_SCALE,
+    BG_AFFINE_UPDATE_SET_Y_SCALE,
+    BG_AFFINE_UPDATE_ADD_Y_SCALE,
+    BG_AFFINE_UPDATE_SUB_Y_SCALE,
+    BG_AFFINE_UPDATE_SET_X_CENTER,
+    BG_AFFINE_UPDATE_ADD_X_CENTER,
+    BG_AFFINE_UPDATE_SUB_X_CENTER,
+    BG_AFFINE_UPDATE_SET_Y_CENTER,
+    BG_AFFINE_UPDATE_ADD_Y_CENTER,
+    BG_AFFINE_UPDATE_SUB_Y_CENTER,
+};
+
+enum BgScreenSize {
+    BG_SCREEN_SIZE_128x128 = 0,
+    BG_SCREEN_SIZE_256x256,
+    BG_SCREEN_SIZE_256x512,
+    BG_SCREEN_SIZE_512x256,
+    BG_SCREEN_SIZE_512x512,
+    BG_SCREEN_SIZE_1024x1024,
+};
+
+enum BgColorMode {
+    BG_COLOR_MODE_4BPP = 0,
+    BG_COLOR_MODE_8BPP,
+};
+
+enum ScrollDirection {
+    SCROLL_DIRECTION_UP = 0,
+    SCROLL_DIRECTION_DOWN,
+    SCROLL_DIRECTION_LEFT,
+    SCROLL_DIRECTION_RIGHT,
+};
+
+typedef struct Bitmap {
+    const u8 *pixels;
+    u16 width;
+    u16 height;
+} Bitmap;
+
+typedef struct BgTemplate {
+    u32 x;
+    u32 y;
+    u32 bufferSize;
+    u32 baseTile;
+    u8 screenSize;
+    u8 colorMode;
+    u8 screenBase;
+    u8 charBase;
+    u8 bgExtPltt;
+    u8 priority;
+    u8 areaOver;
+    u8 dummy;
+    BOOL mosaic;
+} BgTemplate;
+
+typedef struct Background {
+    void *tilemapBuffer;
+    u32 bufferSize;
+    u32 baseTile;
+
+    int xOffset;
+    int yOffset;
+
+    u8 type;
+    u8 screenSize;
+    u8 colorMode;
+    u8 tileSize;
+
+    u16 rotation;
+
+    fx32 xScale;
+    fx32 yScale;
+    int xCenter;
+    int yCenter;
+} Background;
+
+typedef struct BgConfig {
+    u32 heapID;
+    u16 scrollScheduled;
+    u16 bufferTransferScheduled;
+    Background bgs[8];
+} BgConfig;
+
+typedef struct WindowTemplate {
+    u8 bgLayer;
+    u8 tilemapLeft;
+    u8 tilemapTop;
+    u8 width;
+    u8 height;
+    u8 palette;
+    u16 baseTile;
+} WindowTemplate;
+
+typedef struct Window {
+    BgConfig *bgConfig;
+    u8 bgLayer;
+    u8 tilemapLeft;
+    u8 tilemapTop;
+    u8 width;
+    u8 height;
+    u8 palette;
+    u16 baseTile : 15;
+    u16 colorMode : 1;
+    void *pixels;
+} Window;
+
+typedef struct GraphicsModes {
+    GXDispMode displayMode;
+    GXBGMode mainBgMode;
+    GXBGMode subBgMode;
+    GXBG0As bg0As2DOr3D;
+} GraphicsModes;
+
+void SetAllGraphicsModes(const GraphicsModes *graphicsModes);
+void SetScreenGraphicsModes(const GraphicsModes *graphicsModes, u8 screen);
+
+BgConfig *BgConfig_New(u32 heapID);
+u32 BgConfig_GetHeapID(BgConfig *bgConfig);
+void Bg_InitFromTemplate(BgConfig *bgConfig, u8 bgLayer, const BgTemplate *bgTemplate, u8 bgType);
+void Bg_SetControlParam(BgConfig *bgConfig, u8 bgLayer, enum BgControlParam bgControlParam, u8 val);
+void Bg_FreeTilemapBuffer(BgConfig *bgConfig, u8 bgLayer);
+void Bg_SetPriority(u8 bgLayer, u8 priority);
+void Bg_ToggleLayer(u8 bgLayer, u8 enable);
+void Bg_SetOffset(BgConfig *bgConfig, u8 bgLayer, u8 bgOffsetUpdateOp, int val);
+int Bg_GetXOffset(BgConfig *bgConfig, enum BgLayer bgLayer);
+int Bg_GetYOffset(BgConfig *bgConfig, enum BgLayer bgLayer);
+void Bg_SetAffineParams(BgConfig *bgConfig, u8 bgLayer, const MtxFx22 *mtx, int centerX, int centerY);
+void Bg_CopyTilemapBufferToVRAM(BgConfig *bgConfig, u8 bgLayer);
+void Bg_CopyTilemapBufferRangeToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 offset);
+void Bg_LoadTilemapBuffer(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size);
+void Bg_LoadTiles(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 tileStart);
+void Bg_LoadTilesToVRAM(BgConfig *bgConfig, u8 bgLayer, void *src, u32 size, u32 offset);
+void Bg_ClearTilesRange(u8 bgLayer, u32 size, u32 offset, u32 heapID);
+void Bg_FillTilesRange(BgConfig *bgConfig, u32 bgLayer, u32 fillVal, u32 numTiles, u32 offset);
+void Bg_LoadPalette(u8 bgLayer, void *src, u16 size, u16 offset);
+void Bg_MaskPalette(u8 bgLayer, u16 mask);
+void Bg_LoadToTilemapRect(BgConfig *bgConfig, u8 bgLayer, const void *src, u8 destX, u8 destY, u8 destWidth, u8 destHeight);
+void Bg_CopyToTilemapRect(BgConfig *bgConfig, u8 bgLayer, u8 destX, u8 destY, u8 destWidth, u8 destHeight, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight);
+void Bg_CopyRectToTilemapRect(BgConfig *bgConfig, u8 bgLayer, u8 destX, u8 destY, u8 destWidth, u8 destHeight, const void *src, u8 srcX, u8 srcY, u8 srcWidth, u8 srcHeight);
+void Bg_FillTilemapRect(BgConfig *bgConfig, u8 bgLayer, u16 fillVal, u8 x, u8 y, u8 width, u8 height, u8 palette);
+void Bg_ChangeTilemapRectPalette(BgConfig *bgConfig, u8 bgLayer, u8 x, u8 y, u8 width, u8 height, u8 palette);
+void Bg_ClearTilemap(BgConfig *bgConfig, u8 bgLayer);
+void Bg_FillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal);
+void Bg_ScheduleFillTilemap(BgConfig *bgConfig, u8 bgLayer, u16 fillVal);
+void *Bg_GetCharPtr(u8 bgLayer);
+void *Bg_GetTilemapBuffer(BgConfig *bgConfig, u8 bgLayer);
+int Bg_GetXOffset2(BgConfig *bgConfig, u8 bgLayer);
+u16 Bg_GetRotation(BgConfig *bgConfig, u8 bgLayer);
+u8 Bg_GetPriority(BgConfig *bgConfig, u8 bgLayer);
+void Bg_RunScheduledUpdates(BgConfig *bgConfig);
+void Bg_ScheduleTilemapTransfer(BgConfig *bgConfig, u8 bgLayer);
+void Bg_ScheduleScroll(BgConfig *bgConfig, u8 bgLayer, u8 bgOffsetUpdateOp, int val);
+void Bg_ScheduleAffineRotation(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, u16 val);
+void Bg_ScheduleAffineScale(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, fx32 val);
+void Bg_ScheduleAffineRotationCenter(BgConfig *bgConfig, u8 bgLayer, u8 bgAffineUpdateOp, int val);
+u8 Bg_DoesPixelAtXYMatchVal(BgConfig *bgConfig, u8 bgLayer, u16 x, u16 y, u16 *src);
+
+void Bitmap_BlitRect4bpp(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 transparent);
+void Bitmap_BlitRect8bpp(const Bitmap *src, const Bitmap *dest, u16 srcX, u16 srcY, u16 destX, u16 destY, u16 width, u16 height, u16 transparent);
+void Bitmap_FillRect4bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal);
+void Bitmap_FillRect8bpp(const Bitmap *bitmap, u16 x, u16 y, u16 width, u16 height, u8 fillVal);
+
+Window *Window_New(u32 heapID, u8 numWindows);
+void Window_Init(Window *window);
+u8 Window_IsInUse(Window *window);
+void Window_Add(BgConfig *bgConfig, Window *window, u8 bgLayer, u8 tilemapLeft, u8 tilemapTop, u8 width, u8 height, u8 palette, u16 baseTile);
+void Window_AddToTopLeftCorner(BgConfig *bgConfig, Window *window, u8 width, u8 height, u16 baseTile, u8 fillVal);
+void Window_AddFromTemplate(BgConfig *bgConfig, Window *window, const WindowTemplate *template);
+void Window_Remove(Window *window);
+void Windows_Delete(Window *window, u8 numWindows);
+void Window_CopyToVRAM(Window *window);
+void Window_ScheduleCopyToVRAM(Window *window);
+void Window_PutToTilemap(Window *window);
+void Window_PutRectToTilemap(Window *window, u32 width, u32 height);
+void Window_ClearTilemap(Window *window);
+void Window_LoadTiles(Window *window);
+void Window_ClearAndCopyToVRAM(Window *window);
+void Window_ClearAndScheduleCopyToVRAM(Window *window);
+void Window_FillTilemap(Window *window, u8 val);
+void Window_BlitBitmapRect(Window *window, void *src, u16 srcX, u16 srcY, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 destWidth, u16 destHeight);
+void Window_BlitBitmapRectWithTransparency(Window *window, void *src, u16 srcX, u16 srcY, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 destWidth, u16 destHeight, u16 transparent);
+void Window_FillRectWithColor(Window *window, u8 color, u16 x, u16 y, u16 width, u16 height);
+void Window_CopyGlyph(Window *window, const u8 *glyphPixels, u16 srcWidth, u16 srcHeight, u16 destX, u16 destY, u16 table);
+void Window_Scroll(Window *window, u8 direction, u8 distance, u8 fillVal);
+BgConfig *Window_GetBgConfig(Window *window);
+u8 Window_GetBgLayer(Window *window);
+u8 Window_GetWidth(Window *window);
+u8 Window_GetHeight(Window *window);
+u8 Window_GetXPos(Window *window);
+u8 Window_GetYPos(Window *window);
+u16 Window_GetBaseTile(Window *window);
+void Window_SetXPos(Window *window, u8 x);
+void Window_SetYPos(Window *window, u8 y);
+void Window_SetPalette(Window *window, u8 palette);
+
+#endif // POKEPLATINUM_BG_WINDOW_H

include/colored_arrow.h

@@ -1,8 +1,7 @@
 #ifndef POKEPLATINUM_COLORED_ARROW_H
 #define POKEPLATINUM_COLORED_ARROW_H
 
-#include "struct_defs/struct_0205AA50.h"
-
+#include "bg_window.h"
 #include "strbuf.h"
 #include "text.h"
 

include/field/field_system.h

@@ -1,7 +1,6 @@
 #ifndef POKEPLATINUM_FIELD_SYSTEM_STRUCT_H
 #define POKEPLATINUM_FIELD_SYSTEM_STRUCT_H
 
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_02039E30_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02054C18_decl.h"
@@ -40,6 +39,7 @@
 #include "overlay066/struct_ov66_0222DCE0_sub1.h"
 
 #include "bag.h"
+#include "bg_window.h"
 #include "camera.h"
 #include "journal.h"
 #include "map_header_data.h"
@@ -49,7 +49,7 @@
 typedef struct FieldSystem_t {
     FieldSystem_sub1 *unk_00;
     FieldSystem_sub2 *unk_04;
-    BGL *unk_08;
+    BgConfig *unk_08;
     SaveData *saveData;
     TaskManager *unk_10;
     MapHeaderData *mapHeaderData;

include/field_system.h

@@ -1,11 +1,10 @@
 #ifndef POKEPLATINUM_FIELD_SYSTEM_H
 #define POKEPLATINUM_FIELD_SYSTEM_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "field/field_system_decl.h"
 #include "overlay025/poketch_system.h"
 
+#include "bg_window.h"
 #include "overlay_manager.h"
 #include "savedata.h"
 
@@ -18,7 +17,7 @@ void sub_0203CD84(FieldSystem *fieldSystem, const OverlayManagerTemplate *param1
 void sub_0203D128(void);
 void sub_0203D140(void);
 PoketchSystem *FieldSystem_GetPoketchSystem(void);
-BGL *sub_0203D170(void *param0);
+BgConfig *sub_0203D170(void *param0);
 SaveData *FieldSystem_SaveData(void *param0);
 
 #endif // POKEPLATINUM_UNK_0203CC84_H

include/overlay005/encounter_effect.h

@@ -4,8 +4,6 @@
 #include <nitro/fx/fx.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "field/field_system_decl.h"
 #include "overlay005/encounter_effect.h"
@@ -18,6 +16,7 @@
 #include "overlay005/struct_ov5_021DE5A4.h"
 #include "overlay006/battle_params.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "enc_effects.h"
 #include "sys_task_manager.h"
@@ -137,7 +136,7 @@ void ScreenSliceEffect_Modify(EncounterEffect *encEffect, ScreenSliceEffect *scr
 ScreenSplitEffect *ScreenSplitEffect_New(void);
 void ScreenSplitEffect_Delete(ScreenSplitEffect *screenSplitEfx);
 void EncounterEffect_ScreenSplit(EncounterEffect *encEffect, ScreenSplitEffect *screenSplitEfx, u32 numSteps, fx32 initialSpeedX, fx32 initialSpeedY);
-void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, BGL *param6, u32 param7);
+void ov5_021DE3D0(NARC *param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, BgConfig *param6, u32 param7);
 void ov5_021DE47C(UnkStruct_ov5_021DE47C *param0, int param1, int param2);
 void ov5_021DE4AC(UnkStruct_ov5_021DE47C *param0);
 void ov5_021DE4CC(NARC *param0, UnkStruct_ov5_021DE47C *param1, UnkStruct_ov5_021DE5A4 *param2, u32 param3, u32 param4, u32 param5, u32 param6, u32 param7, u32 param8);

include/overlay005/ov5_021D0D80.h

@@ -1,13 +1,13 @@
 #ifndef POKEPLATINUM_OV5_021D0D80_H
 #define POKEPLATINUM_OV5_021D0D80_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "field/field_system_decl.h"
 
+#include "bg_window.h"
+
 void ov5_021D12D0(FieldSystem *fieldSystem, u32 param1);
-void ov5_021D1434(BGL *param0);
-void ov5_021D143C(BGL *param0);
+void ov5_021D1434(BgConfig *param0);
+void ov5_021D143C(BgConfig *param0);
 void ov5_021D16F4(FieldSystem *fieldSystem, BOOL param1);
 void ov5_021D1718(FieldSystem *fieldSystem, BOOL param1);
 void ov5_021D1744(const u8 param0);

include/overlay005/ov5_021DC018.h

@@ -1,11 +1,10 @@
 #ifndef POKEPLATINUM_OV5_021DC018_H
 #define POKEPLATINUM_OV5_021DC018_H
 
-#include "struct_defs/struct_0205AA50.h"
-
 #include "field/field_system_decl.h"
 #include "overlay005/struct_ov5_021DC1A4_decl.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "string_template.h"
 

include/overlay005/ov5_021DD6FC.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV5_021DD6FC_H
 #define POKEPLATINUM_OV5_021DD6FC_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "field/field_system_decl.h"
 #include "overlay005/struct_ov5_021DD9C8_decl.h"
 
-UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BGL *param0);
+#include "bg_window.h"
+
+UnkStruct_ov5_021DD9C8 *ov5_021DD98C(BgConfig *param0);
 void ov5_021DD9C8(UnkStruct_ov5_021DD9C8 *param0);
 void ov5_021DD9E8(UnkStruct_ov5_021DD9C8 *param0, const int param1, const int param2);
 void ov5_021DDA78(UnkStruct_ov5_021DD9C8 *param0);

include/overlay005/ov5_021E1B08.h

@@ -1,11 +1,11 @@
 #ifndef POKEPLATINUM_OV5_021E1B08_H
 #define POKEPLATINUM_OV5_021E1B08_H
 
-#include "struct_defs/struct_0205AA50.h"
-
 #include "field/field_system_decl.h"
 #include "overlay005/struct_ov5_021E1B20_decl.h"
 
+#include "bg_window.h"
+
 void *ov5_021E1B08(u32 param0);
 void ov5_021E1B20(UnkStruct_ov5_021E1B20 *param0);
 void ov5_021E1B38(UnkStruct_ov5_021E1B20 *param0, u16 param1, u16 param2);

include/overlay005/struct_ov5_021E52A8_sub2.h

@@ -3,10 +3,10 @@
 
 #include <nitro/fx/fx.h>
 
-#include "struct_decls/struct_02018340_decl.h"
+#include "bg_window.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     MtxFx22 unk_04;
     u32 unk_14;
     int unk_18;

include/overlay007/ov7_0224BE9C.h

@@ -1,13 +1,12 @@
 #ifndef POKEPLATINUM_OV7_0224BE9C_H
 #define POKEPLATINUM_OV7_0224BE9C_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay007/struct_ov7_0224BEFC_decl.h"
 
+#include "bg_window.h"
 #include "savedata.h"
 
-UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BGL *param2);
+UnkStruct_ov7_0224BEFC *ov7_0224BE9C(u32 param0, SaveData *param1, BgConfig *param2);
 void ov7_0224BEFC(UnkStruct_ov7_0224BEFC *param0);
 BOOL ov7_0224BF2C(UnkStruct_ov7_0224BEFC *param0);
 

include/overlay007/struct_ov7_0224D008.h

@@ -5,11 +5,10 @@
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "overlay005/struct_ov5_021D30A8.h"
 
+#include "bg_window.h"
 #include "camera.h"
 #include "cell_actor.h"
 #include "game_options.h"
@@ -23,7 +22,7 @@
 #include "vars_flags.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     void *unk_04;
     Window unk_08[6];
     Window unk_68;

include/overlay008/ov8_02249960.h

@@ -1,10 +1,9 @@
 #ifndef POKEPLATINUM_OV8_02249960_H
 #define POKEPLATINUM_OV8_02249960_H
 
-#include "struct_defs/struct_0205AA50.h"
-
 #include "field/field_system_decl.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "strbuf.h"
 

include/overlay012/ov12_0221FC20.h

@@ -8,7 +8,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02014014_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/sprite_template.h"
 
 #include "battle/struct_ov16_02264408.h"
@@ -19,6 +18,7 @@
 #include "overlay012/struct_ov12_02223764.h"
 #include "overlay012/struct_ov12_022380DC.h"
 
+#include "bg_window.h"
 #include "spl.h"
 #include "sys_task_manager.h"
 
@@ -42,7 +42,7 @@ u16 ov12_02220248(UnkStruct_ov12_0221FCDC *param0);
 UnkStruct_02014014 *ov12_02220250(UnkStruct_ov12_0221FCDC *param0);
 UnkStruct_02014014 *ov12_02220260(UnkStruct_ov12_0221FCDC *param0, int param1);
 SPLEmitter *ov12_0222026C(UnkStruct_ov12_0221FCDC *param0, int param1);
-BGL *ov12_02220278(UnkStruct_ov12_0221FCDC *param0);
+BgConfig *ov12_02220278(UnkStruct_ov12_0221FCDC *param0);
 s32 ov12_02220280(UnkStruct_ov12_0221FCDC *param0, int param1);
 CellActorData *ov12_02220298(UnkStruct_ov12_0221FCDC *param0, int param1);
 CellActorData *ov12_022202C0(UnkStruct_ov12_0221FCDC *param0, int param1);

include/overlay012/struct_ov12_0223595C.h

@@ -4,10 +4,11 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 
+#include "bg_window.h"
+
 typedef struct {
     u8 unk_00;
     u8 unk_01;
@@ -17,7 +18,7 @@ typedef struct {
     SpriteRenderer *unk_08;
     SpriteGfxHandler *unk_0C;
     SpriteGfxHandler *unk_10;
-    BGL *unk_14;
+    BgConfig *unk_14;
     PaletteData *unk_18;
 } UnkStruct_ov12_0223595C;
 

include/overlay013/struct_ov13_022213F0.h

@@ -5,13 +5,12 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "overlay013/struct_ov13_0221FC20.h"
 #include "overlay013/struct_ov13_02221ED0.h"
 #include "overlay013/struct_ov13_02228A50_decl.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -19,7 +18,7 @@
 typedef struct {
     UnkStruct_ov13_0221FC20 *unk_00;
     UnkStruct_ov13_02221ED0 unk_04[6];
-    BGL *unk_1E0;
+    BgConfig *unk_1E0;
     PaletteData *unk_1E4;
     u16 unk_1E8[4][96];
     u16 unk_4E8[4][96];

include/overlay013/struct_ov13_02227244.h

@@ -5,21 +5,20 @@
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "battle/struct_ov16_0226DEEC_decl.h"
 #include "overlay013/struct_ov13_022264F4.h"
 #include "overlay013/struct_ov13_02228A50_decl.h"
 
 #include "bag.h"
+#include "bg_window.h"
 #include "message.h"
 #include "strbuf.h"
 #include "string_template.h"
 
 typedef struct {
     UnkStruct_ov13_022264F4 *unk_00;
-    BGL *unk_04;
+    BgConfig *unk_04;
     PaletteData *unk_08;
     UnkStruct_0200C440 *unk_0C;
     MessageLoader *unk_10;

include/overlay017/ov17_0223F118.h

@@ -5,7 +5,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_02095C48.h"
 
@@ -13,12 +12,13 @@
 #include "overlay017/struct_ov17_0223F6E8.h"
 #include "overlay017/struct_ov17_0223F744.h"
 
+#include "bg_window.h"
 #include "strbuf.h"
 #include "text.h"
 
 GenericPointerData *ov17_0223F140(int param0);
 void ov17_0223F1E0(GenericPointerData *param0);
-void ov17_0223F1E8(int param0, BGL *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
+void ov17_0223F1E8(int param0, BgConfig *param1, SpriteGfxHandler *param2, UnkStruct_02012744 *param3, UnkStruct_ov17_0223F2E4 *param4, const Strbuf *param5, enum Font param6, TextColor param7, int param8, int param9, int param10, int param11, int param12, int param13, int param14);
 void ov17_0223F2E4(UnkStruct_ov17_0223F2E4 *param0);
 void ov17_0223F2F8(UnkStruct_ov17_0223F2E4 *param0, int param1, int param2, int param3);
 Strbuf *ov17_0223F310(u32 param0, u32 param1);

include/overlay017/ov17_0223F7E4.h

@@ -1,15 +1,16 @@
 #ifndef POKEPLATINUM_OV17_0223F7E4_H
 #define POKEPLATINUM_OV17_0223F7E4_H
 
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_02095C48.h"
 
 #include "overlay017/struct_ov17_0223F7E4_decl.h"
 #include "overlay017/struct_ov17_0223F88C.h"
 #include "overlay017/struct_ov17_022472F8.h"
 
-void ov17_0223F80C(BGL *param0);
-void ov17_0223F864(BGL *param0);
+#include "bg_window.h"
+
+void ov17_0223F80C(BgConfig *param0);
+void ov17_0223F864(BgConfig *param0);
 void *ov17_0223F88C(UnkStruct_02095C48 *param0, UnkStruct_ov17_0223F88C *param1, UnkStruct_ov17_022472F8 *param2);
 void ov17_0223F960(UnkStruct_ov17_0223F7E4 *param0);
 void ov17_0223F9C4(UnkStruct_ov17_0223F7E4 *param0, int param1, int param2, void *param3);

include/overlay017/ov17_022492DC.h

@@ -1,14 +1,15 @@
 #ifndef POKEPLATINUM_OV17_022492DC_H
 #define POKEPLATINUM_OV17_022492DC_H
 
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_02095C48.h"
 
 #include "overlay017/struct_ov17_022492DC_decl.h"
 #include "overlay017/struct_ov17_0224A1EC.h"
 
-void ov17_02249300(BGL *param0);
-void ov17_02249358(BGL *param0);
+#include "bg_window.h"
+
+void ov17_02249300(BgConfig *param0);
+void ov17_02249358(BgConfig *param0);
 void *ov17_02249380(UnkStruct_02095C48 *param0, UnkStruct_ov17_0224A1EC *param1);
 void ov17_022493A4(UnkStruct_ov17_022492DC *param0);
 void ov17_022493C4(UnkStruct_ov17_022492DC *param0);

include/overlay017/struct_ov17_0223F88C.h

@@ -8,14 +8,13 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 
 #include "battle/struct_ov16_0223E0C8.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 #include "overlay017/struct_ov17_0223F2E4.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -27,7 +26,7 @@ typedef struct {
     SpriteRenderer *unk_18;
     SpriteGfxHandler *unk_1C;
     UnkStruct_ov12_0221FCDC *unk_20;
-    BGL *unk_24;
+    BgConfig *unk_24;
     Window unk_28[1];
     MessageLoader *unk_38;
     MessageLoader *unk_3C;

include/overlay017/struct_ov17_022476F8.h

@@ -7,13 +7,12 @@
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 
 #include "battle/struct_ov16_0223E0C8.h"
 #include "overlay017/struct_ov17_0223F6E8.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -25,7 +24,7 @@ typedef struct {
     Sprite *unk_18;
     SpriteRenderer *unk_1C;
     SpriteGfxHandler *unk_20;
-    BGL *unk_24;
+    BgConfig *unk_24;
     Window unk_28[1];
     MessageLoader *unk_38;
     StringTemplate *unk_3C;

include/overlay017/struct_ov17_0224A1EC.h

@@ -8,8 +8,6 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 
 #include "battle/struct_ov16_0223E0C8.h"
@@ -24,6 +22,7 @@
 #include "overlay017/struct_ov17_0224C9A4.h"
 #include "overlay017/struct_ov17_02253084.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -36,7 +35,7 @@ typedef struct {
     Sprite *unk_48[4];
     SpriteRenderer *unk_58;
     SpriteGfxHandler *unk_5C;
-    BGL *unk_60;
+    BgConfig *unk_60;
     Window unk_64[2];
     MessageLoader *unk_84;
     StringTemplate *unk_88;

include/overlay017/struct_ov17_022507C4.h

@@ -8,13 +8,12 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 
 #include "battle/struct_ov16_0223E0C8.h"
 #include "overlay017/struct_ov17_0223F6E8.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "strbuf.h"
 #include "string_template.h"
@@ -26,7 +25,7 @@ typedef struct {
     Sprite *unk_08[4];
     SpriteRenderer *unk_18;
     SpriteGfxHandler *unk_1C;
-    BGL *unk_20;
+    BgConfig *unk_20;
     Window unk_24[9];
     MessageLoader *unk_B4;
     StringTemplate *unk_B8;

include/overlay019/ov19_021D79F8.h

@@ -1,17 +1,16 @@
 #ifndef POKEPLATINUM_OV19_021D79F8_H
 #define POKEPLATINUM_OV19_021D79F8_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D4F5C.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021D8318.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 
-BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4);
+BOOL ov19_021D79F8(UnkStruct_ov19_021D8318 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4);
 void ov19_021D7A74(UnkStruct_ov19_021D8318 *param0);
 void ov19_021D7A9C(UnkStruct_ov19_021D8318 *param0);
 void ov19_021D7B4C(UnkStruct_ov19_021D8318 *param0, const UnkStruct_ov19_021D4F5C *param1, int param2, BOOL param3);

include/overlay019/ov19_021DA92C.h

@@ -2,16 +2,16 @@
 #define POKEPLATINUM_OV19_021DA92C_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA9E0.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "message.h"
 
-BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, const MessageLoader *param5, NARC *param6);
+BOOL ov19_021DA92C(UnkStruct_ov19_021DA9E0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, const MessageLoader *param5, NARC *param6);
 void ov19_021DA9E0(UnkStruct_ov19_021DA9E0 *param0);
 void ov19_021DAA80(UnkStruct_ov19_021DA9E0 *param0);
 void ov19_021DAA90(UnkStruct_ov19_021DA9E0 *param0);

include/overlay019/ov19_021DB2FC.h

@@ -2,17 +2,17 @@
 #define POKEPLATINUM_OV19_021DB2FC_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DB6F0.h"
 #include "overlay019/struct_ov19_021DF964.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "message.h"
 
-BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, MessageLoader *param5, const StringTemplate *param6, int param7, NARC *param8);
+BOOL ov19_021DB2FC(UnkStruct_ov19_021DB6F0 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, MessageLoader *param5, const StringTemplate *param6, int param7, NARC *param8);
 void ov19_021DB370(UnkStruct_ov19_021DB6F0 *param0);
 void ov19_021DB3C4(UnkStruct_ov19_021DB6F0 *param0);
 void ov19_021DB448(UnkStruct_ov19_021DB6F0 *param0, u32 param1);

include/overlay019/ov19_021DB8E4.h

@@ -4,15 +4,15 @@
 #include <nnsys.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DBA9C.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 
-BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, NARC *param5);
+BOOL ov19_021DB8E4(UnkStruct_ov19_021DBA9C *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, NARC *param5);
 void ov19_021DBA9C(UnkStruct_ov19_021DBA9C *param0);
 void ov19_021DBAD0(UnkStruct_ov19_021DBA9C *param0);
 void ov19_021DBB48(UnkStruct_ov19_021DBA9C *param0);

include/overlay019/ov19_021DC5F0.h

@@ -2,16 +2,16 @@
 #define POKEPLATINUM_OV19_021DC5F0_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DC680.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 
-BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, NARC *param5);
+BOOL ov19_021DC5F0(UnkStruct_ov19_021DC680 *param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, NARC *param5);
 void ov19_021DC680(UnkStruct_ov19_021DC680 *param0);
 void ov19_021DC6A0(UnkStruct_ov19_021DC680 *param0);
 void ov19_021DC6C8(UnkStruct_ov19_021DC680 *param0);

include/overlay019/ov19_021DCF88.h

@@ -2,15 +2,15 @@
 #define POKEPLATINUM_OV19_021DCF88_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DCF88_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 
-BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4);
+BOOL ov19_021DCF88(UnkStruct_ov19_021DCF88 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4);
 void ov19_021DD078(UnkStruct_ov19_021DCF88 *param0);
 void ov19_021DD114(UnkStruct_ov19_021DCF88 *param0, NARC *param1);
 void ov19_021DD378(UnkStruct_ov19_021DCF88 *param0);

include/overlay019/ov19_021DE3E8.h

@@ -3,15 +3,14 @@
 
 #include <nitro/fx/fx.h>
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DE3E8_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 
-BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4);
+BOOL ov19_021DE3E8(UnkStruct_ov19_021DE3E8 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4);
 void ov19_021DE440(UnkStruct_ov19_021DE3E8 *param0);
 void ov19_021DE584(UnkStruct_ov19_021DE3E8 *param0);
 void ov19_021DE7A0(UnkStruct_ov19_021DE3E8 *param0);

include/overlay019/ov19_021DEC04.h

@@ -2,16 +2,16 @@
 #define POKEPLATINUM_OV19_021DEC04_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DEC04_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "message.h"
 
-BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BGL *param3, CellActorCollection *param4, MessageLoader *param5, NARC *param6);
+BOOL ov19_021DEC04(UnkStruct_ov19_021DEC04 **param0, UnkStruct_ov19_021D61B0 *param1, const UnkStruct_ov19_021D4DF0 *param2, BgConfig *param3, CellActorCollection *param4, MessageLoader *param5, NARC *param6);
 void ov19_021DECAC(UnkStruct_ov19_021DEC04 *param0);
 void ov19_021DECE8(UnkStruct_ov19_021DEC04 *param0, NARC *param1);
 void ov19_021DEDDC(UnkStruct_ov19_021DEC04 *param0, BOOL param1);

include/overlay019/struct_ov19_021D8318.h

@@ -1,13 +1,13 @@
 #ifndef POKEPLATINUM_STRUCT_OV19_021D8318_H
 #define POKEPLATINUM_STRUCT_OV19_021D8318_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021DA384.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
+#include "bg_window.h"
+
 typedef struct {
     u8 unk_00;
     u8 unk_01;
@@ -40,7 +40,7 @@ typedef struct {
     int unk_585C;
     u16 unk_5860[9][16];
     UnkStruct_ov19_021DA384 *unk_58F0;
-    BGL *unk_58F4;
+    BgConfig *unk_58F4;
     const UnkStruct_ov19_021D4DF0 *unk_58F8;
     UnkStruct_ov19_021D61B0 *unk_58FC;
 } UnkStruct_ov19_021D8318;

include/overlay019/struct_ov19_021DA9E0.h

@@ -6,12 +6,11 @@
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_0200C440_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "strbuf.h"
 #include "sys_task_manager.h"
@@ -19,7 +18,7 @@
 typedef struct {
     BOOL unk_00;
     Window *unk_04;
-    BGL *unk_08;
+    BgConfig *unk_08;
     CellActorCollection *unk_0C;
     const UnkStruct_ov19_021D4DF0 *unk_10;
     UnkStruct_ov19_021D61B0 *unk_14;

include/overlay019/struct_ov19_021DB6F0.h

@@ -3,18 +3,16 @@
 
 #include <nnsys.h>
 
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
-
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "strbuf.h"
 #include "string_template.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     u8 padding_04[4];
     const UnkStruct_ov19_021D4DF0 *unk_08;
     UnkStruct_ov19_021D61B0 *unk_0C;

include/overlay019/struct_ov19_021DBA9C.h

@@ -4,13 +4,11 @@
 #include <nnsys.h>
 
 #include "struct_decls/struct_0200C440_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0201AE08.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "message.h"
 #include "strbuf.h"
@@ -18,7 +16,7 @@
 
 typedef struct {
     UnkStruct_ov19_021D61B0 *unk_00;
-    BGL *unk_04;
+    BgConfig *unk_04;
     CellActorCollection *unk_08;
     const UnkStruct_ov19_021D4DF0 *unk_0C;
     Window *unk_10;
@@ -31,7 +29,7 @@ typedef struct {
     NNSG2dScreenData *unk_30;
     void *unk_34;
     NNSG2dScreenData *unk_38;
-    UnkStruct_0201AE08 unk_3C;
+    Bitmap unk_3C;
     UnkStruct_0200C440 *unk_44;
     CellActor *unk_48[18];
     CellActor *unk_90;

include/overlay019/struct_ov19_021DC680.h

@@ -3,19 +3,18 @@
 
 #include <nnsys.h>
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay019/struct_ov19_021D4DF0.h"
 #include "overlay019/struct_ov19_021D61B0_decl.h"
 #include "overlay019/struct_ov19_021D8318.h"
 #include "overlay019/struct_ov19_021DA384.h"
 #include "overlay019/struct_ov19_021DCD18.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 
 typedef struct {
     UnkStruct_ov19_021D61B0 *unk_00;
-    BGL *unk_04;
+    BgConfig *unk_04;
     CellActorCollection *unk_08;
     const UnkStruct_ov19_021D4DF0 *unk_0C;
     UnkStruct_ov19_021D8318 *unk_10;

include/overlay020/ov20_021D2098.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV20_021D2098_H
 #define POKEPLATINUM_OV20_021D2098_H
 
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_020998EC_decl.h"
 
 #include "overlay020/struct_ov20_021D16E8_decl.h"
 #include "overlay020/struct_ov20_021D2128_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "sys_task_manager.h"
 
@@ -17,7 +17,7 @@ void ov20_021D21A0(UnkStruct_ov20_021D2128 *param0, int param1);
 BOOL ov20_021D21F8(UnkStruct_ov20_021D2128 *param0);
 BOOL ov20_021D2210(UnkStruct_ov20_021D2128 *param0, int param1);
 u32 ov20_021D2DF4(UnkStruct_ov20_021D2128 *param0);
-BGL *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0);
+BgConfig *ov20_021D2E04(UnkStruct_ov20_021D2128 *param0);
 CellActorCollection *ov20_021D2E08(UnkStruct_ov20_021D2128 *param0);
 void ov20_021D2E0C(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param1, u32 param2, u32 param3);
 CellActor *ov20_021D2E50(UnkStruct_ov20_021D2128 *param0, CellActorResourceData *param1, u32 param2, u32 param3, u32 param4, int param5);

include/overlay020/ov20_021D4E38.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV20_021D4E38_H
 #define POKEPLATINUM_OV20_021D4E38_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay020/struct_ov20_021D4E8C.h"
 #include "overlay020/struct_ov20_021D4FF0.h"
 
-void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BGL *param1, u32 param2, int param3, int param4, int param5);
+#include "bg_window.h"
+
+void ov20_021D4E38(UnkStruct_ov20_021D4E8C *param0, BgConfig *param1, u32 param2, int param3, int param4, int param5);
 BOOL ov20_021D4E8C(UnkStruct_ov20_021D4E8C *param0);
 void ov20_021D4F1C(UnkStruct_ov20_021D4FF0 *param0, int param1, int param2, int param3, int param4, int param5);
 BOOL ov20_021D4F4C(UnkStruct_ov20_021D4FF0 *param0);

include/overlay020/struct_ov20_021D4E8C.h

@@ -1,12 +1,11 @@
 #ifndef POKEPLATINUM_STRUCT_OV20_021D4E8C_H
 #define POKEPLATINUM_STRUCT_OV20_021D4E8C_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
+#include "bg_window.h"
 #include "sys_task_manager.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     u32 unk_04;
     int unk_08;
     fx32 unk_0C;

include/overlay021/ov21_021D0D80.h

@@ -3,9 +3,6 @@
 
 #include <nnsys.h>
 
-#include "struct_decls/struct_02018340_decl.h"
-#include "struct_defs/struct_0205AA50.h"
-
 #include "overlay021/struct_ov21_021D0D80_1.h"
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D13FC.h"
@@ -18,6 +15,7 @@
 #include "overlay021/struct_ov21_021D4CA0.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "overlay_manager.h"
 #include "strbuf.h"
@@ -52,7 +50,7 @@ void ov21_021D144C(CellActor *param0, int param1);
 void ov21_021D1498(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2);
 void ov21_021D1524(CellActor *param0, UnkStruct_ov21_021D4CA0 *param1, int param2, int param3, int param4);
 void ov21_021D154C(TouchScreenHitTable *hitTable, int param1, int param2, int param3, int param4);
-void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BGL *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8);
+void ov21_021D1558(UnkStruct_ov21_021D157C *param0, BgConfig *param1, int param2, NNSG2dScreenData *param3, int param4, int param5, int param6, int param7, int param8);
 BOOL ov21_021D157C(UnkStruct_ov21_021D157C *param0);
 void ov21_021D1650(Window *param0, int param1, int param2, int param3);
 Window *ov21_021D16D8(UnkStruct_ov21_021D13FC *param0, const UnkStruct_ov21_021D3320 *param1, int param2, int param3);

include/overlay021/ov21_021D1FA4.h

@@ -6,7 +6,6 @@
 
 #include "struct_decls/sprite_decl.h"
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay021/struct_ov21_021D13FC.h"
 #include "overlay021/struct_ov21_021D22F8.h"
@@ -16,6 +15,7 @@
 #include "overlay021/struct_ov21_021D4CB8.h"
 #include "overlay021/struct_ov21_021D4EE4_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "sprite_resource.h"
 
@@ -57,7 +57,7 @@ void ov21_021D2648(UnkStruct_ov21_021D2648 *param0, int param1, int param2, int
 BOOL ov21_021D2664(UnkStruct_ov21_021D2648 *param0);
 NARC *ov21_021D26E0(UnkStruct_ov21_021D13FC *param0);
 void *ov21_021D26E8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, u32 param3);
-u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BGL *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7);
+u32 ov21_021D2724(UnkStruct_ov21_021D13FC *param0, u32 param1, BgConfig *param2, u32 param3, u32 param4, u32 param5, BOOL param6, u32 param7);
 void ov21_021D276C(UnkStruct_ov21_021D13FC *param0, u32 param1, int param2, u32 param3, u32 param4, u32 param5);
 void *ov21_021D27B8(UnkStruct_ov21_021D13FC *param0, u32 param1, BOOL param2, NNSG2dScreenData **param3, u32 param4);
 void *ov21_021D27E0(UnkStruct_ov21_021D13FC *param0, u32 param1, NNSG2dPaletteData **param2, u32 param3);

include/overlay021/ov21_021D4C0C.h

@@ -1,13 +1,12 @@
 #ifndef POKEPLATINUM_OV21_021D4C0C_H
 #define POKEPLATINUM_OV21_021D4C0C_H
 
-#include "struct_defs/struct_0205AA50.h"
-
 #include "overlay021/struct_ov21_021D1FA4.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 #include "overlay021/struct_ov21_021D4CA0.h"
 #include "overlay021/struct_ov21_021D4CB8.h"
 
+#include "bg_window.h"
 #include "strbuf.h"
 
 UnkStruct_ov21_021D4C0C *ov21_021D4C0C(const UnkStruct_ov21_021D1FA4 *param0);

include/overlay021/ov21_021D517C.h

@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV21_021D517C_H
 #define POKEPLATINUM_OV21_021D517C_H
 
-#include "struct_defs/struct_0205AA50.h"
+#include "bg_window.h"
 
 void ov21_021D517C(Window *param0, u8 *param1, u16 param2, u16 param3, u8 param4, u8 *param5, u8 param6, u8 param7, u16 param8, u16 param9);
 void ov21_021D5214(u8 *param0, u8 param1, u8 param2);

include/overlay021/ov21_021DE668.h

@@ -1,13 +1,13 @@
 #ifndef POKEPLATINUM_OV21_021DE668_H
 #define POKEPLATINUM_OV21_021DE668_H
 
-#include "struct_defs/struct_0205AA50.h"
-
 #include "overlay021/struct_ov21_021D0F60_decl.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 #include "overlay021/struct_ov21_021DE6D4.h"
 #include "overlay021/struct_ov21_021E68F4.h"
 
+#include "bg_window.h"
+
 void ov21_021DE668(UnkStruct_ov21_021E68F4 *param0, UnkStruct_ov21_021D0F60 *param1, int param2);
 void ov21_021DE6C0(UnkStruct_ov21_021E68F4 *param0);
 BOOL ov21_021DE6D4(UnkStruct_ov21_021DE6D4 *param0, int param1);

include/overlay021/struct_ov21_021D13FC.h

@@ -5,9 +5,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
 #include "struct_decls/struct_02015064_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_0200C738.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "overlay021/struct_ov21_021D22F8.h"
 #include "overlay021/struct_ov21_021D23F8.h"
@@ -15,12 +13,13 @@
 #include "overlay021/struct_ov21_021D3124.h"
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "sprite_resource.h"
 #include "sys_task_manager.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     Window unk_04;
     UnkStruct_0200C738 unk_14;
     CellActorCollection *unk_138;

include/overlay021/struct_ov21_021D157C.h

@@ -3,10 +3,10 @@
 
 #include <nnsys.h>
 
-#include "struct_decls/struct_02018340_decl.h"
+#include "bg_window.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     NNSG2dScreenData *unk_04;
     int unk_08;
     int unk_0C;

include/overlay021/struct_ov21_021D1FA4.h

@@ -1,13 +1,12 @@
 #ifndef POKEPLATINUM_STRUCT_OV21_021D1FA4_H
 #define POKEPLATINUM_STRUCT_OV21_021D1FA4_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
+#include "bg_window.h"
 #include "cell_actor.h"
 
 typedef struct {
     CellActorCollection *unk_00;
-    BGL *unk_04;
+    BgConfig *unk_04;
     int unk_08;
     int unk_0C;
 } UnkStruct_ov21_021D1FA4;

include/overlay021/struct_ov21_021D4CB8.h

@@ -3,10 +3,9 @@
 
 #include <nnsys.h>
 
-#include "struct_defs/struct_0205AA50.h"
-
 #include "overlay021/struct_ov21_021D4C0C_decl.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 
 typedef struct {

include/overlay021/struct_ov21_021E8E0C.h

@@ -3,12 +3,12 @@
 
 #include "struct_decls/struct_02002F38_decl.h"
 #include "struct_decls/struct_02007768_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
+#include "bg_window.h"
 #include "pokemon.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     PaletteData *unk_04;
     UnkStruct_02007768 *unk_08;
     int unk_0C;

include/overlay022/ov22_02255094.h

@@ -5,12 +5,12 @@
 #include <nnsys.h>
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay022/struct_ov22_022550D4.h"
 #include "overlay022/struct_ov22_02255CB8.h"
 #include "overlay022/struct_ov22_0225A0E4.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 
 void ov22_02255094(void);
@@ -38,7 +38,7 @@ void ov22_022553F8(UnkStruct_ov22_0225A0E4 *param0);
 void ov22_02255410(UnkStruct_ov22_02255CB8 *param0, int param1);
 int ov22_02255420(NNSG2dCharacterData *param0, int param1, int param2, int param3);
 void ov22_0225547C(UnkStruct_ov22_0225A0E4 *param0, const UnkStruct_ov22_022550D4 *param1, int param2);
-void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BGL *param1, int param2);
+void ov22_022554A8(UnkStruct_ov22_0225A0E4 *param0, BgConfig *param1, int param2);
 void ov22_022554F8(UnkStruct_ov22_0225A0E4 *param0);
 void ov22_02255524(UnkStruct_ov22_0225A0E4 *param0);
 void ov22_02255530(UnkStruct_ov22_0225A0E4 *param0);

include/overlay022/struct_ov22_02256BAC.h

@@ -2,15 +2,15 @@
 #define POKEPLATINUM_STRUCT_OV22_02256BAC_H
 
 #include "struct_decls/struct_02006C24_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_02095C60.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "game_options.h"
 #include "sprite_resource.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     CellActorCollection *unk_04;
     SpriteResourceCollection **unk_08;
     const Options *unk_0C;

include/overlay022/struct_ov22_02257964_sub2.h

@@ -5,19 +5,20 @@
 #include "struct_decls/struct_02015064_decl.h"
 #include "struct_decls/struct_02015128_decl.h"
 #include "struct_decls/struct_020151A4_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_020298D8.h"
 
 #include "overlay022/struct_ov22_02254DE0.h"
 #include "overlay022/struct_ov22_022597BC.h"
 
+#include "bg_window.h"
+
 typedef struct {
     UnkStruct_02015064 *unk_00;
     UnkStruct_02015128 **unk_04;
     UnkStruct_020151A4 **unk_08;
     u8 *unk_0C;
     UnkStruct_02007768 *unk_10;
-    BGL *unk_14;
+    BgConfig *unk_14;
     UnkStruct_ov22_02254DE0 *unk_18;
     UnkStruct_ov22_022597BC unk_1C;
     int unk_48;

include/overlay022/struct_ov22_02257F50_sub2.h

@@ -4,17 +4,18 @@
 #include "struct_decls/struct_02015064_decl.h"
 #include "struct_decls/struct_02015128_decl.h"
 #include "struct_decls/struct_020151A4_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay022/struct_ov22_02254DE0.h"
 #include "overlay022/struct_ov22_022597BC.h"
 
+#include "bg_window.h"
+
 typedef struct {
     UnkStruct_02015064 *unk_00;
     UnkStruct_02015128 **unk_04;
     UnkStruct_020151A4 **unk_08;
     u8 *unk_0C;
-    BGL *unk_10;
+    BgConfig *unk_10;
     UnkStruct_ov22_02254DE0 *unk_14;
     UnkStruct_ov22_022597BC unk_18;
     UnkStruct_ov22_02254DE0 *unk_44;

include/overlay022/struct_ov22_02258470.h

@@ -4,18 +4,19 @@
 #include "struct_decls/struct_02015064_decl.h"
 #include "struct_decls/struct_02015128_decl.h"
 #include "struct_decls/struct_020151A4_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay022/struct_ov22_02254DE0.h"
 #include "overlay022/struct_ov22_0225899C.h"
 #include "overlay022/struct_ov22_02259484.h"
 
+#include "bg_window.h"
+
 typedef struct {
     UnkStruct_02015064 *unk_00;
     UnkStruct_02015128 **unk_04;
     UnkStruct_020151A4 **unk_08;
     u8 *unk_0C;
-    BGL *unk_10;
+    BgConfig *unk_10;
     UnkStruct_ov22_02254DE0 *unk_14;
     UnkStruct_ov22_02259484 *unk_18;
     int unk_1C;

include/overlay022/struct_ov22_022597BC.h

@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_022597BC_H
 #define POKEPLATINUM_STRUCT_OV22_022597BC_H
 
-#include "struct_decls/struct_02018340_decl.h"
+#include "bg_window.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     int unk_04;
     int unk_08;
     int unk_0C;

include/overlay022/struct_ov22_022599A0.h

@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_022599A0_H
 #define POKEPLATINUM_STRUCT_OV22_022599A0_H
 
-#include "struct_decls/struct_02018340_decl.h"
+#include "bg_window.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     int unk_04;
     int unk_08;
     int unk_0C;

include/overlay022/struct_ov22_02259C9C.h

@@ -4,10 +4,11 @@
 #include <nnsys.h>
 
 #include "struct_decls/struct_02012744_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 
 #include "overlay022/struct_ov22_02259C58_1.h"
 
+#include "bg_window.h"
+
 typedef struct {
     UnkStruct_ov22_02259C58_1 unk_00;
     const Window *unk_10;

include/overlay022/struct_ov22_0225A0E4.h

@@ -8,9 +8,9 @@
 #include "struct_decls/struct_02015064_decl.h"
 #include "struct_decls/struct_02015128_decl.h"
 #include "struct_decls/struct_020151A4_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_defs/struct_0200C738.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "resource_collection.h"
 #include "sprite_resource.h"
@@ -32,7 +32,7 @@ typedef struct {
     ResourceCollection *unk_34;
     NNSG2dCharacterData **unk_38;
     int unk_3C;
-    BGL *unk_40;
+    BgConfig *unk_40;
     CellActorCollection *unk_44;
     SpriteResourceCollection *unk_48[4];
     UnkStruct_0200C738 unk_58;

include/overlay022/struct_ov22_0225A428.h

@@ -1,12 +1,11 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_0225A428_H
 #define POKEPLATINUM_STRUCT_OV22_0225A428_H
 
-#include "struct_defs/struct_0205AA50.h"
-
 #include "overlay022/struct_ov22_022597BC.h"
 #include "overlay022/struct_ov22_0225A914.h"
 #include "overlay022/struct_ov22_0225AB54.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "sprite_resource.h"
 #include "strbuf.h"

include/overlay022/struct_ov22_0225AB54.h

@@ -1,11 +1,11 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_0225AB54_H
 #define POKEPLATINUM_STRUCT_OV22_0225AB54_H
 
-#include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02095C60.h"
 
 #include "overlay022/struct_ov22_0225AE9C.h"
 
+#include "bg_window.h"
 #include "cell_actor.h"
 #include "sprite_resource.h"
 #include "sys_task_manager.h"

include/overlay022/struct_ov22_0225AF8C.h

@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_STRUCT_OV22_0225AF8C_H
 #define POKEPLATINUM_STRUCT_OV22_0225AF8C_H
 
-#include "struct_decls/struct_02018340_decl.h"
+#include "bg_window.h"
 
 typedef struct {
-    BGL *unk_00;
+    BgConfig *unk_00;
     int unk_04;
     int unk_08;
     int unk_0C;

include/overlay022/struct_ov22_0225B388.h

@@ -5,18 +5,19 @@
 #include "struct_decls/struct_02015064_decl.h"
 #include "struct_decls/struct_02015128_decl.h"
 #include "struct_decls/struct_020151A4_decl.h"
-#include "struct_decls/struct_02018340_decl.h"
 
 #include "overlay022/struct_ov22_02254DE0.h"
 #include "overlay022/struct_ov22_02259484.h"
 
+#include "bg_window.h"
+
 typedef struct {
     UnkStruct_02015064 *unk_00;
     UnkStruct_02015128 **unk_04;
     UnkStruct_020151A4 **unk_08;
     u8 *unk_0C;
     UnkStruct_02007768 *unk_10;
-    BGL *unk_14;
+    BgConfig *unk_14;
     UnkStruct_ov22_02254DE0 *unk_18;
     UnkStruct_ov22_02259484 *unk_1C;
     int unk_20;

include/overlay023/ov23_0224340C.h

@@ -3,11 +3,10 @@
 
 #include <nitro/math.h>
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "field/field_system_decl.h"
 #include "overlay023/struct_ov23_0224271C_decl.h"
 
+#include "bg_window.h"
 #include "strbuf.h"
 
 void ov23_022434BC(void *param0, FieldSystem *fieldSystem);
@@ -65,7 +64,7 @@ void ov23_02245784(void);
 void ov23_022457E4(int param0, int param1, void *param2, void *param3);
 void ov23_0224589C(int param0, int param1, void *param2, void *param3);
 int ov23_02245908(void);
-void ov23_022468A8(BGL *param0);
+void ov23_022468A8(BgConfig *param0);
 void ov23_022489F8(FieldSystem *fieldSystem, int param1, int param2, int param3, int param4, u8 *param5, int param6, u8 *param7, int param8, u8 *param9, int param10);
 void ov23_02248B98(int param0);
 

include/overlay023/ov23_02253598.h

@@ -1,13 +1,13 @@
 #ifndef POKEPLATINUM_OV23_02253598_H
 #define POKEPLATINUM_OV23_02253598_H
 
-#include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0202855C_decl.h"
 #include "struct_decls/struct_020298B0_decl.h"
 
 #include "overlay023/funcptr_ov23_02253834.h"
 #include "overlay023/struct_ov23_02253598_decl.h"
 
+#include "bg_window.h"
 #include "savedata.h"
 #include "trainer_info.h"
 
@@ -16,7 +16,7 @@ void ov23_022535CC(void);
 void ov23_022535EC(void);
 void ov23_02253604(void);
 int ov23_02253608(void);
-void ov23_02253834(BGL *param0, TrainerInfo *param1, UnkFuncPtr_ov23_02253834 param2, void *param3, BOOL param4);
+void ov23_02253834(BgConfig *param0, TrainerInfo *param1, UnkFuncPtr_ov23_02253834 param2, void *param3, BOOL param4);
 void ov23_022538FC(int param0);
 void ov23_02253968(void);
 void ov23_02253998(int param0, int param1, void *param2, void *param3);
@@ -24,7 +24,7 @@ void ov23_022539A8(int param0, int param1, void *param2, void *param3);
 BOOL ov23_022539D8(void);
 void ov23_022539E8(void);
 void ov23_02253A00(SecretBaseRecord *param0, int param1);
-void *ov23_02253C64(BGL *param0, TrainerInfo *param1, UndergroundData *param2, UnkFuncPtr_ov23_02253834 param3, void *param4);
+void *ov23_02253C64(BgConfig *param0, TrainerInfo *param1, UndergroundData *param2, UnkFuncPtr_ov23_02253834 param3, void *param4);
 void ov23_02253D10(void *param0);
 
 #endif // POKEPLATINUM_OV23_02253598_H

include/overlay023/ov23_02253D40.h

@@ -1,20 +1,19 @@
 #ifndef POKEPLATINUM_OV23_02253D40_H
 #define POKEPLATINUM_OV23_02253D40_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay023/struct_ov23_02253E2C_decl.h"
 #include "overlay023/struct_ov23_02253F60.h"
 #include "overlay084/struct_ov84_02240FA8.h"
 
+#include "bg_window.h"
 #include "message.h"
 #include "trainer_info.h"
 
 const UnkStruct_ov84_02240FA8 *ov23_02253D40(void);
-UnkStruct_ov23_02253E2C *ov23_02253D48(int param0, int param1, BGL *param2, int param3, int param4);
+UnkStruct_ov23_02253E2C *ov23_02253D48(int param0, int param1, BgConfig *param2, int param3, int param4);
 void ov23_02253DD8(UnkStruct_ov23_02253E2C *param0);
 void ov23_02253DFC(UnkStruct_ov23_02253E2C *param0, int param1, int param2);
-void ov23_02253E2C(UnkStruct_ov23_02253E2C *param0, BGL *param1, u16 param2, u16 param3);
+void ov23_02253E2C(UnkStruct_ov23_02253E2C *param0, BgConfig *param1, u16 param2, u16 param3);
 MessageLoader *ov23_02253E3C(UnkStruct_ov23_02253E2C *param0);
 int ov23_02253F40(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3);
 int ov23_02253F60(UnkStruct_ov23_02253E2C *param0, int param1, BOOL param2, UnkStruct_ov23_02253F60 param3);

include/overlay023/struct_ov23_02250CD4.h

@@ -5,7 +5,6 @@
 #include "struct_decls/struct_0200112C_decl.h"
 #include "struct_decls/struct_02001AF4_decl.h"
 #include "struct_decls/struct_02013A04_decl.h"
-#include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_0206A844.h"
 
 #include "field/field_system_decl.h"
@@ -17,6 +16,7 @@
 #include "overlay023/funcptr_ov23_022515D8.h"
 #include "overlay023/struct_ov23_02248D20.h"
 
+#include "bg_window.h"
 #include "strbuf.h"
 #include "string_template.h"
 #include "sys_task_manager.h"

include/overlay024/ov24_02253CE0.h

@@ -1,10 +1,10 @@
 #ifndef POKEPLATINUM_OV24_02253CE0_H
 #define POKEPLATINUM_OV24_02253CE0_H
 
-#include "struct_decls/struct_02018340_decl.h"
+#include "bg_window.h"
 
-void ov24_02253CE0(BGL *param0);
-void ov24_02253DA4(BGL *param0);
-BOOL ov24_02253DB4(BGL *param0);
+void ov24_02253CE0(BgConfig *param0);
+void ov24_02253DA4(BgConfig *param0);
+BOOL ov24_02253DB4(BgConfig *param0);
 
 #endif // POKEPLATINUM_OV24_02253CE0_H

include/overlay025/ov25_02254560.h

@@ -3,16 +3,16 @@
 
 #include <nnsys.h>
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay025/poketch_system.h"
 #include "overlay025/struct_ov25_02254560_1.h"
 #include "overlay025/struct_ov25_02254560_decl.h"
 #include "overlay025/struct_ov25_022555E8_decl.h"
 
+#include "bg_window.h"
+
 BOOL ov25_02254560(UnkStruct_ov25_02254560 **param0, const UnkStruct_ov25_02254560_1 *param1, NNSG2dOamManagerInstance *param2, PoketchSystem *poketchSys);
 UnkStruct_ov25_022555E8 *ov25_02254664(void);
-BGL *ov25_02254674(void);
+BgConfig *ov25_02254674(void);
 void ov25_022546B8(u32 param0, u32 param1);
 void ov25_022546F0(u32 param0, u32 param1);
 void ov25_02254728(u16 *param0);

include/overlay025/ov25_02255090.h

@@ -1,11 +1,11 @@
 #ifndef POKEPLATINUM_OV25_02255090_H
 #define POKEPLATINUM_OV25_02255090_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay025/struct_ov25_0225517C.h"
 #include "overlay025/struct_ov25_02255224_decl.h"
 
+#include "bg_window.h"
+
 void ov25_02255090(u32 *param0, u32 param1);
 BOOL ov25_02255130(u32 *param0, u32 param1);
 BOOL ov25_02255154(u32 *param0);
@@ -22,6 +22,6 @@ void ov25_02255290(u16 *param0, u32 param1);
 void ov25_02255308(u32 param0, u32 param1);
 void ov25_02255360(u32 param0);
 void ov25_022553A0(u32 param0, const u32 *param1, u32 param2, BOOL param3);
-void ov25_02255440(BGL *param0, u32 param1, u32 param2);
+void ov25_02255440(BgConfig *param0, u32 param1, u32 param2);
 
 #endif // POKEPLATINUM_OV25_02255090_H

include/overlay025/poketch_system.h

@@ -3,13 +3,12 @@
 
 #include <nnsys.h>
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "field/field_system_decl.h"
 #include "overlay025/poketch_button.h"
 #include "overlay025/struct_ov25_02254560_1.h"
 #include "overlay025/struct_ov25_02254560_decl.h"
 
+#include "bg_window.h"
 #include "poketch_data.h"
 #include "savedata.h"
 #include "sys_task_manager.h"
@@ -75,7 +74,7 @@ enum PoketchEventID {
 
 typedef struct PoketchSystem PoketchSystem;
 
-typedef BOOL (*PoketchAppInitFunction)(void **app, PoketchSystem *poketchSys, BGL *bgl, u32 appID);
+typedef BOOL (*PoketchAppInitFunction)(void **app, PoketchSystem *poketchSys, BgConfig *bgl, u32 appID);
 typedef void (*PoketchAppShutdownFunction)(void *app);
 typedef void (*PoketchAppSaveFunction)(void *app);
 
@@ -107,7 +106,7 @@ struct PoketchSystem {
     PoketchAppSaveFunction currAppSave;
     void *appSaveData;
 
-    BGL *bgl;
+    BgConfig *bgl;
     NNSG2dOamManagerInstance *oamManager;
 
     SaveData *saveData;
@@ -116,7 +115,7 @@ struct PoketchSystem {
     enum ButtonDir buttonDir;
 };
 
-void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, SaveData *saveData, BGL *bgl, NNSG2dOamManagerInstance *oamManager);
+void PoketchSystem_Create(FieldSystem *fieldSystem, PoketchSystem **poketchSys, SaveData *saveData, BgConfig *bgl, NNSG2dOamManagerInstance *oamManager);
 void PoketchSystem_StartShutdown(PoketchSystem *poketchSys);
 BOOL PoketchSystem_IsSystemShutdown(PoketchSystem *poketchSys);
 void PoketchSystem_SendEvent(PoketchSystem *poketchSys, enum PoketchEventID eventID, u32);

include/overlay026/ov26_02256404.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV26_02256404_H
 #define POKEPLATINUM_OV26_02256404_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay026/struct_ov26_02256404_1.h"
 #include "overlay026/struct_ov26_02256404_decl.h"
 
-BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov26_02256404(UnkStruct_ov26_02256404 **param0, const UnkStruct_ov26_02256404_1 *param1, BgConfig *param2);
 void ov26_0225649C(UnkStruct_ov26_02256404 *param0);
 void ov26_022564A8(UnkStruct_ov26_02256404 *param0, u32 param1);
 BOOL ov26_022564CC(UnkStruct_ov26_02256404 *param0, u32 param1);

include/overlay027/ov27_0225680C.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV27_0225680C_H
 #define POKEPLATINUM_OV27_0225680C_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay027/struct_ov27_0225680C_1.h"
 #include "overlay027/struct_ov27_0225680C_decl.h"
 
-BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov27_0225680C(UnkStruct_ov27_0225680C **param0, const UnkStruct_ov27_0225680C_1 *param1, BgConfig *param2);
 void ov27_02256890(UnkStruct_ov27_0225680C *param0);
 void ov27_022569C8(UnkStruct_ov27_0225680C *param0, u32 param1);
 BOOL ov27_022569EC(UnkStruct_ov27_0225680C *param0, u32 param1);

include/overlay028/ov28_0225697C.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV28_0225697C_H
 #define POKEPLATINUM_OV28_0225697C_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay028/struct_ov28_0225697C_1.h"
 #include "overlay028/struct_ov28_0225697C_decl.h"
 
-BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov28_0225697C(UnkStruct_ov28_0225697C **param0, const UnkStruct_ov28_0225697C_1 *param1, BgConfig *param2);
 void ov28_022569AC(UnkStruct_ov28_0225697C *param0);
 void ov28_022569B8(UnkStruct_ov28_0225697C *param0, u32 param1);
 BOOL ov28_022569DC(UnkStruct_ov28_0225697C *param0, u32 param1);

include/overlay029/ov29_022566C8.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV29_022566C8_H
 #define POKEPLATINUM_OV29_022566C8_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay029/struct_ov29_022566C8_1.h"
 #include "overlay029/struct_ov29_022566C8_decl.h"
 
-BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov29_022566C8(UnkStruct_ov29_022566C8 **param0, const UnkStruct_ov29_022566C8_1 *param1, BgConfig *param2);
 void ov29_02256770(UnkStruct_ov29_022566C8 *param0);
 void ov29_022567B4(UnkStruct_ov29_022566C8 *param0, u32 param1);
 BOOL ov29_022567D8(UnkStruct_ov29_022566C8 *param0, u32 param1);

include/overlay030/ov30_022563EC.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV30_022563EC_H
 #define POKEPLATINUM_OV30_022563EC_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay030/struct_ov30_022563EC_1.h"
 #include "overlay030/struct_ov30_022563EC_decl.h"
 
-BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov30_022563EC(UnkStruct_ov30_022563EC **param0, const UnkStruct_ov30_022563EC_1 *param1, BgConfig *param2);
 void ov30_02256444(UnkStruct_ov30_022563EC *param0);
 void ov30_02256464(UnkStruct_ov30_022563EC *param0, u32 param1);
 BOOL ov30_02256488(UnkStruct_ov30_022563EC *param0, u32 param1);

include/overlay031/ov31_02256554.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV31_02256554_H
 #define POKEPLATINUM_OV31_02256554_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay031/struct_ov31_02256554_1.h"
 #include "overlay031/struct_ov31_02256554_decl.h"
 
-BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov31_02256554(UnkStruct_ov31_02256554 **param0, const UnkStruct_ov31_02256554_1 *param1, BgConfig *param2);
 void ov31_02256584(UnkStruct_ov31_02256554 *param0);
 void ov31_02256590(UnkStruct_ov31_02256554 *param0, u32 param1);
 BOOL ov31_022565B4(UnkStruct_ov31_02256554 *param0, u32 param1);

include/overlay032/ov32_02256470.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV32_02256470_H
 #define POKEPLATINUM_OV32_02256470_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay032/struct_ov32_02256470_1.h"
 #include "overlay032/struct_ov32_02256470_decl.h"
 
-BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov32_02256470(UnkStruct_ov32_02256470 **param0, const UnkStruct_ov32_02256470_1 *param1, BgConfig *param2);
 void ov32_02256508(UnkStruct_ov32_02256470 *param0);
 void ov32_02256538(UnkStruct_ov32_02256470 *param0, u32 param1);
 BOOL ov32_0225655C(UnkStruct_ov32_02256470 *param0, u32 param1);

include/overlay033/ov33_02256474.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV33_02256474_H
 #define POKEPLATINUM_OV33_02256474_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay033/struct_ov33_02256474_1.h"
 #include "overlay033/struct_ov33_02256474_decl.h"
 
-BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov33_02256474(UnkStruct_ov33_02256474 **param0, const UnkStruct_ov33_02256474_1 *param1, BgConfig *param2);
 void ov33_022564F0(UnkStruct_ov33_02256474 *param0);
 void ov33_02256548(UnkStruct_ov33_02256474 *param0, u32 param1);
 BOOL ov33_0225656C(UnkStruct_ov33_02256474 *param0, u32 param1);

include/overlay034/ov34_02256540.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV34_02256540_H
 #define POKEPLATINUM_OV34_02256540_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay034/struct_ov34_02256540_1.h"
 #include "overlay034/struct_ov34_02256540_decl.h"
 
-BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov34_02256540(UnkStruct_ov34_02256540 **param0, const UnkStruct_ov34_02256540_1 *param1, BgConfig *param2);
 void ov34_02256604(UnkStruct_ov34_02256540 *param0);
 void ov34_02256640(UnkStruct_ov34_02256540 *param0, u32 param1);
 BOOL ov34_02256664(UnkStruct_ov34_02256540 *param0, u32 param1);

include/overlay035/ov35_02256410.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV35_02256410_H
 #define POKEPLATINUM_OV35_02256410_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay035/struct_ov35_02256410_1.h"
 #include "overlay035/struct_ov35_02256410_decl.h"
 
-BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov35_02256410(UnkStruct_ov35_02256410 **param0, const UnkStruct_ov35_02256410_1 *param1, BgConfig *param2);
 void ov35_0225644C(UnkStruct_ov35_02256410 *param0);
 void ov35_02256548(UnkStruct_ov35_02256410 *param0, u32 param1);
 BOOL ov35_0225656C(UnkStruct_ov35_02256410 *param0, u32 param1);

include/overlay036/poketch_app_pedometer.h

@@ -8,7 +8,7 @@ typedef struct {
 
 typedef struct UnkStruct_ov36_02256404_t UnkStruct_ov36_02256404;
 
-BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BGL *param2);
+BOOL ov36_02256404(UnkStruct_ov36_02256404 **param0, const UnkStruct_ov36_02256404_1 *param1, BgConfig *param2);
 void ov36_02256440(UnkStruct_ov36_02256404 *param0);
 void ov36_0225653C(UnkStruct_ov36_02256404 *param0, u32 param1);
 BOOL ov36_02256560(UnkStruct_ov36_02256404 *param0, u32 param1);

include/overlay037/ov37_022563D4.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV37_022563D4_H
 #define POKEPLATINUM_OV37_022563D4_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay037/struct_ov37_022563D4_1.h"
 #include "overlay037/struct_ov37_022563D4_decl.h"
 
-BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov37_022563D4(UnkStruct_ov37_022563D4 **param0, const UnkStruct_ov37_022563D4_1 *param1, BgConfig *param2);
 void ov37_02256410(UnkStruct_ov37_022563D4 *param0);
 void ov37_02256488(UnkStruct_ov37_022563D4 *param0, u32 param1);
 BOOL ov37_022564AC(UnkStruct_ov37_022563D4 *param0, u32 param1);

include/overlay038/ov38_0225632C.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV38_0225632C_H
 #define POKEPLATINUM_OV38_0225632C_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay038/struct_ov38_0225632C_1.h"
 #include "overlay038/struct_ov38_0225632C_decl.h"
 
-BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov38_0225632C(UnkStruct_ov38_0225632C **param0, const UnkStruct_ov38_0225632C_1 *param1, BgConfig *param2);
 void ov38_0225635C(UnkStruct_ov38_0225632C *param0);
 void ov38_02256368(UnkStruct_ov38_0225632C *param0, u32 param1);
 BOOL ov38_0225638C(UnkStruct_ov38_0225632C *param0, u32 param1);

include/overlay039/ov39_022563DC.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV39_022563DC_H
 #define POKEPLATINUM_OV39_022563DC_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay039/struct_ov39_022563DC_1.h"
 #include "overlay039/struct_ov39_022563DC_decl.h"
 
-BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov39_022563DC(UnkStruct_ov39_022563DC **param0, const UnkStruct_ov39_022563DC_1 *param1, BgConfig *param2);
 void ov39_0225640C(UnkStruct_ov39_022563DC *param0);
 void ov39_02256418(UnkStruct_ov39_022563DC *param0, u32 param1);
 BOOL ov39_0225643C(UnkStruct_ov39_022563DC *param0, u32 param1);

include/overlay040/ov40_0225645C.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV40_0225645C_H
 #define POKEPLATINUM_OV40_0225645C_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay040/struct_ov40_0225645C_1.h"
 #include "overlay040/struct_ov40_0225645C_decl.h"
 
-BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov40_0225645C(UnkStruct_ov40_0225645C **param0, const UnkStruct_ov40_0225645C_1 *param1, BgConfig *param2);
 void ov40_022564B8(UnkStruct_ov40_0225645C *param0);
 void ov40_022565C8(UnkStruct_ov40_0225645C *param0, u32 param1);
 BOOL ov40_022565EC(UnkStruct_ov40_0225645C *param0, u32 param1);

include/overlay041/ov41_022567B0.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV41_022567B0_H
 #define POKEPLATINUM_OV41_022567B0_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay041/struct_ov41_022567B0_1.h"
 #include "overlay041/struct_ov41_022567B0_decl.h"
 
-BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov41_022567B0(UnkStruct_ov41_022567B0 **param0, const UnkStruct_ov41_022567B0_1 *param1, BgConfig *param2);
 void ov41_022567F8(UnkStruct_ov41_022567B0 *param0);
 void ov41_0225688C(UnkStruct_ov41_022567B0 *param0, u32 param1);
 BOOL ov41_022568B0(UnkStruct_ov41_022567B0 *param0, u32 param1);

include/overlay042/ov42_022563D4.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV42_022563D4_H
 #define POKEPLATINUM_OV42_022563D4_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay042/struct_ov42_022563D4_1.h"
 #include "overlay042/struct_ov42_022563D4_decl.h"
 
-BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov42_022563D4(UnkStruct_ov42_022563D4 **param0, const UnkStruct_ov42_022563D4_1 *param1, BgConfig *param2);
 void ov42_0225648C(UnkStruct_ov42_022563D4 *param0);
 void ov42_022564A0(UnkStruct_ov42_022563D4 *param0, u32 param1);
 BOOL ov42_022564C4(UnkStruct_ov42_022563D4 *param0, u32 param1);

include/overlay043/ov43_02256544.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV43_02256544_H
 #define POKEPLATINUM_OV43_02256544_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay043/struct_ov43_02256544_1.h"
 #include "overlay043/struct_ov43_02256544_decl.h"
 
-BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov43_02256544(UnkStruct_ov43_02256544 **param0, const UnkStruct_ov43_02256544_1 *param1, BgConfig *param2);
 void ov43_02256680(UnkStruct_ov43_02256544 *param0);
 void ov43_022566B0(UnkStruct_ov43_02256544 *param0, u32 param1);
 BOOL ov43_022566D4(UnkStruct_ov43_02256544 *param0, u32 param1);

include/overlay044/ov44_022565BC.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV44_022565BC_H
 #define POKEPLATINUM_OV44_022565BC_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay044/struct_ov44_022565BC_1.h"
 #include "overlay044/struct_ov44_022565BC_decl.h"
 
-BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov44_022565BC(UnkStruct_ov44_022565BC **param0, const UnkStruct_ov44_022565BC_1 *param1, BgConfig *param2);
 void ov44_022565F8(UnkStruct_ov44_022565BC *param0);
 void ov44_02256744(UnkStruct_ov44_022565BC *param0, u32 param1);
 BOOL ov44_02256768(UnkStruct_ov44_022565BC *param0, u32 param1);

include/overlay045/ov45_022566EC.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV45_022566EC_H
 #define POKEPLATINUM_OV45_022566EC_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay045/struct_ov45_022566EC_1.h"
 #include "overlay045/struct_ov45_022566EC_decl.h"
 
-BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov45_022566EC(UnkStruct_ov45_022566EC **param0, const UnkStruct_ov45_022566EC_1 *param1, BgConfig *param2);
 void ov45_02256728(UnkStruct_ov45_022566EC *param0);
 void ov45_02256918(UnkStruct_ov45_022566EC *param0, u32 param1);
 BOOL ov45_0225693C(UnkStruct_ov45_022566EC *param0, u32 param1);

include/overlay046/ov46_02256BCC.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV46_02256BCC_H
 #define POKEPLATINUM_OV46_02256BCC_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay046/struct_ov46_02256BCC_1.h"
 #include "overlay046/struct_ov46_02256BCC_decl.h"
 
-BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov46_02256BCC(UnkStruct_ov46_02256BCC **param0, const UnkStruct_ov46_02256BCC_1 *param1, BgConfig *param2);
 void ov46_02256C0C(UnkStruct_ov46_02256BCC *param0);
 void ov46_02256D24(UnkStruct_ov46_02256BCC *param0, u32 param1);
 BOOL ov46_02256D48(UnkStruct_ov46_02256BCC *param0, u32 param1);

include/overlay047/ov47_02256634.h

@@ -1,12 +1,12 @@
 #ifndef POKEPLATINUM_OV47_02256634_H
 #define POKEPLATINUM_OV47_02256634_H
 
-#include "struct_decls/struct_02018340_decl.h"
-
 #include "overlay047/struct_ov47_02256634_1.h"
 #include "overlay047/struct_ov47_02256634_decl.h"
 
-BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BGL *param2);
+#include "bg_window.h"
+
+BOOL ov47_02256634(UnkStruct_ov47_02256634 **param0, const UnkStruct_ov47_02256634_1 *param1, BgConfig *param2);
 void ov47_02256670(UnkStruct_ov47_02256634 *param0);
 void ov47_0225686C(UnkStruct_ov47_02256634 *param0, u32 param1);
 BOOL ov47_02256890(UnkStruct_ov47_02256634 *param0, u32 param1);