3 files changed, 45 insertions, 16 deletions
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h
index 11752296b..a7d46a462 100644
--- a/include/battle_party_menu.h
+++ b/include/battle_party_menu.h
@@ -3,19 +3,6 @@
 
 #include "task.h"
 
-// TODO: Unify all of the 0x0201B000 structs
-struct Struct201B000
-{
-    u8 filler0[0x259];
-    u8 unk259;
-    u8 filler25A[6];
-    u8 unk260;
-    u8 filler261[1];
-    u8 unk262;
-    s16 unk264;
-    s16 unk266;
-};
-
 struct PartyMenuItem
 {
     const u8 *text;
@@ -34,6 +21,5 @@ extern u8 unk_2000000[];
 void SetUpBattlePokemonMenu(u8);
 
 #define EWRAM_1609D unk_2000000[0x1609D]
-#define EWRAM_1B000 (*(struct Struct201B000 *)(unk_2000000 + 0x1B000))
 
 #endif
diff --git a/include/global.h b/include/global.h
index 0e7c43437..433169c21 100755
--- a/include/global.h
+++ b/include/global.h
@@ -610,10 +610,11 @@ struct Pokedex
 
 struct SaveBlock2_Sub
 {
-    /*0x0000, 0x00A4*/ u8 filler_000[0x3D8];
+    /*0x0000, 0x00A8*/ u8 filler_000[0x3D8];
     /*0x03D8, 0x0480*/ u16 var_480;
     /*0x03DA, 0x0482*/ u16 var_482;
-    /*0x03DC, 0x0484*/ u8 filler_3DC[0xD1];
+    /*0x03DC, 0x0484*/ u8 filler_3DC[0xD0];
+    /*0x04AC, 0x0554*/ u8 var_4AC;
     /*0x04AD, 0x0555*/ u8 var_4AD;
     /*0x04AE, 0x0556*/ u8 var_4AE;
     /*0x04AF, 0x0557*/ u8 var_4AF;
diff --git a/include/party_menu.h b/include/party_menu.h
new file mode 100644
index 000000000..a3e3422b1
--- /dev/null
+++ b/include/party_menu.h
@@ -0,0 +1,42 @@
+#ifndef GUARD_PARTY_MENU_H
+#define GUARD_PARTY_MENU_H
+
+// TODO: Unify these two structs
+
+#define DATA_COUNT (6)
+struct Unk201B000
+{
+    //u8 filler0[0x260];
+    struct Pokemon unk0[6];
+    u8 filler258[1];
+    u8 unk259;
+    u8 filler25A[6];
+    u8 unk260;
+    u8 unk261;
+    u8 unk262;
+    u8 unk263;
+    s16 unk264[DATA_COUNT * 2];  // This may be a union
+    u8 filler27C[2];
+    s16 unk27E;
+    s16 unk280;
+    s16 unk282;
+};
+
+struct Struct201B000
+{
+    u8 filler0[0x259];
+    u8 unk259;
+    u8 filler25A[6];
+    u8 unk260;
+    u8 filler261[1];
+    u8 unk262;
+    s16 unk264;
+    s16 unk266;
+};
+
+extern u8 ewram[];
+#define ewram1B000 (*(struct Unk201B000 *)(ewram + 0x1B000))
+#define ewram1B000_alt (*(struct Struct201B000 *)(ewram + 0x1B000))
+#define EWRAM_1B000 ewram1B000_alt
+
+#endif  // GUARD_PARTY_MENU_H