diff --git a/data/data_80CE77C.s b/data/data_80CE77C.s index 33d1b0155..ebb0ab148 100644 --- a/data/data_80CE77C.s +++ b/data/data_80CE77C.s @@ -477,127 +477,5 @@ gUnknown_80D406C: @ 80D406C .string "palet\0" .align 2,0 - .global gUnknown_80D4074 -gUnknown_80D4074: @ 80D4074 - .string "{CENTER_ALIGN}{POKEMON_0}\0" - .align 2,0 - .global gUnknown_80D407C -gUnknown_80D407C: @ 80D4074 - .string "Yes\0" - .align 2,0 - .global gUnknown_80D4080 -gUnknown_80D4080: @ 80D4080 - .string "No\0" - .align 2,0 - .string "pksdir0\0" - .align 2,0 - - .global gUnknown_80D408C -gUnknown_80D408C: @ 80D408C - .4byte wmapfont_text - .4byte wmapmcc_text - .4byte wmapcani_text - .4byte wmappal_text - - .global wmappal_text - wmappal_text: - .string "wmappal\0" - .align 2,0 - - .global wmapcani_text - wmapcani_text: - .string "wmapcani\0" - .align 2,0 - - .global wmapmcc_text - wmapmcc_text: - .string "wmapmcc\0" - .align 2,0 - - .global wmapfont_text - wmapfont_text: - .string "wmapfont\0" - .align 2,0 - - .global gUnknown_80D40C4 -gUnknown_80D40C4: @ 80D40C4 - .byte 0x00, 0x00, 0x18, 0x00 - .byte 0x18, 0x00, 0x18, 0x00 - .byte 0x18, 0x00, 0x00, 0x00 - .byte 0x18, 0x00, 0xE8, 0xFF - .byte 0x00, 0x00, 0xE8, 0xFF - .byte 0xE8, 0xFF, 0xE8, 0xFF - .byte 0xE8, 0xFF, 0x00, 0x00 - .byte 0xE8, 0xFF, 0x18, 0x00 - - .global gUnknown_80D40E4 -gUnknown_80D40E4: @ 80D40E4 - .string "ax%03d\0" - .align 2,0 - - .global gUnknown_80D40EC -gUnknown_80D40EC: @ 80D40EC - .string "wmapspr\0" - .align 2,0 - - .global gUnknown_80D40F4 -gUnknown_80D40F4: @ 80D40F4 - .string "palet\0" - .align 2,0 - - .global gUnknown_80D40FC -gUnknown_80D40FC: @ 80D40FC - .string "{CENTER_ALIGN}%s\0" - .align 2,0 - - .global gUnknown_80D4104 -gUnknown_80D4104: @ 80D4104 - .string "Where would you like to go?\0" - .align 2,0 - - .global gUnknown_80D4120 -gUnknown_80D4120: @ 80D4120 - .string "{MOVE_ITEM_0}\0" - .align 2,0 - - .global gUnknown_80D4124 -gUnknown_80D4124: @ 80D4124 - .string "{MOVE_ITEM_0}($v02" - .byte 0x81, 0x5E - .asciz "$v12)" - .align 2,0 - - .asciz "pksdir0" - .asciz "pksdir0" - - .global gUnknown_80D4144 -gUnknown_80D4144: @ 80D4144 - .2byte 302 - .2byte 303 - .2byte 303 - .2byte 301 - .2byte 304 - .2byte 306 - .2byte 307 - .2byte 0 - - .string "pksdir0\0" - .string "pksdir0\0" - .4byte noneText - .byte 0xff, 0xff, 0xff, 0xff - .4byte noneText - - .global noneText - noneText: - .string "none\0" - .align 2,0 - - .4byte defaultText - .byte 0xff, 0xff, 0xff, 0xff - .4byte noneText - - .global defaultText - defaultText: - .string "default\0" diff --git a/data/data_80CE77C_2.s b/data/data_80CE77C_2.s new file mode 100644 index 000000000..4812dafbd --- /dev/null +++ b/data/data_80CE77C_2.s @@ -0,0 +1,36 @@ + .section .rodata + + .align 2,0 + + .asciz "pksdir0" + .asciz "pksdir0" + + .global gUnknown_80D4144 +gUnknown_80D4144: @ 80D4144 + .2byte 302 + .2byte 303 + .2byte 303 + .2byte 301 + .2byte 304 + .2byte 306 + .2byte 307 + .2byte 0 + + .string "pksdir0\0" + .string "pksdir0\0" + .4byte noneText + .byte 0xff, 0xff, 0xff, 0xff + .4byte noneText + + .global noneText + noneText: + .string "none\0" + .align 2,0 + + .4byte defaultText + .byte 0xff, 0xff, 0xff, 0xff + .4byte noneText + + .global defaultText + defaultText: + .string "default\0" diff --git a/include/code_8004AA0.h b/include/code_8004AA0.h index 7195b948f..82c7138f0 100644 --- a/include/code_8004AA0.h +++ b/include/code_8004AA0.h @@ -21,54 +21,6 @@ typedef struct unkStruct_202EE8C extern unkStruct_202EE8C gUnknown_202EE8C[32]; -struct FiendArea -{ - const u8 *name; - DungeonPos unk4; - u8 unk8[8]; - s16 unk10[8]; -}; - -struct UnkStruct_4018 -{ - u8 unk4018; - s16 unk2[8]; - axdata unk14; -}; - -// size: 0x4DD8 -struct UnkBgStruct -{ - OpenedFile *unk0[5]; - u16 unk14[64][64]; - u16 unk2014[64][64]; - const struct FiendArea *unk4014; - struct UnkStruct_4018 unk4018[32]; - s32 unk4A18; - s32 unk4A1C; - s32 unk4A20; - s32 unk4A24; - s32 unk4A28; - u8 unk4A2C; - axdata unk4A30[8]; - axdata unk4C10; - unkStruct_202EE8C unk4C4C[16]; - s32 unk4DCC; - u32 unk4DD0; - DungeonPos unk4DD4; - DungeonPos unk4DD8; - s32 unk4DDC; - s32 unk4DE0; - s32 unk4DE4; - s32 unk4DE8; - u8 unk4DEC[8]; - u8 unk4DF4; - s32 unk4DF8; - MenuInputStruct unk4DFC; -}; - -extern struct UnkBgStruct *gUnknown_203B0E4; - // size: Variable typedef struct unkDataFor8004AA4 { diff --git a/include/code_801B3C0.h b/include/code_801B3C0.h index 43612b262..116f9816e 100644 --- a/include/code_801B3C0.h +++ b/include/code_801B3C0.h @@ -17,7 +17,7 @@ typedef struct unkStruct_203B230 u8 fill18[0x20 - 0x18]; u32 unk20; u32 unk24; - UnkTextStruct3 unk28; + Windows unk28; MenuInputStructSub unk88; } unkStruct_203B230; diff --git a/include/code_801B60C.h b/include/code_801B60C.h index 1a1b52bc7..7bf96f589 100644 --- a/include/code_801B60C.h +++ b/include/code_801B60C.h @@ -20,7 +20,7 @@ typedef struct unkStruct_203B234 MenuStruct unk78; /* 0xC8 */ u32 menuAction; MenuItem unkCC[5]; - UnkTextStruct3 unkF4; + Windows unkF4; } unkStruct_203B234; bool8 sub_801B60C(u32, u8 id, u8 quantity); diff --git a/include/code_801D014.h b/include/code_801D014.h index 878fde93a..828478b68 100644 --- a/include/code_801D014.h +++ b/include/code_801D014.h @@ -21,7 +21,7 @@ struct unk_203B250 MenuStruct unk18; MenuItem unk68[8]; u16 unkA8[8]; - UnkTextStruct3 unkB8; + Windows unkB8; }; // size: 0x8 diff --git a/include/code_801EE10.h b/include/code_801EE10.h index 2c5bd155b..c49df9c1b 100644 --- a/include/code_801EE10.h +++ b/include/code_801EE10.h @@ -21,7 +21,7 @@ typedef struct unkStruct_203B270 /* 0x1C */ MenuInputStruct input; u32 unk50; u32 unk54; - UnkTextStruct3 unk58; + Windows unk58; const u8 *text; } unkStruct_203B270; diff --git a/include/code_80227B8.h b/include/code_80227B8.h index 8cba3a418..0d42198f8 100644 --- a/include/code_80227B8.h +++ b/include/code_80227B8.h @@ -26,7 +26,7 @@ typedef struct unkStruct_203B294 /* 0xF4 */ u32 menuAction; MenuItem unkF8[8]; u16 unk138[8]; - UnkTextStruct3 unk148; + Windows unk148; } unkStruct_203B294; bool8 sub_80227B8(PokemonStruct1 *pkmn); diff --git a/include/code_8024458.h b/include/code_8024458.h index 8d69e6492..24b1faf71 100644 --- a/include/code_8024458.h +++ b/include/code_8024458.h @@ -16,9 +16,9 @@ struct unkStruct_203B2AC u32 unkB0; u8 fillB4[0xE0 - 0xB4]; u32 unkE0; - UnkTextStruct2 *unkE4; - UnkTextStruct3 unkE8; - UnkTextStruct2_sub2 unk148; + Window *unkE4; + Windows unkE8; + WindowHeader unk148; }; bool8 sub_8024458(s16 speciesNum, s32); diff --git a/include/code_802DB28.h b/include/code_802DB28.h index 07cc7283b..e9f040ce9 100644 --- a/include/code_802DB28.h +++ b/include/code_802DB28.h @@ -15,7 +15,7 @@ struct unkStruct_203B2FC /* 0x30 */ u8 jobSlotIndex; /* 0x34 */ WonderMail *jobInfo; /* 0x38 */ struct MonPortraitMsg monPortrait; - UnkTextStruct3 unk48; + Windows unk48; }; bool8 sub_802DB28(u8 jobSlotIndex, u8 dungeon); diff --git a/include/code_802DE84.h b/include/code_802DE84.h index a16d463f9..efe8f24ed 100644 --- a/include/code_802DE84.h +++ b/include/code_802DE84.h @@ -11,8 +11,8 @@ struct unkStruct_203B300 MenuInputStructSub unk0; /* 0xC */ unkStruct_802C39C *mail; u32 unk10; - UnkTextStruct2 *unk14; - UnkTextStruct3 unk18; + Window *unk14; + Windows unk18; u8 unk78[4]; }; diff --git a/include/credits1.h b/include/credits1.h index 14c91fa68..39c029595 100644 --- a/include/credits1.h +++ b/include/credits1.h @@ -6,7 +6,7 @@ // size: 0x6C typedef struct Credits1Work { - UnkTextStruct3 unk0; + Windows unk0; s32 unk60; s32 unk64; /* 0x68 */ s32 creditsCategoryIndex; diff --git a/include/debug_menu1.h b/include/debug_menu1.h index 7417ac18b..0fec0caaf 100644 --- a/include/debug_menu1.h +++ b/include/debug_menu1.h @@ -8,7 +8,7 @@ struct DebugMenu { MenuStruct unk0[4]; - UnkTextStruct3 unk140; + Windows unk140; u32 fill1A0; }; diff --git a/include/debug_menu2.h b/include/debug_menu2.h index b56610cbe..39cbed18c 100644 --- a/include/debug_menu2.h +++ b/include/debug_menu2.h @@ -14,7 +14,7 @@ typedef struct unkStruct_203B3F0 MenuStruct unk4C; unkStructFor8013AA0 unk9C; u8 fillCC[0xD8 - 0xCC]; - UnkTextStruct3 unkD8; + Windows unkD8; } unkStruct_203B3F0; #endif // GUARD_DEBUG_MENU2_H diff --git a/include/debug_menu3.h b/include/debug_menu3.h index 3c64aec0e..a5851b53a 100644 --- a/include/debug_menu3.h +++ b/include/debug_menu3.h @@ -12,7 +12,7 @@ typedef struct unkStruct_203B3F4 /* 0x8 */ u32 menuAction; /* 0xC */ MenuItem menuItems[8]; MenuStruct unk4C; - UnkTextStruct3 unk9C; + Windows unk9C; } unkStruct_203B3F4; #endif // GUARD_DEBUG_MENU3_H diff --git a/include/debug_menu4.h b/include/debug_menu4.h index 25b605659..7a886483a 100644 --- a/include/debug_menu4.h +++ b/include/debug_menu4.h @@ -17,7 +17,7 @@ typedef struct unkStruct_203B3F8 unkStructFor8013AA0 unk60; MenuItem unk90[8]; u16 unkD0[8]; - UnkTextStruct3 unkE0; + Windows unkE0; } unkStruct_203B3F8; #endif // GUARD_DEBUG_MENU4_H diff --git a/include/felicity_bank.h b/include/felicity_bank.h index a2ad63ba1..c4044d49d 100644 --- a/include/felicity_bank.h +++ b/include/felicity_bank.h @@ -22,7 +22,7 @@ typedef struct FelicityBankWork unkStructFor8013AA0 unk64; /* 0x94 */ struct MonPortraitMsg monPortrait; struct MonPortraitMsg *monPortraitPtr; - UnkTextStruct3 unkA8; + Windows unkA8; } FelicityBankWork; bool8 CreateFelicityBank(s32 mode); diff --git a/include/friend_area_action_menu.h b/include/friend_area_action_menu.h index 7cdf7c193..132d5d898 100644 --- a/include/friend_area_action_menu.h +++ b/include/friend_area_action_menu.h @@ -65,7 +65,7 @@ struct unkStruct_203B2BC MenuItem menuItems[4]; u8 fill120[0x16C - 0x13C]; u16 unk16C[10]; - UnkTextStruct3 unk180; + Windows unk180; }; u32 sub_8027074(void); diff --git a/include/friend_list_menu.h b/include/friend_list_menu.h index eb5485477..a4c6d619f 100644 --- a/include/friend_list_menu.h +++ b/include/friend_list_menu.h @@ -31,7 +31,7 @@ typedef struct unkStruct_203B2B4 MenuStruct unk78; MenuItem unkC8[8]; u16 unk108[8]; - UnkTextStruct3 unk118; + Windows unk118; } unkStruct_203B2B4; bool8 CreateFriendListMenu(s32 param_1); diff --git a/include/friend_rescue.h b/include/friend_rescue.h index 78f4f4c65..a349b7fad 100644 --- a/include/friend_rescue.h +++ b/include/friend_rescue.h @@ -23,8 +23,8 @@ typedef struct WonderMailStruct_203B33C unkStruct_203B480 unk1E8; u8 unk218; MenuStruct unk21C[4]; - UnkTextStruct3 unk35C; - UnkTextStruct3 unk3BC; + Windows unk35C; + Windows unk3BC; /* 0x41C */ Item item; u32 unk420; // Is this supposed to be a File like 203B2C4? u8 unk424[0x100]; diff --git a/include/gulpin_shop.h b/include/gulpin_shop.h index e18eba9fd..4f5ef9b9d 100644 --- a/include/gulpin_shop.h +++ b/include/gulpin_shop.h @@ -27,7 +27,7 @@ typedef struct GulpinShopWork u8 fillC8[0x118 - 0xC8]; /* 0x118 */ struct MonPortraitMsg monPortrait; struct MonPortraitMsg *monPortraitPtr; - UnkTextStruct3 unk12C; + Windows unk12C; } GulpinShopWork; bool8 CreateGulpinShop(u32 mode, s16 pokeSpecies, Move *moves); diff --git a/include/gulpin_shop_801FB50.h b/include/gulpin_shop_801FB50.h index 179573e6b..f0237f115 100644 --- a/include/gulpin_shop_801FB50.h +++ b/include/gulpin_shop_801FB50.h @@ -35,7 +35,7 @@ typedef struct unkStruct_203B27C u8 fill11C[0x16C - 0x11C]; /* 0x16C */ struct MonPortraitMsg monPortrait; struct MonPortraitMsg *monPortraitPtr; - UnkTextStruct3 unk180; + Windows unk180; } unkStruct_203B27C; bool8 sub_801FB50(u32 mode); diff --git a/include/iq_skill_info_menu.h b/include/iq_skill_info_menu.h index 8a09588df..d6f9dd661 100644 --- a/include/iq_skill_info_menu.h +++ b/include/iq_skill_info_menu.h @@ -16,7 +16,7 @@ struct IQSkillInfoMenu u8 fill14[0x20 - 0x18]; u32 unk20; u32 unk24; - UnkTextStruct3 unk28; + Windows unk28; MenuInputStructSub unk88; }; diff --git a/include/iq_skill_menu.h b/include/iq_skill_menu.h index ab3102f5e..6a39ff357 100644 --- a/include/iq_skill_menu.h +++ b/include/iq_skill_menu.h @@ -19,7 +19,7 @@ struct IQSkillMenu /* 0x30 */ s32 menuAction; MenuItem unk34[8]; MenuStruct unk74; - UnkTextStruct3 unkC4; + Windows unkC4; }; bool8 CreateIQSkillMenu(s16 species); diff --git a/include/kangaskhan_storage1.h b/include/kangaskhan_storage1.h index d9fd833d7..ecb31853d 100644 --- a/include/kangaskhan_storage1.h +++ b/include/kangaskhan_storage1.h @@ -47,7 +47,7 @@ struct KangaskhanStorageWork unkStructFor8013AA0 unkA8; /* 0xD8 */ struct MonPortraitMsg monPortrait; struct MonPortraitMsg *monPortraitPtr; - UnkTextStruct3 unkEC; + Windows unkEC; }; bool8 CreateKangaskhanStorage(u32 mode); diff --git a/include/kangaskhan_storage2.h b/include/kangaskhan_storage2.h index 97b8e82e0..8fea21f32 100644 --- a/include/kangaskhan_storage2.h +++ b/include/kangaskhan_storage2.h @@ -27,7 +27,7 @@ typedef struct unkStruct_203B20C u16 unk60[8]; MenuStruct unk70; unkStructFor8013AA0 unkC0; - UnkTextStruct3 unkF0; + Windows unkF0; } unkStruct_203B20C; bool8 sub_8017E1C(void); diff --git a/include/kecleon_bros1.h b/include/kecleon_bros1.h index eb05faa75..054ad9a75 100644 --- a/include/kecleon_bros1.h +++ b/include/kecleon_bros1.h @@ -65,7 +65,7 @@ typedef struct KecleonBrosWork1 /* 0x84 */ MenuStruct menu; /* 0xD4 */ struct MonPortraitMsg monPortrait; struct MonPortraitMsg *monPortraitPtr; - UnkTextStruct3 unkE8; + Windows unkE8; } KecleonBrosWork1; // mode corresponds to the enum: KecleonBrosMode diff --git a/include/luminous_cave.h b/include/luminous_cave.h index 683421305..811046487 100644 --- a/include/luminous_cave.h +++ b/include/luminous_cave.h @@ -33,7 +33,7 @@ typedef struct LuminousCaveWork u8 unk110; u8 unk111; u8 unk112; - UnkTextStruct3 unk114; + Windows unk114; } LuminousCaveWork; void CleanLuminousCave(void); diff --git a/include/mailbox.h b/include/mailbox.h index 22f97b44d..6c181fd09 100644 --- a/include/mailbox.h +++ b/include/mailbox.h @@ -19,7 +19,7 @@ struct unkStruct_203B304 MenuStruct unk6C; MenuItem menuItems[8]; u16 unkFC[8]; - UnkTextStruct3 unk10C; + Windows unk10C; }; extern void SetMailboxState(u32); diff --git a/include/main_menu1.h b/include/main_menu1.h index 1b419b438..1ebc93f99 100644 --- a/include/main_menu1.h +++ b/include/main_menu1.h @@ -38,12 +38,12 @@ void CleanUpMenu(void); void DeleteMainMenu(void); MainMenu1Work *GetMainMenu(void); void InitMainMenu(void); -void SetMenuItems(MenuStruct *, UnkTextStruct3 *, s32 index, const UnkTextStruct2 *, const MenuItem *menuItems, bool8, u32 menuAction, bool8 unused); +void SetMenuItems(MenuStruct *, Windows *, s32 index, const Window *, const MenuItem *menuItems, bool8, u32 menuAction, bool8 unused); void SetUpMenu(void); s32 UpdateMenu(void); void sub_8035C1C(void); -void sub_8035CC0(UnkTextStruct3 *dataArray, u32 index); +void sub_8035CC0(Windows *dataArray, u32 index); void sub_8035CF4(MenuStruct *menu, u32 index, bool8); void sub_8035D1C(void); s16 sub_8035D3C(void); diff --git a/include/main_menu2.h b/include/main_menu2.h index 9267e578c..d53af187c 100644 --- a/include/main_menu2.h +++ b/include/main_menu2.h @@ -9,7 +9,7 @@ typedef struct MainMenu2Work { u32 unk0; MenuStruct unk4[4]; - UnkTextStruct3 unk144; + Windows unk144; /* 0x1A4 */ u32 currMenuChoice; } MainMenu2Work; diff --git a/include/makuhita_dojo1.h b/include/makuhita_dojo1.h index 088ccb009..8c1301bb5 100644 --- a/include/makuhita_dojo1.h +++ b/include/makuhita_dojo1.h @@ -30,7 +30,7 @@ typedef struct MakuhitaDojoWork1 u8 fill38[0x58 - 0x38]; /* 0x58 */ struct MonPortraitMsg monPortrait; struct MonPortraitMsg *monPortraitPtr; - UnkTextStruct3 unk6C; + Windows unk6C; } MakuhitaDojoWork1; void MakuhitaDojo_Delete(void); diff --git a/include/menu_input.h b/include/menu_input.h index 9eee9ac5f..158b098f9 100644 --- a/include/menu_input.h +++ b/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(UnkTextStruct2 *param_1, const MenuItem *param_2); -void sub_8012D08(UnkTextStruct2 *param_1, s32 param_2); -void sub_8012D34(UnkTextStruct2 *param_1, s32 param_2); +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_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(UnkTextStruct3 *); +void sub_80140B4(Windows *); #endif // GUARD_MENU_INPUT_H diff --git a/include/options_menu1.h b/include/options_menu1.h index 46f64b54c..10247f132 100644 --- a/include/options_menu1.h +++ b/include/options_menu1.h @@ -14,7 +14,7 @@ struct unkStruct_203B25C /* 0x1C */ MenuStruct menu; /* 0x6C */ MenuItem menuItems[8]; u16 unkAC[8]; - UnkTextStruct3 unkBC; + Windows unkBC; }; bool8 sub_801DCC4(void); diff --git a/include/options_menu2.h b/include/options_menu2.h index f0ddf18cb..f326e23b8 100644 --- a/include/options_menu2.h +++ b/include/options_menu2.h @@ -11,8 +11,8 @@ struct unkStruct_203B260 /* 0x4 */ MenuInputStructSub unk4; /* 0x10 */ MenuInputStruct input; u32 unk44; - UnkTextStruct2 *unk48; - UnkTextStruct3 unk4C; + Window *unk48; + Windows unk4C; }; bool8 sub_801E198(GameOptions *optionsMenu); diff --git a/include/other_menus1.h b/include/other_menus1.h index 0c35d485e..ad0e478f8 100644 --- a/include/other_menus1.h +++ b/include/other_menus1.h @@ -18,7 +18,7 @@ typedef struct unkStruct_203B35C u32 unk14; u8 fill18[0x1C - 0x18]; MenuStruct unk1C[4]; - UnkTextStruct3 unk15C; + Windows unk15C; unkStruct_8035D94 unk1BC[2]; unkStruct_203B480 unk1CC; unkStruct_203B480 unk1FC; diff --git a/include/party_list_menu.h b/include/party_list_menu.h index 0ed0d2c83..f4ad8476e 100644 --- a/include/party_list_menu.h +++ b/include/party_list_menu.h @@ -32,7 +32,7 @@ typedef struct unkStruct_203B2B8 MenuItem unk16C[10]; MenuItem unk1BC[10]; u16 unk20C[10]; - UnkTextStruct3 unk220; + Windows unk220; } unkStruct_203B2B8; bool8 CreatePartyListMenu(PokemonStruct1 *pokeStruct); diff --git a/include/pelipper_board.h b/include/pelipper_board.h index f29272503..fc4892d72 100644 --- a/include/pelipper_board.h +++ b/include/pelipper_board.h @@ -17,7 +17,7 @@ struct unkStruct_203B308 MenuStruct unk6C; MenuItem menuItems[8]; u16 unkFC[8]; - UnkTextStruct3 unk10C; + Windows unk10C; }; extern struct unkStruct_203B308 *gPelipperBoard; diff --git a/include/pokemon_news2.h b/include/pokemon_news2.h index 5d72cd208..d019d67e4 100644 --- a/include/pokemon_news2.h +++ b/include/pokemon_news2.h @@ -14,7 +14,7 @@ struct unkStruct_203B2D4 const u8 *unk10[4]; u32 unk20; u32 unk24; - UnkTextStruct3 unk28; + Windows unk28; MenuInputStructSub unk88; }; diff --git a/include/post_office_guide2.h b/include/post_office_guide2.h index 82159926c..a30bb5f71 100644 --- a/include/post_office_guide2.h +++ b/include/post_office_guide2.h @@ -11,8 +11,8 @@ typedef struct unkStruct_203B330 u8 unkC; /* 0xD */ u8 dungeonIndex; u32 unk10; - UnkTextStruct2 *unk14; - UnkTextStruct3 unk18; + Window *unk14; + Windows unk18; } unkStruct_203B330; bool8 sub_80319A4(u8, u8 dungeon, s32); diff --git a/include/rescue_password_menu.h b/include/rescue_password_menu.h index 0a2520827..7c3563a94 100644 --- a/include/rescue_password_menu.h +++ b/include/rescue_password_menu.h @@ -12,8 +12,8 @@ struct RescuePasswordMenu u32 currMenu; u32 state; MenuStruct unk8[4]; - UnkTextStruct3 unk148; - UnkTextStruct3 unk1A8; + Windows unk148; + Windows unk1A8; SpriteOAM unk208; u32 unk210; }; diff --git a/include/save_menu.h b/include/save_menu.h index 427e5c584..00bad9724 100644 --- a/include/save_menu.h +++ b/include/save_menu.h @@ -9,7 +9,7 @@ typedef struct SaveMenuWork /* 0x0 */ u32 currMenu; u32 unk4; MenuStruct unk8[4]; - UnkTextStruct3 unk148; + Windows unk148; SpriteOAM unk1A8; u32 unk1B0; // Sprite count? } SaveMenuWork; diff --git a/include/structs/menu.h b/include/structs/menu.h index 6a2ae4bcd..9c49bfc89 100644 --- a/include/structs/menu.h +++ b/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..? - UnkTextStruct2 *unk18; + Window *unk18; s32 unk1C; // width of prompt? s32 unk20; // height of prompt? u8 unk24; // related to unk10 diff --git a/include/structs/str_text.h b/include/structs/str_text.h index 61c0cd30f..2468a4aed 100644 --- a/include/structs/str_text.h +++ b/include/structs/str_text.h @@ -28,36 +28,42 @@ typedef struct UnkTextStruct1 u8 unk46; } UnkTextStruct1; -typedef struct UnkTextStruct2_sub2 +typedef struct WindowHeader { u8 f0; u8 f1; u8 f2; u8 f3; -} UnkTextStruct2_sub2; +} WindowHeader; #include "structs/str_position.h" // size: 0x18 -typedef struct UnkTextStruct2 +typedef struct Window { u8 unk0; u8 fill1[0x4 - 0x1]; - s32 unk4; + s32 type; DungeonPos pos; - s16 unkC; - s16 unkE; - s16 unk10; + s16 width; + s16 height; + 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 UnkTextStruct2_sub2 *unk14; // Pointer to 4 bytes which may be x-coord related. Could be window's header? -} UnkTextStruct2; + const WindowHeader *unk14; +} Window; -typedef struct UnkTextStruct3 { - UnkTextStruct2 a0[4]; +#define WINDOW_TYPE_WITHOUT_BORDER 1 +#define WINDOW_TYPE_NORMAL 3 +#define WINDOW_TYPE_FILL_TRANSPARENT 5 +#define WINDOW_TYPE_WITH_HEADER 6 +#define WINDOW_TYPE_7 7 + +typedef struct Windows { + Window id[4]; // Something ugly, so that sub_805FD74 could match weird compiler memcpy/stack initialization #ifndef NONMATCHING u8 fakeMatch[0]; #endif // NONMATCHING -} UnkTextStruct3; +} Windows; #endif // GUARD_STR_TEXT_H diff --git a/include/structs/struct_sub80095e4.h b/include/structs/struct_sub80095e4.h index a38dfac93..9b5c3318b 100644 --- a/include/structs/struct_sub80095e4.h +++ b/include/structs/struct_sub80095e4.h @@ -12,8 +12,8 @@ typedef struct struct_Sub80095E4 { /* 0x0 */ MenuInputStruct input; u32 unk34; - UnkTextStruct2 *unk38; - UnkTextStruct3 unk3C; + Window *unk38; + Windows unk3C; // size: 0x9C } struct_Sub80095E4; @@ -22,7 +22,7 @@ typedef struct struct_Sub80095E4 typedef struct struct_Sub80095E4_2 { /* 0x0 */ struct_Sub80095E4 s0; // s as in 'struct' ; decided to go against unk as to not have `->unk0->unk3C` - UnkTextStruct2_sub2 unk9C; + WindowHeader unk9C; } struct_Sub80095E4_2; // Note: In order to get matching ASM, this macro had to be created. @@ -33,12 +33,12 @@ typedef struct struct_Sub80095E4_2 s16 newE; \ s16 a0 = (_a0); \ UNUSED s32 a0_ = a0; \ - UNUSED s16 oldE = (ptr).unk3C.a0[(ptr).unk34].unkE; \ + UNUSED s16 oldE = (ptr).unk3C.a0[(ptr).unk34].height; \ a0_ = 0; \ new10 = a0 + 2; \ newE = a0; \ \ - (ptr).unk3C.a0[(ptr).unk34].unkE = newE; \ + (ptr).unk3C.a0[(ptr).unk34].height = newE; \ (ptr).unk3C.a0[(ptr).unk34].unk10 = a0 + 2; \ \ ResetUnusedInputStruct(); \ @@ -54,10 +54,10 @@ typedef struct struct_Sub80095E4_2 #define SUB_80095E4_CALL_2(ptr) \ { \ s32 a0 = sub_80095E4((ptr).input.unk1A, 12) + 2; \ - UNUSED s16 oldE = (ptr).unk3C.a0[(ptr).unk34].unkE; \ + UNUSED s16 oldE = (ptr).unk3C.a0[(ptr).unk34].height; \ s16 newE = a0; \ \ - (ptr).unk3C.a0[(ptr).unk34].unkE = newE; \ + (ptr).unk3C.a0[(ptr).unk34].height = newE; \ (ptr).unk3C.a0[(ptr).unk34].unk10 = newE; \ \ ResetUnusedInputStruct(); \ diff --git a/include/text.h b/include/text.h index 02059816a..a1bb8165c 100644 --- a/include/text.h +++ b/include/text.h @@ -63,8 +63,8 @@ u32 UpdateFadeInTile(u32 a0); u32 sub_80063B0(void); void SelectCharmap(u32 a0); void SetCharacterMask(int a0); -void xxx_call_save_unk_text_struct_800641C(const UnkTextStruct3 *a0, bool8 a1, bool8 a2); -void RestoreUnkTextStruct_8006518(UnkTextStruct3 *unkData); +void xxx_call_save_unk_text_struct_800641C(const Windows *a0, bool8 a1, bool8 a2); +void RestoreUnkTextStruct_8006518(Windows *unkData); u32 sub_8006544(u32 index); void sub_8007334(s32 a0); void sub_80073B8(s32 a0); diff --git a/include/thank_you_wonder_mail.h b/include/thank_you_wonder_mail.h index 7c683e2c7..8761e25dc 100644 --- a/include/thank_you_wonder_mail.h +++ b/include/thank_you_wonder_mail.h @@ -22,8 +22,8 @@ typedef struct WonderMailStruct_203B2C4 unkStruct_203B480 unk1E8; /* 0x218 */ s8 mailIndex; MenuStruct unk21C[4]; - UnkTextStruct3 unk35C; - UnkTextStruct3 unk3BC; + Windows unk35C; + Windows unk3BC; Item unk41C; /* 0x420 */ struct MonPortraitMsg monPortrait; u32 unk430; diff --git a/include/trade_items_menu.h b/include/trade_items_menu.h index 912979441..6fa5cc386 100644 --- a/include/trade_items_menu.h +++ b/include/trade_items_menu.h @@ -47,8 +47,8 @@ struct TradeItemsMenu u32 unk10; unkStructFor8013AA0 unk14; MenuStruct unk44[4]; - UnkTextStruct3 unk184; - UnkTextStruct3 unk1E4; + Windows unk184; + Windows unk1E4; // TODO These might be structs... struct TradeItem unk244; diff --git a/include/wigglytuff_shop2.h b/include/wigglytuff_shop2.h index 1eac49f85..b3477fd49 100644 --- a/include/wigglytuff_shop2.h +++ b/include/wigglytuff_shop2.h @@ -13,8 +13,8 @@ typedef struct WigglytuffShop2Work u32 pokemonStatus[0x10]; /* 0x70 */ s32 numPokemoninFriendArea; s32 unk74; - UnkTextStruct2 *unk78; - UnkTextStruct3 unk7C; + Window *unk78; + Windows unk7C; u8 unkDC[4]; } WigglytuffShop2Work; diff --git a/include/wigglytuff_shop3.h b/include/wigglytuff_shop3.h index 866591260..59ae014c2 100644 --- a/include/wigglytuff_shop3.h +++ b/include/wigglytuff_shop3.h @@ -54,7 +54,7 @@ typedef struct WigglytuffShop3Work MenuStruct unk6C; /* 0xBC */ struct MonPortraitMsg monPortrait; struct MonPortraitMsg *monPortraitPtr; - UnkTextStruct3 unkD0; + Windows unkD0; u32 unk130; u32 unk134; } WigglytuffShop3Work; diff --git a/include/wonder_mail.h b/include/wonder_mail.h index 944f2b769..04690941d 100644 --- a/include/wonder_mail.h +++ b/include/wonder_mail.h @@ -22,8 +22,8 @@ typedef struct WonderMailStruct_203B2C0 u8 fill16A[0x218 - 0x1B8]; /* 0x218 */ u8 mailIndex; MenuStruct unk21C[4]; - UnkTextStruct3 unk35C; - UnkTextStruct3 unk3BC; + Windows unk35C; + Windows unk3BC; /* 0x41C */ u32 unkfill; // ItemSlot? /* 0x420 */ struct MonPortraitMsg monPortrait; /* 0x430 */ u8 padding3[0x534 - 0x430]; diff --git a/include/wonder_mail_802C860.h b/include/wonder_mail_802C860.h index 387a4594a..c4436fc70 100644 --- a/include/wonder_mail_802C860.h +++ b/include/wonder_mail_802C860.h @@ -19,7 +19,7 @@ struct unkStruct_203B2F0 MenuItem unk10C[8]; MenuItem unk14C[8]; u8 fill18C[0x19C - 0x18C]; - UnkTextStruct3 unk19C; + Windows unk19C; }; bool8 InitializeJobListMenu(u32); diff --git a/include/wonder_mail_802D098.h b/include/wonder_mail_802D098.h index 892320027..85fb329d9 100644 --- a/include/wonder_mail_802D098.h +++ b/include/wonder_mail_802D098.h @@ -34,7 +34,7 @@ typedef struct unkStruct_203B2F8 MenuItem unk118[8]; MenuItem unk158[8]; u16 unk198[8]; - UnkTextStruct3 unk1A8; + Windows unk1A8; } unkStruct_203B2F8; bool8 GetWonderMailAccepted(void); diff --git a/ld_script.txt b/ld_script.txt index 9540f7c96..196fc52bb 100755 --- a/ld_script.txt +++ b/ld_script.txt @@ -417,6 +417,8 @@ SECTIONS { src/code_800F034.o(.rodata); src/code_800F958.o(.rodata); data/data_80CE77C.o(.rodata); + src/code_8010F28.o(.rodata); + data/data_80CE77C_2.o(.rodata); src/debug.o(.rodata); src/save.o(.rodata); src/save_read.o(.rodata); diff --git a/src/code_8010F28.c b/src/code_8010F28.c index 3a57ef1de..9ee18f126 100644 --- a/src/code_8010F28.c +++ b/src/code_8010F28.c @@ -16,6 +16,7 @@ #include "code_800C9CC.h" #include "pokemon.h" #include "decompress.h" +#include "constants/direction.h" extern u32 sub_809034C(u8 dungeonIndex, s32 speciesId_, u8 *buffer, bool32 param_4_, bool32 param_5_); extern void sub_801178C(void); @@ -54,26 +55,72 @@ struct UnkStruct_203B0E8 u8 unk5E98[1500]; }; +struct FiendArea +{ + const u8 *name; + DungeonPos unk4; + u8 unk8[8]; + s16 unk10[8]; +}; + +struct UnkStruct_4018 +{ + u8 unk4018; + s16 unk2[8]; + axdata unk14; +}; + +// size: 0x4DD8 +struct UnkBgStruct +{ + OpenedFile *unk0[5]; + u16 unk14[64][64]; + u16 unk2014[64][64]; + const struct FiendArea *unk4014; + struct UnkStruct_4018 unk4018[32]; + s32 unk4A18; + s32 unk4A1C; + s32 unk4A20; + s32 unk4A24; + s32 unk4A28; + u8 unk4A2C; + axdata arrowSprites[NUM_DIRECTIONS]; + axdata unk4C10; + unkStruct_202EE8C unk4C4C[16]; + s32 unk4DCC; + u32 unk4DD0; + DungeonPos bgPos; + DungeonPos monSpritePos; + s32 unk4DDC; + s32 unk4DE0; + s32 unk4DE4; + s32 unk4DE8; + u8 unk4DEC[8]; + u8 unk4DF4; + s32 unk4DF8; + MenuInputStruct menu; +}; + EWRAM_INIT struct UnkBgStruct *gUnknown_203B0E4 = NULL; EWRAM_INIT struct UnkStruct_203B0E8 *gUnknown_203B0E8 = NULL; -EWRAM_INIT UnkTextStruct3 gUnknown_203B0EC = { +EWRAM_INIT Windows gUnknown_203B0EC = { .a0 = { [0] = { - .unk4 = 3, + .type = WINDOW_TYPE_NORMAL, .pos = {2, 10}, - .unkC = 26, - .unkE = 9, + .width = 26, + .height = 9, .unk10 = 9, }, [1] = { - .unk4 = 3, + .type = WINDOW_TYPE_NORMAL, .pos = {23, 6}, - .unkC = 5, - .unkE = 3, + .width = 5, + .height = 3, .unk10 = 3, }, - [2] = { .unk4 = 3,}, - [3] = { .unk4 = 3,}, + [2] = { .type = WINDOW_TYPE_NORMAL,}, + [3] = { .type = WINDOW_TYPE_NORMAL,}, } }; @@ -87,18 +134,16 @@ static inline bool8 ResetFlags(axdata *ptr) return ptr->flags = 0; } -extern u8 *const gUnknown_80D408C[]; + extern u8 *const gUnknown_80D4014[]; extern const FileArchive gTitleMenuFileArchive; extern const FileArchive gMonsterFileArchive; extern const u8 gUnknown_80D40E4[]; extern const u8 gUnknown_80D40EC[]; extern const u8 gUnknown_80D405C[]; -extern const DungeonPos gUnknown_80D40C4[]; extern const u8 gUnknown_80D40FC[]; extern const u8 gUnknown_80D4104[]; extern const u8 gUnknown_80D4120[]; -extern const u8 gUnknown_80D4124[]; extern const u8 gUnknown_80D3EFC[]; extern const u8 gUnknown_80D40F4[]; extern const u8 gUnknown_80D4064[]; @@ -133,7 +178,7 @@ static void sub_8010950(void); static void sub_8010A88(bool8 a0); static bool8 sub_8010A00(void); static void nullsub_24(void); -void sub_8011494(void); +void PrintAvailableSubAreas(void); void sub_8010960(void); void sub_8010798(void); void sub_8010858(void); @@ -143,20 +188,20 @@ void sub_801059C(void); bool8 sub_8010C58(u8 *str); void sub_8010C10(const u8 *text); void sub_801091C(void); -void sub_8011398(void); +void PrintCurrAreaName(void); void sub_801073C(void); void sub_8010B74(DungeonLocation *dungLocation); -void sub_801169C(void); -void sub_80110B0(void); +void RunFrameActions(void); +void UpdateBg(void); void sub_8010EF0(void); -void sub_8011300(void); -void sub_8011240(void); +void ShowDirectionArrows(void); +void UpdateMonSpritePosition(void); bool8 sub_800FFE8(u8 friendAreaId); -void sub_8011168(void); -void sub_80100C0(s32 a0, s32 a1, s32 count); -u8 sub_8010014(void); -s32 sub_800FAA8(s32 *a0, s32 *a1); -bool8 sub_800FB6C(void); +void HideTextWindowAndArrows(void); +void MoveToNewArea(s32 a0, s32 a1, s32 count); +u8 GetNewSelectedArea(void); +s32 ChooseArea(s32 *a0, s32 *newAreaId); +bool8 ChooseSubArea(void); void sub_800FC28(void); void sub_800FC5C(u8 a0); void sub_8010DA4(void); @@ -205,14 +250,14 @@ void sub_800F990(struct struct_unk800F990 *param_1) sub_8011760(); while (1) { s32 local_1c = 0; - s32 local_18 = 0; - s32 iVar2 = sub_800FAA8(&local_1c, &local_18); + s32 newAreaId = 0; + s32 iVar2 = ChooseArea(&local_1c, &newAreaId); if (iVar2 == 1) { - sub_80100C0(local_1c, local_18, 0x32); + MoveToNewArea(local_1c, newAreaId, 0x32); } else if (iVar2 == 2) { - if (!sub_800FB6C()) + if (!ChooseSubArea()) continue; param_1->unkC = gUnknown_203B0E4->unk4DF4; break; @@ -222,7 +267,7 @@ void sub_800F990(struct struct_unk800F990 *param_1) param_1->unkC = 0; break; } - sub_80100C0(gUnknown_203B0E4->unk4A20,0,10); + MoveToNewArea(gUnknown_203B0E4->unk4A20,0,10); } } @@ -231,30 +276,30 @@ void sub_800F990(struct struct_unk800F990 *param_1) nullsub_16(); } -s32 sub_800FAA8(s32 *a0, s32 *a1) +s32 ChooseArea(s32 *a0, s32 *newAreaId) { s32 ret = 0; - sub_8011300(); - sub_8011398(); + ShowDirectionArrows(); + PrintCurrAreaName(); while (ret == 0) { - s32 r3; + s32 areaId; - sub_801169C(); - r3 = sub_8010014(); - if (r3 != 0xFF) { + RunFrameActions(); + areaId = GetNewSelectedArea(); + if (areaId != 0xFF) { s32 r4 = gUnknown_203B0E4->unk4A18; struct UnkStruct_4018 *ptr = &gUnknown_203B0E4->unk4018[r4]; - if (ptr->unk2[r3] >= 0) { - s32 id = ptr->unk2[r3]; + if (ptr->unk2[areaId] >= 0) { + s32 id = ptr->unk2[areaId]; struct UnkStruct_4018 *ptr2 = &gUnknown_203B0E4->unk4018[id]; if (ptr2->unk4018 != 0) { ret = 1; *a0 = id; - *a1 = r3; - gUnknown_203B0E4->unk4A28 = r3; + *newAreaId = areaId; + gUnknown_203B0E4->unk4A28 = areaId; gUnknown_203B0E4->unk4A1C = r4; } } @@ -272,16 +317,16 @@ s32 sub_800FAA8(s32 *a0, s32 *a1) return ret; } -bool8 sub_800FB6C(void) +bool8 ChooseSubArea(void) { bool8 ret = FALSE; - sub_8011494(); + PrintAvailableSubAreas(); while (1) { - MenuInputStruct *menuPtr = &gUnknown_203B0E4->unk4DFC; + MenuInputStruct *menuPtr = &gUnknown_203B0E4->menu; AddMenuCursorSprite(menuPtr); - sub_801169C(); + RunFrameActions(); if (gRealInputs.repeated & DPAD_DOWN) { MoveMenuCursorDown(menuPtr); PlayCursorUpDownSoundEffect(); @@ -310,11 +355,11 @@ void sub_800FC28(void) { s32 i; - sub_8011168(); + HideTextWindowAndArrows(); sub_80117AC(); for (i = 0; i < 60; i++) { gUnknown_203B0E4->unk4DCC -= 2; - sub_801169C(); + RunFrameActions(); } } @@ -452,11 +497,11 @@ void sub_800FC5C(u8 a0) AxResInitFile(&gUnknown_203B0E4->unk4C10, gUnknown_203B0E4->unk0[3], 0, 0, 0, 0, TRUE); gUnknown_203B0E4->unk4A18 = var_48; - gUnknown_203B0E4->unk4DD8 = gUnknown_203B0E4->unk4014[var_48].unk4; - gUnknown_203B0E4->unk4DD4.x = gUnknown_203B0E4->unk4DD8.x - 120; - gUnknown_203B0E4->unk4DD4.y = gUnknown_203B0E4->unk4DD8.y - 80; - sub_8011240(); - sub_80110B0(); + gUnknown_203B0E4->monSpritePos = gUnknown_203B0E4->unk4014[var_48].unk4; + gUnknown_203B0E4->bgPos.x = gUnknown_203B0E4->monSpritePos.x - 120; + gUnknown_203B0E4->bgPos.y = gUnknown_203B0E4->monSpritePos.y - 80; + UpdateMonSpritePosition(); + UpdateBg(); } bool8 sub_800FFE8(u8 friendAreaId) @@ -468,7 +513,7 @@ bool8 sub_800FFE8(u8 friendAreaId) return FALSE; } -u8 sub_8010014(void) +u8 GetNewSelectedArea(void) { u8 sp1[16]; u8 sp2[16]; @@ -505,13 +550,13 @@ u8 sub_8010014(void) return 0xFF; } -void sub_80100C0(s32 a0, s32 a1, s32 count) +void MoveToNewArea(s32 a0, s32 a1, s32 count) { s32 i, arrayId; DungeonPos pos1, pos2; AxResInitFile(&gUnknown_203B0E4->unk4C10, gUnknown_203B0E4->unk0[3], 0, a1 & 7, 0, 0, TRUE); - sub_8011168(); + HideTextWindowAndArrows(); arrayId = gUnknown_203B0E4->unk4A18; pos1 = gUnknown_203B0E4->unk4014[arrayId].unk4; @@ -519,19 +564,19 @@ void sub_80100C0(s32 a0, s32 a1, s32 count) PlayCursorUpDownSoundEffect(); for (i = 0; i < count; i++) { - gUnknown_203B0E4->unk4DD8.x = ((((pos2.x - pos1.x) * (i << 8)) / count) / 256) + pos1.x; - gUnknown_203B0E4->unk4DD8.y = ((((pos2.y - pos1.y) * (i << 8)) / count) / 256) + pos1.y; + gUnknown_203B0E4->monSpritePos.x = ((((pos2.x - pos1.x) * (i << 8)) / count) / 256) + pos1.x; + gUnknown_203B0E4->monSpritePos.y = ((((pos2.y - pos1.y) * (i << 8)) / count) / 256) + pos1.y; - sub_8011240(); - sub_80110B0(); - sub_801169C(); + UpdateMonSpritePosition(); + UpdateBg(); + RunFrameActions(); } gUnknown_203B0E4->unk4A18 = a0; - gUnknown_203B0E4->unk4DD8 = gUnknown_203B0E4->unk4014[a0].unk4; - sub_8011240(); - sub_80110B0(); - sub_801169C(); + gUnknown_203B0E4->monSpritePos = gUnknown_203B0E4->unk4014[a0].unk4; + UpdateMonSpritePosition(); + UpdateBg(); + RunFrameActions(); AxResInitFile(&gUnknown_203B0E4->unk4C10, gUnknown_203B0E4->unk0[3], 0, 0, 0, 0, TRUE); } @@ -893,18 +938,18 @@ static void sub_8010A88(bool8 a0) void sub_8010B74(DungeonLocation *dungLocation) { const s32 x = 12; - UnkTextStruct3 spTxtStruct = { + Windows spTxtStruct = { .a0 = { [0] = { - .unk4 = 3, + .type = WINDOW_TYPE_NORMAL, .pos = {x, 2}, - .unkC = 16, - .unkE = 2, + .width = 16, + .height = 2, .unk10 = 2, }, - [1] = {.unk4 = 3}, - [2] = {.unk4 = 3}, - [3] = {.unk4 = 3}, + [1] = {.type = WINDOW_TYPE_NORMAL}, + [2] = {.type = WINDOW_TYPE_NORMAL}, + [3] = {.type = WINDOW_TYPE_NORMAL}, } }; @@ -918,7 +963,7 @@ void sub_8010B74(DungeonLocation *dungLocation) xxx_call_save_unk_text_struct_800641C(&spTxtStruct, TRUE, TRUE); sub_80073B8(0); CopyDungeonName1toBuffer(gFormatBuffer_Monsters[0], dungLocation); - PrintFormattedStringOnWindow(12, 2, gUnknown_80D4074, 0, '\0'); + PrintFormattedStringOnWindow(12, 2, _("{CENTER_ALIGN}{POKEMON_0}"), 0, '\0'); sub_80073E0(0); } @@ -952,15 +997,15 @@ bool8 sub_8010C58(u8 *str) gUnknown_203B0EC.a0[0].pos.y = 19 - r2; gUnknown_203B0EC.a0[0].unk10 = r2; - gUnknown_203B0EC.a0[0].unkE = r2; + gUnknown_203B0EC.a0[0].height = r2; gUnknown_203B0EC.a0[1].pos.y = 14 - r2; xxx_call_save_unk_text_struct_800641C(&gUnknown_203B0EC, TRUE, TRUE); sub_80073B8(0); PrintFormattedStringOnWindow(4, 0, str, 0, '\0'); sub_80073E0(0); sub_80073B8(1); - PrintFormattedStringOnWindow(10, 0, gUnknown_80D407C, 1, '\0'); - PrintFormattedStringOnWindow(10, 12, gUnknown_80D4080, 1, '\0'); + PrintFormattedStringOnWindow(10, 0, "Yes", 1, '\0'); + PrintFormattedStringOnWindow(10, 12, "No", 1, '\0'); sub_80073E0(1); menuInput.menuIndex = 1; @@ -1010,6 +1055,28 @@ void sub_8010D8C(u8 id, DungeonPos *pos) pos->y = gDungeonCoordinates[id].y; } +UNUSED static const char sPksDir2[] = "pksdir0"; + +static char *const gUnknown_80D408C[] = +{ + "wmapfont", + "wmapmcc", + "wmapcani", + "wmappal", +}; + +static const DungeonPos gUnknown_80D40C4[] = +{ + {0, 24}, + {24, 24}, + {24, 0}, + {24, -24}, + {0, -24}, + {-24, -24}, + {-24, 0}, + {-24, 24}, +}; + void sub_8010DA4(void) { u8 filename[0xC]; @@ -1019,11 +1086,11 @@ void sub_8010DA4(void) OpenedFile *file = OpenFileAndGetFileDataPtr(gUnknown_80D408C[0], &gTitleMenuFileArchive); OpenedFile *file2 = OpenFileAndGetFileDataPtr(gUnknown_80D408C[1], &gTitleMenuFileArchive); - sprintf(filename, gUnknown_80D40E4, pokeStruct->speciesNum); + sprintf(filename, "ax%03d", pokeStruct->speciesNum); gUnknown_203B0E4->unk0[3] = OpenFileAndGetFileDataPtr(filename, &gMonsterFileArchive); - gUnknown_203B0E4->unk0[2] = OpenFileAndGetFileDataPtr(gUnknown_80D40EC, &gTitleMenuFileArchive); + gUnknown_203B0E4->unk0[2] = OpenFileAndGetFileDataPtr("wmapspr", &gTitleMenuFileArchive); gUnknown_203B0E4->unk0[4] = OpenFileAndGetFileDataPtr(gUnknown_80D408C[2], &gTitleMenuFileArchive); - gUnknown_203B0E4->unk0[1] = OpenFileAndGetFileDataPtr(gUnknown_80D40F4, &gMonsterFileArchive); + gUnknown_203B0E4->unk0[1] = OpenFileAndGetFileDataPtr("palet", &gMonsterFileArchive); gUnknown_203B0E4->unk0[0] = OpenFileAndGetFileDataPtr(gUnknown_80D408C[3], &gTitleMenuFileArchive); gUnknown_203B0E4->unk4DD0 = GetPokemonOverworldPalette(pokeStruct->speciesNum, 0); @@ -1035,11 +1102,11 @@ void sub_8010DA4(void) DecompressATFile((u8 *) &gUnknown_203B0E4->unk14, size, file2); gUnknown_203B0E4->unk4DCC = 0; - gUnknown_203B0E4->unk4DD4.x = 0; - gUnknown_203B0E4->unk4DD4.y = 0; + gUnknown_203B0E4->bgPos.x = 0; + gUnknown_203B0E4->bgPos.y = 0; - for (i = 0; i < 8; i++) { - ResetFlags(&gUnknown_203B0E4->unk4A30[i]); + for (i = 0; i < NUM_DIRECTIONS; i++) { + ResetFlags(&gUnknown_203B0E4->arrowSprites[i]); } CloseFile(file); @@ -1065,9 +1132,9 @@ void sub_8010F28(void) sub_8004E8C(&var_30); var_30.unk4 = 0xF3FF; var_30.unkA = 0x800; - pos = gUnknown_203B0E4->unk4DD4; + pos = gUnknown_203B0E4->bgPos; RunAxAnimationFrame(&gUnknown_203B0E4->unk4C10); - DoAxFrame_800558C(&gUnknown_203B0E4->unk4C10, gUnknown_203B0E4->unk4DD8.x - pos.x, gUnknown_203B0E4->unk4DD8.y - pos.y, 3, gUnknown_203B0E4->unk4DD0, &var_30); + DoAxFrame_800558C(&gUnknown_203B0E4->unk4C10, gUnknown_203B0E4->monSpritePos.x - pos.x, gUnknown_203B0E4->monSpritePos.y - pos.y, 3, gUnknown_203B0E4->unk4DD0, &var_30); for (i = 0; i < 32; i++) { struct UnkStruct_4018 *r0 = &gUnknown_203B0E4->unk4018[i]; @@ -1080,13 +1147,13 @@ void sub_8010F28(void) { s32 i; - for (i = 0; i < 8; i++) { - if (CheckAxFlag8000(&gUnknown_203B0E4->unk4A30[i])) { - RunAxAnimationFrame(&gUnknown_203B0E4->unk4A30[i]); + for (i = 0; i < NUM_DIRECTIONS; i++) { + if (CheckAxFlag8000(&gUnknown_203B0E4->arrowSprites[i])) { + RunAxAnimationFrame(&gUnknown_203B0E4->arrowSprites[i]); if (!(gRealInputs.held & R_BUTTON) || (i % 2) != 0) { - DoAxFrame_800558C(&gUnknown_203B0E4->unk4A30[i], - (gUnknown_80D40C4[i].x + gUnknown_203B0E4->unk4DD8.x) - pos.x, - (gUnknown_80D40C4[i].y + gUnknown_203B0E4->unk4DD8.y) - pos.y, + DoAxFrame_800558C(&gUnknown_203B0E4->arrowSprites[i], + (gUnknown_80D40C4[i].x + gUnknown_203B0E4->monSpritePos.x) - pos.x, + (gUnknown_80D40C4[i].y + gUnknown_203B0E4->monSpritePos.y) - pos.y, 2, 0, &var_30); } } @@ -1094,14 +1161,14 @@ void sub_8010F28(void) } } -void sub_80110B0(void) +void UpdateBg(void) { s32 i, j; - s32 y1 = gUnknown_203B0E4->unk4DD4.y >> 3; + s32 y1 = gUnknown_203B0E4->bgPos.y >> 3; s32 y2 = y1; for (i = 0; i < 21; i++) { - s32 x1 = gUnknown_203B0E4->unk4DD4.x >> 3; + s32 x1 = gUnknown_203B0E4->bgPos.x >> 3; s32 x2 = x1; for (j = 0; j < 31; j++) { @@ -1121,7 +1188,7 @@ void sub_80110B0(void) sub_80098F8(3); } -void sub_8011168(void) +void HideTextWindowAndArrows(void) { s32 i; @@ -1130,8 +1197,8 @@ void sub_8011168(void) gUnknown_203B0E4->unk4DE0 = 0; gUnknown_203B0E4->unk4DE4 = 0; gUnknown_203B0E4->unk4DE8 = 0; - for (i = 0; i < 8; i++) { - ResetFlags(&gUnknown_203B0E4->unk4A30[i]); + for (i = 0; i < NUM_DIRECTIONS; i++) { + ResetFlags(&gUnknown_203B0E4->arrowSprites[i]); } } @@ -1162,70 +1229,70 @@ bool8 sub_80111C4(void) return ret; } -void sub_8011240(void) +void UpdateMonSpritePosition(void) { - if (gUnknown_203B0E4->unk4DD8.x - gUnknown_203B0E4->unk4DD4.x < 48) { - gUnknown_203B0E4->unk4DD4.x = gUnknown_203B0E4->unk4DD8.x - 48; + if (gUnknown_203B0E4->monSpritePos.x - gUnknown_203B0E4->bgPos.x < 48) { + gUnknown_203B0E4->bgPos.x = gUnknown_203B0E4->monSpritePos.x - 48; } - else if (gUnknown_203B0E4->unk4DD8.x - gUnknown_203B0E4->unk4DD4.x > 192) { - gUnknown_203B0E4->unk4DD4.x = gUnknown_203B0E4->unk4DD8.x - 192; + else if (gUnknown_203B0E4->monSpritePos.x - gUnknown_203B0E4->bgPos.x > 192) { + gUnknown_203B0E4->bgPos.x = gUnknown_203B0E4->monSpritePos.x - 192; } - if (gUnknown_203B0E4->unk4DD8.y - gUnknown_203B0E4->unk4DD4.y < 48) { - gUnknown_203B0E4->unk4DD4.y = gUnknown_203B0E4->unk4DD8.y - 48; + if (gUnknown_203B0E4->monSpritePos.y - gUnknown_203B0E4->bgPos.y < 48) { + gUnknown_203B0E4->bgPos.y = gUnknown_203B0E4->monSpritePos.y - 48; } - else if (gUnknown_203B0E4->unk4DD8.y - gUnknown_203B0E4->unk4DD4.y > 112) { - gUnknown_203B0E4->unk4DD4.y = gUnknown_203B0E4->unk4DD8.y - 112; + else if (gUnknown_203B0E4->monSpritePos.y - gUnknown_203B0E4->bgPos.y > 112) { + gUnknown_203B0E4->bgPos.y = gUnknown_203B0E4->monSpritePos.y - 112; } - if (gUnknown_203B0E4->unk4DD4.x < 0) { - gUnknown_203B0E4->unk4DD4.x = 0; + if (gUnknown_203B0E4->bgPos.x < 0) { + gUnknown_203B0E4->bgPos.x = 0; } - if (gUnknown_203B0E4->unk4DD4.y < 0) { - gUnknown_203B0E4->unk4DD4.y = 0; + if (gUnknown_203B0E4->bgPos.y < 0) { + gUnknown_203B0E4->bgPos.y = 0; } - if (gUnknown_203B0E4->unk4DD4.x > 239) { - gUnknown_203B0E4->unk4DD4.x = 239; + if (gUnknown_203B0E4->bgPos.x > 239) { + gUnknown_203B0E4->bgPos.x = 239; } - if (gUnknown_203B0E4->unk4DD4.y > 151) { - gUnknown_203B0E4->unk4DD4.y = 151; + if (gUnknown_203B0E4->bgPos.y > 151) { + gUnknown_203B0E4->bgPos.y = 151; } } -void sub_8011300(void) +void ShowDirectionArrows(void) { s32 i; struct UnkStruct_4018 *r9 = &gUnknown_203B0E4->unk4018[gUnknown_203B0E4->unk4A18]; - for (i = 0; i < 8; i++) { - ResetFlags(&gUnknown_203B0E4->unk4A30[i]); + for (i = 0; i < NUM_DIRECTIONS; i++) { + ResetFlags(&gUnknown_203B0E4->arrowSprites[i]); if (r9->unk2[i] >= 0) { struct UnkStruct_4018 *ptr = &gUnknown_203B0E4->unk4018[r9->unk2[i]]; if (ptr->unk4018 != 0) { - AxResInitFile(&gUnknown_203B0E4->unk4A30[i], gUnknown_203B0E4->unk0[2], i + 4, 0, 0x40, 0, TRUE); + AxResInitFile(&gUnknown_203B0E4->arrowSprites[i], gUnknown_203B0E4->unk0[2], i + 4, 0, 0x40, 0, TRUE); } } } } -void sub_8011398(void) +void PrintCurrAreaName(void) { u8 txt[200]; s32 id = gUnknown_203B0E4->unk4A18; const struct FiendArea *r6 = &gUnknown_203B0E4->unk4014[id]; - UnkTextStruct3 spTxtStruct = {0}; + Windows spTxtStruct = {0}; - spTxtStruct.a0[0].unk4 = 3; + spTxtStruct.a0[0].type = WINDOW_TYPE_NORMAL; spTxtStruct.a0[0].pos.x = 7; spTxtStruct.a0[0].pos.y = 2; - spTxtStruct.a0[0].unkC = 21; - spTxtStruct.a0[0].unkE = 2; + spTxtStruct.a0[0].width = 21; + spTxtStruct.a0[0].height = 2; spTxtStruct.a0[0].unk10 = 2; - spTxtStruct.a0[1].unk4 = 3; - spTxtStruct.a0[2].unk4 = 3; - spTxtStruct.a0[3].unk4 = 3; + spTxtStruct.a0[1].type = WINDOW_TYPE_NORMAL; + spTxtStruct.a0[2].type = WINDOW_TYPE_NORMAL; + spTxtStruct.a0[3].type = WINDOW_TYPE_NORMAL; - if (gUnknown_203B0E4->unk4DD8.y - gUnknown_203B0E4->unk4DD4.y <= 80) { + if (gUnknown_203B0E4->monSpritePos.y - gUnknown_203B0E4->bgPos.y <= 80) { spTxtStruct.a0[0].pos.y = 17; } else { @@ -1234,40 +1301,40 @@ void sub_8011398(void) xxx_call_save_unk_text_struct_800641C(&spTxtStruct, TRUE, TRUE); sub_80073B8(0); - sprintfStatic(txt, gUnknown_80D40FC, r6->name); + sprintfStatic(txt, _("{CENTER_ALIGN}%s"), r6->name); PrintFormattedStringOnWindow(12, 2, txt, 0, '\0'); sub_80073E0(0); gUnknown_203B0E4->unk4DDC = (spTxtStruct.a0[0].pos.x * 8) - 5; gUnknown_203B0E4->unk4DE0 = (spTxtStruct.a0[0].pos.y * 8) + 5; - gUnknown_203B0E4->unk4DE4 = (spTxtStruct.a0[0].unkC * 8) + 10; - gUnknown_203B0E4->unk4DE8 = (spTxtStruct.a0[0].unkE * 8) + 10; + gUnknown_203B0E4->unk4DE4 = (spTxtStruct.a0[0].width * 8) + 10; + gUnknown_203B0E4->unk4DE8 = (spTxtStruct.a0[0].height * 8) + 10; } -void sub_8011494(void) +void PrintAvailableSubAreas(void) { s32 i, count, var; s32 id = gUnknown_203B0E4->unk4A18; const struct FiendArea *r8 = &gUnknown_203B0E4->unk4014[id]; - MenuInputStruct *menuInput = &gUnknown_203B0E4->unk4DFC; - UnkTextStruct2_sub2 subTxt; - UnkTextStruct3 spTxtStruct = { + MenuInputStruct *menuInput = &gUnknown_203B0E4->menu; + WindowHeader header; + Windows spTxtStruct = { .a0 = { [0] = { - .unk4 = 6, + .type = WINDOW_TYPE_WITH_HEADER, .pos = {7, 2}, - .unkC = 21, - .unkE = 2, + .width = 21, + .height = 2, .unk10 = 2, - .unk14 = &subTxt, + .unk14 = &header, }, [1] = { - .unk4 = 3, + .type = WINDOW_TYPE_NORMAL, }, [2] = { - .unk4 = 3, + .type = WINDOW_TYPE_NORMAL, }, [3] = { - .unk4 = 3, + .type = WINDOW_TYPE_NORMAL, }, } }; @@ -1281,10 +1348,10 @@ void sub_8011494(void) } gUnknown_203B0E4->unk4DF8 = count; - subTxt.f0 = 1; - subTxt.f1 = 0; - subTxt.f2 = 18; - subTxt.f3 = 0; + header.f0 = 1; + header.f1 = 0; + header.f2 = 18; + header.f3 = 0; menuInput->menuIndex = 0; menuInput->unk1A = count; menuInput->unk1C = count; @@ -1301,7 +1368,7 @@ void sub_8011494(void) menuInput->unk8.y = 8; sub_801317C(&menuInput->unk28); var = sub_80095E4(menuInput->unk1C, 0); - spTxtStruct.a0[0].unk10 = spTxtStruct.a0[0].unkE = var + 2; + spTxtStruct.a0[0].unk10 = spTxtStruct.a0[0].height = var + 2; sub_80137B0(menuInput, var * 8); xxx_call_save_unk_text_struct_800641C(&spTxtStruct, TRUE, TRUE); @@ -1311,7 +1378,7 @@ void sub_8011494(void) gUnknown_203B0E4->unk4DE4 = 0; gUnknown_203B0E4->unk4DE8 = 0; sub_80073B8(0); - PrintFormattedStringOnWindow(16, 0, gUnknown_80D4104, 0, '\0'); + PrintFormattedStringOnWindow(16, 0, _("Where would you like to go?"), 0, '\0'); for (i = 0; i < count; i++) { unkStruct_8092638 unkFriendAreaStruct; @@ -1320,23 +1387,23 @@ void sub_8011494(void) sub_80101F8(gFormatBuffer_Items[0], r5); if (r5 == 0) { - PrintFormattedStringOnWindow(12, r4, gUnknown_80D4120, 0, '\0'); + PrintFormattedStringOnWindow(12, r4, _("{MOVE_ITEM_0}"), 0, '\0'); } else { sub_80926F8(r5, &unkFriendAreaStruct, gUnknown_203B0E4->unk4A2C); gFormatArgs[0] = unkFriendAreaStruct.unk2; gFormatArgs[1] = unkFriendAreaStruct.numPokemon; - PrintFormattedStringOnWindow(12, r4, gUnknown_80D4124, 0, '\0'); + PrintFormattedStringOnWindow(12, r4, _("{MOVE_ITEM_0}($v02／$v12)"), 0, '\0'); } } sub_80073E0(0); } -void sub_801169C(void) +void RunFrameActions(void) { - SetBG2RegOffsets(gUnknown_203B0E4->unk4DD4.x, gUnknown_203B0E4->unk4DD4.y); - SetBG3RegOffsets(gUnknown_203B0E4->unk4DD4.x, gUnknown_203B0E4->unk4DD4.y); + SetBG2RegOffsets(gUnknown_203B0E4->bgPos.x, gUnknown_203B0E4->bgPos.y); + SetBG3RegOffsets(gUnknown_203B0E4->bgPos.x, gUnknown_203B0E4->bgPos.y); sub_8010F28(); sub_8004AF0(sub_80111C4(), gUnknown_203B0E4->unk4C4C, 0xB0, 16, gUnknown_203B0E4->unk4DCC, NULL); sub_8005838(NULL, 0); diff --git a/src/code_8015080.c b/src/code_8015080.c index 7138cc5ce..a493ef1d4 100644 --- a/src/code_8015080.c +++ b/src/code_8015080.c @@ -16,13 +16,13 @@ struct unkStruct_203B1F8 // size: 0x4B4 u32 menuAction; MenuStruct unk4; - UnkTextStruct3 unk54; + Windows unk54; u8 buffer[0x400]; }; EWRAM_INIT struct unkStruct_203B1F8 *gUnknown_203B1F8 = {NULL}; -const UnkTextStruct2 gUnknown_80DAF70 = { +const Window gUnknown_80DAF70 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -31,7 +31,7 @@ const UnkTextStruct2 gUnknown_80DAF70 = { NULL }; -const UnkTextStruct2 gUnknown_80DAF88 = { +const Window gUnknown_80DAF88 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x02, @@ -40,7 +40,7 @@ const UnkTextStruct2 gUnknown_80DAF88 = { NULL }; -const UnkTextStruct2 gUnknown_80DAFA0 = { +const Window gUnknown_80DAFA0 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x16, 0x0F, @@ -251,7 +251,7 @@ static const u8 *const gUnknown_80DB4F4[] = _("END"), }; -static const UnkTextStruct2 gUnknown_80DB538 = { +static const Window gUnknown_80DB538 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -260,7 +260,7 @@ static const UnkTextStruct2 gUnknown_80DB538 = { NULL }; -static const UnkTextStruct2 gUnknown_80DB550 = { +static const Window gUnknown_80DB550 = { 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x0A, @@ -269,7 +269,7 @@ static const UnkTextStruct2 gUnknown_80DB550 = { NULL }; -static const UnkTextStruct2 gUnknown_80DB568 = { +static const Window gUnknown_80DB568 = { 0x00, 0x00, 0x00, 0x00, 0x01, 0x04, 0x03, @@ -278,7 +278,7 @@ static const UnkTextStruct2 gUnknown_80DB568 = { NULL }; -static const UnkTextStruct2 gUnknown_80DB580 = { +static const Window gUnknown_80DB580 = { 0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x02, @@ -356,7 +356,7 @@ struct unkStruct_203B1FC u8 *unkF8; u8 unkFC[56]; u8 *unk134; - UnkTextStruct3 unk138; + Windows unk138; }; extern struct unkStruct_203B1FC *gUnknown_203B1FC; diff --git a/src/code_801C8C4.c b/src/code_801C8C4.c index 833f7546b..5d331fc93 100644 --- a/src/code_801C8C4.c +++ b/src/code_801C8C4.c @@ -164,10 +164,10 @@ void sub_801CCD8(void) y = sub_8013800(&sUnknown_203B244->unk4B4.s0.input, index); PrintStringOnWindow(8, y, buffer, sUnknown_203B244->unk4B4.s0.unk34, 0); y2 = sub_8013800(&sUnknown_203B244->unk4B4.s0.input, index); - sub_8012BC4((sUnknown_203B244->unk4B4.s0.unk38->unkC * 8) - 2, y2, gTeamInventoryRef->teamStorage[itemID], 3, 5, sUnknown_203B244->unk4B4.s0.unk34); + sub_8012BC4((sUnknown_203B244->unk4B4.s0.unk38->width * 8) - 2, y2, gTeamInventoryRef->teamStorage[itemID], 3, 5, sUnknown_203B244->unk4B4.s0.unk34); if (sub_801CFE0(itemID) & 1) - sub_8007B7C(sUnknown_203B244->unk4B4.s0.unk34, 8, sub_8013800(&sUnknown_203B244->unk4B4.s0.input, index), (sUnknown_203B244->unk4B4.s0.unk38->unkC - 1) * '\b', 10); // TODO: Ghidra being crazy + sub_8007B7C(sUnknown_203B244->unk4B4.s0.unk34, 8, sub_8013800(&sUnknown_203B244->unk4B4.s0.input, index), (sUnknown_203B244->unk4B4.s0.unk38->width - 1) * '\b', 10); // TODO: Ghidra being crazy } sub_80073E0(sUnknown_203B244->unk4B4.s0.unk34); diff --git a/src/code_801D014.c b/src/code_801D014.c index 472ebd8ec..c7c0e496b 100644 --- a/src/code_801D014.c +++ b/src/code_801D014.c @@ -200,14 +200,14 @@ static void sub_801D220(void) sUnknown_203B250->unkB8.a0[0] = sUnknown_80DBE98; sub_8012CAC(&sUnknown_203B250->unkB8.a0[0], sUnknown_203B250->unk68); - sUnknown_203B250->unkB8.a0[0].unkC = 9; + sUnknown_203B250->unkB8.a0[0].width = 9; } else { for (i = 0; i < 4; i++) sUnknown_203B250->unkB8.a0[i] = sUnknown_80DBEB0[i]; sub_8012CAC(&sUnknown_203B250->unkB8.a0[0], sUnknown_203B250->unk68); - sUnknown_203B250->unkB8.a0[0].unkC = 8; + sUnknown_203B250->unkB8.a0[0].width = 8; } break; case 1: @@ -219,14 +219,14 @@ static void sub_801D220(void) sUnknown_203B250->unkB8.a0[0] = sUnknown_80DBE98; sub_8012CAC(&sUnknown_203B250->unkB8.a0[0], sUnknown_203B250->unk68); - sUnknown_203B250->unkB8.a0[0].unkC = 9; + sUnknown_203B250->unkB8.a0[0].width = 9; } else { for (i = 0; i < 4; i++) sUnknown_203B250->unkB8.a0[i] = sUnknown_80DBEB0[i]; sub_8012CAC(&sUnknown_203B250->unkB8.a0[0], sUnknown_203B250->unk68); - sUnknown_203B250->unkB8.a0[0].unkC = 8; + sUnknown_203B250->unkB8.a0[0].width = 8; } break; default: diff --git a/src/code_801EE10.c b/src/code_801EE10.c index 0ce383ec7..b13f34682 100644 --- a/src/code_801EE10.c +++ b/src/code_801EE10.c @@ -13,7 +13,7 @@ EWRAM_INIT unkStruct_203B270 *gUnknown_203B270 = {NULL}; -const UnkTextStruct2 gUnknown_80DC240 = { +const Window gUnknown_80DC240 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -22,9 +22,9 @@ const UnkTextStruct2 gUnknown_80DC240 = { NULL }; -const UnkTextStruct2_sub2 gUnkData_80DC258 = {0x01, 0x00, 0x0F, 0x00}; +const WindowHeader gUnkData_80DC258 = {0x01, 0x00, 0x0F, 0x00}; -const UnkTextStruct2 gUnknown_80DC25C = { +const Window gUnknown_80DC25C = { 0, 0, 0, 0, 6, 0x2, 0x2, @@ -33,7 +33,7 @@ const UnkTextStruct2 gUnknown_80DC25C = { &gUnkData_80DC258 }; -const UnkTextStruct2 gUnknown_80DC274 = { +const Window gUnknown_80DC274 = { 0, 0, 0, 0, 3, 0x2, 0xF, diff --git a/src/code_801F428.c b/src/code_801F428.c index 82a225896..070a15300 100644 --- a/src/code_801F428.c +++ b/src/code_801F428.c @@ -20,7 +20,7 @@ struct unkStruct_203B274 }; EWRAM_INIT struct unkStruct_203B274 *gUnknown_203B274 = {NULL}; -static const UnkTextStruct2 sUnknown_80DC2AC = { +static const Window sUnknown_80DC2AC = { 0, 0, 0, 0, 3, 0, 0, @@ -28,7 +28,7 @@ static const UnkTextStruct2 sUnknown_80DC2AC = { 0, 0, NULL }; -static const UnkTextStruct2 sUnknown_80DC2C4 = { +static const Window sUnknown_80DC2C4 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/code_801F808.c b/src/code_801F808.c index 9fd0847bc..e17103e0b 100644 --- a/src/code_801F808.c +++ b/src/code_801F808.c @@ -23,15 +23,15 @@ struct unkStruct_203B278 u32 unk24; MenuInputStruct unk28; u32 unk5C; - UnkTextStruct2 *unk60; - UnkTextStruct3 unk64; - UnkTextStruct2_sub2 unkC4; + Window *unk60; + Windows unk64; + WindowHeader unkC4; MenuInputStructSub unkC8; }; EWRAM_INIT struct unkStruct_203B278 *gUnknown_203B278 = {NULL}; -static const UnkTextStruct2 sUnknown_80DC2F8 = { +static const Window sUnknown_80DC2F8 = { 0, 0, 0, 0, 3, 0, 0, diff --git a/src/code_80227B8.c b/src/code_80227B8.c index 80eb414c2..754ca4587 100644 --- a/src/code_80227B8.c +++ b/src/code_80227B8.c @@ -116,7 +116,7 @@ static void sub_802293C(void) sub_8022D2C(); sUnknown_203B294->unk148.a0[2] = sUnknown_80DC5BC; sub_8012CAC(&sUnknown_203B294->unk148.a0[2], sUnknown_203B294->unkF8); - sUnknown_203B294->unk148.a0[2].unkC = 6; + sUnknown_203B294->unk148.a0[2].width = 6; break; case 3: sUnknown_203B294->unk148.a0[1] = sUnknown_80DC5D4; diff --git a/src/code_8031D70.c b/src/code_8031D70.c index 438aa1e81..c6501811e 100644 --- a/src/code_8031D70.c +++ b/src/code_8031D70.c @@ -18,15 +18,15 @@ struct unkStruct_203B334 u32 mailIndex; MenuInputStructSub unk4; u32 unk10; - UnkTextStruct2 *unk14; - UnkTextStruct3 unk18; + Window *unk14; + Windows unk18; u8 unk78[4]; }; EWRAM_INIT struct unkStruct_203B334 *gUnknown_203B334 = {NULL}; extern unkStruct_203B480 *gUnknown_203B480; -const UnkTextStruct2 gUnknown_80E1FA8 = { +const Window gUnknown_80E1FA8 = { 0, 0, 0, 0, 3, 0x0, 0x0, @@ -35,9 +35,9 @@ const UnkTextStruct2 gUnknown_80E1FA8 = { NULL }; -const UnkTextStruct2_sub2 gUnkData_80E1FC0 = {0x01, 0x00, 0x0A, 0x00}; +const WindowHeader gUnkData_80E1FC0 = {0x01, 0x00, 0x0A, 0x00}; -const UnkTextStruct2 gUnknown_80E1FC4 = { +const Window gUnknown_80E1FC4 = { 0, 0, 0, 0, 6, 0x2, 0x2, diff --git a/src/code_803E724.c b/src/code_803E724.c index c640b874d..5225b48ce 100644 --- a/src/code_803E724.c +++ b/src/code_803E724.c @@ -45,10 +45,10 @@ extern MenuInputStruct gUnknown_202EE10; extern SpriteOAM gUnknown_202EDDC; extern const RGB gUnknown_80F62AC; -extern const struct UnkTextStruct3 gUnknown_80F62B0; -extern const struct UnkTextStruct3 gUnknown_80F6310; -extern const struct UnkTextStruct3 gUnknown_80F6370; -extern const struct UnkTextStruct3 gUnknown_80F63D0; +extern const struct Windows gUnknown_80F62B0; +extern const struct Windows gUnknown_80F6310; +extern const struct Windows gUnknown_80F6370; +extern const struct Windows gUnknown_80F63D0; extern const u32 gUnknown_80F6490[]; extern const s32 gUnknown_80F64B4[]; extern const s32 gUnknown_80F64FC[]; @@ -272,7 +272,7 @@ void sub_803EC94(void) sub_801317C(&gUnknown_202EE10.unk28); } -void sub_803ECB4(UnkTextStruct3 *a0, bool8 a1) +void sub_803ECB4(Windows *a0, bool8 a1) { gUnknown_202EDD0 = 10; sub_8052210(0); diff --git a/src/code_805D8C8_1.c b/src/code_805D8C8_1.c index 1572cae31..a1a635038 100644 --- a/src/code_805D8C8_1.c +++ b/src/code_805D8C8_1.c @@ -1675,28 +1675,28 @@ extern bool8 sub_8044F3C(s32 param_1); extern s32 gUnknown_202EE6C; extern const u8 gUnknown_8106B50[]; -extern void sub_803ECB4(UnkTextStruct3 *a0, u8 a1); -static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3 *a4, UnkTextStruct2_sub2 *a5); +extern void sub_803ECB4(Windows *a0, u8 a1); +static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, Windows *a4, WindowHeader *a5); // Inline needed to (fake?)match. -static inline void sub_805FC30_SetUpTxtStruct(UnkTextStruct3 *src) +static inline void sub_805FC30_SetUpTxtStruct(Windows *src) { memset(src, 0, sizeof(*src)); - src->a0[0].unk4 = 3; - src->a0[1].unk4 = 3; + src->a0[0].type = WINDOW_TYPE_NORMAL; + src->a0[1].type = WINDOW_TYPE_NORMAL; src->a0[1].pos.x = 0x16; src->a0[1].pos.y = 4; - src->a0[1].unkC = 6; - src->a0[1].unkE = 4; + src->a0[1].width = 6; + src->a0[1].height = 4; src->a0[1].unk10 = 4; - src->a0[2].unk4 = 3; - src->a0[3].unk4 = 3; + src->a0[2].type = WINDOW_TYPE_NORMAL; + src->a0[3].type = WINDOW_TYPE_NORMAL; } -void sub_805FC30(UnkTextStruct3 *a0, s32 a1) +void sub_805FC30(Windows *a0, s32 a1) { s32 i; - UnkTextStruct3 sp; + Windows sp; sub_805FC30_SetUpTxtStruct(&sp); sp.a0[0] = a0->a0[0]; @@ -1717,10 +1717,10 @@ void sub_805FC30(UnkTextStruct3 *a0, s32 a1) sub_801317C(&gUnknown_202EE10.unk28); sp.a0[1].pos.x = a1; - sp.a0[1].unkC = 28 - a1; - sp.a0[1].unkE = sp.a0[1].unk10 = sub_80095E4(gUnknown_202EE10.unk1C, 0); + sp.a0[1].width = 28 - a1; + sp.a0[1].height = sp.a0[1].unk10 = sub_80095E4(gUnknown_202EE10.unk1C, 0); sub_803ECB4(&sp, 0); - sub_80137B0(&gUnknown_202EE10, sp.a0[1].unkE * 8); + sub_80137B0(&gUnknown_202EE10, sp.a0[1].height * 8); sub_80073B8(1); for (i = 0; i < gUnknown_202EE6C; i++) { @@ -1760,7 +1760,7 @@ s32 sub_8060D64(s16 *a0, bool8 a1, bool8 a2, bool8 a3, Entity *a4); void sub_8060890(DungeonPos *a0); bool8 sub_8060860(s32 a0); void sub_8060900(Entity *a0); -s32 sub_8060800(UnkTextStruct2_sub2 *a0, s32 a1); +s32 sub_8060800(WindowHeader *a0, s32 a1); void sub_8060CE8(ActionContainer *a0); extern Entity *DrawFieldGiveItemMenu(u8 *a0, s32 a1); @@ -1775,22 +1775,22 @@ bool8 sub_805FD74(Entity * a0, struct UnkMenuBitsStruct *a1) u8 var_2C = 0; u8 var_28 = 0; EntityInfo *a0Info = GetEntInfo(a0); - UnkTextStruct2_sub2 var_3C; + WindowHeader var_3C; - UnkTextStruct3 var_FC = + Windows var_FC = { .a0 = { [0] = { - .unk4 = 6, + .type = WINDOW_TYPE_WITH_HEADER, .pos = {2, 2}, - .unkC = 0x12, - .unkE = 0x10, + .width = 0x12, + .height = 0x10, .unk10 = 0x10, .unk14 = &var_3C, }, - {.unk4 = 3}, {.unk4 = 3}, {.unk4 = 3}, + {.type = WINDOW_TYPE_NORMAL}, {.type = WINDOW_TYPE_NORMAL}, {.type = WINDOW_TYPE_NORMAL}, }, }; @@ -2036,15 +2036,15 @@ bool8 sub_805FD74(Entity * a0, struct UnkMenuBitsStruct *a1) return r9; } -extern const struct UnkTextStruct2 gUnknown_8106B6C; +extern const struct Window gUnknown_8106B6C; extern const struct unkStruct_8090F58 gUnknown_8106B60; -static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextStruct3 *a4, UnkTextStruct2_sub2 *a5) +static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, Windows *a4, WindowHeader *a5) { s32 i, x, y; s32 r10; UnkTextStruct1 *txtStrPtr; - UnkTextStruct2 var_94; + Window var_94; u8 txtBuff[80]; EntityInfo *a1Info; @@ -2064,7 +2064,7 @@ static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextS case 0: case 1: a4->a0[0].unk10 = 0x10; - a4->a0[0].unkE = 0x10; + a4->a0[0].height = 0x10; a5->f2 = 0xC; gUnknown_202EE10.unk6 = 0x10; gUnknown_202EE10.unk1C = 0xA; @@ -2072,7 +2072,7 @@ static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextS break; case 2: a4->a0[0].unk10 = 4; - a4->a0[0].unkE = 4; + a4->a0[0].height = 4; a5->f2 = 6; gUnknown_202EE10.unk6 = 0x12; gUnknown_202EE10.unk1C = 1; @@ -2080,7 +2080,7 @@ static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextS case 3: default: a4->a0[0].unk10 = 4; - a4->a0[0].unkE = 4; + a4->a0[0].height = 4; a5->f2 = 0xC; gUnknown_202EE10.unk6 = 0x12; gUnknown_202EE10.unk1C = 1; @@ -2190,7 +2190,7 @@ static void CreateFieldItemMenu(s32 a0, Entity *a1, bool8 a2, bool8 a3, UnkTextS } } -s32 sub_8060800(UnkTextStruct2_sub2 *a0, s32 a1) +s32 sub_8060800(WindowHeader *a0, s32 a1) { s32 i, r1, r2, r3; @@ -2499,7 +2499,7 @@ s32 sub_8060D64(s16 *a0, bool8 a1, bool8 a2, bool8 a3, Entity *a4) return count; } -extern UnkTextStruct2_sub2 gUnknown_202F270; +extern WindowHeader gUnknown_202F270; struct UnkFieldTeamMenuStruct { @@ -2508,7 +2508,7 @@ struct UnkFieldTeamMenuStruct u8 unk14[MAX_TEAM_MEMBERS]; }; -void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bool8 a2); +void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, Windows *a1, bool8 a2); void sub_806145C(struct UnkFieldTeamMenuStruct *a0); void sub_80615B4(ActionContainer *a0, struct UnkFieldTeamMenuStruct *a1); @@ -2520,18 +2520,18 @@ bool8 sub_8060E38(Entity *a0) bool32 r10, ret; struct UnkFieldTeamMenuStruct sp; - UnkTextStruct3 var_84 = {0}; + Windows var_84 = {0}; - var_84.a0[0].unk4 = 6; + var_84.a0[0].type = WINDOW_TYPE_WITH_HEADER; var_84.a0[0].pos.x = 2; var_84.a0[0].pos.y = 2; - var_84.a0[0].unkC = 0xE; - var_84.a0[0].unkE = 0x10; + var_84.a0[0].width = 0xE; + var_84.a0[0].height = 0x10; var_84.a0[0].unk10 = 0x10; var_84.a0[0].unk14 = &gUnknown_202F270; - var_84.a0[1].unk4 = 3; - var_84.a0[2].unk4 = 3; - var_84.a0[3].unk4 = 3; + var_84.a0[1].type = WINDOW_TYPE_NORMAL; + var_84.a0[2].type = WINDOW_TYPE_NORMAL; + var_84.a0[3].type = WINDOW_TYPE_NORMAL; for (i = 0; i < MAX_TEAM_MEMBERS; i++) { Entity *teamMon = gDungeon->teamPokemon[i]; @@ -2541,7 +2541,7 @@ bool8 sub_8060E38(Entity *a0) } if (!gDungeon->unk644.unk17) { - var_84.a0[0].unk4 = 3; + var_84.a0[0].type = WINDOW_TYPE_NORMAL; var_84.a0[0].pos.y++; } @@ -2678,14 +2678,14 @@ extern const u8 gUnknown_8106BF4[]; extern void sub_8070968(u8 *buffer, EntityInfo *entityInfo, s32 colorNum); -void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bool8 a2) +void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, Windows *a1, bool8 a2) { s32 r0; DungeonPos pos; s32 i; s32 count = 0; - bool8 r10 = (a1->a0[0].unk4 == 6); + bool8 r10 = (a1->a0[0].type == WINDOW_TYPE_WITH_HEADER); sub_8069D18(&pos, GetLeader()); for (i = 0; i < MAX_TEAM_MEMBERS; i++) { @@ -2734,7 +2734,7 @@ void DrawFieldTeamMenu(struct UnkFieldTeamMenuStruct *a0, UnkTextStruct3 *a1, bo r0 += 2; } a1->a0[0].unk10 = r0; - a1->a0[0].unkE = r0; + a1->a0[0].height = r0; gUnknown_202F270.f2 = 8; if (a2) { a1->a0[1] = a1->a0[3]; @@ -2872,25 +2872,25 @@ void sub_8062D68(void); void sub_8062230(void); void sub_8062748(u8 a0); -static inline void SetTxtStruct(UnkTextStruct3 *sp) +static inline void SetTxtStruct(Windows *sp) { memset(sp, 0, sizeof(*sp)); - sp->a0[0].unk4 = 6; + sp->a0[0].type = WINDOW_TYPE_WITH_HEADER; sp->a0[0].pos.x = 2; sp->a0[0].pos.y = 2; - sp->a0[0].unkC = 0x12; - sp->a0[0].unkE = 0xE; + sp->a0[0].width = 0x12; + sp->a0[0].height = 0xE; sp->a0[0].unk10 = 0x12; sp->a0[0].unk12 = 2; sp->a0[0].unk14 = &gUnknown_202F270; - sp->a0[1].unk4 = 3; - sp->a0[2].unk4 = 3; - sp->a0[3].unk4 = 3; + sp->a0[1].type = WINDOW_TYPE_NORMAL; + sp->a0[2].type = WINDOW_TYPE_NORMAL; + sp->a0[3].type = WINDOW_TYPE_NORMAL; } void ShowTacticsMenu(ActionContainer *a0) { - UnkTextStruct3 sp; + Windows sp; EntityInfo *monInfo; u8 tacticIds[NUM_TACTICS]; s32 scrollFirstId; diff --git a/src/code_8066D04.c b/src/code_8066D04.c index 5a6c20b04..dcb37c893 100644 --- a/src/code_8066D04.c +++ b/src/code_8066D04.c @@ -904,19 +904,19 @@ extern void sub_8068344(void); bool8 sub_8044F3C(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 sub_803ECB4(UnkTextStruct3 *a0, u8 a1); +extern void sub_803ECB4(Windows *a0, u8 a1); u32 sub_8014140(s32 a0, const void *a1); void sub_8083D1C(void); void sub_8083D08(void); void sub_8083D30(void); void sub_806806C(PokemonStruct1 *a0); -void sub_805FC30(UnkTextStruct3 *a0, s32 a1); +void sub_805FC30(Windows *a0, s32 a1); extern void sub_803EAF0(u32, u8 *); extern const s32 gUnknown_8106E80[]; extern MenuInputStruct gUnknown_202EE10; -static EWRAM_DATA UnkTextStruct2_sub2 gUnknown_202F308 = {0}; +static EWRAM_DATA WindowHeader gUnknown_202F308 = {0}; static EWRAM_DATA s32 gUnknown_202F30C = 0; EWRAM_DATA s32 gUnknown_202F310 = 0; @@ -925,15 +925,15 @@ 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 UnkTextStruct3 gUnknown_8106DC8 = { +static const Windows gUnknown_8106DC8 = { .a0 = { [0] = { .unk0 = 0, - .unk4 = 0x06, + .type = WINDOW_TYPE_WITH_HEADER, .pos = {0x02, 0x02}, - .unkC = 0x11, - .unkE = 0x0E, + .width = 0x11, + .height = 0x0E, .unk10 = 0x12, .unk12 = 0x02, .unk14 = &gUnknown_202F308 @@ -941,21 +941,21 @@ static const UnkTextStruct3 gUnknown_8106DC8 = { [1] = { .unk0 = 0, - .unk4 = 0x03, + .type = WINDOW_TYPE_NORMAL, .pos = {0x15, 0x04}, - .unkC = 0x07, - .unkE = 0x04, + .width = 0x07, + .height = 0x04, .unk10 = 0x04, .unk12 = 0, .unk14 = NULL }, [2] = { - .unk4 = 0x03, + .type = WINDOW_TYPE_NORMAL, }, [3] = { - .unk4 = 0x03, + .type = WINDOW_TYPE_NORMAL, } } }; @@ -964,7 +964,7 @@ void sub_8067A80(u8 a0, s32 a1, s32 a2, PokemonStruct1 **a3) { s32 i; s32 r10; - UnkTextStruct3 spTxtStruct = gUnknown_8106DC8; + Windows spTxtStruct = gUnknown_8106DC8; gUnknown_202F30C = 0; r10 = 0; @@ -1257,20 +1257,20 @@ void sub_806806C(PokemonStruct1 *a0) { struct unkStruct_808FF20 unkStruct; u8 var_C8[48]; - UnkTextStruct3 spTxtStruct = {0}; + Windows spTxtStruct = {0}; s32 r7; - spTxtStruct.a0[0].unk4 = 6; + spTxtStruct.a0[0].type = WINDOW_TYPE_WITH_HEADER; spTxtStruct.a0[0].pos.x = 2; spTxtStruct.a0[0].pos.y = 2; - spTxtStruct.a0[0].unkC = 0x12; - spTxtStruct.a0[0].unkE = 0xE; + spTxtStruct.a0[0].width = 0x12; + spTxtStruct.a0[0].height = 0xE; spTxtStruct.a0[0].unk10 = 0x12; spTxtStruct.a0[0].unk12 = 2; spTxtStruct.a0[0].unk14 = &gUnknown_202F308; - spTxtStruct.a0[1].unk4 = 3; - spTxtStruct.a0[2].unk4 = 3; - spTxtStruct.a0[3].unk4 = 3; + spTxtStruct.a0[1].type = WINDOW_TYPE_NORMAL; + spTxtStruct.a0[2].type = WINDOW_TYPE_NORMAL; + spTxtStruct.a0[3].type = WINDOW_TYPE_NORMAL; r7 = 0; unkStruct.unk40 = 0; diff --git a/src/code_8072F3C.c b/src/code_8072F3C.c index 2ba1a4abe..6e9b45ff8 100644 --- a/src/code_8072F3C.c +++ b/src/code_8072F3C.c @@ -29,7 +29,7 @@ struct unkStruct_203B314 EWRAM_INIT struct unkStruct_203B314 *gUnknown_203B314 = {NULL}; -const UnkTextStruct2 gUnknown_80E06FC = { +const Window gUnknown_80E06FC = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -38,7 +38,7 @@ const UnkTextStruct2 gUnknown_80E06FC = { NULL }; -const UnkTextStruct2 gUnknown_80E0714 = { +const Window gUnknown_80E0714 = { 0x00, 0x00, 0x00, 0x00, 0x06, 0x02, 0x02, @@ -46,7 +46,7 @@ const UnkTextStruct2 gUnknown_80E0714 = { 0x0E, 0x00, NULL }; -const UnkTextStruct2 gUnknown_80E072C = { +const Window gUnknown_80E072C = { 0x00, 0x00, 0x00, 0x00, 0x06, 0x02, 0x02, diff --git a/src/credits1.c b/src/credits1.c index 6fe585879..7adbffd26 100644 --- a/src/credits1.c +++ b/src/credits1.c @@ -8,8 +8,8 @@ static EWRAM_INIT Credits1Work *sCredits1Work = {NULL}; -extern const UnkTextStruct2 gUnknown_80E4A10; -extern const UnkTextStruct2 gUnknown_80E4A28; +extern const Window gUnknown_80E4A10; +extern const Window gUnknown_80E4A28; extern const u32 gUnknown_80E4A40[]; extern const CreditsData* gCreditsTable[27]; diff --git a/src/data/adventure_log.h b/src/data/adventure_log.h index c7a8c49d2..20170470d 100644 --- a/src/data/adventure_log.h +++ b/src/data/adventure_log.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E1FF0 = +static const Window sUnknown_80E1FF0 = { 0, 0, 0, 0, 3, @@ -8,7 +8,7 @@ static const UnkTextStruct2 sUnknown_80E1FF0 = NULL }; -static const UnkTextStruct2 sUnknown_80E2008 = +static const Window sUnknown_80E2008 = { 0, 0, 0, 0, 6, diff --git a/src/data/code_801602C.h b/src/data/code_801602C.h index 4d0da6c76..735025085 100644 --- a/src/data/code_801602C.h +++ b/src/data/code_801602C.h @@ -5,7 +5,7 @@ enum MENU_ACTION_NO, }; -UNUSED static const UnkTextStruct2 sUnknown_80DB670 = +UNUSED static const Window sUnknown_80DB670 = { 0, 0, 0, 0, 3, diff --git a/src/data/code_801B60C.h b/src/data/code_801B60C.h index 107de37b2..ad877a185 100644 --- a/src/data/code_801B60C.h +++ b/src/data/code_801B60C.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DBA58 = { +static const Window sUnknown_80DBA58 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DBA58 = { NULL }; -static const UnkTextStruct2 sUnknown_80DBA70 = { +static const Window sUnknown_80DBA70 = { 0, 0, 0, 0, 3, 20, 4, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DBA70 = { NULL }; -static const UnkTextStruct2 sUnknown_80DBA88 = { +static const Window sUnknown_80DBA88 = { 0, 0, 0, 0, 3, 20, 14, diff --git a/src/data/code_801C8C4.h b/src/data/code_801C8C4.h index b38d32b13..cb7714118 100644 --- a/src/data/code_801C8C4.h +++ b/src/data/code_801C8C4.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DBE3C = { +static const Window sUnknown_80DBE3C = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DBE3C = { NULL }; -static const UnkTextStruct2 sUnknown_80DBE54 = { +static const Window sUnknown_80DBE54 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/code_801D014.h b/src/data/code_801D014.h index e4d342f7c..bf2f65ab1 100644 --- a/src/data/code_801D014.h +++ b/src/data/code_801D014.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DBE7C = { +static const Window sUnknown_80DBE7C = { 0, 0, 0, 0, 3, 0, 0, @@ -7,8 +7,8 @@ static const UnkTextStruct2 sUnknown_80DBE7C = { NULL }; -static const UnkTextStruct2_sub2 sUnknown_80DBE94 = {1, 0, 7, 0}; -static const UnkTextStruct2 sUnknown_80DBE98 = { +static const WindowHeader sUnknown_80DBE94 = {1, 0, 7, 0}; +static const Window sUnknown_80DBE98 = { 0, 0, 0, 0, 6, 2, 2, @@ -17,7 +17,7 @@ static const UnkTextStruct2 sUnknown_80DBE98 = { &sUnknown_80DBE94 }; -static const UnkTextStruct2 sUnknown_80DBEB0[4] = +static const Window sUnknown_80DBEB0[4] = { { 0, 0, 0, 0, diff --git a/src/data/code_801D9E4.h b/src/data/code_801D9E4.h index 96f83413f..b9b32853a 100644 --- a/src/data/code_801D9E4.h +++ b/src/data/code_801D9E4.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DBF70 = { +static const Window sUnknown_80DBF70 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DBF70 = { NULL }; -static const UnkTextStruct2 sUnknown_80DBF88 = { +static const Window sUnknown_80DBF88 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/code_80227B8.h b/src/data/code_80227B8.h index f2709ada2..28c026edd 100644 --- a/src/data/code_80227B8.h +++ b/src/data/code_80227B8.h @@ -5,7 +5,7 @@ static const MenuItem sUnknown_80DC584[3] = {NULL, 1}, }; -static const UnkTextStruct2 sUnknown_80DC5A4 = +static const Window sUnknown_80DC5A4 = { 0, 0, 0, 0, 3, @@ -14,7 +14,7 @@ static const UnkTextStruct2 sUnknown_80DC5A4 = 0, 0, NULL }; -static const UnkTextStruct2 sUnknown_80DC5BC = +static const Window sUnknown_80DC5BC = { 0, 0, 0, 0, 3, @@ -23,7 +23,7 @@ static const UnkTextStruct2 sUnknown_80DC5BC = 3, 0, NULL }; -static const UnkTextStruct2 sUnknown_80DC5D4 = +static const Window sUnknown_80DC5D4 = { 0, 0, 0, 0, 3, diff --git a/src/data/code_8023144.h b/src/data/code_8023144.h index 22430504f..6ace615ee 100644 --- a/src/data/code_8023144.h +++ b/src/data/code_8023144.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC904 = +static const Window sUnknown_80DC904 = { 0, 0, 0, 0, 3, @@ -8,7 +8,7 @@ static const UnkTextStruct2 sUnknown_80DC904 = NULL }; -static const UnkTextStruct2 sUnknown_80DC91C = +static const Window sUnknown_80DC91C = { 0, 0, 0, 0, 6, diff --git a/src/data/code_8023868.h b/src/data/code_8023868.h index ada6340f0..5fa3a3cf6 100644 --- a/src/data/code_8023868.h +++ b/src/data/code_8023868.h @@ -1,5 +1,5 @@ //static // MAKE STATIC WHEN code_8023868.s IS DONE -const UnkTextStruct2 sUnknown_80DC950 = { +const Window sUnknown_80DC950 = { 0, 0, 0, 0, 3, 0, 0, @@ -8,7 +8,7 @@ const UnkTextStruct2 sUnknown_80DC950 = { NULL }; //static // MAKE STATIC WHEN code_8023868.s IS DONE -const UnkTextStruct2 sUnknown_80DC968 = { +const Window sUnknown_80DC968 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/code_8024458.h b/src/data/code_8024458.h index 87bb678fa..084d84207 100644 --- a/src/data/code_8024458.h +++ b/src/data/code_8024458.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC9B0 = { +static const Window sUnknown_80DC9B0 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DC9B0 = { NULL }; -static const UnkTextStruct2 sUnknown_80DC9C8 = { +static const Window sUnknown_80DC9C8 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/code_802DB28.h b/src/data/code_802DB28.h index 6a13906a7..8ade27fce 100644 --- a/src/data/code_802DB28.h +++ b/src/data/code_802DB28.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E016C = { +static const Window sUnknown_80E016C = { 0, 0, 0, 0, 3, 0, 0, diff --git a/src/data/code_802DE84.h b/src/data/code_802DE84.h index 6e9629a50..47e8abcb7 100644 --- a/src/data/code_802DE84.h +++ b/src/data/code_802DE84.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E0248 = { +static const Window sUnknown_80E0248 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,8 +7,8 @@ static const UnkTextStruct2 sUnknown_80E0248 = { NULL }; -static const UnkTextStruct2_sub2 sUnknown_80E0260 = {1, 0, 18, 0}; -static const UnkTextStruct2 sUnknown_80E0264 = { +static const WindowHeader sUnknown_80E0260 = {1, 0, 18, 0}; +static const Window sUnknown_80E0264 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/debug_menu1.h b/src/data/debug_menu1.h index 5dde96b47..92e2c9579 100644 --- a/src/data/debug_menu1.h +++ b/src/data/debug_menu1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E7D40 = { +static const Window sUnknown_80E7D40 = { 0, 0, 0, 0, 3, 0, 0, @@ -6,7 +6,7 @@ static const UnkTextStruct2 sUnknown_80E7D40 = { 0, 0, NULL }; -static const UnkTextStruct2 sUnknown_80E7D58 = { +static const Window sUnknown_80E7D58 = { 0, 0, 0, 0, 3, 2, 2, diff --git a/src/data/debug_menu2.h b/src/data/debug_menu2.h index f0e808633..454a1de70 100644 --- a/src/data/debug_menu2.h +++ b/src/data/debug_menu2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E7E34 = +static const Window sUnknown_80E7E34 = { 0, 0, 0, 0, 3, @@ -8,7 +8,7 @@ static const UnkTextStruct2 sUnknown_80E7E34 = NULL }; -static const UnkTextStruct2 sUnknown_80E7E4C = +static const Window sUnknown_80E7E4C = { 0, 0, 0, 0, 3, @@ -18,7 +18,7 @@ static const UnkTextStruct2 sUnknown_80E7E4C = NULL }; -static const UnkTextStruct2 sUnknown_80E7E64 = +static const Window sUnknown_80E7E64 = { 0, 0, 0, 0, 3, diff --git a/src/data/debug_menu3.h b/src/data/debug_menu3.h index 8a55acedf..557c7734b 100644 --- a/src/data/debug_menu3.h +++ b/src/data/debug_menu3.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E7E8C = +static const Window sUnknown_80E7E8C = { 0, 0, 0, 0, 3, @@ -8,7 +8,7 @@ static const UnkTextStruct2 sUnknown_80E7E8C = NULL }; -static const UnkTextStruct2 sUnknown_80E7EA4 = +static const Window sUnknown_80E7EA4 = { 0, 0, 0, 0, 3, diff --git a/src/data/debug_menu4.h b/src/data/debug_menu4.h index c802c5293..02a5ce21f 100644 --- a/src/data/debug_menu4.h +++ b/src/data/debug_menu4.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E7ED4 = +static const Window sUnknown_80E7ED4 = { 0, 0, 0, 0, 3, @@ -8,7 +8,7 @@ static const UnkTextStruct2 sUnknown_80E7ED4 = NULL }; -static const UnkTextStruct2 sUnknown_80E7EEC = +static const Window sUnknown_80E7EEC = { 0, 0, 0, 0, 3, @@ -18,7 +18,7 @@ static const UnkTextStruct2 sUnknown_80E7EEC = NULL }; -static const UnkTextStruct2 sUnknown_80E7F04 = +static const Window sUnknown_80E7F04 = { 0, 0, 0, 0, 3, diff --git a/src/data/felicity_bank.h b/src/data/felicity_bank.h index 7e1056981..426f8e26b 100644 --- a/src/data/felicity_bank.h +++ b/src/data/felicity_bank.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DB6DC = { +static const Window sUnknown_80DB6DC = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DB6DC = { NULL }; -static const UnkTextStruct2 sUnknown_80DB6F4 = { +static const Window sUnknown_80DB6F4 = { 0, 0, 0, 0, 3, 2, 3, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DB6F4 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB70C = { +static const Window sUnknown_80DB70C = { 0, 0, 0, 0, 3, 17, 8, diff --git a/src/data/friend_area_action_menu.h b/src/data/friend_area_action_menu.h index d85972a1c..37e8b627e 100644 --- a/src/data/friend_area_action_menu.h +++ b/src/data/friend_area_action_menu.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DD6EC = +static const Window sUnknown_80DD6EC = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -8,7 +8,7 @@ static const UnkTextStruct2 sUnknown_80DD6EC = NULL }; -static const UnkTextStruct2 sUnknown_80DD704 = +static const Window sUnknown_80DD704 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -18,7 +18,7 @@ static const UnkTextStruct2 sUnknown_80DD704 = NULL }; -static const UnkTextStruct2 sUnknown_80DD71C = +static const Window sUnknown_80DD71C = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -28,7 +28,7 @@ static const UnkTextStruct2 sUnknown_80DD71C = NULL }; -static const UnkTextStruct2 sUnknown_80DD734 = +static const Window sUnknown_80DD734 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -38,7 +38,7 @@ static const UnkTextStruct2 sUnknown_80DD734 = NULL }; -static const UnkTextStruct2 sUnknown_80DD74C = +static const Window sUnknown_80DD74C = { 0x00, 0x00, 0x00, 0x00, 0x03, diff --git a/src/data/friend_list_menu.h b/src/data/friend_list_menu.h index 62d7c8390..6e63b7fa2 100644 --- a/src/data/friend_list_menu.h +++ b/src/data/friend_list_menu.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DD148 = { +static const Window sUnknown_80DD148 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DD148 = { NULL }; -static const UnkTextStruct2 sUnknown_80DD160 = { +static const Window sUnknown_80DD160 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x13, 0x04, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DD160 = { NULL }; -static const UnkTextStruct2 sUnknown_80DD178 = { +static const Window sUnknown_80DD178 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x14, 0x04, @@ -25,7 +25,7 @@ static const UnkTextStruct2 sUnknown_80DD178 = { NULL }; -static const UnkTextStruct2 sUnknown_80DD190 = { +static const Window sUnknown_80DD190 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x11, diff --git a/src/data/friend_rescue_menus.h b/src/data/friend_rescue_menus.h index 250e0f916..acb4964a2 100644 --- a/src/data/friend_rescue_menus.h +++ b/src/data/friend_rescue_menus.h @@ -102,7 +102,7 @@ const MenuItem gUnknown_80E22F0[] = { {NULL, 8}, }; -const UnkTextStruct2 gUnknown_80E231C = +const Window gUnknown_80E231C = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -112,7 +112,7 @@ const UnkTextStruct2 gUnknown_80E231C = NULL }; -const UnkTextStruct2 gUnknown_80E2334 = +const Window gUnknown_80E2334 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -142,7 +142,7 @@ const MenuItem gUnknown_80E23A8[] = { {NULL, 8}, }; -const UnkTextStruct2 gUnknown_80E23F0 = +const Window gUnknown_80E23F0 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -159,7 +159,7 @@ const MenuItem gUnknown_80E2408[] = { {NULL, 8}, }; -UNUSED static const UnkTextStruct2 sUnused = +UNUSED static const Window sUnused = { 0x00, 0x00, 0x00, 0x00, 0x03, diff --git a/src/data/gulpin_shop.h b/src/data/gulpin_shop.h index 8bd5d1909..4fe5521bc 100644 --- a/src/data/gulpin_shop.h +++ b/src/data/gulpin_shop.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 gUnknown_80DC11C = { +static const Window gUnknown_80DC11C = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 gUnknown_80DC11C = { NULL }; -static const UnkTextStruct2 gUnknown_80DC134 = { +static const Window gUnknown_80DC134 = { 0, 0, 0, 0, 3, 22, 4, @@ -16,7 +16,7 @@ static const UnkTextStruct2 gUnknown_80DC134 = { NULL }; -UNUSED static const UnkTextStruct2 gUnknown_80DC14C = { +UNUSED static const Window gUnknown_80DC14C = { 0, 0, 0, 0, 3, 22, 14, diff --git a/src/data/gulpin_shop_801FB50.h b/src/data/gulpin_shop_801FB50.h index cf1567c84..be115b037 100644 --- a/src/data/gulpin_shop_801FB50.h +++ b/src/data/gulpin_shop_801FB50.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 gUnknown_80DC31C = { +static const Window gUnknown_80DC31C = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 gUnknown_80DC31C = { NULL }; -static const UnkTextStruct2 gUnknown_80DC334 = { +static const Window gUnknown_80DC334 = { 0, 0, 0, 0, 3, 19, 4, @@ -16,7 +16,7 @@ static const UnkTextStruct2 gUnknown_80DC334 = { NULL }; -static const UnkTextStruct2 gUnknown_80DC34C = { +static const Window gUnknown_80DC34C = { 0, 0, 0, 0, 3, 22, 4, @@ -25,7 +25,7 @@ static const UnkTextStruct2 gUnknown_80DC34C = { NULL }; -UNUSED static const UnkTextStruct2 gUnknown_80DC364 = { +UNUSED static const Window gUnknown_80DC364 = { 0, 0, 0, 0, 3, 22, 14, @@ -34,7 +34,7 @@ UNUSED static const UnkTextStruct2 gUnknown_80DC364 = { NULL }; -static const UnkTextStruct2 gUnknown_80DC37C = { +static const Window gUnknown_80DC37C = { 0, 0, 0, 0, 3, 22, 3, diff --git a/src/data/hints_menu1.h b/src/data/hints_menu1.h index cb8eb410c..cc9e1d230 100644 --- a/src/data/hints_menu1.h +++ b/src/data/hints_menu1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC0A0 = { +static const Window sUnknown_80DC0A0 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,8 +7,8 @@ static const UnkTextStruct2 sUnknown_80DC0A0 = { NULL }; -static const UnkTextStruct2_sub2 sUnknown_80DC0B8 = {1, 0, 8, 0}; -static const UnkTextStruct2 sUnknown_80DC0BC = { +static const WindowHeader sUnknown_80DC0B8 = {1, 0, 8, 0}; +static const Window sUnknown_80DC0BC = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/hints_menu2.h b/src/data/hints_menu2.h index 23c79a5fd..36e1fe90a 100644 --- a/src/data/hints_menu2.h +++ b/src/data/hints_menu2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC0E4 = { +static const Window sUnknown_80DC0E4 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DC0E4 = { NULL }; -static const UnkTextStruct2 sUnknown_80DC0FC = { +static const Window sUnknown_80DC0FC = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/iq_skill_list_menu.h b/src/data/iq_skill_list_menu.h index 0ea4a139c..5726e9ff6 100644 --- a/src/data/iq_skill_list_menu.h +++ b/src/data/iq_skill_list_menu.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DBDD8 = { +static const Window sUnknown_80DBDD8 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DBDD8 = { NULL }; -static const UnkTextStruct2 sUnknown_80DBDF0 = { +static const Window sUnknown_80DBDF0 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/iq_skill_menu.h b/src/data/iq_skill_menu.h index 585bdf665..ddea346e7 100644 --- a/src/data/iq_skill_menu.h +++ b/src/data/iq_skill_menu.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DBD98 = { +static const Window sUnknown_80DBD98 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DBD98 = { NULL }; -static const UnkTextStruct2 sUnknown_80DBDB0 = { +static const Window sUnknown_80DBDB0 = { 0, 0, 0, 0, 3, 20, 4, diff --git a/src/data/kangaskhan_storage1.h b/src/data/kangaskhan_storage1.h index b8aafcf99..2265bbee8 100644 --- a/src/data/kangaskhan_storage1.h +++ b/src/data/kangaskhan_storage1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DB748 = { +static const Window sUnknown_80DB748 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DB748 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB760 = { +static const Window sUnknown_80DB760 = { 0, 0, 0, 0, 3, 20, 4, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DB760 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB778 = { +static const Window sUnknown_80DB778 = { 0, 0, 0, 0, 3, 20, 9, @@ -25,7 +25,7 @@ static const UnkTextStruct2 sUnknown_80DB778 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB790 = { +static const Window sUnknown_80DB790 = { 0, 0, 0, 0, 3, 20, 14, diff --git a/src/data/kangaskhan_storage2.h b/src/data/kangaskhan_storage2.h index 2ea9e895d..7e2f001ff 100644 --- a/src/data/kangaskhan_storage2.h +++ b/src/data/kangaskhan_storage2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DB7B8 = { +static const Window sUnknown_80DB7B8 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DB7B8 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB7D0 = { +static const Window sUnknown_80DB7D0 = { 0, 0, 0, 0, 3, 3, 3, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DB7D0 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB7E8 = { +static const Window sUnknown_80DB7E8 = { 0, 0, 0, 0, 3, 20, 4, @@ -25,7 +25,7 @@ static const UnkTextStruct2 sUnknown_80DB7E8 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB800 = { +static const Window sUnknown_80DB800 = { 0, 0, 0, 0, 3, 20, 9, @@ -34,7 +34,7 @@ static const UnkTextStruct2 sUnknown_80DB800 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB818 = { +static const Window sUnknown_80DB818 = { 0, 0, 0, 0, 3, 20, 14, diff --git a/src/data/kecleon_bros1.h b/src/data/kecleon_bros1.h index fa762ce11..9196bea0e 100644 --- a/src/data/kecleon_bros1.h +++ b/src/data/kecleon_bros1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DB840 = { +static const Window sUnknown_80DB840 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DB840 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB858 = { +static const Window sUnknown_80DB858 = { 0, 0, 0, 0, 3, 20, 4, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DB858 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB870 = { +static const Window sUnknown_80DB870 = { 0, 0, 0, 0, 3, 20, 9, @@ -25,7 +25,7 @@ static const UnkTextStruct2 sUnknown_80DB870 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB888 = { +static const Window sUnknown_80DB888 = { 0, 0, 0, 0, 3, 20, 14, diff --git a/src/data/kecleon_bros2.h b/src/data/kecleon_bros2.h index 055ff803d..cbee090f4 100644 --- a/src/data/kecleon_bros2.h +++ b/src/data/kecleon_bros2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DB8B4 = { +static const Window sUnknown_80DB8B4 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DB8B4 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB8CC = { +static const Window sUnknown_80DB8CC = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/kecleon_bros3.h b/src/data/kecleon_bros3.h index ceb5b732e..ae9b1e20e 100644 --- a/src/data/kecleon_bros3.h +++ b/src/data/kecleon_bros3.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DB8FC = { +static const Window sUnknown_80DB8FC = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DB8FC = { NULL }; -static const UnkTextStruct2 sUnknown_80DB914 = { +static const Window sUnknown_80DB914 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/kecleon_bros4.h b/src/data/kecleon_bros4.h index 8c89d6847..7f0564cb0 100644 --- a/src/data/kecleon_bros4.h +++ b/src/data/kecleon_bros4.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DB944 = { +static const Window sUnknown_80DB944 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DB944 = { NULL }; -static const UnkTextStruct2 sUnknown_80DB95C = { +static const Window sUnknown_80DB95C = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/luminous_cave.h b/src/data/luminous_cave.h index 8cbdd6693..171080f00 100644 --- a/src/data/luminous_cave.h +++ b/src/data/luminous_cave.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC9E8 = { +static const Window sUnknown_80DC9E8 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DC9E8 = { NULL }; -static const UnkTextStruct2 sUnknown_80DCA00 = { +static const Window sUnknown_80DCA00 = { 0, 0, 0, 0, 3, 20, 4, diff --git a/src/data/main_menu1.h b/src/data/main_menu1.h index 44dd27688..930bb7d15 100644 --- a/src/data/main_menu1.h +++ b/src/data/main_menu1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E59A8 = { +static const Window sUnknown_80E59A8 = { 0, 0, 0, 0, 3, 0, 0, diff --git a/src/data/main_menu2.h b/src/data/main_menu2.h index 97e9b4265..21b9a3233 100644 --- a/src/data/main_menu2.h +++ b/src/data/main_menu2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E59C8 = { +static const Window sUnknown_80E59C8 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80E59C8 = { NULL }; -static const UnkTextStruct2 sUnknown_80E59E0 = { +static const Window sUnknown_80E59E0 = { 0, 0, 0, 0, 3, 2, 2, @@ -22,7 +22,7 @@ static const MenuItem sUnknown_80E59F8[] = { {NULL, 0xFFDD}, }; -UNUSED static const UnkTextStruct2 sUnknown_80E5A29 = { +UNUSED static const Window sUnknown_80E5A29 = { 0, 0, 0, 0, 3, 2, 2, @@ -36,7 +36,7 @@ UNUSED static const MenuItem sUnknown_80E5A44[] = { {NULL, 0xFFDD}, }; -static const UnkTextStruct2 sUnknown_80E5A60 = { +static const Window sUnknown_80E5A60 = { 0, 0, 0, 0, 3, 2, 2, @@ -45,7 +45,7 @@ static const UnkTextStruct2 sUnknown_80E5A60 = { NULL }; -static const UnkTextStruct2 sUnknown_80E5A78 = { +static const Window sUnknown_80E5A78 = { 0, 0, 0, 0, 3, 2, 2, @@ -73,7 +73,7 @@ static const MenuItem sUnknown_80E5AFC[] = { {NULL, 0xFFDD}, }; -static const UnkTextStruct2 sUnknown_80E5B34 = { +static const Window sUnknown_80E5B34 = { 0, 0, 0, 0, 3, 2, 2, @@ -101,7 +101,7 @@ static const MenuItem sUnknown_80E5B8C[] = { {NULL, 0xFFDD}, }; -static const UnkTextStruct2 sUnknown_80E5BC4 = { +static const Window sUnknown_80E5BC4 = { 0, 0, 0, 0, 3, 2, 2, @@ -129,7 +129,7 @@ static const MenuItem sUnknown_80E5C18[] = { {NULL, 0xFFDD}, }; -UNUSED static const UnkTextStruct2 sUnknown_80E5C50 = { +UNUSED static const Window sUnknown_80E5C50 = { 0, 0, 0, 0, 3, 2, 2, @@ -150,7 +150,7 @@ UNUSED static const MenuItem sUnknown_80E5C9C[] = { {NULL, 0xFFDD}, }; -static const UnkTextStruct2 sUnknown_80E5CB4 = { +static const Window sUnknown_80E5CB4 = { 0, 0, 0, 0, 3, 2, 15, diff --git a/src/data/makuhita_dojo1.h b/src/data/makuhita_dojo1.h index ea5c04a47..a2995abf7 100644 --- a/src/data/makuhita_dojo1.h +++ b/src/data/makuhita_dojo1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E0760 = { +static const Window sUnknown_80E0760 = { 0, 0, 0, 0, 3, 0, 0, diff --git a/src/data/makuhita_dojo2.h b/src/data/makuhita_dojo2.h index f3472bda4..36d00c544 100644 --- a/src/data/makuhita_dojo2.h +++ b/src/data/makuhita_dojo2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E07EC = { +static const Window sUnknown_80E07EC = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80E07EC = { NULL }; -static const UnkTextStruct2 sUnknown_80E0804 = { +static const Window sUnknown_80E0804 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/options_menu1.h b/src/data/options_menu1.h index 3d4e4cf9d..385ae556f 100644 --- a/src/data/options_menu1.h +++ b/src/data/options_menu1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DBFB0 = { +static const Window sUnknown_80DBFB0 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,8 +7,8 @@ static const UnkTextStruct2 sUnknown_80DBFB0 = { NULL }; -static const UnkTextStruct2_sub2 sUnknown_80DBFC8 = {1, 0, 7, 0}; -static const UnkTextStruct2 sUnknown_80DBFCC = { +static const WindowHeader sUnknown_80DBFC8 = {1, 0, 7, 0}; +static const Window sUnknown_80DBFCC = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/options_menu2.h b/src/data/options_menu2.h index 183c07dc4..2fc493b8e 100644 --- a/src/data/options_menu2.h +++ b/src/data/options_menu2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC020 = { +static const Window sUnknown_80DC020 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,8 +7,8 @@ static const UnkTextStruct2 sUnknown_80DC020 = { NULL }; -static const UnkTextStruct2_sub2 sUnknown_80DC038 = {1, 0, 10, 0}; -static const UnkTextStruct2 sUnknown_80DC03C = { +static const WindowHeader sUnknown_80DC038 = {1, 0, 10, 0}; +static const Window sUnknown_80DC03C = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/other_menus1.h b/src/data/other_menus1.h index 2a2421f6a..0cd742fde 100644 --- a/src/data/other_menus1.h +++ b/src/data/other_menus1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E653C = { +static const Window sUnknown_80E653C = { 0, 0, 0, 0, 3, 0, 0, @@ -6,7 +6,7 @@ static const UnkTextStruct2 sUnknown_80E653C = { 0, 0, NULL }; -static const UnkTextStruct2 sUnknown_80E6554 = { +static const Window sUnknown_80E6554 = { 0, 0, 0, 0, 3, 3, 8, @@ -50,7 +50,7 @@ static const MenuItem sUnknown_80E667C[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E66BC = { +static const Window sUnknown_80E66BC = { 0, 0, 0, 0, 3, 3, 8, @@ -66,7 +66,7 @@ static const MenuItem sUnknown_80E66D4[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6748 = { +static const Window sUnknown_80E6748 = { 0, 0, 0, 0, 3, 3, 8, @@ -82,7 +82,7 @@ static const MenuItem sUnknown_80E6760[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E67D4 = { +static const Window sUnknown_80E67D4 = { 0, 0, 0, 0, 3, 3, 8, @@ -98,7 +98,7 @@ static const MenuItem sUnknown_80E67EC[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6830 = { +static const Window sUnknown_80E6830 = { 0, 0, 0, 0, 3, 3, 8, @@ -114,7 +114,7 @@ static const MenuItem sUnknown_80E6848[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E689C = { +static const Window sUnknown_80E689C = { 0, 0, 0, 0, 3, 3, 8, @@ -130,7 +130,7 @@ static const MenuItem sUnknown_80E68B4[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6938 = { +static const Window sUnknown_80E6938 = { 0, 0, 0, 0, 3, 3, 8, @@ -146,7 +146,7 @@ static const MenuItem sUnknown_80E6950[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E69B0 = { +static const Window sUnknown_80E69B0 = { 0, 0, 0, 0, 3, 3, 8, @@ -162,7 +162,7 @@ static const MenuItem sUnknown_80E69C8[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6A10 = { +static const Window sUnknown_80E6A10 = { 0, 0, 0, 0, 3, 3, 8, @@ -178,7 +178,7 @@ static const MenuItem sUnknown_80E6A28[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6A74 = { +static const Window sUnknown_80E6A74 = { 0, 0, 0, 0, 3, 3, 8, @@ -194,7 +194,7 @@ static const MenuItem sUnknown_80E6A8C[] = { {NULL, 3}, }; -UNUSED static const UnkTextStruct2 sUnknown_80E6AEC = { +UNUSED static const Window sUnknown_80E6AEC = { 0, 0, 0, 0, 3, 3, 8, @@ -210,7 +210,7 @@ UNUSED static const MenuItem sUnknown_80E6B04[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6B78 = { +static const Window sUnknown_80E6B78 = { 0, 0, 0, 0, 3, 3, 8, @@ -226,7 +226,7 @@ static const MenuItem sUnknown_80E6B90[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6BF4 = { +static const Window sUnknown_80E6BF4 = { 0, 0, 0, 0, 3, 3, 8, @@ -242,7 +242,7 @@ static const MenuItem sUnknown_80E6C0C[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6C50 = { +static const Window sUnknown_80E6C50 = { 0, 0, 0, 0, 3, 3, 8, @@ -258,7 +258,7 @@ static const MenuItem sUnknown_80E6C68[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6CD0 = { +static const Window sUnknown_80E6CD0 = { 0, 0, 0, 0, 3, 3, 8, @@ -274,7 +274,7 @@ static const MenuItem sUnknown_80E6CE8[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6D54 = { +static const Window sUnknown_80E6D54 = { 0, 0, 0, 0, 3, 3, 8, @@ -290,7 +290,7 @@ static const MenuItem sUnknown_80E6D6C[] = { {NULL, 3}, }; -static const UnkTextStruct2 sUnknown_80E6DDC = { +static const Window sUnknown_80E6DDC = { 0, 0, 0, 0, 3, 3, 8, diff --git a/src/data/party_list_menu.h b/src/data/party_list_menu.h index 33a2d849e..df95aee6c 100644 --- a/src/data/party_list_menu.h +++ b/src/data/party_list_menu.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DD310 = { +static const Window sUnknown_80DD310 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DD310 = { NULL }; -static const UnkTextStruct2 sUnknown_80DD328 = { +static const Window sUnknown_80DD328 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x13, 0x03, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DD328 = { NULL }; -static const UnkTextStruct2 sUnknown_80DD340 = { +static const Window sUnknown_80DD340 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x14, 0x04, @@ -25,7 +25,7 @@ static const UnkTextStruct2 sUnknown_80DD340 = { NULL }; -static const UnkTextStruct2 sUnknown_80DD358 = { +static const Window sUnknown_80DD358 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x11, @@ -34,7 +34,7 @@ static const UnkTextStruct2 sUnknown_80DD358 = { NULL }; -static const UnkTextStruct2 sUnknown_80DD370 = { +static const Window sUnknown_80DD370 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x03, diff --git a/src/data/personality_test1.h b/src/data/personality_test1.h index 5e939f674..0c886bffb 100644 --- a/src/data/personality_test1.h +++ b/src/data/personality_test1.h @@ -819,7 +819,7 @@ static const u8* const sPersonalityTypeDescriptionTable[NUM_PERSONALITIES] = { [QUIRKY] = DESC_QUIRKY }; -static const UnkTextStruct2 sUnknown_80F4244 = { +static const Window sUnknown_80F4244 = { 0, 0, 0, 0, 5, 12, 6, diff --git a/src/data/personality_test2.h b/src/data/personality_test2.h index 5f329d14f..0b2f715da 100644 --- a/src/data/personality_test2.h +++ b/src/data/personality_test2.h @@ -12,7 +12,7 @@ const s16 gPartners[NUM_PARTNERS] = MONSTER_MUDKIP }; -const UnkTextStruct2 gUnknown_80F4278 = +const Window gUnknown_80F4278 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -22,7 +22,7 @@ const UnkTextStruct2 gUnknown_80F4278 = NULL }; -const UnkTextStruct2 gUnknown_80F4290 = +const Window gUnknown_80F4290 = { 0x00, 0x00, 0x00, 0x00, 0x06, @@ -32,7 +32,7 @@ const UnkTextStruct2 gUnknown_80F4290 = NULL }; -const UnkTextStruct2 gUnknown_80F42A8 = +const Window gUnknown_80F42A8 = { 0x00, 0x00, 0x00, 0x00, 0x05, diff --git a/src/data/pokemon_news1.h b/src/data/pokemon_news1.h index 96d888cd2..e62649775 100644 --- a/src/data/pokemon_news1.h +++ b/src/data/pokemon_news1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DFBD0 = { +static const Window sUnknown_80DFBD0 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,8 +7,8 @@ static const UnkTextStruct2 sUnknown_80DFBD0 = { NULL }; -static const UnkTextStruct2_sub2 sUnknown_80DFBE8 = {1, 0, 12, 0}; -static const UnkTextStruct2 sUnknown_80DFBEC = { +static const WindowHeader sUnknown_80DFBE8 = {1, 0, 12, 0}; +static const Window sUnknown_80DFBEC = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/pokemon_news2.h b/src/data/pokemon_news2.h index 9c328d73f..4dd2e2c46 100644 --- a/src/data/pokemon_news2.h +++ b/src/data/pokemon_news2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DFC18 = { +static const Window sUnknown_80DFC18 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,8 +7,8 @@ static const UnkTextStruct2 sUnknown_80DFC18 = { NULL }; -static const UnkTextStruct2_sub2 sUnknown_80DFC30 = {1, 0, 22, 0}; -static const UnkTextStruct2 sUnknown_80DFC34 = { +static const WindowHeader sUnknown_80DFC30 = {1, 0, 22, 0}; +static const Window sUnknown_80DFC34 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/pokemon_news3.h b/src/data/pokemon_news3.h index 9025cce23..ca38ded74 100644 --- a/src/data/pokemon_news3.h +++ b/src/data/pokemon_news3.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DFC5C = { +static const Window sUnknown_80DFC5C = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DFC5C = { NULL }; -static const UnkTextStruct2 sUnknown_80DFC74 = { +static const Window sUnknown_80DFC74 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/post_office_guide2.h b/src/data/post_office_guide2.h index 190161e6a..86d16481f 100644 --- a/src/data/post_office_guide2.h +++ b/src/data/post_office_guide2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80E1EFC = +static const Window sUnknown_80E1EFC = { 0, 0, 0, 0, 3, @@ -8,9 +8,9 @@ static const UnkTextStruct2 sUnknown_80E1EFC = NULL }; -static const UnkTextStruct2_sub2 sUnknown_80E1F14 = {1, 0, 8, 0}; +static const WindowHeader sUnknown_80E1F14 = {1, 0, 8, 0}; -static const UnkTextStruct2 sUnknown_80E1F18 = +static const Window sUnknown_80E1F18 = { 0, 0, 0, 0, 6, diff --git a/src/data/trade_items_menu.h b/src/data/trade_items_menu.h index e56aab7d9..2af2b4552 100644 --- a/src/data/trade_items_menu.h +++ b/src/data/trade_items_menu.h @@ -10,7 +10,7 @@ static const MenuItem sUnknown_80E60D4[] = { {NULL, 0}, }; -static const UnkTextStruct2 sUnknown_80E60EC = +static const Window sUnknown_80E60EC = { 0, 0, 0, 0, 3, @@ -27,7 +27,7 @@ static const MenuItem sUnknown_80E6104[] = { {NULL, 0}, }; -static const UnkTextStruct2 unused = +static const Window unused = { 0, 0, 0, 0, 3, @@ -43,7 +43,7 @@ static const MenuItem sUnknown_80E6154[] = { {NULL, 0}, }; -static const UnkTextStruct2 sUnknown_80E6174 = +static const Window sUnknown_80E6174 = { 0, 0, 0, 0, 3, diff --git a/src/data/wigglytuff_shop1.h b/src/data/wigglytuff_shop1.h index bfce03b7e..91c0c60e2 100644 --- a/src/data/wigglytuff_shop1.h +++ b/src/data/wigglytuff_shop1.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC464 = { +static const Window sUnknown_80DC464 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DC464 = { NULL }; -static const UnkTextStruct2 sUnknown_80DC47C = { +static const Window sUnknown_80DC47C = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/wigglytuff_shop2.h b/src/data/wigglytuff_shop2.h index 70e999735..333f1f5bc 100644 --- a/src/data/wigglytuff_shop2.h +++ b/src/data/wigglytuff_shop2.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC4BC = { +static const Window sUnknown_80DC4BC = { 0, 0, 0, 0, 3, 0, 0, @@ -7,8 +7,8 @@ static const UnkTextStruct2 sUnknown_80DC4BC = { NULL }; -static const UnkTextStruct2_sub2 sUnknown_80DC4D4 = {1, 0, 18, 0}; -static const UnkTextStruct2 sUnknown_80DC4D8 = { +static const WindowHeader sUnknown_80DC4D4 = {1, 0, 18, 0}; +static const Window sUnknown_80DC4D8 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/wigglytuff_shop3.h b/src/data/wigglytuff_shop3.h index 39ad2944c..109d777b6 100644 --- a/src/data/wigglytuff_shop3.h +++ b/src/data/wigglytuff_shop3.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DC534 = { +static const Window sUnknown_80DC534 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DC534 = { NULL }; -static const UnkTextStruct2 sUnknown_80DC54C = { +static const Window sUnknown_80DC54C = { 0, 0, 0, 0, 3, 21, 4, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DC54C = { NULL }; -static const UnkTextStruct2 sUnknown_80DC564 = { +static const Window sUnknown_80DC564 = { 0, 0, 0, 0, 3, 21, 14, diff --git a/src/data/wonder_mail_1.h b/src/data/wonder_mail_1.h index f4df68bf9..f3100a8b4 100644 --- a/src/data/wonder_mail_1.h +++ b/src/data/wonder_mail_1.h @@ -40,7 +40,7 @@ const MenuItem gUnknown_80DDAA0[] = { {NULL, 10}, }; -const UnkTextStruct2 gUnknown_80DDACC = +const Window gUnknown_80DDACC = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -50,7 +50,7 @@ const UnkTextStruct2 gUnknown_80DDACC = NULL }; -const UnkTextStruct2 gUnknown_80DDAE4 = +const Window gUnknown_80DDAE4 = { 0x00, 0x00, 0x00, 0x00, 0x03, diff --git a/src/data/wonder_mail_802C10C.h b/src/data/wonder_mail_802C10C.h index 7aa4081fa..3cb574982 100644 --- a/src/data/wonder_mail_802C10C.h +++ b/src/data/wonder_mail_802C10C.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DFC9C = { +static const Window sUnknown_80DFC9C = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DFC9C = { NULL }; -static const UnkTextStruct2 sUnknown_80DFCB4 = { +static const Window sUnknown_80DFCB4 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/wonder_mail_802C4C8.h b/src/data/wonder_mail_802C4C8.h index 0f34b3b24..4aa69d8ac 100644 --- a/src/data/wonder_mail_802C4C8.h +++ b/src/data/wonder_mail_802C4C8.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DFCE4 = { +static const Window sUnknown_80DFCE4 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DFCE4 = { NULL }; -static const UnkTextStruct2 sUnknown_80DFCFC = { +static const Window sUnknown_80DFCFC = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/wonder_mail_802C860.h b/src/data/wonder_mail_802C860.h index 4b8e71810..2ccd48b8c 100644 --- a/src/data/wonder_mail_802C860.h +++ b/src/data/wonder_mail_802C860.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DFD28 = { +static const Window sUnknown_80DFD28 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DFD28 = { NULL }; -static const UnkTextStruct2 sUnknown_80DFD40 = { +static const Window sUnknown_80DFD40 = { 0, 0, 0, 0, 4, 21, 6, @@ -16,7 +16,7 @@ static const UnkTextStruct2 sUnknown_80DFD40 = { NULL }; -static const UnkTextStruct2 sUnknown_80DFD58 = { +static const Window sUnknown_80DFD58 = { 0, 0, 0, 0, 4, 21, 15, diff --git a/src/data/wonder_mail_802CDD4.h b/src/data/wonder_mail_802CDD4.h index 7c1f58c7b..dd31d31b8 100644 --- a/src/data/wonder_mail_802CDD4.h +++ b/src/data/wonder_mail_802CDD4.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DFD8C = { +static const Window sUnknown_80DFD8C = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DFD8C = { NULL }; -static const UnkTextStruct2 sUnknown_80DFDA4 = { +static const Window sUnknown_80DFDA4 = { 0, 0, 0, 0, 6, 2, 2, diff --git a/src/data/wonder_mail_802D098.h b/src/data/wonder_mail_802D098.h index 7c0839f67..7994644ec 100644 --- a/src/data/wonder_mail_802D098.h +++ b/src/data/wonder_mail_802D098.h @@ -1,4 +1,4 @@ -static const UnkTextStruct2 sUnknown_80DFDD4 = { +static const Window sUnknown_80DFDD4 = { 0, 0, 0, 0, 3, 0, 0, @@ -7,7 +7,7 @@ static const UnkTextStruct2 sUnknown_80DFDD4 = { NULL }; -UNUSED static const UnkTextStruct2 sUnknown_80DFDEC = { +UNUSED static const Window sUnknown_80DFDEC = { 0, 0, 0, 0, 3, 3, 3, @@ -16,7 +16,7 @@ UNUSED static const UnkTextStruct2 sUnknown_80DFDEC = { NULL }; -static const UnkTextStruct2 sUnknown_80DFE04 = { +static const Window sUnknown_80DFE04 = { 0, 0, 0, 0, 3, 21, 6, @@ -25,7 +25,7 @@ static const UnkTextStruct2 sUnknown_80DFE04 = { NULL }; -static const UnkTextStruct2 sUnknown_80DFE1C = { +static const Window sUnknown_80DFE1C = { 0, 0, 0, 0, 3, 21, 15, @@ -34,7 +34,7 @@ static const UnkTextStruct2 sUnknown_80DFE1C = { NULL }; -UNUSED static const UnkTextStruct2 sUnknown_80DFE34 = { +UNUSED static const Window sUnknown_80DFE34 = { 0, 0, 0, 0, 3, 21, 15, diff --git a/src/friend_rescue.c b/src/friend_rescue.c index 6144736d8..92db2a0d7 100644 --- a/src/friend_rescue.c +++ b/src/friend_rescue.c @@ -32,7 +32,7 @@ extern void SetFriendRescueMenuState(u32); extern TeamInventory *gTeamInventoryRef; -// NOTE: MenuItems and UnkTextStruct2 defined in here.. +// NOTE: MenuItems and Window defined in here.. #include "data/friend_rescue_menus.h" const u8 gUnknown_80E25F4[] = "What would you like to do?"; diff --git a/src/kecleon_bros4.c b/src/kecleon_bros4.c index 8e6487969..2d0745da3 100644 --- a/src/kecleon_bros4.c +++ b/src/kecleon_bros4.c @@ -285,7 +285,7 @@ void sub_801A9E0(void) } if (sub_801AED0(teamItemIndex) & 1) - sub_8007B7C(gUnknown_203B224->unk54.s0.unk34, 8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), (gUnknown_203B224->unk54.s0.unk38->unkC - 2) * 8, 10); + sub_8007B7C(gUnknown_203B224->unk54.s0.unk34, 8, sub_8013800(&gUnknown_203B224->unk54.s0.input, r7), (gUnknown_203B224->unk54.s0.unk38->width - 2) * 8, 10); } sub_80073E0(gUnknown_203B224->unk54.s0.unk34); diff --git a/src/load_screen.c b/src/load_screen.c index 506b7af4b..0c3d01d98 100644 --- a/src/load_screen.c +++ b/src/load_screen.c @@ -29,7 +29,7 @@ struct LoadScreen // size: 0x27c u32 currMenu; MenuStruct unk4[4]; - UnkTextStruct3 unk144; + Windows unk144; /* 0x1A4 */ u8 formattedTeamName[0x24]; /* 0x1C8 */ u8 formattedPlayerName[0x24]; /* 0x1EC */ u8 formattedLocation[0x24]; @@ -48,7 +48,7 @@ void sub_80397B4(void); extern void sub_80920D8(u8 *); -const UnkTextStruct2 gUnknown_80E75F8 = { +const Window gUnknown_80E75F8 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -57,7 +57,7 @@ const UnkTextStruct2 gUnknown_80E75F8 = { NULL }; -const UnkTextStruct2 gUnknown_80E7610 = { +const Window gUnknown_80E7610 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x02, @@ -80,7 +80,7 @@ EWRAM_INIT MenuItem gUnknown_203B378[2] = { EWRAM_INIT u32 gUnknown_203B388[12] = {0xC, 0xC, 0xE, 0xE, 0xD, 0xE, 0xC, 0xD, 0xD, 0xB, 0xB, 0xB}; EWRAM_INIT u32 gUnknown_203B3B8[12] = {0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x1A, 0x18, 0x1B, 0x16, 0x19, 0x17}; -const UnkTextStruct2 gUnknown_80E762C = { +const Window gUnknown_80E762C = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x0F, @@ -124,7 +124,7 @@ const MenuItem gDeleteSaveConfirmMenuItems[3] = {NULL, 3}, }; -const UnkTextStruct2 gUnknown_80E7784 = +const Window gUnknown_80E7784 = { 0x00, 0x00, 0x00, 0x00, 0x03, diff --git a/src/mailbox.c b/src/mailbox.c index 83ea8e5f7..4d26398d3 100644 --- a/src/mailbox.c +++ b/src/mailbox.c @@ -20,7 +20,7 @@ EWRAM_INIT struct unkStruct_203B304 *gUnknown_203B304 = {NULL}; -const UnkTextStruct2 gUnknown_80E0284 = +const Window gUnknown_80E0284 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -30,7 +30,7 @@ const UnkTextStruct2 gUnknown_80E0284 = NULL }; -const UnkTextStruct2 gUnknown_80E029C = +const Window gUnknown_80E029C = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -40,7 +40,7 @@ const UnkTextStruct2 gUnknown_80E029C = NULL }; -const UnkTextStruct2 gUnknown_80E02B4 = +const Window gUnknown_80E02B4 = { 0x00, 0x00, 0x00, 0x00, 0x04, @@ -50,7 +50,7 @@ const UnkTextStruct2 gUnknown_80E02B4 = NULL }; -const UnkTextStruct2 gUnknown_80E02CC = +const Window gUnknown_80E02CC = { 0x00, 0x00, 0x00, 0x00, 0x04, @@ -166,7 +166,7 @@ void sub_802E0A0(void) CreateMailActionMenu(); gUnknown_203B304->unk10C.a0[2] = gUnknown_80E02B4; sub_8012CAC(&gUnknown_203B304->unk10C.a0[2], gUnknown_203B304->menuItems); - gUnknown_203B304->unk10C.a0[2].unkC = 6; + gUnknown_203B304->unk10C.a0[2].width = 6; gUnknown_203B304->unk10C.a0[3] = gUnknown_80E02CC; break; default: diff --git a/src/main_menu1.c b/src/main_menu1.c index 5db81b46d..2e0538c17 100644 --- a/src/main_menu1.c +++ b/src/main_menu1.c @@ -291,9 +291,9 @@ void sub_8035C1C(void) sMainMenu->sub.unk2D = 0; } -void SetMenuItems(MenuStruct *a0, UnkTextStruct3 *a1, s32 index, const UnkTextStruct2 *a3, const MenuItem *menuItems, bool8 a5, u32 menuAction, bool8 unused) +void SetMenuItems(MenuStruct *a0, Windows *a1, s32 index, const Window *a3, const MenuItem *menuItems, bool8 a5, u32 menuAction, bool8 unused) { - UnkTextStruct2 *txtPtrs = a1->a0; + Window *txtPtrs = a1->a0; txtPtrs[index] = *a3; ResetUnusedInputStruct(); xxx_call_save_unk_text_struct_800641C(a1, TRUE, TRUE); @@ -306,9 +306,9 @@ void SetMenuItems(MenuStruct *a0, UnkTextStruct3 *a1, s32 index, const UnkTextSt a0[index].unk4C = TRUE; } -void sub_8035CC0(UnkTextStruct3 *dataArray, u32 index) +void sub_8035CC0(Windows *dataArray, u32 index) { - UnkTextStruct2 *txtPtrs; + Window *txtPtrs; RestoreUnkTextStruct_8006518(dataArray); txtPtrs = dataArray->a0; diff --git a/src/menu_input.c b/src/menu_input.c index 8b2f39d7c..e418bf3c1 100644 --- a/src/menu_input.c +++ b/src/menu_input.c @@ -16,9 +16,9 @@ const u32 gDefaultMenuTextColors[3] = { COLOR_WHITE_2, COLOR_RED, COLOR_RED }; -const UnkTextStruct2_sub2 UnkData_80D47C4 = {0x01, 0x00, 0x10, 0x00}; +const WindowHeader UnkData_80D47C4 = {0x01, 0x00, 0x10, 0x00}; -const UnkTextStruct2 gUnknown_80D47C8[4] = { +const Window gUnknown_80D47C8[4] = { 0x00, 0x00, 0x00, 0x00, 0x06, 0x02, 0x02, @@ -223,7 +223,7 @@ void sub_8012C60(u32 x, u32 y, u32 a2, u32 color, u32 a4) xxx_call_draw_char(x + add_x, y, uVar2, color, a4); } -void sub_8012CAC(UnkTextStruct2 *a0, const MenuItem *a1) +void sub_8012CAC(Window *a0, const MenuItem *a1) { s32 length; s32 maxLength; @@ -240,35 +240,35 @@ void sub_8012CAC(UnkTextStruct2 *a0, const MenuItem *a1) } } - a0->unkC = (maxLength / 8) + 2; + a0->width = (maxLength / 8) + 2; sub_8012D08(a0, count); } -void sub_8012D08(UnkTextStruct2 *param_1, s32 param_2) +void sub_8012D08(Window *param_1, s32 param_2) { s32 sVar2; s16 sVar3; sVar2 = (s16) sub_80095E4(param_2, 12); - if (param_1->unk4 == 6) + if (param_1->type == WINDOW_TYPE_WITH_HEADER) sVar2 = (s16)(sVar2 + 2); sVar3 = sVar2; - param_1->unkE = sVar3; + param_1->height = sVar3; param_1->unk10 = sVar3; } -void sub_8012D34(struct UnkTextStruct2 *param_1, s32 param_2) +void sub_8012D34(struct Window *param_1, s32 param_2) { s32 sVar2; s16 sVar3; sVar2 = (s16) sub_8009614(param_2, 24); - if (param_1->unk4 == 6) + if (param_1->type == WINDOW_TYPE_WITH_HEADER) sVar2 = (s16)(sVar2 + 2); sVar3 = sVar2; - param_1->unkE = sVar3; + param_1->height = sVar3; param_1->unk10 = sVar3; } @@ -386,10 +386,10 @@ void sub_8012EBC(MenuStruct *param_1) const u32 *colorArray; s32 counter; s32 index; - UnkTextStruct3 textStack; + Windows textStack; u8 buffer[256]; UnkTextStruct1 *ptr_text; - UnkTextStruct2 *ptr_text2; + Window *ptr_text2; if (param_1->unk4D) { sub_80073B8(param_1->index); @@ -1193,7 +1193,7 @@ void sub_8013F84(void) AddSprite(&SStack_18,0x100,0,0x0); } -void sub_80140B4(UnkTextStruct3 *a0) +void sub_80140B4(Windows *a0) { s32 i; diff --git a/src/mission_reward.c b/src/mission_reward.c index 4a970e60c..af575043f 100644 --- a/src/mission_reward.c +++ b/src/mission_reward.c @@ -22,7 +22,7 @@ struct unkStruct_203B310 /* 0xC */ s32 itemRewardIndex; unkStruct_802F204 *unk10; /* 0x14 */ struct MonPortraitMsg monPortrait; - UnkTextStruct3 unk24; + Windows unk24; }; EWRAM_INIT struct unkStruct_203B310 *gUnknown_203B310 = {NULL}; @@ -41,7 +41,7 @@ enum FriendRewardStates REWARD_EXIT, }; -const UnkTextStruct2 gUnknown_80E041C = { +const Window gUnknown_80E041C = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, diff --git a/src/options_menu1.c b/src/options_menu1.c index 69dd2ef66..64359721e 100644 --- a/src/options_menu1.c +++ b/src/options_menu1.c @@ -122,7 +122,7 @@ static void sub_801DD84(void) sUnknown_203B25C->unkBC.a0[0] = sUnknown_80DBFCC; sub_8012CAC(&sUnknown_203B25C->unkBC.a0[0], sUnknown_203B25C->menuItems); - sUnknown_203B25C->unkBC.a0[0].unkC = 10; + sUnknown_203B25C->unkBC.a0[0].width = 10; break; case OPTIONS_MENU_MAIN: CreateOthersMenu(); @@ -132,7 +132,7 @@ static void sub_801DD84(void) sUnknown_203B25C->unkBC.a0[0] = sUnknown_80DBFCC; sub_8012CAC(&sUnknown_203B25C->unkBC.a0[0], sUnknown_203B25C->menuItems); - sUnknown_203B25C->unkBC.a0[0].unkC = 10; + sUnknown_203B25C->unkBC.a0[0].width = 10; break; default: for (i = 0; i < 4; i++) diff --git a/src/other_menus1.c b/src/other_menus1.c index 63f1f1153..13260361d 100644 --- a/src/other_menus1.c +++ b/src/other_menus1.c @@ -119,7 +119,7 @@ static void sub_80371B8(void) { unkStruct_8035D94 *item; const MenuItem *MenuItems; - const UnkTextStruct2 *puVar5; + const Window *puVar5; puVar5 = NULL; MenuItems = NULL; diff --git a/src/party_list_menu.c b/src/party_list_menu.c index bc0fb1e48..a76a1551e 100644 --- a/src/party_list_menu.c +++ b/src/party_list_menu.c @@ -171,7 +171,7 @@ static void sub_802608C(void) PartyListMenu_CreateMenu1(); sUnknown_203B2B8->unk220.a0[2] = sUnknown_80DD328; sub_8012CAC(&sUnknown_203B2B8->unk220.a0[2], sUnknown_203B2B8->unk16C); - sUnknown_203B2B8->unk220.a0[2].unkC = 9; + sUnknown_203B2B8->unk220.a0[2].width = 9; break; case 0x14: PartyListMenu_CreateMenu2(); @@ -782,7 +782,7 @@ void sub_8026E08(u32 r0) sub_808D930(buffer, sUnknown_203B2B8->pokeStruct->speciesNum); sprintfStatic(buffer1, sUnknown_80DD6E0, gFormatBuffer_Monsters[0]); x = sub_8008ED0(buffer1); - PrintStringOnWindow(((sUnknown_80DD370.unkC << 3) - x) / 2, 3, buffer1, r0, 0); + PrintStringOnWindow(((sUnknown_80DD370.width << 3) - x) / 2, 3, buffer1, r0, 0); sub_80073E0(r0); } diff --git a/src/pelipper_board.c b/src/pelipper_board.c index 521ecd5aa..a02fc1385 100644 --- a/src/pelipper_board.c +++ b/src/pelipper_board.c @@ -20,7 +20,7 @@ EWRAM_INIT struct unkStruct_203B308 *gPelipperBoard = {NULL}; -const UnkTextStruct2 gUnknown_80E0330 = +const Window gUnknown_80E0330 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -30,7 +30,7 @@ const UnkTextStruct2 gUnknown_80E0330 = NULL }; -const UnkTextStruct2 gUnknown_80E0348 = +const Window gUnknown_80E0348 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -40,7 +40,7 @@ const UnkTextStruct2 gUnknown_80E0348 = NULL }; -const UnkTextStruct2 gUnknown_80E0360 = +const Window gUnknown_80E0360 = { 0x00, 0x00, 0x00, 0x00, 0x04, @@ -50,7 +50,7 @@ const UnkTextStruct2 gUnknown_80E0360 = NULL }; -const UnkTextStruct2 gUnknown_80E0378 = +const Window gUnknown_80E0378 = { 0x00, 0x00, 0x00, 0x00, 0x04, @@ -161,7 +161,7 @@ void sub_802E94C(void) sub_802EC10(); gPelipperBoard->unk10C.a0[2] = gUnknown_80E0360; sub_8012CAC(&gPelipperBoard->unk10C.a0[2], gPelipperBoard->menuItems); - gPelipperBoard->unk10C.a0[2].unkC = 6; + gPelipperBoard->unk10C.a0[2].width = 6; gPelipperBoard->unk10C.a0[3] = gUnknown_80E0378; break; default: diff --git a/src/personality_test1.c b/src/personality_test1.c index 013b326e5..ced2ed640 100644 --- a/src/personality_test1.c +++ b/src/personality_test1.c @@ -386,7 +386,7 @@ static void PersonalityTest_DisplayStarterSprite(void) s32 paletteIndex; s32 emotionId; const u8 *gfx; - UnkTextStruct3 stackArray; + Windows stackArray; starterID = sPersonalityTestTracker->unk4.StarterID; RestoreUnkTextStruct_8006518(&stackArray); diff --git a/src/rescue_password_menu.c b/src/rescue_password_menu.c index 3d0251d64..ec01dfef8 100644 --- a/src/rescue_password_menu.c +++ b/src/rescue_password_menu.c @@ -26,7 +26,7 @@ EWRAM_INIT u8 gUnknown_203B368 = {1}; EWRAM_INIT u32 gUnknown_203B36C = {65502}; EWRAM_INIT struct RescuePasswordMenu *gRescuePasswordMenu = {NULL}; -const UnkTextStruct2 gUnknown_80E71E4 = { +const Window gUnknown_80E71E4 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -35,7 +35,7 @@ const UnkTextStruct2 gUnknown_80E71E4 = { NULL }; -const UnkTextStruct2 gUnknown_80E71FC = { +const Window gUnknown_80E71FC = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -59,7 +59,7 @@ ALIGNED(4) const u8 CheckAgain_80E7234[] = _("{CENTER_ALIGN}Please check it agai ALIGNED(4) const u8 IncorrectPassword_80E7250[] = _("{CENTER_ALIGN}Incorrect password!"); ALIGNED(4) const u8 Error_80E7268[] = _("{CENTER_ALIGN}{COLOR RED}Error!{RESET} "); -const UnkTextStruct2 gUnknown_80E7278 = { +const Window gUnknown_80E7278 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -83,7 +83,7 @@ ALIGNED(4) const u8 DATA_80E72B0[] = " "; ALIGNED(4) const u8 PasswordAccept_80E72B4[] = _("{CENTER_ALIGN}The password has been accepted."); ALIGNED(4) const u8 Success_80E72D8[] = _("{CENTER_ALIGN}{COLOR CYAN_G}Success!{RESET} "); -const UnkTextStruct2 gUnknown_80E72EC = { +const Window gUnknown_80E72EC = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -103,7 +103,7 @@ const MenuItem gUnknown_80E7304[4] = { ALIGNED(4) const u8 NotSOSMail_80E7324[] = _("{CENTER_ALIGN}This is not an {COLOR CYAN_G}SOS Mail{RESET}."); -const UnkTextStruct2 gUnknown_80E7344 = { +const Window gUnknown_80E7344 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -123,7 +123,7 @@ const MenuItem gUnknown_80E735C[4] = { ALIGNED(4) const u8 ReceiveSOSMail_80E737C[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}SOS Mail{RESET} has been received already."); -const UnkTextStruct2 gUnknown_80E73AC = { +const Window gUnknown_80E73AC = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -143,7 +143,7 @@ const MenuItem gUnknown_80E73C4[4] = { ALIGNED(4) const u8 sUnknown_80E73E4[] = _("{CENTER_ALIGN}This is not an {COLOR CYAN_G}A-OK Mail{RESET}."); -const UnkTextStruct2 gUnknown_80E7408 = { +const Window gUnknown_80E7408 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -163,7 +163,7 @@ const MenuItem gUnknown_80E7420[4] = { ALIGNED(4) const u8 sUnknown_80E7440[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}A-OK Mail{RESET} cannot be used."); -const UnkTextStruct2 gUnknown_80E7468 = { +const Window gUnknown_80E7468 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -182,7 +182,7 @@ const MenuItem gUnknown_80E7480[4] = { }; ALIGNED(4) const u8 sUnknown_80E74A0[] = _("{CENTER_ALIGN}This is not a {COLOR CYAN_G}Thank-You Mail{RESET}."); -const UnkTextStruct2 gUnknown_80E74C8 = { +const Window gUnknown_80E74C8 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -202,7 +202,7 @@ const MenuItem gUnknown_80E74E0[4] = { ALIGNED(4) const u8 sUnknown_80E7500[] = _("{CENTER_ALIGN}This {COLOR CYAN_G}Thank-You Mail{RESET} cannot be used."); -const UnkTextStruct2 gUnknown_80E752C = { +const Window gUnknown_80E752C = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, @@ -221,7 +221,7 @@ const MenuItem gUnknown_80E7544[4] = { }; ALIGNED(4) const u8 sUnknown_80E7564[] = _("{CENTER_ALIGN}This is not a {COLOR CYAN_G}Wonder Mail{RESET}."); -const UnkTextStruct2 gUnknown_80E7588 = { +const Window gUnknown_80E7588 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x09, diff --git a/src/save_menu.c b/src/save_menu.c index 47a4b51eb..3e2348452 100644 --- a/src/save_menu.c +++ b/src/save_menu.c @@ -12,7 +12,7 @@ static EWRAM_INIT SaveMenuWork *sUnknown_203B364 = {NULL}; -const UnkTextStruct2 gUnknown_80E6F20 = +const Window gUnknown_80E6F20 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -22,7 +22,7 @@ const UnkTextStruct2 gUnknown_80E6F20 = NULL }; -const UnkTextStruct2 gUnknown_80E6F38 = +const Window gUnknown_80E6F38 = { 0x00, 0x00, 0x00, 0x00, 0x03, diff --git a/src/string_format.c b/src/string_format.c index c76c256ce..881586285 100644 --- a/src/string_format.c +++ b/src/string_format.c @@ -60,7 +60,7 @@ u32 sub_8014140(void) // This kinda looks like the 'true' beginning of the file static const u32 gUnknown_80D48A0[] = {0x7, 0x2, 0x2}; -static const struct UnkTextStruct2 gUnknown_80D48AC = { +static const struct Window gUnknown_80D48AC = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -69,7 +69,7 @@ static const struct UnkTextStruct2 gUnknown_80D48AC = { 0x00, 0x00, 0x00 }; -static const UnkTextStruct2 gUnknown_80D48C4 = { +static const Window gUnknown_80D48C4 = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x0F, @@ -78,7 +78,7 @@ static const UnkTextStruct2 gUnknown_80D48C4 = { NULL }; -static const UnkTextStruct2 gUnknown_80D48DC = { +static const Window gUnknown_80D48DC = { 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x08, @@ -149,7 +149,7 @@ static EWRAM_DATA s32 gUnknown_202EC1C = 0; // Only read, but never written to. Possibly used in Blue? struct NeverWrittenToStruct202EC20 { - struct UnkTextStruct2 unk0; + struct Window unk0; const u8 *unk18; }; static EWRAM_DATA struct NeverWrittenToStruct202EC20 *sNeverWrittenToUnknownStructPtr = NULL; @@ -157,23 +157,23 @@ static UNUSED EWRAM_DATA u8 sUnusedEwram1[4] = {0}; static EWRAM_DATA MenuInputStructSub gUnknown_202EC28 = {0}; -static EWRAM_INIT UnkTextStruct3 sUnknown_203B198 = { +static EWRAM_INIT Windows sUnknown_203B198 = { .a0 = { [0] = { .pos = {2, 15}, - .unkC = 26, - .unkE = 5, + .width = 26, + .height = 5, .unk10 = 7, }, [1] = { .unk0 = 0x40, - .unk4 = 7 + .type = WINDOW_TYPE_7, }, [2] = { - .unk4 = 3, + .type = WINDOW_TYPE_NORMAL, }, [3] = { - .unk4 = 3, + .type = WINDOW_TYPE_NORMAL, } } }; @@ -233,8 +233,8 @@ void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const Me sUnknown_203B198.a0[0] = gUnknown_80D48C4; } - sUnknown_203B198.a0[1].unkC = 0; - sUnknown_203B198.a0[1].unkE = 0; + sUnknown_203B198.a0[1].width = 0; + sUnknown_203B198.a0[1].height = 0; sUnknown_203B198.a0[1].unk10 = 0; sUnknown_203B198.a0[1].unk0 = 0x40; @@ -243,18 +243,18 @@ void CreateMenuDialogueBoxAndPortrait(const u8 *text, void *a1, u32 r9, const Me sUnknown_203B198.a0[1].pos.x = monPortraitPtr->pos.x; sUnknown_203B198.a0[1].pos.y = monPortraitPtr->pos.y; - sUnknown_203B198.a0[1].unkC = 5; - sUnknown_203B198.a0[1].unkE = 5; + sUnknown_203B198.a0[1].width = 5; + sUnknown_203B198.a0[1].height = 5; sUnknown_203B198.a0[1].unk10 = 5; for (i = 0; i < 16; i++) { SetBGPaletteBufferColorArray(224 + i, &monPortraitPtr->faceData->sprites[monPortraitPtr->spriteId].pal[i]); } portraitOn = TRUE; if (monPortraitPtr->unkE) { - sUnknown_203B198.a0[1].unk4 = 7; + sUnknown_203B198.a0[1].type = WINDOW_TYPE_7; } else { - sUnknown_203B198.a0[1].unk4 = 5; + sUnknown_203B198.a0[1].type = WINDOW_TYPE_FILL_TRANSPARENT; } } @@ -621,12 +621,12 @@ static void sub_8014A88(void) if (r5 % 8) r2++; - sUnknown_203B198.a0[2].unk4 = gUnknown_202EC10; + sUnknown_203B198.a0[2].type = gUnknown_202EC10; r1 = r7 / 8; r1 += 2; - sUnknown_203B198.a0[2].unkC = r1; + sUnknown_203B198.a0[2].width = r1; sUnknown_203B198.a0[2].unk10 = r2; - sUnknown_203B198.a0[2].unkE = r2; + sUnknown_203B198.a0[2].height = r2; sUnknown_203B198.a0[2].pos.x = 28 - r1; sUnknown_203B198.a0[2].pos.y = 14 - r2; sUnknown_203B198.a0[0].unk0 = 0x80; diff --git a/src/text.c b/src/text.c index c5d72ce51..526b1261d 100644 --- a/src/text.c +++ b/src/text.c @@ -38,7 +38,7 @@ EWRAM_DATA static s32 sCurrentCharmap = 0; EWRAM_DATA static vu32 sUnknown_20274B0 = 0; EWRAM_DATA static u32 sUnknown_20274B4[0xEC0] = {0}; EWRAM_DATA static OpenedFile *sCharmapFiles[3] = {NULL}; -EWRAM_DATA static UnkTextStruct3 sUnknown_202AFC0 = {0}; +EWRAM_DATA static Windows sUnknown_202AFC0 = {0}; EWRAM_DATA static s32 sUnknown_202B020 = 0; EWRAM_DATA static s32 sUnknown_202B024 = 0; EWRAM_DATA static s32 sCharHeight[2] = {0}; @@ -64,14 +64,14 @@ EWRAM_INIT void (*gIwramTextFunc4)(s32 a0) = sub_8272A78; // This variable is only used in InitGraphics function, which may or may not belong to text.c EWRAM_INIT u8 gUnknown_203B090 = 0; -static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct3 *a0, bool8 a1, bool8 a2, DungeonPos *a3); -static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const UnkTextStruct2 *a5, bool8 a6, u32 a7, DungeonPos *a8, u8 a9); +static void SaveUnkTextStructAndXXX_8006438(const Windows *a0, bool8 a1, bool8 a2, DungeonPos *a3); +static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const Window *a5, bool8 a6, u32 a7, DungeonPos *a8, u8 a9); static void sub_800677C(UnkTextStruct1 *a0, s32 a1, u16 *a2, u8 a3); static void sub_80069CC(UnkTextStruct1 *a0, s32 a1, s32 a2, s32 a3, u16 *a4); static void sub_8006AC4(UnkTextStruct1 *a0, s32 a1, s32 a2, s32 a3, u16 *a4); static void sub_8006B70(UnkTextStruct1 *a0, s32 a1, s32 a2, s32 a3, u16 *a4); static void sub_8006C44(UnkTextStruct1 *a0, s32 a1, u16 *a2, u8 a3); -static void sub_8006E94(UnkTextStruct1 *a0, s32 a1, u32 a2, const UnkTextStruct2_sub2 *a3, u16 *a4); +static void sub_8006E94(UnkTextStruct1 *a0, s32 a1, u32 a2, const WindowHeader *a3, u16 *a4); static u32 xxx_draw_char(struct UnkTextStruct1 *a0, s32 x, s32 y, u32 a3, u32 color, u32 a5); static void nullsub_129(u32 a0, s32 x, s32 y, s32 a3, u32 color); static void sub_8007958(UnkTextStruct1 *a0, u32 a1, s32 x, s32 y, s32 a4, u32 color); @@ -86,7 +86,7 @@ static void sub_80084A4(UnkTextStruct1 *a0, u16 a1[32][32], u32 a2, s32 a3, s32 static void sub_8008818(UnkTextStruct1 *a0, s32 a1, s32 a2, s32 a3, s32 a4, s32 a5); static bool8 xxx_update_bg_vram(UnkTextStruct1 *a0); static void sub_800898C(void); -static void sub_80089AC(const UnkTextStruct2 *r4, DungeonPos *r5_Str); +static void sub_80089AC(const Window *r4, DungeonPos *r5_Str); static void PrepareTextbox_8008C6C(UnkTextStruct1 *strArr, u32 strId); static void xxx_draw_string(UnkTextStruct1 *strArr, s32 x, s32 y, const u8 *str, u32 windowId, u32 terminatingChr, s32 characterSpacing, s32 lineSpacing); static const u8 *HandleTextFormat(UnkTextStruct1 *strArr, const u8 *str, struct UnkDrawStringStruct *sp); @@ -113,13 +113,13 @@ static const u32 gUnknown_80B853C[16] = 0xEEEEEEEE, }; -static const UnkTextStruct3 gUnknown_80B857C = +static const Windows gUnknown_80B857C = { .a0 = { - [0] = {.unk4 = 3}, - [1] = {.unk4 = 3}, - [2] = {.unk4 = 3}, - [3] = {.unk4 = 3}, + [0] = {.type = WINDOW_TYPE_NORMAL}, + [1] = {.type = WINDOW_TYPE_NORMAL}, + [2] = {.type = WINDOW_TYPE_NORMAL}, + [3] = {.type = WINDOW_TYPE_NORMAL}, } }; @@ -275,14 +275,14 @@ void SetCharacterMask(int a0) sTextShadowMask = retval; } -void xxx_call_save_unk_text_struct_800641C(const UnkTextStruct3 *a0, bool8 a1, bool8 a2) +void xxx_call_save_unk_text_struct_800641C(const Windows *a0, bool8 a1, bool8 a2) { DungeonPos r3 = {0, 0}; SaveUnkTextStructAndXXX_8006438(a0, a1, a2, &r3); } // https://decomp.me/scratch/xF5Y1 -static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct3 *a0, bool8 a1, bool8 a2, DungeonPos *a3) +static void SaveUnkTextStructAndXXX_8006438(const Windows *a0, bool8 a1, bool8 a2, DungeonPos *a3) { s32 i; u32 r9; @@ -299,10 +299,10 @@ static void SaveUnkTextStructAndXXX_8006438(const UnkTextStruct3 *a0, bool8 a1, for (i = 0; i < 4; i++) { sUnknown_202AFC0.a0[i] = a0->a0[i]; - if (a0->a0[i].unkC) { + if (a0->a0[i].width) { sub_8006554(gUnknown_2027370, (u32 *)VRAM, sUnknown_20274B4, &gUnknown_202B038[0][0][0], gUnknown_80B8804[i], &a0->a0[i], a1, r9, a3, 0); sub_80089AC(&a0->a0[i], a3); - r9 += a0->a0[i].unkC * a0->a0[i].unk10; + r9 += a0->a0[i].width * a0->a0[i].unk10; } } @@ -319,7 +319,7 @@ UNUSED static void nullsub_152(void) { } -void RestoreUnkTextStruct_8006518(UnkTextStruct3 *unkData) +void RestoreUnkTextStruct_8006518(Windows *unkData) { s32 i; for (i = 0; i < 4; i++) @@ -336,7 +336,7 @@ u32 sub_8006544(u32 index) } // a1 is a VRAM pointer -static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const UnkTextStruct2 *a5, bool8 a6, u32 a7, DungeonPos *a8, u8 a9) +static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, const Window *a5, bool8 a6, u32 a7, DungeonPos *a8, u8 a9) { UnkTextStruct1 *t1; s32 iVar3; @@ -354,10 +354,10 @@ static void sub_8006554(UnkTextStruct1 *a0, u32 *a1, u32 *a2, u16 *a3, u32 a4, c iVar5 = a5->pos.y + a8->y; t1->unk0 = iVar3; t1->unk2 = iVar5; - t1->unk4 = a5->unkC; + t1->unk4 = a5->width; t1->unk8 = a5->unk10; - t1->unk6 = a5->unkE; - t1->unkC = a5->unk4; + t1->unk6 = a5->height; + t1->unkC = a5->type; t1->unk10 = a7; if (t1->unkC == 6) @@ -686,7 +686,7 @@ static void sub_8006C44(UnkTextStruct1 *a0, s32 a1, u16 *a2, u8 a3) // Not even close but I don't feel like continuing atm https://decomp.me/scratch/F58jg /* -void sub_8006E94(UnkTextStruct1 *a0, s32 a1, u32 a2, const UnkTextStruct2_sub2 *a3, u16 *a4) +void sub_8006E94(UnkTextStruct1 *a0, s32 a1, u32 a2, const WindowHeader *a3, u16 *a4) { s32 bVar1; s32 iVar2; @@ -870,7 +870,7 @@ void sub_8006E94(UnkTextStruct1 *a0, s32 a1, u32 a2, const UnkTextStruct2_sub2 * } */ NAKED -static void sub_8006E94(UnkTextStruct1 *a0, s32 a1, u32 a2, const UnkTextStruct2_sub2 *a3, u16 *a4) +static void sub_8006E94(UnkTextStruct1 *a0, s32 a1, u32 a2, const WindowHeader *a3, u16 *a4) { asm_unified( "\tpush {r4-r7,lr}\n" @@ -2866,7 +2866,7 @@ static void sub_800898C(void) } } -static void sub_80089AC(const UnkTextStruct2 *r4, DungeonPos *r5_Str) +static void sub_80089AC(const Window *r4, DungeonPos *r5_Str) { u8 *r6; @@ -2874,12 +2874,12 @@ static void sub_80089AC(const UnkTextStruct2 *r4, DungeonPos *r5_Str) return; r6 = (void*) &gUnknown_3000E94; - if (r4->unk4 == 1) { + if (r4->type == WINDOW_TYPE_WITHOUT_BORDER) { s32 r12 = (r4->pos.x + r5_Str->x) * 8; s32 r5 = (r4->pos.y + r5_Str->y) * 8; - s32 r7 = (r4->pos.x + r5_Str->x + r4->unkC) * 8; - s32 r2 = (r4->pos.y + r5_Str->y + r4->unkE) * 8; - if (r4->unkE != 0) { + s32 r7 = (r4->pos.x + r5_Str->x + r4->width) * 8; + s32 r2 = (r4->pos.y + r5_Str->y + r4->height) * 8; + if (r4->height != 0) { if (r5 < 0) r5 = 0; if (r2 < 0) @@ -2907,14 +2907,14 @@ static void sub_80089AC(const UnkTextStruct2 *r4, DungeonPos *r5_Str) } } } - else if (r4->unk4 == 6) { + else if (r4->type == WINDOW_TYPE_WITH_HEADER) { s32 i; s32 r9 = ((r4->pos.x + r5_Str->x) * 8) - 5; s32 r5 = ((r4->pos.y + r5_Str->y) * 8) - 4; - s32 var_24 = ((r4->pos.x + r5_Str->x + r4->unkC) * 8) + 5; - s32 r8 = ((r4->pos.y + r5_Str->y + r4->unkE) * 8) + 5; + s32 var_24 = ((r4->pos.x + r5_Str->x + r4->width) * 8) + 5; + s32 r8 = ((r4->pos.y + r5_Str->y + r4->height) * 8) + 5; s32 r12 = ((r4->pos.x + r5_Str->x) * 8) + 3; - const UnkTextStruct2_sub2 *r2 = r4->unk14; + const WindowHeader *r2 = r4->unk14; s32 tmp = r2->f2 - 1; s32 r10 = (((tmp + r2->f0 + 2) * 8) + r12) - 4; s32 r4 = r9 + ((r2->f1 + 1) * 8); @@ -2985,12 +2985,12 @@ static void sub_80089AC(const UnkTextStruct2 *r4, DungeonPos *r5_Str) else { s32 r8 = ((r4->pos.x + r5_Str->x) * 8) - 5; s32 r3 = ((r4->pos.y + r5_Str->y) * 8) - 5; - s32 r12 = ((r4->pos.x + r5_Str->x + r4->unkC) * 8) + 5; - s32 r5 = ((r4->pos.y + r5_Str->y + r4->unkE) * 8) + 5; - if (r4->unkE != 0) { - if (r4->unk4 == 0) { + s32 r12 = ((r4->pos.x + r5_Str->x + r4->width) * 8) + 5; + s32 r5 = ((r4->pos.y + r5_Str->y + r4->height) * 8) + 5; + if (r4->height != 0) { + if (r4->type == 0) { r3 += 8; - r5 = ((r4->pos.y + r5_Str->y + r4->unkE) * 8) - 3; + r5 = ((r4->pos.y + r5_Str->y + r4->height) * 8) - 3; } if (r3 < 0) r3 = 0; diff --git a/src/thank_you_wonder_mail.c b/src/thank_you_wonder_mail.c index 9870dc165..ba974be9e 100644 --- a/src/thank_you_wonder_mail.c +++ b/src/thank_you_wonder_mail.c @@ -75,7 +75,7 @@ const Item gUnknown_80DED44 = ITEM_FLAG_EXISTS, 0, ITEM_NOTHING }; -const UnkTextStruct2 gUnknown_80DED48 = +const Window gUnknown_80DED48 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -85,7 +85,7 @@ const UnkTextStruct2 gUnknown_80DED48 = NULL }; -const UnkTextStruct2 gUnknown_80DED60 = +const Window gUnknown_80DED60 = { 0x00, 0x00, 0x00, 0x00, 0x03, @@ -106,7 +106,7 @@ const MenuItem gUnknown_80DED78[] = }; // Unused -const UnkTextStruct2 gUnknown_80DEDA0 = +const Window gUnknown_80DEDA0 = { 0x00, 0x00, 0x00, 0x00, 0x03, diff --git a/src/unk_menu_203B360.c b/src/unk_menu_203B360.c index 5b9a49ffc..9b18501c9 100644 --- a/src/unk_menu_203B360.c +++ b/src/unk_menu_203B360.c @@ -15,14 +15,14 @@ typedef struct unkStruct_203B360 /* 0x0 */ u32 currMenu; u32 unk4; // state MenuStruct unk8[4]; - UnkTextStruct3 unk148; + Windows unk148; SpriteOAM unk1A8; u32 unk1B0; // sprite count? } unkStruct_203B360; static EWRAM_INIT unkStruct_203B360 *sUnknown_203B360 = {NULL}; -const UnkTextStruct2 gUnknown_80E6E7C = { +const Window gUnknown_80E6E7C = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -31,7 +31,7 @@ const UnkTextStruct2 gUnknown_80E6E7C = { NULL }; -const UnkTextStruct2 gUnknown_80E6E94 = { +const Window gUnknown_80E6E94 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x05, 0x09, diff --git a/src/wonder_mail_3_mid.c b/src/wonder_mail_3_mid.c index 0aadefc63..336b2eb47 100644 --- a/src/wonder_mail_3_mid.c +++ b/src/wonder_mail_3_mid.c @@ -19,7 +19,7 @@ struct unkStruct_203B30C unkStruct_802C39C unk8; MenuStruct unk60; MenuItem unkB0[8]; - UnkTextStruct3 unkF0; + Windows unkF0; }; static EWRAM_INIT struct unkStruct_203B30C *gUnknown_203B30C = {NULL}; @@ -31,7 +31,7 @@ extern void sub_802F004(); extern void sub_802F088(); extern void sub_802F108(void); -const UnkTextStruct2 gUnknown_80E03C4 = { +const Window gUnknown_80E03C4 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -39,7 +39,7 @@ const UnkTextStruct2 gUnknown_80E03C4 = { 0x00, 0x00, NULL }; -const UnkTextStruct2 gUnknown_80E03DC = { +const Window gUnknown_80E03DC = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x03, @@ -47,7 +47,7 @@ const UnkTextStruct2 gUnknown_80E03DC = { 0x03, 0x00, NULL }; -const UnkTextStruct2 gUnknown_80E03F4 = { +const Window gUnknown_80E03F4 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x15, 0x06, diff --git a/src/wonder_mail_4.c b/src/wonder_mail_4.c index 0a999c111..877debafa 100644 --- a/src/wonder_mail_4.c +++ b/src/wonder_mail_4.c @@ -26,7 +26,7 @@ static EWRAM_INIT struct unkStruct_203B320 *gUnknown_203B320 = {NULL}; extern unkStruct_203B480 *gUnknown_203B480; -const UnkTextStruct2 gUnknown_80E083C = { +const Window gUnknown_80E083C = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -35,7 +35,7 @@ const UnkTextStruct2 gUnknown_80E083C = { NULL }; -const UnkTextStruct2 gUnknown_80E0854 = { +const Window gUnknown_80E0854 = { 0x00, 0x00, 0x00, 0x00, 0x06, 0x02, 0x02, diff --git a/src/wonder_mail_5.c b/src/wonder_mail_5.c index bae544939..f65d2e112 100644 --- a/src/wonder_mail_5.c +++ b/src/wonder_mail_5.c @@ -20,8 +20,8 @@ struct unkStruct_203B324 MenuInputStructSub unk0; u8 mailIndex; u32 windowID; - UnkTextStruct2 *unk14; - UnkTextStruct3 unk18; + Window *unk14; + Windows unk18; }; static EWRAM_INIT struct unkStruct_203B324 *gUnknown_203B324 = {NULL}; @@ -29,7 +29,7 @@ static EWRAM_INIT struct unkStruct_203B324 *gUnknown_203B324 = {NULL}; extern unkStruct_203B480 *gUnknown_203B480; -const UnkTextStruct2 gUnknown_80E0900 = { +const Window gUnknown_80E0900 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -38,9 +38,9 @@ const UnkTextStruct2 gUnknown_80E0900 = { NULL }; -const UnkTextStruct2_sub2 gUnknown_80E0918 = {0x01, 0x00, 0x12, 0x00}; +const WindowHeader gUnknown_80E0918 = {0x01, 0x00, 0x12, 0x00}; -const UnkTextStruct2 gUnknown_80E091C = { +const Window gUnknown_80E091C = { 0x00, 0x00, 0x00, 0x00, 0x06, 0x02, 0x02, diff --git a/src/wonder_mail_6.c b/src/wonder_mail_6.c index b85f3b88a..65539214d 100644 --- a/src/wonder_mail_6.c +++ b/src/wonder_mail_6.c @@ -17,7 +17,7 @@ struct unkStruct_203B328 u8 mailIndex; MenuStruct unk8; MenuStruct unk58; - UnkTextStruct3 unkA8; + Windows unkA8; /* 0x108 */ struct MonPortraitMsg monPortrait; u32 wonderMailType; }; @@ -48,7 +48,7 @@ const MenuItem gUnknown_80E0968[] = {NULL, CANCEL_ACTION} }; -const UnkTextStruct2 gUnknown_80E0990 = { +const Window gUnknown_80E0990 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, @@ -56,7 +56,7 @@ const UnkTextStruct2 gUnknown_80E0990 = { 0x00, 0x00, NULL }; -const UnkTextStruct2 gUnknown_80E09A8 = { +const Window gUnknown_80E09A8 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x13, 0x0B, @@ -64,7 +64,7 @@ const UnkTextStruct2 gUnknown_80E09A8 = { 0x03, 0x00, NULL }; -const UnkTextStruct2 gUnknown_80E09C0 = { +const Window gUnknown_80E09C0 = { 0x00, 0x00, 0x00, 0x00, 0x03, 0x11, 0x0F, diff --git a/src/wonder_mail_802D098.c b/src/wonder_mail_802D098.c index 5ed5a68fa..67f05bc99 100644 --- a/src/wonder_mail_802D098.c +++ b/src/wonder_mail_802D098.c @@ -147,13 +147,13 @@ static void sub_802D1B8(void) sub_802D5A4(); sUnknown_203B2F8->unk1A8.a0[2] = sUnknown_80DFE04; sub_8012CAC(&sUnknown_203B2F8->unk1A8.a0[2], sUnknown_203B2F8->unk118); - sUnknown_203B2F8->unk1A8.a0[2].unkC = 6; + sUnknown_203B2F8->unk1A8.a0[2].width = 6; break; case 14: sub_802D63C(); sUnknown_203B2F8->unk1A8.a0[3] = sUnknown_80DFE1C; sub_8012CAC(&sUnknown_203B2F8->unk1A8.a0[3], sUnknown_203B2F8->unk158); - sUnknown_203B2F8->unk1A8.a0[3].unkC = 6; + sUnknown_203B2F8->unk1A8.a0[3].width = 6; break; default: for (i = 0; i < 4; i++) diff --git a/src/wonder_mail_main_menu.c b/src/wonder_mail_main_menu.c index 9ec2e5877..ed505e690 100644 --- a/src/wonder_mail_main_menu.c +++ b/src/wonder_mail_main_menu.c @@ -49,7 +49,7 @@ struct unkStruct_203B3E8 u8 unk38_u8[0x30]; // idk why it fills to 0x30 instead... } UNK38; u8 fill68[0x1EC - 0x68]; - UnkTextStruct3 unk1EC; + Windows unk1EC; u32 unk24C; /* 0x250 */ u32 wonderMailStatus; unkStruct_803B344 unk254;