Use Window and WindowTemplate

asm/code_805D8C8.s

@@ -4653,7 +4653,7 @@ _08065F16:
 	.align 2, 0
 _08065F28: .4byte gGameOptionsRef
 _08065F2C: .4byte gDungeonMenu
-_08065F30: .4byte gUnknown_2027370
+_08065F30: .4byte gWindows
 _08065F34: .4byte gUnknown_80FF774
 _08065F38: .4byte gUnknown_80FF7EC
 _08065F3C: .4byte gRealInputs
@@ -4910,7 +4910,7 @@ _08066134: .4byte gUnknown_203B43C
 _08066138: .4byte gUnknown_8106D08
 _0806613C: .4byte gUnknown_202F2F8
 _08066140: .4byte gUnknown_202F2FC
-_08066144: .4byte gUnknown_2027370
+_08066144: .4byte gWindows
 _08066148: .4byte gUnknown_8106D68
 _0806614C: .4byte gRealInputs
 _08066150:
@@ -5344,7 +5344,7 @@ _080664C0:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080664C8: .4byte gUnknown_2027370
+_080664C8: .4byte gWindows
 _080664CC: .4byte gDungeonFramesCounter
 _080664D0: .4byte gUnknown_202F300
 _080664D4: .4byte 0x0000feff

include/code_801B3C0.h

@@ -17,7 +17,7 @@ typedef struct unkStruct_203B230
     u8 fill18[0x20 - 0x18];
     u32 unk20;
     u32 unk24;
-    Windows unk28;
+    WindowTemplates unk28;
     MenuInputStructSub unk88;
 } unkStruct_203B230;
 

include/code_801B60C.h

@@ -20,7 +20,7 @@ typedef struct unkStruct_203B234
     MenuStruct unk78;
     /* 0xC8 */ u32 menuAction;
     MenuItem unkCC[5];
-    Windows windows;
+    WindowTemplates windows;
 } unkStruct_203B234;
 
 bool8 sub_801B60C(u32, u8 id, u8 quantity);

include/code_801D014.h

@@ -21,7 +21,7 @@ struct unk_203B250
     MenuStruct unk18;
     MenuItem unk68[8];
     u16 unkA8[8];
-    Windows windows;
+    WindowTemplates windows;
 };
 
 // size: 0x8

include/code_801EE10.h

@@ -21,7 +21,7 @@ typedef struct unkStruct_203B270
     /* 0x1C */ MenuInputStruct input;
     u32 unk50;
     u32 unk54;
-    Windows windows;
+    WindowTemplates windows;
     const u8 *text;
 } unkStruct_203B270;
 

include/code_80227B8.h

@@ -26,7 +26,7 @@ typedef struct unkStruct_203B294
     /* 0xF4 */ u32 menuAction;
     MenuItem unkF8[8];
     u16 unk138[8];
-    Windows windows;
+    WindowTemplates windows;
 } unkStruct_203B294;
 
 bool8 sub_80227B8(PokemonStruct1 *pkmn);

include/code_8024458.h

@@ -15,8 +15,8 @@ struct unkStruct_203B2AC
     struct unkStruct_808FF20 unk4C;
     struct UnkInfoTabStruct unkB0;
     u32 unkE0;
-    Window *unkE4;
-    Windows unkE8;
+    WindowTemplate *unkE4;
+    WindowTemplates unkE8;
     WindowHeader unk148;
 };
 

include/code_802DB28.h

@@ -15,7 +15,7 @@ struct unkStruct_203B2FC
     /* 0x30 */ u8 jobSlotIndex;
     /* 0x34 */ WonderMail *jobInfo;
     /* 0x38 */ struct MonPortraitMsg monPortrait;
-    Windows unk48;
+    WindowTemplates unk48;
 };
 
 bool8 sub_802DB28(u8 jobSlotIndex, u8 dungeon);

include/code_802DE84.h

@@ -11,8 +11,8 @@ struct unkStruct_203B300
     MenuInputStructSub unk0;
     /* 0xC */ unkStruct_802C39C *mail;
     u32 unk10;
-    Window *unk14;
-    Windows unk18;
+    WindowTemplate *unk14;
+    WindowTemplates unk18;
     u8 unk78[4];
 };
 

include/credits1.h

@@ -6,7 +6,7 @@
 // size: 0x6C
 typedef struct Credits1Work
 {
-    Windows unk0;
+    WindowTemplates unk0;
     s32 unk60;
     s32 unk64;
     /* 0x68 */ s32 creditsCategoryIndex;

include/debug_menu1.h

@@ -8,7 +8,7 @@
 struct DebugMenu
 {
     MenuStruct unk0[4];
-    Windows unk140;
+    WindowTemplates unk140;
     u32 fill1A0;
 };
 

include/debug_menu2.h

@@ -14,7 +14,7 @@ typedef struct unkStruct_203B3F0
     MenuStruct unk4C;
     unkStructFor8013AA0 unk9C;
     u8 fillCC[0xD8 - 0xCC];
-    Windows unkD8;
+    WindowTemplates unkD8;
 } unkStruct_203B3F0;
 
 #endif // GUARD_DEBUG_MENU2_H

include/debug_menu3.h

@@ -12,7 +12,7 @@ typedef struct unkStruct_203B3F4
     /* 0x8 */ u32 menuAction;
     /* 0xC */ MenuItem menuItems[8];
     MenuStruct unk4C;
-    Windows unk9C;
+    WindowTemplates unk9C;
 } unkStruct_203B3F4;
 
 #endif // GUARD_DEBUG_MENU3_H

include/debug_menu4.h

@@ -17,7 +17,7 @@ typedef struct unkStruct_203B3F8
     unkStructFor8013AA0 unk60;
     MenuItem unk90[8];
     u16 unkD0[8];
-    Windows unkE0;
+    WindowTemplates unkE0;
 } unkStruct_203B3F8;
 
 #endif // GUARD_DEBUG_MENU4_H

include/dungeon_submenu.h

@@ -3,6 +3,6 @@
 
 #include "structs/str_text.h"
 
-void CreateDungeonMenuSubWindow(Window *mainWindow, s32 subWindowX);
+void CreateDungeonMenuSubWindow(WindowTemplate *mainWindow, s32 subWindowX);
 
 #endif

include/felicity_bank.h

@@ -22,7 +22,7 @@ typedef struct FelicityBankWork
     unkStructFor8013AA0 unk64;
     /* 0x94 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    Windows unkA8;
+    WindowTemplates unkA8;
 } FelicityBankWork;
 
 bool8 CreateFelicityBank(s32 mode);

include/friend_area_action_menu.h

@@ -65,7 +65,7 @@ struct unkStruct_203B2BC
     MenuItem menuItems[4];
     u8 fill120[0x16C - 0x13C];
     u16 unk16C[10];
-    Windows unk180;
+    WindowTemplates unk180;
 };
 
 u32 sub_8027074(void);

include/friend_list_menu.h

@@ -31,7 +31,7 @@ typedef struct unkStruct_203B2B4
     MenuStruct unk78;
     MenuItem unkC8[8];
     u16 unk108[8];
-    Windows unk118;
+    WindowTemplates unk118;
 } unkStruct_203B2B4;
 
 bool8 CreateFriendListMenu(s32 param_1);

include/friend_rescue.h

@@ -23,8 +23,8 @@ typedef struct WonderMailStruct_203B33C
     unkStruct_203B480 unk1E8;
     u8 unk218;
     MenuStruct unk21C[4];
-    Windows unk35C;
-    Windows unk3BC;
+    WindowTemplates unk35C;
+    WindowTemplates unk3BC;
     /* 0x41C */ Item item;
     u32 unk420; // Is this supposed to be a File like 203B2C4?
     u8 unk424[0x100];

