6 files changed, 59 insertions, 32 deletions
diff --git a/include/battle_party_menu.h b/include/battle_party_menu.h
index 5112c7b3c..71bd2cf51 100644
--- a/include/battle_party_menu.h
+++ b/include/battle_party_menu.h
@@ -1,26 +1,9 @@
 #ifndef GUARD_BATTLE_PARTY_MENU_H
 #define GUARD_BATTLE_PARTY_MENU_H
 
-#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;
-};
-
 extern u8 unk_2000000[];
+#define EWRAM_1609D unk_2000000[0x1609D]
 
 void SetUpBattlePokemonMenu(u8);
 
-#define EWRAM_1609D unk_2000000[0x1609D]
-#define EWRAM_1B000 (*(struct Struct201B000 *)(unk_2000000 + 0x1B000))
-
 #endif
diff --git a/include/choose_party.h b/include/choose_party.h
index 1e575a355..e31aa3c02 100644
--- a/include/choose_party.h
+++ b/include/choose_party.h
@@ -3,6 +3,11 @@
 
 void sub_8121E10(void);
 void sub_8121E34(void);
-void sub_8123138(u8);
+bool8 sub_8121E78(void);
+void sub_81222B0(u8 taskId);
+bool8 sub_8122854(void);
+void sub_8122A48(u8 taskId);
+void sub_8122E0C(u8 taskId);
+void sub_8123138(u8 taskId);
 
 #endif // GUARD_CHOOSE_PARTY_H
diff --git a/include/global.h b/include/global.h
index 9da4bd57c..d172cfa25 100755
--- a/include/global.h
+++ b/include/global.h
@@ -625,10 +625,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
index 917d6a58c..58292081f 100644
--- a/include/party_menu.h
+++ b/include/party_menu.h
@@ -16,6 +16,44 @@ struct PartyPopupMenu
     const u8 *unk4;
 };
 
+// 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
+
 void sub_806AEDC(void);
 void sub_806AF4C();
 void OpenPartyMenu(u8, u8);
diff --git a/include/pokemon_summary_screen.h b/include/pokemon_summary_screen.h
index 3f7ed8fad..71259c887 100644
--- a/include/pokemon_summary_screen.h
+++ b/include/pokemon_summary_screen.h
@@ -3,7 +3,7 @@
 
 extern const u8 *const gNatureNames[];
 
-void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(u8), int);
+void ShowPokemonSummaryScreen(struct Pokemon *, u8, u8, void (*)(void), int);
 void sub_809D9F0(struct Pokemon *party, u8, u8, void *, u32);
 void sub_809D9F0(struct Pokemon *, u8, u8, void *, u32);
 u8 sub_809FA30(void);
diff --git a/include/songs.h b/include/songs.h
index 8180ee67e..a813cc785 100644
--- a/include/songs.h
+++ b/include/songs.h
@@ -121,16 +121,16 @@ enum
     /*0x73*/ SE_TB_KON,
     /*0x74*/ SE_TB_KARA,
     /*0x75*/ SE_BIDORO,
-    SE_W085,
-    SE_W085B,
-    SE_W231,
-    SE_W171,
-    SE_W233,
-    SE_W233B,
-    SE_W145,
-    SE_W145B,
-    SE_W145C,
-    SE_W240,
+    /*0x76*/ SE_W085,
+    /*0x77*/ SE_W085B,
+    /*0x78*/ SE_W231,
+    /*0x79*/ SE_W171,
+    /*0x7A*/ SE_W233,
+    /*0x7B*/ SE_W233B,
+    /*0x7C*/ SE_W145,
+    /*0x7D*/ SE_W145B,
+    /*0x7E*/ SE_W145C,
+    /*0x7F*/ SE_W240,
     SE_W015,
     SE_W081,
     SE_W081B,