move MenuStruct to include/menu and use in more places

include/debug_menu.h

@@ -19,7 +19,7 @@ enum DebugMenuOptions
 struct DebugMenu
 {
     // size: 0x1A4
-    u8 fill0[0x140];
+    struct MenuStruct unk0[4];
     /* 0x140 */ struct UnkTextStruct2 unk140[4];
     u32 fill1A0;
 };

include/menu.h

@@ -27,5 +27,4 @@ struct MenuStruct
     u8 unk4D;
 };
 
-
 #endif // GUARD_MENU_H

include/rescue_password_menu.h

@@ -1,6 +1,8 @@
 #ifndef GUARD_RESCUE_PASSWORD_MENU_H
 #define GUARD_RESCUE_PASSWORD_MENU_H
 
+#include "menu.h"
+
 struct unkSprite
 {
     u16 unk208;
@@ -14,13 +16,10 @@ struct RescuePasswordMenu
     // size: 0x214
     u32 currMenu;
     u32 state;
-    u32 unk8;
-    u8 fillC[0x148 - 0xC];
+    struct MenuStruct unk8[4];
     struct UnkTextStruct2 unk148[4];
     struct UnkTextStruct2 unk1A8[4];
-
     struct unkSprite unk208;
-
     u32 unk210;
 };
 

include/trade_items_menu.h

@@ -3,6 +3,7 @@
 
 #include "text.h"
 #include "item.h"
+#include "menu.h"
 
 struct TradeSubStruct
 {
@@ -32,10 +33,7 @@ struct TradeItemsMenu
     u32 unk30;
     u32 unk34;
     u8 fill38[0x44 - 0x38];
-    u32 unk44;
-    u8 fill8[0x134 - 0x48];
-    u32 unk134;
-    u8 fill138[0x184 - 0x138];
+    struct MenuStruct unk44[4];
     struct UnkTextStruct2 unk184[4];
     struct UnkTextStruct2 unk1E4[4];
 

include/wonder_mail.h

@@ -4,6 +4,7 @@
 #include "file_system.h"
 #include "text.h"
 #include "item.h"
+#include "menu.h"
 #include "pokemon.h"
 #include "code_8094F88.h"
 
@@ -61,12 +62,7 @@ struct WonderMailStruct_203B2C0
     struct WonderMailStruct_203B2C0_sub unk130;
     u8 fill16A[0x218 - 0x1B8];
     u8 mailIndex;
-    u32 unk21C;
-    u8 padding[0x7C];
-    u32 unk29C;
-    u8 padding6[0x6C];
-    u32 unk30C;
-    u8 padding8[0x4C];
+    struct MenuStruct unk21C[4];
     struct UnkTextStruct2 unk35C[4];
     struct UnkTextStruct2 unk3BC[4];
     /* 0x41C */ u32 unkfill; // ItemSlot?
@@ -99,10 +95,7 @@ struct WonderMailStruct_203B2C4
     struct unkStruct_203B480 unk1B8;
     struct unkStruct_203B480 unk1E8;
     s8 mailIndex;
-    u32 unk21C;
-    u8 filler220[0x30C - 0x220];
-    u32 unk30C;
-    u8 filler310[0x35C - 0x310];
+    struct MenuStruct unk21C[4];
     struct UnkTextStruct2 unk35C[4];
     struct UnkTextStruct2 unk3BC[4];
     struct Item unk41C;