include/gulpin_shop.h

@@ -27,7 +27,7 @@ typedef struct GulpinShopWork
     u8 fillC8[0x118 - 0xC8];
     /* 0x118 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    Windows unk12C;
+    WindowTemplates unk12C;
 } GulpinShopWork;
 
 bool8 CreateGulpinShop(u32 mode, s16 pokeSpecies, Move *moves);

include/gulpin_shop_801FB50.h

@@ -35,7 +35,7 @@ typedef struct unkStruct_203B27C
     u8 fill11C[0x16C - 0x11C];
     /* 0x16C */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    Windows unk180;
+    WindowTemplates unk180;
 } unkStruct_203B27C;
 
 bool8 sub_801FB50(u32 mode);

include/iq_skill_info_menu.h

@@ -16,7 +16,7 @@ struct IQSkillInfoMenu
     u8 fill14[0x20 - 0x18];
     u32 unk20;
     u32 unk24;
-    Windows unk28;
+    WindowTemplates unk28;
     MenuInputStructSub unk88;
 };
 

include/iq_skill_menu.h

@@ -19,7 +19,7 @@ struct IQSkillMenu
     /* 0x30 */ s32 menuAction;
     MenuItem unk34[8];
     MenuStruct unk74;
-    Windows unkC4;
+    WindowTemplates unkC4;
 };
 
 bool8 CreateIQSkillMenu(s16 species);

include/kangaskhan_storage1.h

@@ -47,7 +47,7 @@ struct KangaskhanStorageWork
     unkStructFor8013AA0 unkA8;
     /* 0xD8 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    Windows unkEC;
+    WindowTemplates unkEC;
 };
 
 bool8 CreateKangaskhanStorage(u32 mode);

include/kangaskhan_storage2.h

@@ -27,7 +27,7 @@ typedef struct unkStruct_203B20C
     u16 unk60[8];
     MenuStruct unk70;
     unkStructFor8013AA0 unkC0;
-    Windows unkF0;
+    WindowTemplates unkF0;
 } unkStruct_203B20C;
 
 bool8 sub_8017E1C(void);

include/kecleon_bros1.h

@@ -65,7 +65,7 @@ typedef struct KecleonBrosWork1
     /* 0x84 */ MenuStruct menu;
     /* 0xD4 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    Windows unkE8;
+    WindowTemplates unkE8;
 } KecleonBrosWork1;
 
 // mode corresponds to the enum: KecleonBrosMode

include/luminous_cave.h

@@ -33,7 +33,7 @@ typedef struct LuminousCaveWork
     u8 unk110;
     u8 unk111;
     u8 unk112;
-    Windows unk114;
+    WindowTemplates unk114;
 } LuminousCaveWork;
 
 void CleanLuminousCave(void);

include/mailbox.h

@@ -19,7 +19,7 @@ struct unkStruct_203B304
     MenuStruct unk6C;
     MenuItem menuItems[8];
     u16 unkFC[8];
-    Windows unk10C;
+    WindowTemplates unk10C;
 };
 
 extern void SetMailboxState(u32);

include/main_menu1.h

@@ -38,12 +38,12 @@ void CleanUpMenu(void);
 void DeleteMainMenu(void);
 MainMenu1Work *GetMainMenu(void);
 void InitMainMenu(void);
-void SetMenuItems(MenuStruct *, Windows *, s32 index, const Window *, const MenuItem *menuItems, bool8, u32 menuAction, bool8 unused);
+void SetMenuItems(MenuStruct *, WindowTemplates *, s32 index, const WindowTemplate *, const MenuItem *menuItems, bool8, u32 menuAction, bool8 unused);
 void SetUpMenu(void);
 s32 UpdateMenu(void);
 
 void sub_8035C1C(void);
-void sub_8035CC0(Windows *dataArray, u32 index);
+void sub_8035CC0(WindowTemplates *dataArray, u32 index);
 void sub_8035CF4(MenuStruct *menu, u32 index, bool8);
 void sub_8035D1C(void);
 s16 sub_8035D3C(void);

include/main_menu2.h

@@ -9,7 +9,7 @@ typedef struct MainMenu2Work
 {
     u32 unk0;
     MenuStruct unk4[4];
-    Windows unk144;
+    WindowTemplates unk144;
     /* 0x1A4 */ u32 currMenuChoice;
 } MainMenu2Work;
 

include/makuhita_dojo1.h

@@ -30,7 +30,7 @@ typedef struct MakuhitaDojoWork1
     u8 fill38[0x58 - 0x38];
     /* 0x58 */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    Windows unk6C;
+    WindowTemplates unk6C;
 } MakuhitaDojoWork1;
 
 void MakuhitaDojo_Delete(void);

include/menu_input.h

@@ -9,9 +9,9 @@ s32 GetKeyPress(MenuInputStruct *r0);
 s32 sub_8012AE8(void);
 void sub_8012BC4(u32 x, u32 y, s32 n, s32 len, u32 color, u32 param_6);
 void sub_8012C60(u32 x, u32 y, u32 param_3, u32 color, u32 param_5);
-void sub_8012CAC(Window *param_1, const MenuItem *param_2);
-void sub_8012D08(Window *param_1, s32 param_2);
-void sub_8012D34(Window *param_1, s32 param_2);
+void sub_8012CAC(WindowTemplate *param_1, const MenuItem *param_2);
+void sub_8012D08(WindowTemplate *param_1, s32 param_2);
+void sub_8012D34(WindowTemplate *param_1, s32 param_2);
 void sub_8012D60(MenuStruct *param_1, const MenuItem *menuItems, const u32 *colorArray, u16 *param_4, s32 menuAction, s32 index);
 void sub_8012E04(MenuStruct *param_1, const MenuItem *menuItems, const u32 *colorArray, u16 *param_4, s32 menuAction, s32 index);
 void sub_8012EA4(MenuStruct *param_1, bool8 r1);
@@ -49,7 +49,7 @@ void sub_8013C68(unkStructFor8013AA0 *);
 void sub_8013D10(unkStructFor8013AA0 *);
 void sub_8013E54(void);
 void sub_8013F84(void);
-void sub_80140B4(Windows *);
+void sub_80140B4(WindowTemplates *);
 
 
 #endif // GUARD_MENU_INPUT_H

include/options_menu1.h

@@ -14,7 +14,7 @@ struct unkStruct_203B25C
     /* 0x1C */ MenuStruct menu;
     /* 0x6C */ MenuItem menuItems[8];
     u16 unkAC[8];
-    Windows unkBC;
+    WindowTemplates unkBC;
 };
 
 bool8 sub_801DCC4(void);

include/options_menu2.h

@@ -11,8 +11,8 @@ struct unkStruct_203B260
     /* 0x4 */ MenuInputStructSub unk4;
     /* 0x10 */ MenuInputStruct input;
     u32 unk44;
-    Window *unk48;
-    Windows unk4C;
+    WindowTemplate *unk48;
+    WindowTemplates unk4C;
 };
 
 bool8 sub_801E198(GameOptions *optionsMenu);

include/other_menus1.h

@@ -18,7 +18,7 @@ typedef struct unkStruct_203B35C
     u32 unk14;
     u8 fill18[0x1C - 0x18];
     MenuStruct unk1C[4];
-    Windows unk15C;
+    WindowTemplates unk15C;
     unkStruct_8035D94 unk1BC[2];
     unkStruct_203B480 unk1CC;
     unkStruct_203B480 unk1FC;

include/party_list_menu.h

@@ -32,7 +32,7 @@ typedef struct unkStruct_203B2B8
     MenuItem unk16C[10];
     MenuItem unk1BC[10];
     u16 unk20C[10];
-    Windows unk220;
+    WindowTemplates unk220;
 } unkStruct_203B2B8;
 
 bool8 CreatePartyListMenu(PokemonStruct1 *pokeStruct);

include/pelipper_board.h

@@ -17,7 +17,7 @@ struct unkStruct_203B308
     MenuStruct unk6C;
     MenuItem menuItems[8];
     u16 unkFC[8];
-    Windows unk10C;
+    WindowTemplates unk10C;
 };
 extern struct unkStruct_203B308 *gPelipperBoard;
 

include/pokemon_news2.h

@@ -14,7 +14,7 @@ struct unkStruct_203B2D4
     const u8 *unk10[4];
     u32 unk20;
     u32 unk24;
-    Windows unk28;
+    WindowTemplates unk28;
     MenuInputStructSub unk88;
 };
 

include/post_office_guide2.h

@@ -11,8 +11,8 @@ typedef struct unkStruct_203B330
     u8 unkC;
     /* 0xD */ u8 dungeonIndex;
     u32 unk10;
-    Window *unk14;
-    Windows unk18;
+    WindowTemplate *unk14;
+    WindowTemplates unk18;
 } unkStruct_203B330;
 
 bool8 sub_80319A4(u8, u8 dungeon, s32);

include/rescue_password_menu.h

@@ -12,8 +12,8 @@ struct RescuePasswordMenu
     u32 currMenu;
     u32 state;
     MenuStruct unk8[4];
-    Windows unk148;
-    Windows unk1A8;
+    WindowTemplates unk148;
+    WindowTemplates unk1A8;
     SpriteOAM unk208;
     u32 unk210;
 };

include/save_menu.h

@@ -9,7 +9,7 @@ typedef struct SaveMenuWork
     /* 0x0 */ u32 currMenu;
     u32 unk4;
     MenuStruct unk8[4];
-    Windows unk148;
+    WindowTemplates unk148;
     SpriteOAM unk1A8;
     u32 unk1B0; // Sprite count?
 } SaveMenuWork;

include/structs/menu.h

@@ -72,7 +72,7 @@ typedef struct unkStructFor8013AA0
     s32 unkC; // maxInclusive?
     s32 unk10;
     s32 unk14; // index of unk18? But read as chosenValue..?
-    Window *unk18;
+    WindowTemplate *unk18;
     s32 unk1C; // width of prompt?
     s32 unk20; // height of prompt?
     u8 unk24; // related to unk10

include/structs/str_text.h

@@ -2,7 +2,7 @@
 #define GUARD_STR_TEXT_H
 
 // size: 0x48
-typedef struct UnkTextStruct1
+typedef struct Window
 {
     s16 unk0;
     s16 unk2;
@@ -26,7 +26,7 @@ typedef struct UnkTextStruct1
     u8 unk44;
     bool8 unk45;
     u8 unk46;
-} UnkTextStruct1;
+} Window;
 
 typedef struct WindowHeader
 {
@@ -39,7 +39,7 @@ typedef struct WindowHeader
 #include "structs/str_position.h"
 
 // size: 0x18
-typedef struct Window
+typedef struct WindowTemplate
 {
     u8 unk0;
     s32 type;
@@ -49,10 +49,10 @@ typedef struct Window
     s16 unk10; // In most cases it's the same as height. If it's smaller than height, the window may look glitchy. Maybe something with tile allocation/how the window is filled?
     s16 unk12;
     const WindowHeader *unk14;
-} Window;
+} WindowTemplate;
 
 // All fields are zeroed out except for type which is set to WINDOW_TYPE_NORMAL.
-#define WINDOW_DUMMY (Window) {.unk0 = 0, .type = WINDOW_TYPE_NORMAL, .width = 0, .pos = {0, 0}, .height = 0, .unk10 = 0, .unk12 = 0, .unk14 = NULL}
+#define WINDOW_DUMMY (WindowTemplate) {.unk0 = 0, .type = WINDOW_TYPE_NORMAL, .width = 0, .pos = {0, 0}, .height = 0, .unk10 = 0, .unk12 = 0, .unk14 = NULL}
 
 #define WINDOW_TYPE_0                   0
 #define WINDOW_TYPE_WITHOUT_BORDER      1
@@ -63,8 +63,8 @@ typedef struct Window
 
 #define MAX_WINDOWS 4
 
-typedef struct Windows {
-    Window id[MAX_WINDOWS];
-} Windows;
+typedef struct WindowTemplates {
+    WindowTemplate id[MAX_WINDOWS];
+} WindowTemplates;
 
 #endif // GUARD_STR_TEXT_H

include/structs/struct_sub80095e4.h

@@ -12,8 +12,8 @@ typedef struct struct_Sub80095E4
 {
     /* 0x0 */ MenuInputStruct input;
     u32 unk34;
-    Window *unk38;
-    Windows windows;
+    WindowTemplate *unk38;
+    WindowTemplates windows;
     // size: 0x9C
 } struct_Sub80095E4;
 

include/text.h

@@ -49,7 +49,7 @@ struct UnkDrawStringStruct
     s32 unk30;
 };
 
-extern UnkTextStruct1 gUnknown_2027370[4];
+extern Window gWindows[MAX_WINDOWS];
 extern u8 gUnknown_202749A[11];
 extern bool8 gUnknown_20274A5;
 extern u16 gUnknown_202B038[4][32][32]; // Usage points to these dimensions
@@ -63,8 +63,8 @@ u32 UpdateFadeInTile(u32 a0);
 u32 sub_80063B0(void);
 void SelectCharmap(u32 a0);
 void SetCharacterMask(int a0);
-void ShowWindows(const Windows *windows, bool8 a1, bool8 a2);
-void RestoreUnkTextStruct_8006518(Windows *unkData);
+void ShowWindows(const WindowTemplates *windows, bool8 a1, bool8 a2);
+void RestoreUnkTextStruct_8006518(WindowTemplates *unkData);
 u32 sub_8006544(u32 index);
 void sub_8007334(s32 a0);
 void sub_80073B8(s32 a0);

include/thank_you_wonder_mail.h

@@ -22,8 +22,8 @@ typedef struct WonderMailStruct_203B2C4
     unkStruct_203B480 unk1E8;
     /* 0x218 */ s8 mailIndex;
     MenuStruct unk21C[4];
-    Windows unk35C;
-    Windows unk3BC;
+    WindowTemplates unk35C;
+    WindowTemplates unk3BC;
     Item unk41C;
     /* 0x420 */ struct MonPortraitMsg monPortrait;
     u32 unk430;

include/trade_items_menu.h

@@ -47,8 +47,8 @@ struct TradeItemsMenu
     u32 unk10;
     unkStructFor8013AA0 unk14;
     MenuStruct unk44[4];
-    Windows unk184;
-    Windows unk1E4;
+    WindowTemplates unk184;
+    WindowTemplates unk1E4;
 
     // TODO These might be structs...
     struct TradeItem unk244;

include/wigglytuff_shop2.h

@@ -13,8 +13,8 @@ typedef struct WigglytuffShop2Work
     u32 pokemonStatus[0x10];
     /* 0x70 */ s32 numPokemoninFriendArea;
     s32 unk74;
-    Window *unk78;
-    Windows unk7C;
+    WindowTemplate *unk78;
+    WindowTemplates unk7C;
     u8 unkDC[4];
 } WigglytuffShop2Work;
 

include/wigglytuff_shop3.h

@@ -54,7 +54,7 @@ typedef struct WigglytuffShop3Work
     MenuStruct unk6C;
     /* 0xBC */ struct MonPortraitMsg monPortrait;
     struct MonPortraitMsg *monPortraitPtr;
-    Windows unkD0;
+    WindowTemplates unkD0;
     u32 unk130;
     u32 unk134;
 } WigglytuffShop3Work;

include/wonder_mail.h

@@ -22,8 +22,8 @@ typedef struct WonderMailStruct_203B2C0
     u8 fill16A[0x218 - 0x1B8];
     /* 0x218 */ u8 mailIndex;
     MenuStruct unk21C[4];
-    Windows unk35C;
-    Windows unk3BC;
+    WindowTemplates unk35C;
+    WindowTemplates unk3BC;
     /* 0x41C */ u32 unkfill; // ItemSlot?
     /* 0x420 */ struct MonPortraitMsg monPortrait;
     /* 0x430 */ u8 padding3[0x534 - 0x430];

include/wonder_mail_802C860.h

@@ -19,7 +19,7 @@ struct unkStruct_203B2F0
     MenuItem unk10C[8];
     MenuItem unk14C[8];
     u8 fill18C[0x19C - 0x18C];
-    Windows unk19C;
+    WindowTemplates unk19C;
 };
 
 bool8 InitializeJobListMenu(u32);

include/wonder_mail_802D098.h

@@ -34,7 +34,7 @@ typedef struct unkStruct_203B2F8
     MenuItem unk118[8];
     MenuItem unk158[8];
     u16 unk198[8];
-    Windows unk1A8;
+    WindowTemplates unk1A8;
 } unkStruct_203B2F8;
 
 bool8 GetWonderMailAccepted(void);

src/code_8015080.c

@@ -16,13 +16,13 @@ struct unkStruct_203B1F8
     // size: 0x4B4
     u32 menuAction;
     MenuStruct unk4;
-    Windows windows;
+    WindowTemplates windows;
     u8 buffer[0x400];
 };
 
 EWRAM_INIT struct unkStruct_203B1F8 *gUnknown_203B1F8 = {NULL};
 
-const Window gUnknown_80DAF70 = {
+const WindowTemplate gUnknown_80DAF70 = {
    0x00,
    0x03,
    0x00, 0x00,
@@ -31,7 +31,7 @@ const Window gUnknown_80DAF70 = {
    NULL
 };
 
-const Window gUnknown_80DAF88 = {
+const WindowTemplate gUnknown_80DAF88 = {
    0x00,
    0x03,
    0x02, 0x02,
@@ -40,7 +40,7 @@ const Window gUnknown_80DAF88 = {
    NULL
 };
 
-const Window gUnknown_80DAFA0 = {
+const WindowTemplate gUnknown_80DAFA0 = {
    0x00,
    0x03,
    0x16, 0x0F,
@@ -251,7 +251,7 @@ static const u8 *const gUnknown_80DB4F4[] =
     _("END"),
 };
 
-static const Window gUnknown_80DB538 = {
+static const WindowTemplate gUnknown_80DB538 = {
    0x00,
    0x03,
    0x00, 0x00,
@@ -260,7 +260,7 @@ static const Window gUnknown_80DB538 = {
    NULL
 };
 
-static const Window gUnknown_80DB550 = {
+static const WindowTemplate gUnknown_80DB550 = {
    0x00,
    0x01,
    0x01, 0x0A,
@@ -269,7 +269,7 @@ static const Window gUnknown_80DB550 = {
    NULL
 };
 
-static const Window gUnknown_80DB568 = {
+static const WindowTemplate gUnknown_80DB568 = {
    0x00,
    0x01,
    0x04, 0x03,
@@ -278,7 +278,7 @@ static const Window gUnknown_80DB568 = {
    NULL
 };
 
-static const Window gUnknown_80DB580 = {
+static const WindowTemplate gUnknown_80DB580 = {
    0x00,
    0x01,
    0x01, 0x02,
@@ -356,7 +356,7 @@ struct unkStruct_203B1FC
     u8 *unkF8;
     u8 unkFC[56];
     u8 *unk134;
-    Windows windows;
+    WindowTemplates windows;
 };
 extern struct unkStruct_203B1FC *gUnknown_203B1FC;
 
@@ -640,7 +640,7 @@ bool8 sub_8015748(void)
 
 void sub_80157D8(void)
 {
-    UnkTextStruct1 *txtPtr = &gUnknown_2027370[1];
+    Window *txtPtr = &gWindows[1];
 
     // Note: for cases 4 and 5, the code is identical except for different position structs.
     if (gUnknown_203B1FC->unk0 == 4) {
@@ -675,7 +675,7 @@ void sub_80157D8(void)
 void sub_80158BC(void)
 {
     s32 x, y;
-    UnkTextStruct1 *txtPtr = &gUnknown_2027370[0];
+    Window *txtPtr = &gWindows[0];
     u32 var;
 
     switch (sub_8012AE8()) {

src/code_801EE10.c

@@ -13,7 +13,7 @@
 
 EWRAM_INIT unkStruct_203B270 *gUnknown_203B270 = {NULL};
 
-const Window gUnknown_80DC240 = {
+const WindowTemplate gUnknown_80DC240 = {
     0x00,
     0x03,
     0x00, 0x00,
@@ -24,7 +24,7 @@ const Window gUnknown_80DC240 = {
 
 const WindowHeader gUnkData_80DC258 = {0x01, 0x00, 0x0F, 0x00};
 
-const Window gUnknown_80DC25C = {
+const WindowTemplate gUnknown_80DC25C = {
     0,
     6,
     0x2, 0x2,
@@ -33,7 +33,7 @@ const Window gUnknown_80DC25C = {
     &gUnkData_80DC258
 };
 
-const Window gUnknown_80DC274 = {
+const WindowTemplate gUnknown_80DC274 = {
     0,
     3,
     0x2, 0xF,

src/code_801F428.c

@@ -20,7 +20,7 @@ struct unkStruct_203B274
 };
 EWRAM_INIT struct unkStruct_203B274 *gUnknown_203B274 = {NULL};
 
-static const Window sUnknown_80DC2AC = {
+static const WindowTemplate sUnknown_80DC2AC = {
     0,
     3,
     0, 0,
@@ -28,7 +28,7 @@ static const Window sUnknown_80DC2AC = {
     0, 0,
     NULL
 };
-static const Window sUnknown_80DC2C4 = {
+static const WindowTemplate sUnknown_80DC2C4 = {
     0,
     6,
     2, 2,

src/code_801F808.c

@@ -23,15 +23,15 @@ struct unkStruct_203B278
     u32 unk24;
     MenuInputStruct unk28;
     u32 unk5C;
-    Window *unk60;
-    Windows windows;
+    WindowTemplate *unk60;
+    WindowTemplates windows;
     WindowHeader unkC4;
     MenuInputStructSub unkC8;
 };
 
 EWRAM_INIT struct unkStruct_203B278 *gUnknown_203B278 = {NULL};
 
-static const Window sUnknown_80DC2F8 = {
+static const WindowTemplate sUnknown_80DC2F8 = {
     0,
     3,
     0, 0,

src/code_8031D70.c

@@ -18,15 +18,15 @@ struct unkStruct_203B334
     u32 mailIndex;
     MenuInputStructSub unk4;
     u32 unk10;
-    Window *unk14;
-    Windows unk18;
+    WindowTemplate *unk14;
+    WindowTemplates unk18;
     u8 unk78[4];
 };
 
 EWRAM_INIT struct unkStruct_203B334 *gUnknown_203B334 = {NULL};
 extern unkStruct_203B480 *gUnknown_203B480;
 
-const Window gUnknown_80E1FA8 = {
+const WindowTemplate gUnknown_80E1FA8 = {
     0,
     3,
     0x0, 0x0,
@@ -37,7 +37,7 @@ const Window gUnknown_80E1FA8 = {
 
 const WindowHeader gUnkData_80E1FC0 = {0x01, 0x00, 0x0A, 0x00};
 
-const Window gUnknown_80E1FC4 = {
+const WindowTemplate gUnknown_80E1FC4 = {
     0,
     6,
     0x2, 0x2,

src/code_803E724.c

@@ -173,7 +173,7 @@ void sub_803EA10(void)
     SetBGPaletteBufferColorRGB(248, &gFontPalette[8], gDungeonBrightness, NULL);
 }
 
-static const struct Windows gUnknown_80F62B0 =
+static const struct WindowTemplates gUnknown_80F62B0 =
 {
     .id = {
         [0] = {
@@ -191,7 +191,7 @@ static const struct Windows gUnknown_80F62B0 =
     }
 };
 
-static const struct Windows gUnknown_80F6310 =
+static const struct WindowTemplates gUnknown_80F6310 =
 {
     .id = {
         [0] = {
@@ -209,7 +209,7 @@ static const struct Windows gUnknown_80F6310 =
     }
 };
 
-static const struct Windows gUnknown_80F6370 =
+static const struct WindowTemplates gUnknown_80F6370 =
 {
     .id = {
         [0] = {
@@ -243,7 +243,7 @@ static const struct Windows gUnknown_80F6370 =
     }
 };
 
-static const struct Windows gUnknown_80F63D0 =
+static const struct WindowTemplates gUnknown_80F63D0 =
 {
     .id = {
         [0] = {
@@ -353,7 +353,7 @@ void sub_803EC94(void)
     sub_801317C(&gDungeonMenu.unk28);
 }
 
-void DungeonShowWindows(Windows *a0, bool8 a1)
+void DungeonShowWindows(WindowTemplates *a0, bool8 a1)
 {
     gUnknown_202EDD0 = 10;
     sub_8052210(0);

src/code_805D8C8.c

@@ -39,7 +39,7 @@ void sub_8068310(s32 size, u16 **param_2)
 void sub_8068344(void)
 {
     if ((gDungeonFramesCounter & 8) != 0) {
-        UnkTextStruct1 *ptr = &gUnknown_2027370[0];
+        Window *ptr = &gWindows[0];
         SpriteOAM sprite = {0};
 
         SpriteSetAffine1(&sprite, 0);
@@ -63,7 +63,7 @@ void sub_8068344(void)
 void sub_80684C4(void)
 {
     if ((gDungeonFramesCounter & 8) != 0) {
-        UnkTextStruct1 *ptr = &gUnknown_2027370[0];
+        Window *ptr = &gWindows[0];
         SpriteOAM sprite = {0};
 
         SpriteSetAffine1(&sprite, 0);

src/code_8066D04.c

@@ -904,13 +904,13 @@ extern void sub_8068344(void);
 bool8 CanSubMenuItemBeChosen(s32 param_1);
 void sub_8068310(s32 a0, PokemonStruct1 **a1);
 void sub_8067F00(u8 a0, PokemonStruct1 **a1, s32 a2, s32 a3, s32 a4);
-extern void DungeonShowWindows(Windows *a0, u8 a1);
+extern void DungeonShowWindows(WindowTemplates *a0, u8 a1);
 u32 sub_8014140(s32 a0, const void *a1);
 void sub_8083D1C(void);
 void PlayDungeonConfirmationSE(void);
 void PlayDungeonCancelSE(void);
 void sub_806806C(PokemonStruct1 *a0);
-void CreateDungeonMenuSubWindow(Windows *a0, s32 a1);
+void CreateDungeonMenuSubWindow(WindowTemplates *a0, s32 a1);
 extern void sub_803EAF0(u32, u8 *);
 
 extern const s32 gUnknown_8106E80[];
@@ -925,7 +925,7 @@ static const u8 gUnknown_8106DA4[] = {
     0x01, 0, 0x38, 0, 0, 0, 0x18, 0, 0x18, 0, 0, 0, 0x02, 0, 0x38, 0, 0x68, 0, 0x18, 0, 0x18, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
 
-static const Windows gUnknown_8106DC8 = {
+static const WindowTemplates gUnknown_8106DC8 = {
     .id = {
         [0] =
         {
@@ -958,7 +958,7 @@ void sub_8067A80(u8 a0, s32 a1, s32 a2, PokemonStruct1 **a3)
 {
     s32 i;
     s32 r10;
-    Windows spTxtStruct = gUnknown_8106DC8;
+    WindowTemplates spTxtStruct = gUnknown_8106DC8;
 
     gUnknown_202F30C = 0;
     r10 = 0;
@@ -1251,7 +1251,7 @@ void sub_806806C(PokemonStruct1 *a0)
 {
     struct unkStruct_808FF20 unkStruct;
     struct UnkInfoTabStruct var_C8;
-    Windows spTxtStruct = {0};
+    WindowTemplates spTxtStruct = {0};
     s32 r7;
 
     spTxtStruct.id[0].type = WINDOW_TYPE_WITH_HEADER;
@@ -1295,8 +1295,8 @@ void sub_806806C(PokemonStruct1 *a0)
         sub_808FF20(&unkStruct, a0, gDungeon->unk644.unk16);
         CreatePokemonInfoTabScreen(spF8[r7], r7, &unkStruct, &var_C8, 0);
 
-        gDungeonMenu.unkC = (gUnknown_2027370[0].unk0 + 15) * 8;
-        gDungeonMenu.unkE = ((gUnknown_2027370[0].unk2 + 1) * 8) - 2;
+        gDungeonMenu.unkC = (gWindows[0].unk0 + 15) * 8;
+        gDungeonMenu.unkE = ((gWindows[0].unk2 + 1) * 8) - 2;
 
         while (1) {
             s32 r5;

src/code_8072F3C.c

@@ -29,7 +29,7 @@ struct unkStruct_203B314
 
 EWRAM_INIT struct unkStruct_203B314 *gUnknown_203B314 = {NULL};
 
-const Window gUnknown_80E06FC = {
+const WindowTemplate gUnknown_80E06FC = {
     0x00,
     0x03,
     0x00, 0x00,
@@ -38,7 +38,7 @@ const Window gUnknown_80E06FC = {
     NULL
 };
 
-const Window gUnknown_80E0714 = {
+const WindowTemplate gUnknown_80E0714 = {
     0x00,
     0x06,
     0x02, 0x02,
@@ -46,7 +46,7 @@ const Window gUnknown_80E0714 = {
     0x0E, 0x00,
     NULL
 };
-const Window gUnknown_80E072C = {
+const WindowTemplate gUnknown_80E072C = {
     0x00,
     0x06,
     0x02, 0x02,

src/credits1.c

@@ -8,8 +8,8 @@
 
 static EWRAM_INIT Credits1Work *sCredits1Work = {NULL};
 
-extern const Window gUnknown_80E4A10;
-extern const Window gUnknown_80E4A28;
+extern const WindowTemplate gUnknown_80E4A10;
+extern const WindowTemplate gUnknown_80E4A28;
 extern const u32 gUnknown_80E4A40[];
 extern const CreditsData* gCreditsTable[27];
 

src/data/adventure_log.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E1FF0 =
+static const WindowTemplate sUnknown_80E1FF0 =
 {
     0,
     3,
@@ -8,7 +8,7 @@ static const Window sUnknown_80E1FF0 =
     NULL
 };
 
-static const Window sUnknown_80E2008 =
+static const WindowTemplate sUnknown_80E2008 =
 {
     0,
     6,

src/data/code_801602C.h

@@ -5,7 +5,7 @@ enum
     MENU_ACTION_NO,
 };
 
-UNUSED static const Window sUnknown_80DB670 =
+UNUSED static const WindowTemplate sUnknown_80DB670 =
 {
     0,
     3,

src/data/code_801B60C.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DBA58 = {
+static const WindowTemplate sUnknown_80DBA58 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DBA58 = {
     NULL
 };
 
-static const Window sUnknown_80DBA70 = {
+static const WindowTemplate sUnknown_80DBA70 = {
     0,
     3,
     20, 4,
@@ -16,7 +16,7 @@ static const Window sUnknown_80DBA70 = {
     NULL
 };
 
-static const Window sUnknown_80DBA88 = {
+static const WindowTemplate sUnknown_80DBA88 = {
     0,
     3,
     20, 14,

src/data/code_801C8C4.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DBE3C = {
+static const WindowTemplate sUnknown_80DBE3C = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DBE3C = {
     NULL
 };
 
-static const Window sUnknown_80DBE54 = {
+static const WindowTemplate sUnknown_80DBE54 = {
     0,
     6,
     2, 2,

src/data/code_801D014.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DBE7C = {
+static const WindowTemplate sUnknown_80DBE7C = {
     0,
     3,
     0, 0,
@@ -8,7 +8,7 @@ static const Window sUnknown_80DBE7C = {
 };
 
 static const WindowHeader sUnknown_80DBE94 = {1, 0, 7, 0};
-static const Window sUnknown_80DBE98 = {
+static const WindowTemplate sUnknown_80DBE98 = {
     0,
     6,
     2, 2,
@@ -17,7 +17,7 @@ static const Window sUnknown_80DBE98 = {
     &sUnknown_80DBE94
 };
 
-static const Window sUnknown_80DBEB0[MAX_WINDOWS] =
+static const WindowTemplate sUnknown_80DBEB0[MAX_WINDOWS] =
 {
     {
         0,

src/data/code_801D9E4.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DBF70 = {
+static const WindowTemplate sUnknown_80DBF70 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DBF70 = {
     NULL
 };
 
-static const Window sUnknown_80DBF88 = {
+static const WindowTemplate sUnknown_80DBF88 = {
     0,
     6,
     2, 2,

src/data/code_80227B8.h

@@ -5,7 +5,7 @@ static const MenuItem sUnknown_80DC584[3] =
     {NULL, 1},
 };
 
-static const Window sUnknown_80DC5A4 =
+static const WindowTemplate sUnknown_80DC5A4 =
 {
     0,
     3,
@@ -14,7 +14,7 @@ static const Window sUnknown_80DC5A4 =
     0, 0,
     NULL
 };
-static const Window sUnknown_80DC5BC =
+static const WindowTemplate sUnknown_80DC5BC =
 {
     0,
     3,
@@ -23,7 +23,7 @@ static const Window sUnknown_80DC5BC =
     3, 0,
     NULL
 };
-static const Window sUnknown_80DC5D4 =
+static const WindowTemplate sUnknown_80DC5D4 =
 {
     0,
     3,

src/data/code_8023144.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DC904 =
+static const WindowTemplate sUnknown_80DC904 =
 {
     0,
     3,
@@ -8,7 +8,7 @@ static const Window sUnknown_80DC904 =
     NULL
 };
 
-static const Window sUnknown_80DC91C =
+static const WindowTemplate sUnknown_80DC91C =
 {
     0,
     6,

src/data/code_8023868.h

@@ -1,5 +1,5 @@
 //static // MAKE STATIC WHEN code_8023868.s IS DONE
-const Window sUnknown_80DC950 = {
+const WindowTemplate sUnknown_80DC950 = {
     0,
     3,
     0, 0,
@@ -8,7 +8,7 @@ const Window sUnknown_80DC950 = {
     NULL
 };
 //static // MAKE STATIC WHEN code_8023868.s IS DONE
-const Window sUnknown_80DC968 = {
+const WindowTemplate sUnknown_80DC968 = {
     0,
     6,
     2, 2,

src/data/code_8024458.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DC9B0 = {
+static const WindowTemplate sUnknown_80DC9B0 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DC9B0 = {
     NULL
 };
 
-static const Window sUnknown_80DC9C8 = {
+static const WindowTemplate sUnknown_80DC9C8 = {
     0,
     6,
     2, 2,

src/data/code_802DB28.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E016C = {
+static const WindowTemplate sUnknown_80E016C = {
     0,
     3,
     0, 0,

src/data/code_802DE84.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E0248 = {
+static const WindowTemplate sUnknown_80E0248 = {
     0,
     3,
     0, 0,
@@ -8,7 +8,7 @@ static const Window sUnknown_80E0248 = {
 };
 
 static const WindowHeader sUnknown_80E0260 = {1, 0, 18, 0};
-static const Window sUnknown_80E0264 = {
+static const WindowTemplate sUnknown_80E0264 = {
     0,
     6,
     2, 2,

src/data/debug_menu1.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E7D40 = {
+static const WindowTemplate sUnknown_80E7D40 = {
     0,
     3,
     0, 0,
@@ -6,7 +6,7 @@ static const Window sUnknown_80E7D40 = {
     0, 0,
     NULL
 };
-static const Window sUnknown_80E7D58 = {
+static const WindowTemplate sUnknown_80E7D58 = {
     0,
     3,
     2, 2,

src/data/debug_menu2.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E7E34 =
+static const WindowTemplate sUnknown_80E7E34 =
 {
     0,
     3,
@@ -8,7 +8,7 @@ static const Window sUnknown_80E7E34 =
     NULL
 };
 
-static const Window sUnknown_80E7E4C =
+static const WindowTemplate sUnknown_80E7E4C =
 {
     0,
     3,
@@ -18,7 +18,7 @@ static const Window sUnknown_80E7E4C =
     NULL
 };
 
-static const Window sUnknown_80E7E64 =
+static const WindowTemplate sUnknown_80E7E64 =
 {
     0,
     3,

src/data/debug_menu3.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E7E8C =
+static const WindowTemplate sUnknown_80E7E8C =
 {
     0,
     3,
@@ -8,7 +8,7 @@ static const Window sUnknown_80E7E8C =
     NULL
 };
 
-static const Window sUnknown_80E7EA4 =
+static const WindowTemplate sUnknown_80E7EA4 =
 {
     0,
     3,

src/data/debug_menu4.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E7ED4 =
+static const WindowTemplate sUnknown_80E7ED4 =
 {
     0,
     3,
@@ -8,7 +8,7 @@ static const Window sUnknown_80E7ED4 =
     NULL
 };
 
-static const Window sUnknown_80E7EEC =
+static const WindowTemplate sUnknown_80E7EEC =
 {
     0,
     3,
@@ -18,7 +18,7 @@ static const Window sUnknown_80E7EEC =
     NULL
 };
 
-static const Window sUnknown_80E7F04 =
+static const WindowTemplate sUnknown_80E7F04 =
 {
     0,
     3,

src/data/felicity_bank.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DB6DC = {
+static const WindowTemplate sUnknown_80DB6DC = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DB6DC = {
     NULL
 };
 
-static const Window sUnknown_80DB6F4 = {
+static const WindowTemplate sUnknown_80DB6F4 = {
     0,
     3,
     2, 3,
@@ -16,7 +16,7 @@ static const Window sUnknown_80DB6F4 = {
     NULL
 };
 
-static const Window sUnknown_80DB70C = {
+static const WindowTemplate sUnknown_80DB70C = {
     0,
     3,
     17, 8,

src/data/friend_area_action_menu.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DD6EC =
+static const WindowTemplate sUnknown_80DD6EC =
 {
     0,
     0x03,
@@ -8,7 +8,7 @@ static const Window sUnknown_80DD6EC =
     NULL
 };
 
-static const Window sUnknown_80DD704 =
+static const WindowTemplate sUnknown_80DD704 =
 {
     0,
     0x03,
@@ -18,7 +18,7 @@ static const Window sUnknown_80DD704 =
     NULL
 };
 
-static const Window sUnknown_80DD71C =
+static const WindowTemplate sUnknown_80DD71C =
 {
     0,
     0x03,
@@ -28,7 +28,7 @@ static const Window sUnknown_80DD71C =
     NULL
 };
 
-static const Window sUnknown_80DD734 =
+static const WindowTemplate sUnknown_80DD734 =
 {
     0,
     0x03,
@@ -38,7 +38,7 @@ static const Window sUnknown_80DD734 =
     NULL
 };
 
-static const Window sUnknown_80DD74C =
+static const WindowTemplate sUnknown_80DD74C =
 {
     0,
     0x03,

src/data/friend_list_menu.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DD148 = {
+static const WindowTemplate sUnknown_80DD148 = {
     0,
     0x03,
     0x00, 0x00,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DD148 = {
     NULL
 };
 
-static const Window sUnknown_80DD160 = {
+static const WindowTemplate sUnknown_80DD160 = {
     0,
     0x03,
     0x13, 0x04,
@@ -16,7 +16,7 @@ static const Window sUnknown_80DD160 = {
     NULL
 };
 
-static const Window sUnknown_80DD178 = {
+static const WindowTemplate sUnknown_80DD178 = {
     0,
     0x03,
     0x14, 0x04,
@@ -25,7 +25,7 @@ static const Window sUnknown_80DD178 = {
     NULL
 };
 
-static const Window sUnknown_80DD190 = {
+static const WindowTemplate sUnknown_80DD190 = {
     0,
     0x03,
     0x02, 0x11,

src/data/friend_rescue_menus.h

@@ -102,7 +102,7 @@ const MenuItem gUnknown_80E22F0[] = {
     {NULL, 8},
 };
 
-const Window gUnknown_80E231C =
+const WindowTemplate gUnknown_80E231C =
 {
     0,
     0x03,
@@ -112,7 +112,7 @@ const Window gUnknown_80E231C =
     NULL
 };
 
-const Window gUnknown_80E2334 =
+const WindowTemplate gUnknown_80E2334 =
 {
     0,
     0x03,
@@ -142,7 +142,7 @@ const MenuItem gUnknown_80E23A8[] = {
     {NULL, 8},
 };
 
-const Window gUnknown_80E23F0 =
+const WindowTemplate gUnknown_80E23F0 =
 {
     0,
     0x03,
@@ -159,7 +159,7 @@ const MenuItem gUnknown_80E2408[] = {
     {NULL, 8},
 };
 
-UNUSED static const Window sUnused =
+UNUSED static const WindowTemplate sUnused =
 {
     0,
     0x03,

src/data/gulpin_shop.h

@@ -1,4 +1,4 @@
-static const Window gUnknown_80DC11C = {
+static const WindowTemplate gUnknown_80DC11C = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window gUnknown_80DC11C = {
     NULL
 };
 
-static const Window gUnknown_80DC134 = {
+static const WindowTemplate gUnknown_80DC134 = {
     0,
     3,
     22, 4,
@@ -16,7 +16,7 @@ static const Window gUnknown_80DC134 = {
     NULL
 };
 
-UNUSED static const Window gUnknown_80DC14C = {
+UNUSED static const WindowTemplate gUnknown_80DC14C = {
     0,
     3,
     22, 14,

src/data/gulpin_shop_801FB50.h

@@ -1,4 +1,4 @@
-static const Window gUnknown_80DC31C = {
+static const WindowTemplate gUnknown_80DC31C = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window gUnknown_80DC31C = {
     NULL
 };
 
-static const Window gUnknown_80DC334 = {
+static const WindowTemplate gUnknown_80DC334 = {
     0,
     3,
     19, 4,
@@ -16,7 +16,7 @@ static const Window gUnknown_80DC334 = {
     NULL
 };
 
-static const Window gUnknown_80DC34C = {
+static const WindowTemplate gUnknown_80DC34C = {
     0,
     3,
     22, 4,
@@ -25,7 +25,7 @@ static const Window gUnknown_80DC34C = {
     NULL
 };
 
-UNUSED static const Window gUnknown_80DC364 = {
+UNUSED static const WindowTemplate gUnknown_80DC364 = {
     0,
     3,
     22, 14,
@@ -34,7 +34,7 @@ UNUSED static const Window gUnknown_80DC364 = {
     NULL
 };
 
-static const Window gUnknown_80DC37C = {
+static const WindowTemplate gUnknown_80DC37C = {
     0,
     3,
     22, 3,

src/data/hints_menu1.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DC0A0 = {
+static const WindowTemplate sUnknown_80DC0A0 = {
     0,
     3,
     0, 0,
@@ -8,7 +8,7 @@ static const Window sUnknown_80DC0A0 = {
 };
 
 static const WindowHeader sUnknown_80DC0B8 = {1, 0, 8, 0};
-static const Window sUnknown_80DC0BC = {
+static const WindowTemplate sUnknown_80DC0BC = {
     0,
     6,
     2, 2,

src/data/hints_menu2.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DC0E4 = {
+static const WindowTemplate sUnknown_80DC0E4 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DC0E4 = {
     NULL
 };
 
-static const Window sUnknown_80DC0FC = {
+static const WindowTemplate sUnknown_80DC0FC = {
     0,
     6,
     2, 2,

src/data/iq_skill_list_menu.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DBDD8 = {
+static const WindowTemplate sUnknown_80DBDD8 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DBDD8 = {
     NULL
 };
 
-static const Window sUnknown_80DBDF0 = {
+static const WindowTemplate sUnknown_80DBDF0 = {
     0,
     6,
     2, 2,

src/data/iq_skill_menu.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DBD98 = {
+static const WindowTemplate sUnknown_80DBD98 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DBD98 = {
     NULL
 };
 
-static const Window sUnknown_80DBDB0 = {
+static const WindowTemplate sUnknown_80DBDB0 = {
     0,
     3,
     20, 4,

src/data/kangaskhan_storage1.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DB748 = {
+static const WindowTemplate sUnknown_80DB748 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DB748 = {
     NULL
 };
 
-static const Window sUnknown_80DB760 = {
+static const WindowTemplate sUnknown_80DB760 = {
     0,
     3,
     20, 4,
@@ -16,7 +16,7 @@ static const Window sUnknown_80DB760 = {
     NULL
 };
 
-static const Window sUnknown_80DB778 = {
+static const WindowTemplate sUnknown_80DB778 = {
     0,
     3,
     20, 9,
@@ -25,7 +25,7 @@ static const Window sUnknown_80DB778 = {
     NULL
 };
 
-static const Window sUnknown_80DB790 = {
+static const WindowTemplate sUnknown_80DB790 = {
     0,
     3,
     20, 14,

src/data/kangaskhan_storage2.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DB7B8 = {
+static const WindowTemplate sUnknown_80DB7B8 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DB7B8 = {
     NULL
 };
 
-static const Window sUnknown_80DB7D0 = {
+static const WindowTemplate sUnknown_80DB7D0 = {
     0,
     3,
     3, 3,
@@ -16,7 +16,7 @@ static const Window sUnknown_80DB7D0 = {
     NULL
 };
 
-static const Window sUnknown_80DB7E8 = {
+static const WindowTemplate sUnknown_80DB7E8 = {
     0,
     3,
     20, 4,
@@ -25,7 +25,7 @@ static const Window sUnknown_80DB7E8 = {
     NULL
 };
 
-static const Window sUnknown_80DB800 = {
+static const WindowTemplate sUnknown_80DB800 = {
     0,
     3,
     20, 9,
@@ -34,7 +34,7 @@ static const Window sUnknown_80DB800 = {
     NULL
 };
 
-static const Window sUnknown_80DB818 = {
+static const WindowTemplate sUnknown_80DB818 = {
     0,
     3,
     20, 14,

src/data/kecleon_bros1.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DB840 = {
+static const WindowTemplate sUnknown_80DB840 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DB840 = {
     NULL
 };
 
-static const Window sUnknown_80DB858 = {
+static const WindowTemplate sUnknown_80DB858 = {
     0,
     3,
     20, 4,
@@ -16,7 +16,7 @@ static const Window sUnknown_80DB858 = {
     NULL
 };
 
-static const Window sUnknown_80DB870 = {
+static const WindowTemplate sUnknown_80DB870 = {
     0,
     3,
     20, 9,
@@ -25,7 +25,7 @@ static const Window sUnknown_80DB870 = {
     NULL
 };
 
-static const Window sUnknown_80DB888 = {
+static const WindowTemplate sUnknown_80DB888 = {
     0,
     3,
     20, 14,

src/data/kecleon_bros2.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DB8B4 = {
+static const WindowTemplate sUnknown_80DB8B4 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DB8B4 = {
     NULL
 };
 
-static const Window sUnknown_80DB8CC = {
+static const WindowTemplate sUnknown_80DB8CC = {
     0,
     6,
     2, 2,

src/data/kecleon_bros3.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DB8FC = {
+static const WindowTemplate sUnknown_80DB8FC = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DB8FC = {
     NULL
 };
 
-static const Window sUnknown_80DB914 = {
+static const WindowTemplate sUnknown_80DB914 = {
     0,
     6,
     2, 2,

src/data/kecleon_bros4.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DB944 = {
+static const WindowTemplate sUnknown_80DB944 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DB944 = {
     NULL
 };
 
-static const Window sUnknown_80DB95C = {
+static const WindowTemplate sUnknown_80DB95C = {
     0,
     6,
     2, 2,

src/data/luminous_cave.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DC9E8 = {
+static const WindowTemplate sUnknown_80DC9E8 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80DC9E8 = {
     NULL
 };
 
-static const Window sUnknown_80DCA00 = {
+static const WindowTemplate sUnknown_80DCA00 = {
     0,
     3,
     20, 4,

src/data/main_menu1.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E59A8 = {
+static const WindowTemplate sUnknown_80E59A8 = {
    0,
    3,
    0, 0,

src/data/main_menu2.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E59C8 = {
+static const WindowTemplate sUnknown_80E59C8 = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80E59C8 = {
     NULL
 };
 
-static const Window sUnknown_80E59E0 = {
+static const WindowTemplate sUnknown_80E59E0 = {
     0,
     3,
     2, 2,
@@ -22,7 +22,7 @@ static const MenuItem sUnknown_80E59F8[] = {
     {NULL, 0xFFDD},
 };
 
-UNUSED static const Window sUnknown_80E5A29 = {
+UNUSED static const WindowTemplate sUnknown_80E5A29 = {
     0,
     3,
     2, 2,
@@ -36,7 +36,7 @@ UNUSED static const MenuItem sUnknown_80E5A44[] = {
     {NULL, 0xFFDD},
 };
 
-static const Window sUnknown_80E5A60 = {
+static const WindowTemplate sUnknown_80E5A60 = {
     0,
     3,
     2, 2,
@@ -45,7 +45,7 @@ static const Window sUnknown_80E5A60 = {
     NULL
 };
 
-static const Window sUnknown_80E5A78 = {
+static const WindowTemplate sUnknown_80E5A78 = {
     0,
     3,
     2, 2,
@@ -73,7 +73,7 @@ static const MenuItem sUnknown_80E5AFC[] = {
     {NULL, 0xFFDD},
 };
 
-static const Window sUnknown_80E5B34 = {
+static const WindowTemplate sUnknown_80E5B34 = {
     0,
     3,
     2, 2,
@@ -101,7 +101,7 @@ static const MenuItem sUnknown_80E5B8C[] = {
     {NULL, 0xFFDD},
 };
 
-static const Window sUnknown_80E5BC4 = {
+static const WindowTemplate sUnknown_80E5BC4 = {
     0,
     3,
     2, 2,
@@ -129,7 +129,7 @@ static const MenuItem sUnknown_80E5C18[] = {
     {NULL, 0xFFDD},
 };
 
-UNUSED static const Window sUnknown_80E5C50 = {
+UNUSED static const WindowTemplate sUnknown_80E5C50 = {
     0,
     3,
     2, 2,
@@ -150,7 +150,7 @@ UNUSED static const MenuItem sUnknown_80E5C9C[] = {
     {NULL, 0xFFDD},
 };
 
-static const Window sUnknown_80E5CB4 = {
+static const WindowTemplate sUnknown_80E5CB4 = {
     0,
     3,
     2, 15,

src/data/makuhita_dojo1.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E0760 = {
+static const WindowTemplate sUnknown_80E0760 = {
     0,
     3,
     0, 0,

src/data/makuhita_dojo2.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80E07EC = {
+static const WindowTemplate sUnknown_80E07EC = {
     0,
     3,
     0, 0,
@@ -7,7 +7,7 @@ static const Window sUnknown_80E07EC = {
     NULL
 };
 
-static const Window sUnknown_80E0804 = {
+static const WindowTemplate sUnknown_80E0804 = {
     0,
     6,
     2, 2,

src/data/options_menu1.h

@@ -1,4 +1,4 @@
-static const Window sUnknown_80DBFB0 = {
+static const WindowTemplate sUnknown_80DBFB0 = {
     0,
     3,
     0, 0,
@@ -8,7 +8,7 @@ static const Window sUnknown_80DBFB0 = {
 };
 
 static const WindowHeader sUnknown_80DBFC8 = {1, 0, 7, 0};
-static const Window sUnknown_80DBFCC = {
+static const WindowTemplate sUnknown_80DBFCC = {
     0,
     6,
     2, 2,