diff --git a/include/functypes/funcptr_0205AB10.h b/include/functypes/funcptr_0205AB10.h
index 2c1e6aa7b4..dd027bd9a4 100644
--- a/include/functypes/funcptr_0205AB10.h
+++ b/include/functypes/funcptr_0205AB10.h
@@ -1,8 +1,8 @@
 #ifndef POKEPLATINUM_FUNCPTR_0205AB10_H
 #define POKEPLATINUM_FUNCPTR_0205AB10_H
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
-typedef void (UnkFuncPtr_0205AB10)(BOOL, const UnkStruct_02079FF4 *);
+typedef void (UnkFuncPtr_0205AB10)(BOOL, const Party *);
 
 #endif // POKEPLATINUM_FUNCPTR_0205AB10_H
diff --git a/include/overlay005/ov5_021E622C.h b/include/overlay005/ov5_021E622C.h
index 0db3551db1..58031029eb 100644
--- a/include/overlay005/ov5_021E622C.h
+++ b/include/overlay005/ov5_021E622C.h
@@ -8,13 +8,13 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 u8 ov5_021E6238(UnkStruct_02026310 * param0);
 int ov5_021E6270(UnkStruct_02026310 * param0);
-void ov5_021E6358(UnkStruct_02079FF4 * param0, int param1, UnkStruct_02026310 * param2, UnkStruct_021C0794 * param3);
-u16 ov5_021E64F8(UnkStruct_02079FF4 * param0, UnkStruct_0200B358 * param1, UnkStruct_02026310 * param2, u8 param3);
+void ov5_021E6358(Party * param0, int param1, UnkStruct_02026310 * param2, UnkStruct_021C0794 * param3);
+u16 ov5_021E64F8(Party * param0, UnkStruct_0200B358 * param1, UnkStruct_02026310 * param2, u8 param3);
 int ov5_021E6520(UnkStruct_02073C74_sub1 * param0, u32 param1);
 int ov5_021E6568(UnkStruct_02026218 * param0);
 int ov5_021E6590(UnkStruct_02026218 * param0);
@@ -26,12 +26,12 @@ void ov5_021E6720(UnkStruct_02026310 * param0);
 void ov5_021E6B40(UnkStruct_02026310 * param0);
 void ov5_021E6CF0(UnkStruct_02073C74 * param0, u16 param1, u8 param2, UnkStruct_02025E6C * param3, int param4, int param5);
 void ov5_021E6DE8(UnkStruct_02073C74 * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4);
-void ov5_021E6EA8(UnkStruct_02026310 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02025E6C * param2);
-BOOL ov5_021E7154(UnkStruct_02026310 * param0, UnkStruct_02079FF4 * param1, UnkStruct_0203CDB0 * param2);
-UnkStruct_02073C74 * ov5_021E7278(UnkStruct_02079FF4 * param0);
+void ov5_021E6EA8(UnkStruct_02026310 * param0, Party * param1, UnkStruct_02025E6C * param2);
+BOOL ov5_021E7154(UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CDB0 * param2);
+UnkStruct_02073C74 * ov5_021E7278(Party * param0);
 void ov5_021E72BC(UnkStruct_02026310 * param0, UnkStruct_0200B358 * param1);
 void ov5_021E7308(UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 param3, u8 param4, UnkStruct_0200B358 * param5);
-u16 ov5_021E73A0(UnkStruct_02079FF4 * param0, int param1, UnkStruct_0200B358 * param2);
+u16 ov5_021E73A0(Party * param0, int param1, UnkStruct_0200B358 * param2);
 u8 ov5_021E73C8(UnkStruct_02026310 * param0);
 u8 ov5_021E73F0(u32 param0);
 u32 ov5_021E7420(UnkStruct_02026310 * param0);
diff --git a/include/overlay006/struct_ov6_02240D5C.h b/include/overlay006/struct_ov6_02240D5C.h
index a5fe8a61f5..071cbcd6ba 100644
--- a/include/overlay006/struct_ov6_02240D5C.h
+++ b/include/overlay006/struct_ov6_02240D5C.h
@@ -12,7 +12,7 @@
 #include "struct_decls/struct_02056B24_decl.h"
 #include "struct_decls/struct_0206D140_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0207A9CC.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_decls/struct_0207D99C_decl.h"
@@ -22,7 +22,7 @@
 
 typedef struct {
     u32 unk_00;
-    UnkStruct_02079FF4 * unk_04[4];
+    Party * unk_04[4];
     int unk_14;
     int unk_18[4];
     UnkStruct_0207A9CC unk_28[4];
diff --git a/include/overlay010/struct_ov10_0221F800.h b/include/overlay010/struct_ov10_0221F800.h
index 1a1e79957a..3a7981ef5c 100644
--- a/include/overlay010/struct_ov10_0221F800.h
+++ b/include/overlay010/struct_ov10_0221F800.h
@@ -2,12 +2,12 @@
 #define POKEPLATINUM_STRUCT_OV10_0221F800_H
 
 #include "struct_decls/struct_02023790_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay006/struct_ov6_02240D5C.h"
 
 typedef struct {
     UnkStruct_ov6_02240D5C * unk_00;
-    UnkStruct_02079FF4 * unk_04[4];
+    Party * unk_04[4];
     UnkStruct_02023790 * unk_14[4];
     u32 unk_24;
     u8 unk_28;
diff --git a/include/overlay013/struct_ov13_0221FC20.h b/include/overlay013/struct_ov13_0221FC20.h
index bc79daa564..c668c55213 100644
--- a/include/overlay013/struct_ov13_0221FC20.h
+++ b/include/overlay013/struct_ov13_0221FC20.h
@@ -1,11 +1,11 @@
 #ifndef POKEPLATINUM_STRUCT_OV13_0221FC20_H
 #define POKEPLATINUM_STRUCT_OV13_0221FC20_H
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 
 typedef struct {
-    UnkStruct_02079FF4 * unk_00;
+    Party * unk_00;
     void * unk_04;
     UnkStruct_0207ADB4 * unk_08;
     u32 unk_0C;
diff --git a/include/overlay016/ov16_0223DF00.h b/include/overlay016/ov16_0223DF00.h
index 523e1f5861..7be5b66dda 100644
--- a/include/overlay016/ov16_0223DF00.h
+++ b/include/overlay016/ov16_0223DF00.h
@@ -19,7 +19,7 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0207A9CC.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
@@ -42,7 +42,7 @@ u32 ov16_0223DF0C(UnkStruct_0207ADB4 * param0);
 UnkStruct_ov16_0224B9DC * ov16_0223DF10(UnkStruct_0207ADB4 * param0);
 UnkStruct_ov16_0225BFFC * ov16_0223DF14(UnkStruct_0207ADB4 * param0, int param1);
 int ov16_0223DF1C(UnkStruct_0207ADB4 * param0);
-UnkStruct_02079FF4 * ov16_0223DF20(UnkStruct_0207ADB4 * param0, int param1);
+Party * ov16_0223DF20(UnkStruct_0207ADB4 * param0, int param1);
 int ov16_0223DF60(UnkStruct_0207ADB4 * param0, int param1);
 UnkStruct_02073C74 * ov16_0223DFAC(UnkStruct_0207ADB4 * param0, int param1, int param2);
 UnkStruct_02007768 * ov16_0223E000(UnkStruct_0207ADB4 * param0);
@@ -165,7 +165,7 @@ void ov16_0223F858(UnkStruct_0207ADB4 * param0, u8 * param1);
 void ov16_0223F87C(UnkStruct_0207ADB4 * param0, u8 * param1);
 void ov16_0223F8AC(UnkStruct_0207ADB4 * param0, UnkStruct_02007C7C ** param1);
 void ov16_0223F8DC(UnkStruct_0207ADB4 * param0, int param1);
-u32 ov16_0223F904(UnkStruct_02079FF4 * param0, UnkStruct_02025E6C * param1);
+u32 ov16_0223F904(Party * param0, UnkStruct_02025E6C * param1);
 void ov16_0223F938(UnkStruct_0207ADB4 * param0, int param1);
 void ov16_0223F9A0(UnkStruct_0207ADB4 * param0, int param1);
 BOOL ov16_0223F9E0(UnkStruct_0207ADB4 * param0, int param1);
diff --git a/include/overlay019/struct_ov19_021D4DF0.h b/include/overlay019/struct_ov19_021D4DF0.h
index 811c0ebbed..4f4130f7fe 100644
--- a/include/overlay019/struct_ov19_021D4DF0.h
+++ b/include/overlay019/struct_ov19_021D4DF0.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV19_021D4DF0_H
 
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay019/struct_ov19_021D3CFC.h"
 #include "overlay019/struct_ov19_021D4DE4.h"
 #include "overlay019/struct_ov19_021D4EE4.h"
@@ -15,7 +15,7 @@
 
 typedef struct {
     const UnkStruct_020797DC * unk_00;
-    const UnkStruct_02079FF4 * unk_04;
+    const Party * unk_04;
     UnkStruct_ov19_021D3CFC unk_08;
     UnkStruct_ov19_021D5594 unk_14;
     UnkStruct_ov19_021D4F5C unk_40;
diff --git a/include/overlay088/ov88_0223B140.h b/include/overlay088/ov88_0223B140.h
index 2fb508f2d2..16d9714712 100644
--- a/include/overlay088/ov88_0223B140.h
+++ b/include/overlay088/ov88_0223B140.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV88_0223B140_H
 
 #include "struct_decls/struct_020067E8_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_02095E80_decl.h"
 
 int ov88_0223B140(UnkStruct_020067E8 * param0, int * param1);
@@ -10,6 +10,6 @@ int ov88_0223B57C(UnkStruct_020067E8 * param0, int * param1);
 int ov88_0223C03C(UnkStruct_020067E8 * param0, int * param1);
 void ov88_0223D044(int param0, int param1, int param2);
 void ov88_0223D058(UnkStruct_02095E80 * param0, int param1, int param2);
-void ov88_0223D098(int param0, UnkStruct_02079FF4 * param1, int param2);
+void ov88_0223D098(int param0, Party * param1, int param2);
 
 #endif // POKEPLATINUM_OV88_0223B140_H
diff --git a/include/overlay088/struct_ov88_0223C370.h b/include/overlay088/struct_ov88_0223C370.h
index e374b407ee..6a21110e90 100644
--- a/include/overlay088/struct_ov88_0223C370.h
+++ b/include/overlay088/struct_ov88_0223C370.h
@@ -10,13 +10,13 @@
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 typedef struct {
     UnkStruct_0203CDB0 * unk_00;
     UnkStruct_02025E6C * unk_04;
-    UnkStruct_02079FF4 * unk_08;
+    Party * unk_08;
     UnkStruct_02027F8C * unk_0C;
     UnkStruct_021C0794 * unk_10;
     UnkStruct_0202C878 * unk_14;
diff --git a/include/overlay094/ov94_0223FB48.h b/include/overlay094/ov94_0223FB48.h
index d22b3be983..ce1cbdc2a0 100644
--- a/include/overlay094/ov94_0223FB48.h
+++ b/include/overlay094/ov94_0223FB48.h
@@ -4,14 +4,14 @@
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay094/struct_ov94_0223FD4C_decl.h"
 
 int ov94_0223FB48(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_0223FBBC(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_0223FBDC(UnkStruct_ov94_0223FD4C * param0, int param1);
 int ov94_022411D0(int param0);
-UnkStruct_02073C74_sub1 * ov94_022411DC(UnkStruct_02079FF4 * param0, UnkStruct_020797DC * param1, int param2, int param3);
+UnkStruct_02073C74_sub1 * ov94_022411DC(Party * param0, UnkStruct_020797DC * param1, int param2, int param3);
 BOOL ov94_02241498(UnkStruct_02073C74 * param0);
 
 #endif // POKEPLATINUM_OV94_0223FB48_H
diff --git a/include/overlay104/ov104_0222DCE0.h b/include/overlay104/ov104_0222DCE0.h
index 51d90b8893..73b08c4fc5 100644
--- a/include/overlay104/ov104_0222DCE0.h
+++ b/include/overlay104/ov104_0222DCE0.h
@@ -7,7 +7,7 @@
 #include "struct_defs/struct_0204B184.h"
 #include "struct_defs/struct_0204B1E8.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay006/struct_ov6_02240D5C.h"
 #include "overlay104/struct_ov104_0223A348.h"
@@ -21,7 +21,7 @@ u32 ov104_0222DD6C(UnkStruct_ov104_0223A348_sub2 * param0, u16 param1, u32 param
 void ov104_0222DF40(const UnkStruct_ov104_0223A348_sub2 * param0, UnkStruct_02073C74 * param1, u8 param2);
 u16 ov104_0222E10C(u8 param0);
 void ov104_0222E134(UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1);
-void ov104_0222E1C0(UnkStruct_021C0794 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2);
+void ov104_0222E1C0(UnkStruct_021C0794 * param0, Party * param1, UnkStruct_02073C74 * param2);
 void ov104_0222E1D8(UnkStruct_02022550 * param0, u8 param1);
 void ov104_0222E204(UnkStruct_02022550 * param0, s16 param1, s16 param2, u8 param3);
 u8 ov104_0222E240(u16 param0, u16 param1);
diff --git a/include/overlay104/ov104_02237DD8.h b/include/overlay104/ov104_02237DD8.h
index 24701deabb..44d8b499fc 100644
--- a/include/overlay104/ov104_02237DD8.h
+++ b/include/overlay104/ov104_02237DD8.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_OV104_02237DD8_H
 #define POKEPLATINUM_OV104_02237DD8_H
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay104/struct_ov104_0223BFFC.h"
 #include "overlay104/struct_ov104_0223C4CC_decl.h"
@@ -20,7 +20,7 @@ void ov104_022384A8(UnkStruct_ov104_0223BFFC * param0);
 void ov104_022384B4(UnkStruct_ov104_0223BFFC * param0);
 void ov104_022384D4(UnkStruct_ov104_0223BFFC * param0);
 void ov104_022384DC(UnkStruct_ov104_0223BFFC * param0);
-int ov104_02238538(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, int param3);
+int ov104_02238538(UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, int param3);
 void ov104_02238658(void * param0, UnkStruct_ov104_0223C4CC * param1);
 void ov104_02238728(void * param0, UnkStruct_ov104_0223C4CC * param1);
 void ov104_02238764(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2);
@@ -34,6 +34,6 @@ void ov104_02238AB4(u8 param0, u8 param1);
 BOOL ov104_02238B40(UnkStruct_ov104_0223BFFC * param0, u16 param1, u16 param2);
 void ov104_02238B88(UnkStruct_ov104_0223BFFC * param0, u8 param1);
 u16  ov104_02239014(UnkStruct_ov104_0223BFFC * param0);
-void ov104_02239054(UnkStruct_02079FF4 * param0, UnkStruct_02079FF4 * param1, int param2, int param3);
+void ov104_02239054(Party * param0, Party * param1, int param2, int param3);
 
 #endif // POKEPLATINUM_OV104_02237DD8_H
diff --git a/include/overlay104/ov104_0223B6F4.h b/include/overlay104/ov104_0223B6F4.h
index df116c6831..be1b83768c 100644
--- a/include/overlay104/ov104_0223B6F4.h
+++ b/include/overlay104/ov104_0223B6F4.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay006/struct_ov6_02240D5C.h"
 #include "overlay104/struct_ov104_02230BE4.h"
 #include "overlay104/struct_ov104_0223BA10.h"
@@ -15,9 +15,9 @@ u8 ov104_0223B7DC(u8 param0, BOOL param1);
 UnkStruct_ov6_02240D5C * ov104_0223B810(UnkStruct_ov104_0223BA10 * param0, UnkStruct_ov104_02230BE4 * param1);
 u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 * param0);
 BOOL ov104_0223BA14(u8 param0);
-void ov104_0223BA24(UnkStruct_02079FF4 * param0);
+void ov104_0223BA24(Party * param0);
 void ov104_0223BA7C(UnkStruct_ov104_0223BA10 * param0, UnkStruct_02073C74 * param1);
-void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2);
+void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, Party * param1, UnkStruct_02073C74 * param2);
 void ov104_0223BAB8(UnkStruct_ov104_0223BA10 * param0);
 u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 * param0);
 void ov104_0223BB84(UnkStruct_02018340 * param0, UnkStruct_ov104_0223BA10 * param1, u32 param2);
diff --git a/include/overlay104/ov104_0223BCBC.h b/include/overlay104/ov104_0223BCBC.h
index 3456e6ca79..269b038613 100644
--- a/include/overlay104/ov104_0223BCBC.h
+++ b/include/overlay104/ov104_0223BCBC.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_OV104_0223BCBC_H
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay006/struct_ov6_02240D5C.h"
 #include "overlay104/struct_ov104_02230BE4.h"
 #include "overlay104/struct_ov104_0223BFFC.h"
@@ -14,7 +14,7 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8(UnkStruct_ov104_0223BFFC * param0, UnkSt
 u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC * param0);
 BOOL ov104_0223C000(u8 param0);
 void ov104_0223C010(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02073C74 * param1);
-void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2);
+void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, Party * param1, UnkStruct_02073C74 * param2);
 void ov104_0223C04C(UnkStruct_ov104_0223BFFC * param0);
 u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC * param0, u8 param1);
 u16 ov104_0223C124(UnkStruct_ov104_0223BFFC * param0);
diff --git a/include/overlay104/struct_ov104_02234130.h b/include/overlay104/struct_ov104_02234130.h
index 0351f5fe8f..21dac06b8c 100644
--- a/include/overlay104/struct_ov104_02234130.h
+++ b/include/overlay104/struct_ov104_02234130.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_02234130_H
 #define POKEPLATINUM_STRUCT_OV104_02234130_H
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 typedef struct {
@@ -10,8 +10,8 @@ typedef struct {
     u8 unk_05;
     u8 unk_06;
     u8 padding_07;
-    UnkStruct_02079FF4 * unk_08;
-    UnkStruct_02079FF4 * unk_0C;
+    Party * unk_08;
+    Party * unk_0C;
     u16 unk_10[6];
     void * unk_1C;
     u8 padding_20[4];
diff --git a/include/overlay104/struct_ov104_02235208.h b/include/overlay104/struct_ov104_02235208.h
index 5c0ca18f6c..8fdf9f8f5f 100644
--- a/include/overlay104/struct_ov104_02235208.h
+++ b/include/overlay104/struct_ov104_02235208.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_02235208_H
 #define POKEPLATINUM_STRUCT_OV104_02235208_H
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 typedef struct {
@@ -10,7 +10,7 @@ typedef struct {
     u8 unk_05;
     u16 unk_06;
     u8 * unk_08;
-    UnkStruct_02079FF4 * unk_0C;
+    Party * unk_0C;
     void * unk_10;
     u16 * unk_14;
     u16 unk_18;
diff --git a/include/overlay104/struct_ov104_0223597C.h b/include/overlay104/struct_ov104_0223597C.h
index 7e5f33c9a2..0947069827 100644
--- a/include/overlay104/struct_ov104_0223597C.h
+++ b/include/overlay104/struct_ov104_0223597C.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_0223597C_H
 #define POKEPLATINUM_STRUCT_OV104_0223597C_H
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 typedef struct {
@@ -14,8 +14,8 @@ typedef struct {
     u8 unk_0C[4];
     u8 unk_10[4];
     u8 unk_14[4];
-    UnkStruct_02079FF4 * unk_18;
-    UnkStruct_02079FF4 * unk_1C;
+    Party * unk_18;
+    Party * unk_1C;
     u16 unk_20;
     u8 padding[2];
     void * unk_24;
diff --git a/include/overlay104/struct_ov104_02238240.h b/include/overlay104/struct_ov104_02238240.h
index fb86d1f981..13c543633d 100644
--- a/include/overlay104/struct_ov104_02238240.h
+++ b/include/overlay104/struct_ov104_02238240.h
@@ -1,7 +1,7 @@
 #ifndef POKEPLATINUM_STRUCT_OV104_02238240_H
 #define POKEPLATINUM_STRUCT_OV104_02238240_H
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 typedef struct {
@@ -18,8 +18,8 @@ typedef struct {
     u16 unk_1C;
     u16 unk_1E;
     u8 padding_20[16];
-    UnkStruct_02079FF4 * unk_30;
-    UnkStruct_02079FF4 * unk_34;
+    Party * unk_30;
+    Party * unk_34;
     u16 unk_38;
     u8 padding_3A[2];
     void * unk_3C;
diff --git a/include/overlay104/struct_ov104_0223ADA0.h b/include/overlay104/struct_ov104_0223ADA0.h
index c50ef6942d..5182c0b589 100644
--- a/include/overlay104/struct_ov104_0223ADA0.h
+++ b/include/overlay104/struct_ov104_0223ADA0.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_defs/struct_0202FF58.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay104/struct_ov104_0223A348.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
@@ -33,8 +33,8 @@ typedef struct {
     u32 unk_3E0[4];
     UnkStruct_ov104_0223A348_sub2 unk_3F0[4];
     u16 unk_4D0;
-    UnkStruct_02079FF4 * unk_4D4;
-    UnkStruct_02079FF4 * unk_4D8;
+    Party * unk_4D4;
+    Party * unk_4D8;
     u16 unk_4DC[6];
     u16 unk_4E8[6];
     UnkStruct_0202FF58 * unk_4F4;
diff --git a/include/overlay104/struct_ov104_0223B5C0.h b/include/overlay104/struct_ov104_0223B5C0.h
index ef7545719d..c620ca0cf7 100644
--- a/include/overlay104/struct_ov104_0223B5C0.h
+++ b/include/overlay104/struct_ov104_0223B5C0.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02030114_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay104/struct_ov104_0223A348.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
@@ -22,7 +22,7 @@ typedef struct {
     u16 unk_18[20];
     UnkStruct_ov104_0223A348 unk_40[2];
     u8 unk_260[2];
-    UnkStruct_02079FF4 * unk_264;
+    Party * unk_264;
     u16 unk_268[20];
     UnkStruct_ov104_0223A348_sub2 unk_290[20];
     u16 unk_6F0;
diff --git a/include/overlay104/struct_ov104_0223BA10.h b/include/overlay104/struct_ov104_0223BA10.h
index 121bc01882..dc32d2ff27 100644
--- a/include/overlay104/struct_ov104_0223BA10.h
+++ b/include/overlay104/struct_ov104_0223BA10.h
@@ -2,7 +2,7 @@
 #define POKEPLATINUM_STRUCT_OV104_0223BA10_H
 
 #include "struct_decls/struct_020302DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay104/struct_ov104_0223A348.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
@@ -24,8 +24,8 @@ typedef struct {
     u16 unk_22;
     u8 unk_24[3];
     u8 unk_27;
-    UnkStruct_02079FF4 * unk_28;
-    UnkStruct_02079FF4 * unk_2C;
+    Party * unk_28;
+    Party * unk_2C;
     u16 unk_30[14];
     UnkStruct_ov104_0223A348 unk_4C[2];
     u16 unk_26C[4];
diff --git a/include/overlay104/struct_ov104_0223BFFC.h b/include/overlay104/struct_ov104_0223BFFC.h
index 2eac79258a..bc92229726 100644
--- a/include/overlay104/struct_ov104_0223BFFC.h
+++ b/include/overlay104/struct_ov104_0223BFFC.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0200D0F4_decl.h"
 #include "struct_decls/struct_020304A0_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay104/struct_ov104_0223A348.h"
 #include "overlay104/struct_ov104_0223A348_sub2.h"
@@ -34,8 +34,8 @@ typedef struct {
     UnkStruct_0200D0F4 * unk_40[4];
     UnkStruct_0200D0F4 * unk_50[4];
     UnkStruct_0200D0F4 * unk_60[4];
-    UnkStruct_02079FF4 * unk_70;
-    UnkStruct_02079FF4 * unk_74;
+    Party * unk_70;
+    Party * unk_74;
     u16 unk_78[14];
     u32 unk_94[4];
     u32 unk_A4[4];
diff --git a/include/overlay107/ov107_02249604.h b/include/overlay107/ov107_02249604.h
index 6b67cd9f34..6254a80d3b 100644
--- a/include/overlay107/ov107_02249604.h
+++ b/include/overlay107/ov107_02249604.h
@@ -2,10 +2,10 @@
 #define POKEPLATINUM_OV107_02249604_H
 
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay107/struct_ov107_02249954.h"
 
-void ov107_02249604(UnkStruct_ov107_02249954 * param0, UnkStruct_02079FF4 * param1, u8 param2);
+void ov107_02249604(UnkStruct_ov107_02249954 * param0, Party * param1, u8 param2);
 UnkStruct_02022550 * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
 void ov107_02249954(UnkStruct_ov107_02249954 * param0);
 void ov107_022499BC(UnkStruct_ov107_02249954 * param0, u16 param1);
diff --git a/include/overlay108/ov108_02243030.h b/include/overlay108/ov108_02243030.h
index 663a4aa90d..a039fd1a1b 100644
--- a/include/overlay108/ov108_02243030.h
+++ b/include/overlay108/ov108_02243030.h
@@ -2,10 +2,10 @@
 #define POKEPLATINUM_OV108_02243030_H
 
 #include "struct_decls/struct_02022550_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay108/struct_ov108_02243030.h"
 
-void ov108_02243030(UnkStruct_ov108_02243030 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, u8 param3);
+void ov108_02243030(UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3);
 UnkStruct_02022550 * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
 void ov108_02243194(UnkStruct_ov108_02243030 * param0);
 
diff --git a/include/party.h b/include/party.h
index 33b8008a2c..eed06b29c9 100644
--- a/include/party.h
+++ b/include/party.h
@@ -2,22 +2,22 @@
 #define POKEPLATINUM_UNK_02079FEC_H
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 int Party_sizeof(void);
-UnkStruct_02079FF4 * sub_02079FF4(u32 param0);
-void sub_0207A008(UnkStruct_02079FF4 * param0);
-void Party_InitWithCapacity(UnkStruct_02079FF4 * party, int capacity);
-BOOL Party_AddPokemon(UnkStruct_02079FF4 * party, UnkStruct_02073C74 * pokemon);
-BOOL Party_RemovePokemonBySlotIndex(UnkStruct_02079FF4 * party, int slot);
-int Party_GetCapacity(const UnkStruct_02079FF4 * party);
-int Party_GetCurrentCount(const UnkStruct_02079FF4 * party);
-UnkStruct_02073C74 * Party_GetPokemonBySlotIndex(const UnkStruct_02079FF4 * party, int slot);
-void sub_0207A128(UnkStruct_02079FF4 * party, int slot, UnkStruct_02073C74 * param2);
-BOOL Party_SwapSlots(UnkStruct_02079FF4 * party, int slotA, int slotB);
-void Party_cpy(const UnkStruct_02079FF4 * src, UnkStruct_02079FF4 * dest);
-BOOL Party_HasPokemon(const UnkStruct_02079FF4 * party, int species);
-UnkStruct_02079FF4 * GetPartyFromSavedata(UnkStruct_021C0794 * party);
+Party * sub_02079FF4(u32 param0);
+void sub_0207A008(Party * param0);
+void Party_InitWithCapacity(Party * party, int capacity);
+BOOL Party_AddPokemon(Party * party, UnkStruct_02073C74 * pokemon);
+BOOL Party_RemovePokemonBySlotIndex(Party * party, int slot);
+int Party_GetCapacity(const Party * party);
+int Party_GetCurrentCount(const Party * party);
+UnkStruct_02073C74 * Party_GetPokemonBySlotIndex(const Party * party, int slot);
+void sub_0207A128(Party * party, int slot, UnkStruct_02073C74 * param2);
+BOOL Party_SwapSlots(Party * party, int slotA, int slotB);
+void Party_cpy(const Party * src, Party * dest);
+BOOL Party_HasPokemon(const Party * party, int species);
+Party * GetPartyFromSavedata(UnkStruct_021C0794 * party);
 
 #endif // POKEPLATINUM_UNK_02079FEC_H
diff --git a/include/struct_decls/struct_02079FF4_decl.h b/include/struct_decls/struct_02079FF4_decl.h
deleted file mode 100644
index bd9c76a7a9..0000000000
--- a/include/struct_decls/struct_02079FF4_decl.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_02079FF4_DECL_H
-#define POKEPLATINUM_STRUCT_02079FF4_DECL_H
-
-typedef struct UnkStruct_02079FF4_t UnkStruct_02079FF4;
-
-#endif // POKEPLATINUM_STRUCT_02079FF4_DECL_H
diff --git a/include/struct_decls/struct_party_decl.h b/include/struct_decls/struct_party_decl.h
new file mode 100644
index 0000000000..9d38ffaba0
--- /dev/null
+++ b/include/struct_decls/struct_party_decl.h
@@ -0,0 +1,6 @@
+#ifndef POKEPLATINUM_STRUCT_PARTY_DECL_H
+#define POKEPLATINUM_STRUCT_PARTY_DECL_H
+
+typedef struct Party Party;
+
+#endif // POKEPLATINUM_STRUCT_02079FF4_DECL_H
diff --git a/include/struct_defs/struct_0203D9B8.h b/include/struct_defs/struct_0203D9B8.h
index 33003c2513..2c7dcf80f0 100644
--- a/include/struct_defs/struct_0203D9B8.h
+++ b/include/struct_defs/struct_0203D9B8.h
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202AB28_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_defs/struct_020989DC.h"
 
@@ -17,7 +17,7 @@ typedef struct {
     u16 unk_06;
     UnkStruct_0202AB28 * unk_08;
     UnkStruct_02025E6C * unk_0C;
-    UnkStruct_02079FF4 * unk_10;
+    Party * unk_10;
     UnkStruct_0207D3C0 * unk_14;
     UnkStruct_020279FC * unk_18;
     UnkStruct_020989DC unk_1C[100];
diff --git a/include/struct_defs/struct_0203E0FC.h b/include/struct_defs/struct_0203E0FC.h
index 200f27472d..f22a692b91 100644
--- a/include/struct_defs/struct_0203E0FC.h
+++ b/include/struct_defs/struct_0203E0FC.h
@@ -11,14 +11,14 @@
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_0202DA40_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 typedef struct {
     UnkStruct_0202DA40 * unk_00;
     UnkStruct_02025CCC * unk_04;
-    UnkStruct_02079FF4 * unk_08;
+    Party * unk_08;
     UnkStruct_020797DC * unk_0C;
     UnkStruct_02026324 * unk_10;
     UnkStruct_0202B370 * unk_14;
diff --git a/include/struct_defs/struct_0203E234.h b/include/struct_defs/struct_0203E234.h
index a09b1f8f67..388c10747a 100644
--- a/include/struct_defs/struct_0203E234.h
+++ b/include/struct_defs/struct_0203E234.h
@@ -3,11 +3,11 @@
 
 #include "struct_decls/struct_02025E5C_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 typedef struct {
     const UnkStruct_02025E6C * unk_00;
-    const UnkStruct_02079FF4 * unk_04;
+    const Party * unk_04;
     const UnkStruct_02025E5C * unk_08;
 } UnkStruct_0203E234;
 
diff --git a/include/struct_defs/struct_0205964C.h b/include/struct_defs/struct_0205964C.h
index 88d3e5662b..ccdb7de802 100644
--- a/include/struct_defs/struct_0205964C.h
+++ b/include/struct_defs/struct_0205964C.h
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "functypes/funcptr_020598EC.h"
 #include "struct_defs/struct_02072014.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include <nitro/math.h>
 
@@ -24,7 +24,7 @@ typedef struct {
     u8 unk_41;
     u8 unk_42;
     u8 unk_43;
-    UnkStruct_02079FF4 * unk_44;
+    Party * unk_44;
 } UnkStruct_0205964C;
 
 #endif // POKEPLATINUM_STRUCT_0205964C_H
diff --git a/include/struct_defs/struct_02079FF4.h b/include/struct_defs/struct_02079FF4.h
deleted file mode 100644
index b72cf5ec04..0000000000
--- a/include/struct_defs/struct_02079FF4.h
+++ /dev/null
@@ -1,12 +0,0 @@
-#ifndef POKEPLATINUM_STRUCT_02079FF4_H
-#define POKEPLATINUM_STRUCT_02079FF4_H
-
-#include "struct_defs/struct_02073C74.h"
-
-typedef struct UnkStruct_02079FF4_t {
-    int unk_00;
-    int unk_04;
-    UnkStruct_02073C74 unk_08[6];
-} UnkStruct_02079FF4;
-
-#endif // POKEPLATINUM_STRUCT_02079FF4_H
diff --git a/include/struct_defs/struct_0207ADB4_t.h b/include/struct_defs/struct_0207ADB4_t.h
index c265c42180..c05bceef13 100644
--- a/include/struct_defs/struct_0207ADB4_t.h
+++ b/include/struct_defs/struct_0207ADB4_t.h
@@ -22,7 +22,7 @@
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_decls/struct_0206D140_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0207A9CC.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
@@ -61,7 +61,7 @@ struct UnkStruct_0207ADB4_t {
     UnkStruct_0207D99C * unk_5C;
     UnkStruct_02026324 * unk_60;
     UnkStruct_020797DC * unk_64;
-    UnkStruct_02079FF4 * unk_68[4];
+    Party * unk_68[4];
     UnkStruct_0202CC84 * unk_78[4];
     UnkStruct_02007768 * unk_88;
     UnkStruct_ov12_0221FCDC * unk_8C;
diff --git a/include/struct_defs/struct_0207AE68_t.h b/include/struct_defs/struct_0207AE68_t.h
index 171754bb01..d7392d1f1f 100644
--- a/include/struct_defs/struct_0207AE68_t.h
+++ b/include/struct_defs/struct_0207AE68_t.h
@@ -17,7 +17,7 @@
 #include "struct_decls/struct_02056B24_decl.h"
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_0207C690.h"
 #include "struct_defs/struct_0207C8C4.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
@@ -32,7 +32,7 @@ struct UnkStruct_0207AE68_t {
     UnkStruct_02002F38 * unk_14;
     UnkStruct_02007768 * unk_18;
     UnkStruct_02007C7C * unk_1C[2];
-    UnkStruct_02079FF4 * unk_24;
+    Party * unk_24;
     UnkStruct_02073C74 * unk_28;
     UnkStruct_020279FC * unk_2C;
     UnkStruct_0207C8C4 * unk_30;
diff --git a/include/struct_defs/struct_02095C48.h b/include/struct_defs/struct_02095C48.h
index 8dcd2633fb..b769178ef6 100644
--- a/include/struct_defs/struct_02095C48.h
+++ b/include/struct_defs/struct_02095C48.h
@@ -6,7 +6,7 @@
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202A750_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_defs/struct_02094A58.h"
 #include "struct_defs/struct_02095C48_sub1.h"
 #include "struct_defs/struct_02095C60.h"
@@ -14,7 +14,7 @@
 
 typedef struct {
     UnkStruct_02095C48_sub1 unk_00;
-    UnkStruct_02079FF4 * unk_148;
+    Party * unk_148;
     void * unk_14C[4];
     void * unk_150;
     u8 unk_154;
diff --git a/include/struct_defs/struct_02095E80_t.h b/include/struct_defs/struct_02095E80_t.h
index ae96c48efe..0d27ff4c60 100644
--- a/include/struct_defs/struct_02095E80_t.h
+++ b/include/struct_defs/struct_02095E80_t.h
@@ -22,7 +22,7 @@
 #include "struct_decls/struct_0202CC84_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_defs/struct_0205AA50.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_02095E80_decl.h"
 #include "struct_defs/struct_02095E80_sub1.h"
 #include "struct_defs/struct_02098D38.h"
@@ -108,8 +108,8 @@ struct UnkStruct_02095E80_t {
     int unk_2168;
     u8 unk_216C[256];
     int (* unk_226C)(UnkStruct_02095E80 *);
-    UnkStruct_02079FF4 * unk_2270;
-    UnkStruct_02079FF4 * unk_2274;
+    Party * unk_2270;
+    Party * unk_2274;
     UnkStruct_0202CC84 * unk_2278;
     UnkStruct_02027F8C * unk_227C;
     UnkStruct_02027F8C unk_2280;
diff --git a/include/struct_defs/struct_02097F18.h b/include/struct_defs/struct_02097F18.h
index c93e4d9e75..c131ebc4de 100644
--- a/include/struct_defs/struct_02097F18.h
+++ b/include/struct_defs/struct_02097F18.h
@@ -4,13 +4,13 @@
 #include "struct_defs/struct_020279FC.h"
 #include "struct_decls/struct_0202CA1C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 typedef struct {
     int unk_00;
     UnkStruct_02073C74 * unk_04[6];
-    UnkStruct_02079FF4 * unk_1C;
+    Party * unk_1C;
     UnkStruct_0202CA1C * unk_20;
     UnkStruct_020279FC * unk_24;
     UnkStruct_021C0794 * unk_28;
diff --git a/include/struct_defs/struct_02098C44.h b/include/struct_defs/struct_02098C44.h
index 3968127a01..cbe1880d36 100644
--- a/include/struct_defs/struct_02098C44.h
+++ b/include/struct_defs/struct_02098C44.h
@@ -2,10 +2,10 @@
 #define POKEPLATINUM_STRUCT_02098C44_H
 
 #include "struct_defs/struct_020279FC.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 typedef struct {
-    UnkStruct_02079FF4 * unk_00;
+    Party * unk_00;
     void * unk_04;
     void * unk_08;
     UnkStruct_020279FC * unk_0C;
diff --git a/include/struct_defs/struct_party.h b/include/struct_defs/struct_party.h
new file mode 100644
index 0000000000..cb0d37da2c
--- /dev/null
+++ b/include/struct_defs/struct_party.h
@@ -0,0 +1,12 @@
+#ifndef POKEPLATINUM_STRUCT_PARTY_H
+#define POKEPLATINUM_STRUCT_PARTY_H
+
+#include "struct_defs/struct_02073C74.h"
+
+typedef struct Party {
+    int capacity;
+    int currentCount;
+    UnkStruct_02073C74 pokemon[6];
+} Party;
+
+#endif // POKEPLATINUM_STRUCT_PARTY_H
diff --git a/include/unk_0202DF8C.h b/include/unk_0202DF8C.h
index 0de9cf697d..80879fe4e4 100644
--- a/include/unk_0202DF8C.h
+++ b/include/unk_0202DF8C.h
@@ -2,14 +2,14 @@
 #define POKEPLATINUM_UNK_0202DF8C_H
 
 #include "struct_defs/struct_0202DF8C.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay087/struct_ov87_021D1640.h"
 
 #include <nitro/rtc.h>
 
 int sub_0202DF8C(void);
 void sub_0202DF94(UnkStruct_0202DF8C * param0);
-void sub_0202DFA8(UnkStruct_0202DF8C * param0, const UnkStruct_02079FF4 * param1, const RTCDate * param2);
+void sub_0202DFA8(UnkStruct_0202DF8C * param0, const Party * param1, const RTCDate * param2);
 u32 sub_0202E148(const UnkStruct_0202DF8C * param0);
 u32 sub_0202E174(const UnkStruct_0202DF8C * param0, int param1);
 u32 sub_0202E1A8(const UnkStruct_0202DF8C * param0, int param1);
diff --git a/include/unk_02050A74.h b/include/unk_02050A74.h
index 346752fdac..8330c8d08f 100644
--- a/include/unk_02050A74.h
+++ b/include/unk_02050A74.h
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay006/struct_ov6_02240D5C.h"
 
 void sub_02050ABC(UnkStruct_020508D4 * param0, UnkStruct_ov6_02240D5C * param1);
@@ -19,7 +19,7 @@ void sub_020515CC(UnkStruct_020508D4 * param0, int param1, int param2, int param
 void sub_0205167C(UnkStruct_020508D4 * param0, const u8 * param1, int param2);
 void sub_020516F4(UnkStruct_020508D4 * param0, int param1, int param2, int param3);
 void sub_020517E8(UnkStruct_0203CDB0 * param0, const u8 * param1, int param2);
-void sub_0205184C(UnkStruct_0203CDB0 * param0, const UnkStruct_02079FF4 * param1, int param2);
+void sub_0205184C(UnkStruct_0203CDB0 * param0, const Party * param1, int param2);
 void sub_02051ABC(UnkStruct_020508D4 * param0, u16 param1, u8 param2, int * param3, BOOL param4);
 
 #endif // POKEPLATINUM_UNK_02050A74_H
diff --git a/include/unk_02051D8C.h b/include/unk_02051D8C.h
index cc70f61069..5dfb76dba5 100644
--- a/include/unk_02051D8C.h
+++ b/include/unk_02051D8C.h
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0202CC84_decl.h"
 #include "struct_decls/struct_0203CDB0_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207D99C_decl.h"
 #include "struct_defs/struct_0209C370.h"
 #include "struct_decls/struct_021C0794_decl.h"
@@ -18,13 +18,13 @@ UnkStruct_ov6_02240D5C * sub_02051F38(int param0, int param1);
 UnkStruct_ov6_02240D5C * sub_02051F4C(int param0, const UnkStruct_0203CDB0 * param1);
 void sub_020520A4(UnkStruct_ov6_02240D5C * param0);
 void sub_0205213C(UnkStruct_ov6_02240D5C * param0, UnkStruct_02073C74 * param1, int param2);
-void sub_02052164(UnkStruct_ov6_02240D5C * param0, const UnkStruct_02079FF4 * param1, int param2);
+void sub_02052164(UnkStruct_ov6_02240D5C * param0, const Party * param1, int param2);
 void sub_02052184(UnkStruct_ov6_02240D5C * param0, const UnkStruct_02025E6C * param1, int param2);
 void sub_020521A4(UnkStruct_ov6_02240D5C * param0, const UnkStruct_0202CC84 * param1, int param2);
 void sub_020521B8(UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1, UnkStruct_021C0794 * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6);
 void sub_02052314(UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1);
 void sub_02052348(UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1, int param2);
-void sub_020524E4(UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1, const UnkStruct_02079FF4 * param2, const u8 * param3);
+void sub_020524E4(UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1, const Party * param2, const u8 * param3);
 void sub_020526CC(UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1, const u8 * param2);
 void sub_020526E8(const UnkStruct_ov6_02240D5C * param0, UnkStruct_0203CDB0 * param1);
 void sub_02052754(const UnkStruct_ov6_02240D5C * param0, UnkStruct_0203CDB0 * param1);
diff --git a/include/unk_02054884.h b/include/unk_02054884.h
index 4dd6356170..8b9ad1d0fc 100644
--- a/include/unk_02054884.h
+++ b/include/unk_02054884.h
@@ -2,20 +2,20 @@
 #define POKEPLATINUM_UNK_02054884_H
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 BOOL sub_02054884(UnkStruct_02073C74 * param0);
 BOOL sub_020548B0(int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param3, u16 param4, int param5, int param6);
 BOOL sub_02054930(int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param3, int param4, int param5);
-void sub_02054988(UnkStruct_02079FF4 * param0, int param1, int param2, u16 param3);
-int sub_020549A0(UnkStruct_02079FF4 * param0, u16 param1);
-int sub_02054A10(const UnkStruct_02079FF4 * param0);
-UnkStruct_02073C74 * sub_02054A40(const UnkStruct_02079FF4 * param0);
-UnkStruct_02073C74 * sub_02054A74(const UnkStruct_02079FF4 * param0);
-BOOL sub_02054AB0(const UnkStruct_02079FF4 * param0);
-void sub_02054AC4(UnkStruct_02079FF4 * param0);
-int sub_02054B04(UnkStruct_02079FF4 * param0, u16 param1);
+void sub_02054988(Party * param0, int param1, int param2, u16 param3);
+int sub_020549A0(Party * param0, u16 param1);
+int sub_02054A10(const Party * param0);
+UnkStruct_02073C74 * sub_02054A40(const Party * param0);
+UnkStruct_02073C74 * sub_02054A74(const Party * param0);
+BOOL sub_02054AB0(const Party * param0);
+void sub_02054AC4(Party * param0);
+int sub_02054B04(Party * param0, u16 param1);
 BOOL sub_02054B94(UnkStruct_02073C74 * param0);
 
 #endif // POKEPLATINUM_UNK_02054884_H
diff --git a/include/unk_02073C2C.h b/include/unk_02073C2C.h
index 71fba309fc..fcaf2cf6d2 100644
--- a/include/unk_02073C2C.h
+++ b/include/unk_02073C2C.h
@@ -16,7 +16,7 @@
 #include "struct_decls/struct_02073C74_sub1_decl.h"
 #include "struct_decls/struct_02075874_decl.h"
 #include "struct_decls/struct_02078B40_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay005/struct_ov5_021DE5D0.h"
 
 #include <nitro/rtc.h>
@@ -88,7 +88,7 @@ u8 sub_02076AF8(UnkStruct_02073C74 * param0);
 u8 sub_02076B00(UnkStruct_02073C74_sub1 * param0);
 UnkStruct_02073C74_sub1 * sub_02076B10(UnkStruct_02073C74 * param0);
 u8 sub_02076B14(UnkStruct_02073C74 * param0);
-u16 sub_02076B94(UnkStruct_02079FF4 * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4);
+u16 sub_02076B94(Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4);
 u16 sub_02076F84(const u16 param0);
 u16 sub_02076FD4(const u16 param0);
 void sub_02077020(UnkStruct_02073C74_sub1 * param0);
@@ -105,7 +105,7 @@ void sub_0207734C(UnkStruct_02073C74_sub1 * param0, int param1, int param2);
 void sub_02077408(UnkStruct_02073C74 * param0, u32 param1);
 BOOL sub_0207749C(UnkStruct_02073C74 * param0, u16 param1);
 void sub_020774C8(UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74 * param1);
-u8 sub_02077550(UnkStruct_02079FF4 * param0);
+u8 sub_02077550(Party * param0);
 u16 sub_020775A4(u16 param0);
 u16 sub_020775C4(u16 param0);
 void sub_020775EC(UnkStruct_02073C74 * param0, UnkStruct_02073C74 * param1);
@@ -115,10 +115,10 @@ s8 sub_0207762C(UnkStruct_02073C74 * param0, int param1);
 s8 sub_02077634(UnkStruct_02073C74_sub1 * param0, int param1);
 s8 sub_02077648(u32 param0, int param1);
 int sub_02077660(int param0, int param1, u16 * param2);
-void sub_020776B0(UnkStruct_02079FF4 * param0);
-u8 sub_02077758(UnkStruct_02079FF4 * param0, u8 param1);
-void sub_020777B4(UnkStruct_02079FF4 * param0, s32 param1);
-void sub_0207782C(UnkStruct_02079FF4 * param0);
+void sub_020776B0(Party * param0);
+u8 sub_02077758(Party * param0, u8 param1);
+void sub_020777B4(Party * param0, s32 param1);
+void sub_0207782C(Party * param0);
 BOOL sub_020778D8(UnkStruct_02073C74 * param0);
 BOOL sub_020778E0(UnkStruct_02073C74_sub1 * param0);
 BOOL sub_020778F8(UnkStruct_02073C74 * param0);
@@ -129,12 +129,12 @@ u8 sub_02077988(u16 param0);
 int sub_02077A00(UnkStruct_02073C74 * param0);
 int sub_02077A1C(UnkStruct_02073C74_sub1 * param0);
 void sub_02077A64(UnkStruct_02073C74 * param0);
-void sub_02077A9C(UnkStruct_02079FF4 * param0, int param1);
+void sub_02077A9C(Party * param0, int param1);
 void sub_02077ACC(UnkStruct_02073C74 * param0, int param1);
 void sub_02077ADC(UnkStruct_02073C74_sub1 * param0, int param1);
 BOOL sub_02077B14(UnkStruct_02073C74 * param0);
-void sub_02077B8C(UnkStruct_02079FF4 * param0);
-BOOL sub_02077BD8(UnkStruct_02079FF4 * param0, int param1, const RTCTime * param2);
+void sub_02077B8C(Party * param0);
+BOOL sub_02077BD8(Party * param0, int param1, const RTCTime * param2);
 BOOL sub_02077C20(UnkStruct_02073C74 * param0, int param1, int param2);
 void sub_02077D28(int param0, int param1, u16 * param2);
 void sub_02077D3C(UnkStruct_0202CC84 * param0, int param1, u16 param2, int param3, int param4, int param5, int param6, int param7);
diff --git a/include/unk_0207A2A8.h b/include/unk_0207A2A8.h
index 74349b6764..3293538ebb 100644
--- a/include/unk_0207A2A8.h
+++ b/include/unk_0207A2A8.h
@@ -3,13 +3,13 @@
 
 #include "struct_defs/struct_0202610C.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_02098700_decl.h"
 
 UnkStruct_02098700 * sub_0207A2A8(int param0);
 void sub_0207A2C0(UnkStruct_02098700 * param0);
 BOOL sub_0207A2D0(const UnkStruct_0202610C * param0, UnkStruct_02073C74 * param1, const UnkStruct_02098700 * param2);
-int sub_0207A3AC(const UnkStruct_0202610C * param0, UnkStruct_02079FF4 * param1, const UnkStruct_02098700 * param2, u8 * param3);
-int sub_0207A594(const UnkStruct_0202610C * param0, UnkStruct_02079FF4 * param1, const UnkStruct_02098700 * param2);
+int sub_0207A3AC(const UnkStruct_0202610C * param0, Party * param1, const UnkStruct_02098700 * param2, u8 * param3);
+int sub_0207A594(const UnkStruct_0202610C * param0, Party * param1, const UnkStruct_02098700 * param2);
 
 #endif // POKEPLATINUM_UNK_0207A2A8_H
diff --git a/include/unk_0207AE68.h b/include/unk_0207AE68.h
index 7d77b7f05d..350506ec20 100644
--- a/include/unk_0207AE68.h
+++ b/include/unk_0207AE68.h
@@ -6,11 +6,11 @@
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_02056B24_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 
-UnkStruct_0207AE68 * sub_0207AE68(UnkStruct_02079FF4 * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11);
+UnkStruct_0207AE68 * sub_0207AE68(Party * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11);
 BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0);
 void sub_0207B0E0(UnkStruct_0207AE68 * param0);
 
diff --git a/include/unk_02096420.h b/include/unk_02096420.h
index 1294f29440..51a4d12b70 100644
--- a/include/unk_02096420.h
+++ b/include/unk_02096420.h
@@ -2,12 +2,12 @@
 #define POKEPLATINUM_UNK_02096420_H
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 u8 sub_02096420(UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3);
-u8 sub_0209693C(UnkStruct_02079FF4 * param0, u16 param1, u8 param2, u8 param3, u32 param4);
+u8 sub_0209693C(Party * param0, u16 param1, u8 param2, u8 param3, u32 param4);
 u8 sub_02096954(UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3, u32 param4);
-u8 sub_02096F14(UnkStruct_02079FF4 * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5);
-void sub_02097284(UnkStruct_02079FF4 * param0);
+u8 sub_02096F14(Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5);
+void sub_02097284(Party * param0);
 
 #endif // POKEPLATINUM_UNK_02096420_H
diff --git a/src/overlay005/ov5_021D1C30.c b/src/overlay005/ov5_021D1C30.c
index 226d4420c9..359c311743 100644
--- a/src/overlay005/ov5_021D1C30.c
+++ b/src/overlay005/ov5_021D1C30.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0203A55C.h"
 #include "struct_defs/struct_0203CDB0.h"
@@ -896,7 +896,7 @@ static BOOL ov5_021D29D8 (UnkStruct_0203CDB0 * param0, const int param1, const i
 
 static BOOL ov5_021D2ABC (UnkStruct_0203CDB0 * param0)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
     UnkStruct_02026310 * v1 = sub_02026310(param0->unk_0C);
 
     if (ov5_021E7154(v1, v0, param0) == 1) {
@@ -954,7 +954,7 @@ static void ov5_021D2B54 (UnkStruct_0203CDB0 * param0)
 {
     int v0, v1;
     UnkStruct_02073C74 * v2;
-    UnkStruct_02079FF4 * v3 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v3 = GetPartyFromSavedata(param0->unk_0C);
     u16 v4 = sub_0203A138(param0->unk_1C->unk_00);
 
     v1 = Party_GetCurrentCount(v3);
@@ -967,7 +967,7 @@ static void ov5_021D2B54 (UnkStruct_0203CDB0 * param0)
 
 static BOOL ov5_021D2B94 (UnkStruct_0203CDB0 * param0)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
     u16 * v1 = sub_0203A78C(sub_0203A790(param0->unk_0C));
 
     (*v1)++;
diff --git a/src/overlay005/ov5_021E622C.c b/src/overlay005/ov5_021E622C.c
index 043bc96f14..29fc657b05 100644
--- a/src/overlay005/ov5_021E622C.c
+++ b/src/overlay005/ov5_021E622C.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
@@ -1959,15 +1959,15 @@ typedef struct {
 void ov5_021E6DE8(UnkStruct_02073C74 * param0, u16 param1, UnkStruct_02026310 * param2, u32 param3, u8 param4);
 void sub_020262C0(UnkStruct_02026224 * param0);
 static u8 ov5_021E70FC(UnkStruct_02026310 * param0);
-static int ov5_021E6F6C(UnkStruct_02079FF4 * param0);
+static int ov5_021E6F6C(Party * param0);
 static u8 ov5_021E6FF0(UnkStruct_02073C74_sub1 ** param0);
 void ov5_021E6B40(UnkStruct_02026310 * param0);
 int ov5_021E6630(UnkStruct_02026310 * param0, u8 param1, UnkStruct_0200B358 * param2);
 u8 ov5_021E6640(UnkStruct_02026310 * param0, int param1, UnkStruct_0200B358 * param2);
-u16 ov5_021E73A0(UnkStruct_02079FF4 * param0, int param1, UnkStruct_0200B358 * param2);
+u16 ov5_021E73A0(Party * param0, int param1, UnkStruct_0200B358 * param2);
 u8 ov5_021E73C8(UnkStruct_02026310 * param0);
 void ov5_021E72BC(UnkStruct_02026310 * param0, UnkStruct_0200B358 * param1);
-static void ov5_021E62C4(UnkStruct_02079FF4 * param0, int param1, UnkStruct_02026218 * param2, UnkStruct_021C0794 * param3);
+static void ov5_021E62C4(Party * param0, int param1, UnkStruct_02026218 * param2, UnkStruct_021C0794 * param3);
 static int ov5_021E7110(UnkStruct_0203CDB0 * param0);
 
 static UnkStruct_02073C74_sub1 * ov5_021E622C (UnkStruct_02026310 * param0, int param1)
@@ -2019,7 +2019,7 @@ static int ov5_021E62B0 (UnkStruct_02073C74_sub1 * param0)
     return IsItemMail(v0);
 }
 
-static void ov5_021E62C4 (UnkStruct_02079FF4 * param0, int param1, UnkStruct_02026218 * param2, UnkStruct_021C0794 * param3)
+static void ov5_021E62C4 (Party * param0, int param1, UnkStruct_02026218 * param2, UnkStruct_021C0794 * param3)
 {
     int v0;
     UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(param0, param1);
@@ -2047,7 +2047,7 @@ static void ov5_021E62C4 (UnkStruct_02079FF4 * param0, int param1, UnkStruct_020
     }
 }
 
-void ov5_021E6358 (UnkStruct_02079FF4 * param0, int param1, UnkStruct_02026310 * param2, UnkStruct_021C0794 * param3)
+void ov5_021E6358 (Party * param0, int param1, UnkStruct_02026310 * param2, UnkStruct_021C0794 * param3)
 {
     int v0;
     UnkStruct_0202CD88 * v1 = sub_0202CD88(param3);
@@ -2098,7 +2098,7 @@ static void ov5_021E63E0 (UnkStruct_02073C74 * param0)
     sub_0207418C(param0);
 }
 
-static int ov5_021E6444 (UnkStruct_02079FF4 * param0, UnkStruct_02026218 * param1, UnkStruct_0200B358 * param2)
+static int ov5_021E6444 (Party * param0, UnkStruct_02026218 * param1, UnkStruct_0200B358 * param2)
 {
     UnkStruct_02073C74 * v0 = sub_02073C74(4);
     UnkStruct_02073C74_sub1 * v1 = sub_02026220(param1);
@@ -2129,7 +2129,7 @@ static int ov5_021E6444 (UnkStruct_02079FF4 * param0, UnkStruct_02026218 * param
     return v4;
 }
 
-u16 ov5_021E64F8 (UnkStruct_02079FF4 * param0, UnkStruct_0200B358 * param1, UnkStruct_02026310 * param2, u8 param3)
+u16 ov5_021E64F8 (Party * param0, UnkStruct_0200B358 * param1, UnkStruct_02026310 * param2, u8 param3)
 {
     u16 v0;
     UnkStruct_02026218 * v1 = sub_02026218(param2, param3);
@@ -2681,7 +2681,7 @@ void ov5_021E6DE8 (UnkStruct_02073C74 * param0, u16 param1, UnkStruct_02026310 *
     sub_020237BC(v3);
 }
 
-void ov5_021E6EA8 (UnkStruct_02026310 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02025E6C * param2)
+void ov5_021E6EA8 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_02025E6C * param2)
 {
     u16 v0;
     u8 v1[2], v2;
@@ -2715,7 +2715,7 @@ void ov5_021E6EA8 (UnkStruct_02026310 * param0, UnkStruct_02079FF4 * param1, Unk
     FreeToHeap(v3);
 }
 
-static int ov5_021E6F6C (UnkStruct_02079FF4 * param0)
+static int ov5_021E6F6C (Party * param0)
 {
     u8 v0;
     u8 v1;
@@ -2851,7 +2851,7 @@ static int ov5_021E7110 (UnkStruct_0203CDB0 * param0)
     return 255;
 }
 
-BOOL ov5_021E7154 (UnkStruct_02026310 * param0, UnkStruct_02079FF4 * param1, UnkStruct_0203CDB0 * param2)
+BOOL ov5_021E7154 (UnkStruct_02026310 * param0, Party * param1, UnkStruct_0203CDB0 * param2)
 {
     u32 v0, v1, v2, v3, v4;
     u32 v5 = 0, v6;
@@ -2916,7 +2916,7 @@ BOOL ov5_021E7154 (UnkStruct_02026310 * param0, UnkStruct_02079FF4 * param1, Unk
     return 0;
 }
 
-UnkStruct_02073C74 * ov5_021E7278 (UnkStruct_02079FF4 * param0)
+UnkStruct_02073C74 * ov5_021E7278 (Party * param0)
 {
     int v0;
     UnkStruct_02073C74 * v1;
@@ -2978,7 +2978,7 @@ void ov5_021E7308 (UnkStruct_02026310 * param0, u32 param1, u32 param2, u32 para
     sub_0200BCF0(param5, param3, v3);
 }
 
-u16 ov5_021E73A0 (UnkStruct_02079FF4 * param0, int param1, UnkStruct_0200B358 * param2)
+u16 ov5_021E73A0 (Party * param0, int param1, UnkStruct_0200B358 * param2)
 {
     UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0, param1);
 
diff --git a/src/overlay005/ov5_021F6454.c b/src/overlay005/ov5_021F6454.c
index e180b07d4c..a740300cf7 100644
--- a/src/overlay005/ov5_021F6454.c
+++ b/src/overlay005/ov5_021F6454.c
@@ -19,7 +19,7 @@
 #include "struct_decls/struct_02061830_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay005/struct_ov5_021F6704_decl.h"
 
 #include "struct_defs/struct_02013A04_t.h"
@@ -500,7 +500,7 @@ BOOL ov5_021F6B3C (UnkStruct_0203E724 * param0)
 BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02073C74 * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     int v2, v3, v4;
     int v5, v6;
     u32 v7;
@@ -567,7 +567,7 @@ BOOL ov5_021F6C60 (UnkStruct_0203E724 * param0)
 BOOL ov5_021F6D80 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02073C74 * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     int v2, v3;
     u32 v4;
     int v5;
@@ -638,7 +638,7 @@ BOOL ov5_021F6E9C (UnkStruct_0203E724 * param0)
     u32 v0, v1, v2;
     int v3, v4, v5;
     UnkStruct_02073C74 * v6;
-    UnkStruct_02079FF4 * v7;
+    Party * v7;
     UnkStruct_0203CDB0 * v8 = param0->unk_34;
     u16 * v9 = inline_0204FCAC(param0);
     u16 * v10 = inline_0204FCAC(param0);
@@ -672,7 +672,7 @@ BOOL ov5_021F6F44 (UnkStruct_0203E724 * param0)
     u32 v0, v1;
     u16 v2, v3;
     UnkStruct_02073C74 * v4;
-    UnkStruct_02079FF4 * v5;
+    Party * v5;
     UnkStruct_0203CDB0 * v6 = param0->unk_34;
     u16 v7 = inline_02049538(param0);
     u16 v8 = inline_02049538(param0);
@@ -796,7 +796,7 @@ BOOL ov5_021F7208 (UnkStruct_0203E724 * param0)
 BOOL ov5_021F7270 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02073C74 * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkStruct_0203CDB0 * v2 = param0->unk_34;
     u16 v3 = inline_02049538(param0);
     u16 * v4 = inline_0204FCAC(param0);
diff --git a/src/overlay006/ov6_02240C9C.c b/src/overlay006/ov6_02240C9C.c
index f0afbe3ab2..74ddb33680 100644
--- a/src/overlay006/ov6_02240C9C.c
+++ b/src/overlay006/ov6_02240C9C.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0202D7B0.h"
 #include "struct_defs/struct_0203CDB0.h"
@@ -239,7 +239,7 @@ BOOL ov6_02240D5C (UnkStruct_0203CDB0 * param0)
     BOOL v8;
     BOOL v9;
     UnkStruct_ov6_02241674 v10;
-    UnkStruct_02079FF4 * v11;
+    Party * v11;
     UnkStruct_ov6_02242634 * v12;
     UnkStruct_ov6_0224222C v13[12];
     UnkStruct_ov6_022422D0 v14;
@@ -397,7 +397,7 @@ BOOL ov6_02240D5C (UnkStruct_0203CDB0 * param0)
 BOOL ov6_0224106C (UnkStruct_0203CDB0 * param0, const int param1, UnkStruct_ov6_02240D5C ** param2)
 {
     UnkStruct_02073C74 * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     BOOL v2;
     UnkStruct_ov6_0224222C v3[12];
     UnkStruct_ov6_022422D0 v4;
@@ -493,7 +493,7 @@ BOOL ov6_022411C8 (UnkStruct_0203CDB0 * param0, UnkStruct_020508D4 * param1)
     BOOL v7;
     BOOL v8;
     UnkStruct_ov6_02241674 v9;
-    UnkStruct_02079FF4 * v10;
+    Party * v10;
     UnkStruct_ov6_02242634 * v11;
     UnkStruct_ov6_0224222C v12[12];
     UnkStruct_ov6_022422D0 v13;
@@ -616,7 +616,7 @@ BOOL ov6_022413E4 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C ** param1
     BOOL v7;
     BOOL v8;
     UnkStruct_ov6_02241674 v9;
-    UnkStruct_02079FF4 * v10;
+    Party * v10;
     UnkStruct_ov6_02242634 * v11;
     UnkStruct_ov6_0224222C v12[12];
     UnkStruct_ov6_022422D0 v13;
@@ -1373,7 +1373,7 @@ void ov6_02242034 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * param1)
     v1 = ov5_021EFFE4(param0);
 
     {
-        UnkStruct_02079FF4 * v4;
+        Party * v4;
 
         v4 = GetPartyFromSavedata(param0->unk_0C);
         v0 = Party_GetPokemonBySlotIndex(v4, 0);
@@ -1410,7 +1410,7 @@ void ov6_022420D4 (UnkStruct_0203CDB0 * param0, u16 param1, u8 param2, UnkStruct
     UnkStruct_ov6_022422D0 v1;
 
     {
-        UnkStruct_02079FF4 * v2;
+        Party * v2;
 
         v2 = GetPartyFromSavedata(param0->unk_0C);
         v0 = Party_GetPokemonBySlotIndex(v2, 0);
diff --git a/src/overlay006/ov6_02246034.c b/src/overlay006/ov6_02246034.c
index 6000b68eab..c298cf5779 100644
--- a/src/overlay006/ov6_02246034.c
+++ b/src/overlay006/ov6_02246034.c
@@ -4,7 +4,7 @@
 #include "inlines.h"
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0202D7B0.h"
 #include "struct_defs/struct_0203CDB0.h"
@@ -29,7 +29,7 @@ void ov6_02246034 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02240D5C * param1)
     int v2;
     UnkStruct_0202D7B0 * v3;
     UnkStruct_0206C638 * v4;
-    UnkStruct_02079FF4 * v5;
+    Party * v5;
     UnkStruct_02073C74 * v6;
 
     v5 = param1->unk_04[1];
diff --git a/src/overlay006/ov6_02246184.c b/src/overlay006/ov6_02246184.c
index f080018a88..7ffa33ef14 100644
--- a/src/overlay006/ov6_02246184.c
+++ b/src/overlay006/ov6_02246184.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay006/struct_ov6_02246204_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
@@ -107,7 +107,7 @@ u32 ov6_0224622C (const UnkStruct_ov6_02246204 * param0)
 
 void ov6_02246234 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
 
     sub_0207A128(v0, param2, param1->unk_04);
     sub_0202F180(param0->unk_0C, param1->unk_04);
@@ -115,7 +115,7 @@ void ov6_02246234 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1,
 
 void ov6_02246254 (UnkStruct_0203CDB0 * param0, UnkStruct_ov6_02246204 * param1, int param2, UnkStruct_ov6_02246254 * param3, UnkStruct_02073C74 * param4, UnkStruct_02073C74 * param5)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
     UnkStruct_02073C74 * v1;
     UnkStruct_02023790 * v2;
     u32 v3;
diff --git a/src/overlay007/ov7_0224B4E8.c b/src/overlay007/ov7_0224B4E8.c
index 3824c2d85f..4866506d0c 100644
--- a/src/overlay007/ov7_0224B4E8.c
+++ b/src/overlay007/ov7_0224B4E8.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02013A04_decl.h"
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_02098700_decl.h"
 
 #include "struct_defs/struct_02013A04_t.h"
@@ -431,7 +431,7 @@ static void ov7_0224BBA0 (UnkStruct_ov7_0224B4E8 * param0)
 
 static BOOL ov7_0224BBC4 (UnkStruct_ov7_0224B4E8 * param0)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_10->unk_0C);
+    Party * v0 = GetPartyFromSavedata(param0->unk_10->unk_0C);
     int v1 = sub_0207A594(param0->unk_10->unk_B0, v0, param0->unk_6C);
     int v2;
 
diff --git a/src/overlay010/ov10_0221F800.c b/src/overlay010/ov10_0221F800.c
index 73bfa9e1c0..6225b844f0 100644
--- a/src/overlay010/ov10_0221F800.c
+++ b/src/overlay010/ov10_0221F800.c
@@ -20,7 +20,7 @@
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_020127E8.h"
@@ -1526,7 +1526,7 @@ static void ov10_02221188 (UnkStruct_ov10_0221FB28 * param0, u8 param1, s16 para
     }
 }
 
-static void ov10_022211F0 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_02079FF4 * param1, u16 param2, u16 param3)
+static void ov10_022211F0 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u16 param2, u16 param3)
 {
     UnkStruct_02073C74 * v0;
     u8 v1;
@@ -2027,7 +2027,7 @@ static void ov10_02221C48 (UnkStruct_ov10_0221FB28 * param0, u8 param1)
     sub_0201C3C0(param0->unk_0C, 2);
 }
 
-static void ov10_02221D14 (UnkStruct_ov10_0221FB28 * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov10_02221D14 (UnkStruct_ov10_0221FB28 * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
     u16 v1;
diff --git a/src/overlay013/ov13_022264F4.c b/src/overlay013/ov13_022264F4.c
index 29d1aa168a..963a30f514 100644
--- a/src/overlay013/ov13_022264F4.c
+++ b/src/overlay013/ov13_022264F4.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "struct_decls/struct_0207D99C_decl.h"
 
@@ -476,7 +476,7 @@ static u8 ov13_02226A5C (UnkStruct_ov13_02227244 * param0)
         }
 
         {
-            UnkStruct_02079FF4 * v7 = ov16_0223DF20(v0->unk_00, v0->unk_10);
+            Party * v7 = ov16_0223DF20(v0->unk_00, v0->unk_10);
             UnkStruct_020797DC * v8 = ov16_0223E228(v0->unk_00);
 
             if ((Party_GetCurrentCount(v7) == 6) && (sub_020799A0(v8) == 18)) {
diff --git a/src/overlay014/ov14_0221FC20.c b/src/overlay014/ov14_0221FC20.c
index 7c219a817a..13cf8f41e7 100644
--- a/src/overlay014/ov14_0221FC20.c
+++ b/src/overlay014/ov14_0221FC20.c
@@ -3,7 +3,7 @@
 
 #include "assert.h"
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "overlay014/struct_ov14_0221FC20_decl.h"
 #include "overlay016/struct_ov16_0224B9DC_decl.h"
@@ -1311,7 +1311,7 @@ static void ov14_02220D48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
 
 static void ov14_02220D8C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     UnkStruct_02073C74 * v1;
     int v2;
     u8 v3;
@@ -1527,7 +1527,7 @@ static void ov14_02221114 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
 
 static void ov14_022211AC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     UnkStruct_02073C74 * v1;
     int v2;
     u8 v3;
@@ -1564,7 +1564,7 @@ static void ov14_022211AC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
 
 static void ov14_022212A0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     UnkStruct_02073C74 * v1;
     int v2;
     u8 v3;
@@ -3968,7 +3968,7 @@ BOOL ov14_022244B0 (UnkStruct_0207ADB4 * param0, int param1)
     u8 v3;
     BOOL v4;
     u8 * v5;
-    UnkStruct_02079FF4 * v6;
+    Party * v6;
     UnkStruct_02073C74 * v7;
     UnkStruct_ov16_0224B9DC * v8;
 
diff --git a/src/overlay016/ov16_0223DF00.c b/src/overlay016/ov16_0223DF00.c
index d7162d56dc..16c0bfbc56 100644
--- a/src/overlay016/ov16_0223DF00.c
+++ b/src/overlay016/ov16_0223DF00.c
@@ -18,7 +18,7 @@
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_0202CC84_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_decls/struct_0207D99C_decl.h"
@@ -79,7 +79,7 @@ u32 ov16_0223DF0C(UnkStruct_0207ADB4 * param0);
 UnkStruct_ov16_0224B9DC * ov16_0223DF10(UnkStruct_0207ADB4 * param0);
 UnkStruct_ov16_0225BFFC * ov16_0223DF14(UnkStruct_0207ADB4 * param0, int param1);
 int ov16_0223DF1C(UnkStruct_0207ADB4 * param0);
-UnkStruct_02079FF4 * ov16_0223DF20(UnkStruct_0207ADB4 * param0, int param1);
+Party * ov16_0223DF20(UnkStruct_0207ADB4 * param0, int param1);
 int ov16_0223DF60(UnkStruct_0207ADB4 * param0, int param1);
 UnkStruct_02073C74 * ov16_0223DFAC(UnkStruct_0207ADB4 * param0, int param1, int param2);
 UnkStruct_02007768 * ov16_0223E000(UnkStruct_0207ADB4 * param0);
@@ -198,7 +198,7 @@ void ov16_0223F858(UnkStruct_0207ADB4 * param0, u8 * param1);
 void ov16_0223F87C(UnkStruct_0207ADB4 * param0, u8 * param1);
 void ov16_0223F8AC(UnkStruct_0207ADB4 * param0, UnkStruct_02007C7C ** param1);
 void ov16_0223F8DC(UnkStruct_0207ADB4 * param0, int param1);
-u32 ov16_0223F904(UnkStruct_02079FF4 * param0, UnkStruct_02025E6C * param1);
+u32 ov16_0223F904(Party * param0, UnkStruct_02025E6C * param1);
 void ov16_0223F938(UnkStruct_0207ADB4 * param0, int param1);
 void ov16_0223F9A0(UnkStruct_0207ADB4 * param0, int param1);
 BOOL ov16_0223F9E0(UnkStruct_0207ADB4 * param0, int param1);
@@ -257,7 +257,7 @@ int ov16_0223DF1C (UnkStruct_0207ADB4 * param0)
     return param0->unk_44;
 }
 
-UnkStruct_02079FF4 * ov16_0223DF20 (UnkStruct_0207ADB4 * param0, int param1)
+Party * ov16_0223DF20 (UnkStruct_0207ADB4 * param0, int param1)
 {
     if ((param0->unk_2C & 0x8) || ((param0->unk_2C & 0x10) && (ov16_0223E1F8(param0, param1) & 0x1))) {
         return param0->unk_68[param1];
@@ -1669,7 +1669,7 @@ void ov16_0223F8DC (UnkStruct_0207ADB4 * param0, int param1)
     }
 }
 
-u32 ov16_0223F904 (UnkStruct_02079FF4 * param0, UnkStruct_02025E6C * param1)
+u32 ov16_0223F904 (Party * param0, UnkStruct_02025E6C * param1)
 {
     static const u8 v0[] = {
         2, 4, 6, 9, 12, 16, 20, 25, 30,
diff --git a/src/overlay016/ov16_022405FC.c b/src/overlay016/ov16_022405FC.c
index 5082f91026..d4fb2651a7 100644
--- a/src/overlay016/ov16_022405FC.c
+++ b/src/overlay016/ov16_022405FC.c
@@ -14,7 +14,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "overlay016/struct_ov16_02241584_decl.h"
 #include "overlay016/struct_ov16_0224B7CC_decl.h"
@@ -338,7 +338,7 @@ static int ov16_0224B504(UnkStruct_ov16_0224B9DC * param0, int param1);
 static int ov16_0224B510(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2);
 static int ov16_0224B518(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2);
 static u32 ov16_022431BC(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2);
-static void ov16_022499C0(UnkStruct_02079FF4 * param0, int param1, int param2, int param3);
+static void ov16_022499C0(Party * param0, int param1, int param2, int param3);
 static int ov16_0224A724(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1);
 static void ov16_0224B520(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC * param1, UnkStruct_02073C74 * param2);
 static void ov16_0224B7CC(UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B7CC * param1);
@@ -4301,7 +4301,7 @@ static BOOL ov16_02244BC4 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
 
     if (v1 & 0x1) {
         {
-            UnkStruct_02079FF4 * v2;
+            Party * v2;
             UnkStruct_02073C74 * v3;
             int v4;
             int v5 = 0, v6, v7, v8, v9, v10;
@@ -7033,8 +7033,8 @@ static BOOL ov16_02248324 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
 
     if ((v5 & 0x8) || ((v5 & 0x10) && (ov16_0223E208(param0, v2)))) {
         {
-            UnkStruct_02079FF4 * v8;
-            UnkStruct_02079FF4 * v9;
+            Party * v8;
+            Party * v9;
 
             v8 = ov16_0223DF20(param0, v2);
             v9 = ov16_0223DF20(param0, ov16_0223E258(param0, v2));
@@ -7066,7 +7066,7 @@ static BOOL ov16_02248324 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
         }
     } else {
         {
-            UnkStruct_02079FF4 * v10;
+            Party * v10;
 
             v10 = ov16_0223DF20(param0, v2);
             v7 = ov16_0223DF14(param0, v2);
@@ -8110,7 +8110,7 @@ static void ov16_02248E74 (UnkStruct_0201CD38 * param0, void * param1)
     }
 }
 
-static void ov16_022499C0 (UnkStruct_02079FF4 * param0, int param1, int param2, int param3)
+static void ov16_022499C0 (Party * param0, int param1, int param2, int param3)
 {
     int v0;
     s16 v1 = 0;
@@ -8604,7 +8604,7 @@ static void ov16_02249B80 (UnkStruct_0201CD38 * param0, void * param1)
         if (sub_0200384C(v4) == 0) {
             {
                 UnkStruct_ov16_0225C300 v21;
-                UnkStruct_02079FF4 * v22;
+                Party * v22;
                 int v23;
 
                 v22 = ov16_0223DF20(v2->unk_00, 0);
diff --git a/src/overlay016/ov16_0224B940.c b/src/overlay016/ov16_0224B940.c
index 0fd480fed8..21e8c42825 100644
--- a/src/overlay016/ov16_0224B940.c
+++ b/src/overlay016/ov16_0224B940.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "overlay014/struct_ov14_0221FC20_decl.h"
 #include "overlay016/struct_ov16_0224B9DC_decl.h"
@@ -3735,7 +3735,7 @@ static void ov16_0225074C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
 
 static void ov16_02250760 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     u32 v1;
 
     v1 = ov16_0223DF0C(param0);
@@ -3784,7 +3784,7 @@ static BOOL ov16_0225079C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
                     int v6;
                     int v7 = 0;
                     int v8 = 0;
-                    UnkStruct_02079FF4 * v9;
+                    Party * v9;
                     UnkStruct_02073C74 * v10;
                     UnkStruct_ov16_0225BFFC * v11;
 
@@ -3820,7 +3820,7 @@ static BOOL ov16_0225079C (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
                 {
                     int v12;
                     int v13 = 0;
-                    UnkStruct_02079FF4 * v14;
+                    Party * v14;
                     UnkStruct_02073C74 * v15;
                     UnkStruct_ov16_0225BFFC * v16;
 
@@ -3885,7 +3885,7 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
                     {
                         int v4;
                         int v5 = 0;
-                        UnkStruct_02079FF4 * v6;
+                        Party * v6;
                         UnkStruct_02073C74 * v7;
                         UnkStruct_ov16_0225BFFC * v8;
 
@@ -3911,8 +3911,8 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
                 {
                     int v9;
                     int v10 = 0;
-                    UnkStruct_02079FF4 * v11;
-                    UnkStruct_02079FF4 * v12;
+                    Party * v11;
+                    Party * v12;
                     UnkStruct_02073C74 * v13;
                     UnkStruct_ov16_0225BFFC * v14;
 
@@ -3950,7 +3950,7 @@ static BOOL ov16_02250A48 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
                 {
                     int v15;
                     int v16 = 0;
-                    UnkStruct_02079FF4 * v17;
+                    Party * v17;
                     UnkStruct_02073C74 * v18;
                     UnkStruct_ov16_0225BFFC * v19;
 
diff --git a/src/overlay016/ov16_0225177C.c b/src/overlay016/ov16_0225177C.c
index 530a082bd2..17f12f49b7 100644
--- a/src/overlay016/ov16_0225177C.c
+++ b/src/overlay016/ov16_0225177C.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "struct_decls/struct_0207D3B0_decl.h"
 #include "struct_decls/struct_02098700_decl.h"
@@ -1975,7 +1975,7 @@ BOOL ov16_02253FCC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param
                 {
                     int v3;
                     int v4;
-                    UnkStruct_02079FF4 * v5;
+                    Party * v5;
                     UnkStruct_02073C74 * v6;
 
                     v5 = ov16_0223DF20(param0, 1);
@@ -2006,7 +2006,7 @@ BOOL ov16_02253FCC (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param
                 {
                     int v7;
                     int v8;
-                    UnkStruct_02079FF4 * v9;
+                    Party * v9;
                     UnkStruct_02073C74 * v10;
 
                     v9 = ov16_0223DF20(param0, 1);
@@ -3113,7 +3113,7 @@ BOOL ov16_02255AB4 (UnkStruct_ov16_0224B9DC * param0, int param1, int param2, in
 BOOL ov16_02255B10 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param1, int param2)
 {
     BOOL v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkStruct_02073C74 * v2;
     int v3;
     int v4 = 0, v5, v6, v7, v8, v9;
diff --git a/src/overlay016/ov16_0225BFFC.c b/src/overlay016/ov16_0225BFFC.c
index a05421dc64..a284ca08e2 100644
--- a/src/overlay016/ov16_0225BFFC.c
+++ b/src/overlay016/ov16_0225BFFC.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0200C6E4_decl.h"
 #include "struct_decls/struct_0200C704_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "overlay016/struct_ov16_0225BFFC_decl.h"
 #include "overlay016/struct_ov16_02268A14_decl.h"
@@ -953,7 +953,7 @@ static void ov16_0225CA60 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC
 static void ov16_0225CA74 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0225BFFC * param1)
 {
     UnkStruct_ov16_02266A38 * v0 = (UnkStruct_ov16_02266A38 *)&param1->unk_90[0];
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkStruct_02073C74 * v2;
     int v3;
     int v4;
diff --git a/src/overlay016/ov16_0225CBB8.c b/src/overlay016/ov16_0225CBB8.c
index 03574125c4..c646d5b348 100644
--- a/src/overlay016/ov16_0225CBB8.c
+++ b/src/overlay016/ov16_0225CBB8.c
@@ -16,7 +16,7 @@
 #include "struct_decls/struct_02018340_decl.h"
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "overlay012/struct_ov12_0221FCDC_decl.h"
 #include "overlay016/struct_ov16_0224B9DC_decl.h"
@@ -3707,7 +3707,7 @@ static void ov16_022611DC (UnkStruct_0201CD38 * param0, void * param1)
         int v2;
         int v3 = 0;
         int v4;
-        UnkStruct_02079FF4 * v5 = ov16_0223DF20(v0->unk_00, v0->unk_0D);
+        Party * v5 = ov16_0223DF20(v0->unk_00, v0->unk_0D);
         UnkStruct_02073C74 * v6;
 
         if ((ov16_0223DF0C(v0->unk_00) & 0x2) && ((ov16_0223DF0C(v0->unk_00) & 0x8) == 0)) {
@@ -4272,7 +4272,7 @@ static void ov16_02261E8C (UnkStruct_0201CD38 * param0, void * param1)
                 int v4 = 0;
                 int v5;
                 int v6, v7;
-                UnkStruct_02079FF4 * v8;
+                Party * v8;
                 UnkStruct_02073C74 * v9, * v10;
 
                 ov16_0223B384(v0->unk_00);
@@ -4400,7 +4400,7 @@ static void ov16_02262258 (UnkStruct_0201CD38 * param0, void * param1)
 {
     UnkStruct_ov16_0225D840 * v0 = (UnkStruct_ov16_0225D840 *)param1;
     int v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_02073C74 * v3;
     int v4, v5;
     u32 v6;
@@ -4462,7 +4462,7 @@ static void  ov16_0226232C (UnkStruct_0201CD38 * param0, void * param1)
         ov16_02264730(v0->unk_00);
     } else {
         {
-            UnkStruct_02079FF4 * v2;
+            Party * v2;
             UnkStruct_02073C74 * v3;
             int v4 = v1 - 1;
 
diff --git a/src/overlay016/ov16_0226485C.c b/src/overlay016/ov16_0226485C.c
index 463f06687e..66d0003809 100644
--- a/src/overlay016/ov16_0226485C.c
+++ b/src/overlay016/ov16_0226485C.c
@@ -1,7 +1,7 @@
 #include <nitro.h>
 #include <string.h>
 
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 #include "overlay016/struct_ov16_0224B9DC_decl.h"
 
@@ -582,7 +582,7 @@ void ov16_02265330 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC * param
     int v3, v4;
     int v5;
     int v6;
-    UnkStruct_02079FF4 * v7;
+    Party * v7;
     UnkStruct_02073C74 * v8;
     u32 v9;
     int v10;
@@ -1722,7 +1722,7 @@ static void ov16_02266CF0 (UnkStruct_0207ADB4 * param0, UnkStruct_ov16_0224B9DC
     int v3;
     int v4;
     u32 v5;
-    UnkStruct_02079FF4 * v6;
+    Party * v6;
     UnkStruct_02073C74 * v7;
 
     MI_CpuClearFast(param2, sizeof(UnkStruct_ov16_0225C840));
diff --git a/src/overlay019/ov19_021D0D80.c b/src/overlay019/ov19_021D0D80.c
index 205b1095e3..0743493dc1 100644
--- a/src/overlay019/ov19_021D0D80.c
+++ b/src/overlay019/ov19_021D0D80.c
@@ -16,7 +16,7 @@
 #include "struct_decls/struct_02073C74_sub1_decl.h"
 #include "struct_decls/struct_02075874_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207CB08_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
@@ -119,7 +119,7 @@ typedef struct {
     u16 unk_08[NELEMS(Unk_ov19_021DFDF0)];
     UnkStruct_02073C74_sub1 * unk_10;
     UnkStruct_020797DC * unk_14;
-    UnkStruct_02079FF4 * unk_18;
+    Party * unk_18;
     BOOL unk_1C;
 } UnkStruct_ov19_021D38E0;
 
@@ -129,7 +129,7 @@ typedef struct UnkStruct_ov19_021D5DF8_t {
     UnkStruct_02042434 * unk_118;
     UnkStruct_021C0794 * unk_11C;
     UnkStruct_020797DC * unk_120;
-    UnkStruct_02079FF4 * unk_124;
+    Party * unk_124;
     UnkStruct_0208737C * unk_128;
     UnkStruct_02098D38 unk_12C;
     UnkStruct_ov19_021D38E0 unk_15C;
diff --git a/src/overlay032/ov32_022561C0.c b/src/overlay032/ov32_022561C0.c
index e73e58d332..d3e8ba23f4 100644
--- a/src/overlay032/ov32_022561C0.c
+++ b/src/overlay032/ov32_022561C0.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay025/struct_ov25_0225424C_decl.h"
 #include "overlay032/struct_ov32_02256470_decl.h"
 
@@ -41,7 +41,7 @@ static void ov32_022562B4(UnkStruct_ov32_0225621C * param0, u32 param1);
 static BOOL ov32_022562C8(UnkStruct_ov32_0225621C * param0);
 static BOOL ov32_02256308(UnkStruct_ov32_0225621C * param0);
 static BOOL ov32_02256394(UnkStruct_ov32_0225621C * param0);
-static void ov32_022563C8(UnkStruct_ov32_02256470_1 * param0, UnkStruct_02079FF4 * param1);
+static void ov32_022563C8(UnkStruct_ov32_02256470_1 * param0, Party * param1);
 
 static void NitroStaticInit (void)
 {
@@ -197,7 +197,7 @@ static BOOL ov32_02256394 (UnkStruct_ov32_0225621C * param0)
     return 0;
 }
 
-static void ov32_022563C8 (UnkStruct_ov32_02256470_1 * param0, UnkStruct_02079FF4 * param1)
+static void ov32_022563C8 (UnkStruct_ov32_02256470_1 * param0, Party * param1)
 {
     UnkStruct_02073C74 * v0;
     int v1;
diff --git a/src/overlay033/ov33_022561C0.c b/src/overlay033/ov33_022561C0.c
index 6258e5558e..957abc00f0 100644
--- a/src/overlay033/ov33_022561C0.c
+++ b/src/overlay033/ov33_022561C0.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay025/struct_ov25_0225424C_decl.h"
 #include "overlay033/struct_ov33_02256474_decl.h"
 
@@ -76,7 +76,7 @@ static BOOL ov33_0225621C (UnkStruct_ov33_0225621C * param0, UnkStruct_ov25_0225
         param0->unk_60 = param1;
 
         {
-            UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(sub_020245A4());
+            Party * v0 = GetPartyFromSavedata(sub_020245A4());
             UnkStruct_02073C74 * v1;
             int v2;
             int v3;
diff --git a/src/overlay044/ov44_022561C0.c b/src/overlay044/ov44_022561C0.c
index 535d9f09e4..a78aad0a9b 100644
--- a/src/overlay044/ov44_022561C0.c
+++ b/src/overlay044/ov44_022561C0.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay025/struct_ov25_0225424C_decl.h"
 #include "overlay025/struct_ov25_02255B34_decl.h"
 #include "overlay044/struct_ov44_022565BC_decl.h"
@@ -78,7 +78,7 @@ static BOOL ov44_022561D4 (void ** param0, UnkStruct_ov25_0225424C * param1, Unk
 
 static BOOL ov44_0225621C (UnkStruct_ov44_0225621C * param0, UnkStruct_ov25_0225424C * param1, UnkStruct_02018340 * param2, u32 param3)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(ov25_02254544(param1));
+    Party * v0 = GetPartyFromSavedata(ov25_02254544(param1));
     UnkStruct_02073C74 * v1;
     int v2;
     int v3 = 0;
diff --git a/src/overlay065/ov65_0222DCE0.c b/src/overlay065/ov65_0222DCE0.c
index 2d728923d4..0971fce7cb 100644
--- a/src/overlay065/ov65_0222DCE0.c
+++ b/src/overlay065/ov65_0222DCE0.c
@@ -21,7 +21,7 @@
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay065/struct_ov65_0222EBE0_decl.h"
 
 #include "struct_defs/struct_020127E8.h"
@@ -660,7 +660,7 @@ static int ov65_0222DED4 (int param0)
 
 static int ov65_0222DF88 (UnkStruct_ov65_0222EBE0 * param0)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_160);
+    Party * v0 = GetPartyFromSavedata(param0->unk_160);
     UnkStruct_02073C74 * v1;
     int v2 = Party_GetCurrentCount(v0);
     int v3, v4 = 0;
@@ -1809,7 +1809,7 @@ static void ov65_0222F4C4 (UnkStruct_ov65_0222EBE0 * param0, int param1)
 {
     UnkStruct_02025E6C * v0 = sub_02025E38(param0->unk_160);
     UnkStruct_02026324 * v1 = sub_02027560(param0->unk_160);
-    UnkStruct_02079FF4 * v2 = GetPartyFromSavedata(param0->unk_160);
+    Party * v2 = GetPartyFromSavedata(param0->unk_160);
     UnkStruct_0202C878 * v3 = sub_0202C878(param0->unk_160);
     int v4, v5;
 
diff --git a/src/overlay066/ov66_0222DDF0.c b/src/overlay066/ov66_0222DDF0.c
index b9c66d9c33..fb89d41de4 100644
--- a/src/overlay066/ov66_0222DDF0.c
+++ b/src/overlay066/ov66_0222DDF0.c
@@ -17,7 +17,7 @@
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_02030EC4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207E060_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay066/struct_ov66_0223177C_decl.h"
@@ -2314,7 +2314,7 @@ static void ov66_0222F768 (UnkStruct_ov66_0222DFF8 * param0)
 static void ov66_0222F7C8 (UnkStruct_ov66_0222F6C4 * param0, UnkStruct_021C0794 * param1, u32 param2)
 {
     UnkStruct_02025E6C * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkStruct_0202C878 * v2;
     UnkStruct_02026324 * v3;
     UnkStruct_02055BA8 * v4;
diff --git a/src/overlay088/ov88_0223B140.c b/src/overlay088/ov88_0223B140.c
index abc6823251..35e676bda8 100644
--- a/src/overlay088/ov88_0223B140.c
+++ b/src/overlay088/ov88_0223B140.c
@@ -17,7 +17,7 @@
 #include "struct_decls/struct_0202CC84_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_02095E80_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
@@ -129,10 +129,10 @@ static int ov88_0223E8D0(UnkStruct_02095E80 * param0);
 static int ov88_0223E914(UnkStruct_02095E80 * param0);
 static void ov88_0223E984(UnkStruct_02095E80 * param0);
 static void ov88_0223E998(UnkStruct_02095E80 * param0);
-static void ov88_0223B710(UnkStruct_0200B358 * param0, UnkStruct_02079FF4 * param1, int param2);
-static void ov88_0223B748(UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * param1, UnkStruct_0200B144 * param2, UnkStruct_02079FF4 * param3, int param4);
-static void ov88_0223C8D8(UnkStruct_0205AA50 * param0, int param1, UnkStruct_02079FF4 * param2, int param3, UnkStruct_02095E80 * param4);
-static void ov88_0223E694(UnkStruct_02079FF4 * param0, UnkStruct_02079FF4 * param1, int param2, int param3, UnkStruct_ov88_0223C370 * param4);
+static void ov88_0223B710(UnkStruct_0200B358 * param0, Party * param1, int param2);
+static void ov88_0223B748(UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * param1, UnkStruct_0200B144 * param2, Party * param3, int param4);
+static void ov88_0223C8D8(UnkStruct_0205AA50 * param0, int param1, Party * param2, int param3, UnkStruct_02095E80 * param4);
+static void ov88_0223E694(Party * param0, Party * param1, int param2, int param3, UnkStruct_ov88_0223C370 * param4);
 static void ov88_0223BF7C(UnkStruct_02095E80 * param0);
 static void ov88_0223B4F0(UnkStruct_02095E80 * param0);
 static void ov88_0223BFD8(UnkStruct_02095E80 * param0);
@@ -140,11 +140,11 @@ static void ov88_0223BE28(UnkStruct_02095E80 * param0);
 static void ov88_0223CB34(UnkStruct_0205AA50 * param0, int param1, UnkStruct_02095E80 * param2);
 static void ov88_0223BD18(UnkStruct_02073C74 * param0, UnkStruct_ov88_0223C8AC * param1);
 static void ov88_0223E87C(UnkStruct_02022550 * param0, int param1, int param2);
-static int ov88_0223C8AC(UnkStruct_ov88_0223C8AC * param0, UnkStruct_02079FF4 * param1, int param2, int param3);
+static int ov88_0223C8AC(UnkStruct_ov88_0223C8AC * param0, Party * param1, int param2, int param3);
 static void ov88_0223D0C0(UnkStruct_021C0794 * param0);
 static int ov88_0223B914(UnkStruct_02095E80 * param0);
 static int ov88_0223BED8(UnkStruct_02095E80 * param0);
-static void ov88_0223B7A0(UnkStruct_02079FF4 * param0, int param1, UnkStruct_02095E80 * param2);
+static void ov88_0223B7A0(Party * param0, int param1, UnkStruct_02095E80 * param2);
 static int ov88_0223D150(UnkStruct_02095E80 * param0);
 static int ov88_0223DA00(UnkStruct_02095E80 * param0);
 static int ov88_0223DA3C(UnkStruct_02095E80 * param0);
@@ -172,7 +172,7 @@ static void ov88_0223DE68(VecFx32 param0[], int param1, int param2, int param3,
 static void ov88_0223DE7C(UnkStruct_02022550 * param0, UnkStruct_02022550 * param1, UnkStruct_02022550 * param2, int param3, VecFx32 param4[], UnkStruct_ov88_0223C8AC * param5);
 static void ov88_0223BDA4(UnkStruct_02095E80 * param0, int param1);
 static void ov88_0223E848(UnkStruct_02095E80 * param0);
-static void ov88_0223C860(UnkStruct_0205AA50 * param0, UnkStruct_02079FF4 * param1, int param2, int param3, int param4);
+static void ov88_0223C860(UnkStruct_0205AA50 * param0, Party * param1, int param2, int param3, int param4);
 static int ov88_0223D740(UnkStruct_02095E80 * param0);
 static int ov88_0223D7AC(UnkStruct_02095E80 * param0);
 static int ov88_0223D854(UnkStruct_02095E80 * param0);
@@ -511,7 +511,7 @@ int ov88_0223B57C (UnkStruct_020067E8 * param0, int * param1)
     return v1;
 }
 
-static void ov88_0223B710 (UnkStruct_0200B358 * param0, UnkStruct_02079FF4 * param1, int param2)
+static void ov88_0223B710 (UnkStruct_0200B358 * param0, Party * param1, int param2)
 {
     int v0;
 
@@ -520,7 +520,7 @@ static void ov88_0223B710 (UnkStruct_0200B358 * param0, UnkStruct_02079FF4 * par
     }
 }
 
-static void ov88_0223B748 (UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * param1, UnkStruct_0200B144 * param2, UnkStruct_02079FF4 * param3, int param4)
+static void ov88_0223B748 (UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * param1, UnkStruct_0200B144 * param2, Party * param3, int param4)
 {
     int v0;
 
@@ -532,7 +532,7 @@ static void ov88_0223B748 (UnkStruct_0205AA50 * param0, UnkStruct_0200B358 * par
     }
 }
 
-static void ov88_0223B7A0 (UnkStruct_02079FF4 * param0, int param1, UnkStruct_02095E80 * param2)
+static void ov88_0223B7A0 (Party * param0, int param1, UnkStruct_02095E80 * param2)
 {
     int v0;
     int v1;
@@ -1296,7 +1296,7 @@ static int ov88_0223C800 (int param0, UnkStruct_02073C74 * param1, u8 * param2,
     return param0 + 1;
 }
 
-static void ov88_0223C860 (UnkStruct_0205AA50 * param0, UnkStruct_02079FF4 * param1, int param2, int param3, int param4)
+static void ov88_0223C860 (UnkStruct_0205AA50 * param0, Party * param1, int param2, int param3, int param4)
 {
     UnkStruct_02023790 * v0;
 
@@ -1308,7 +1308,7 @@ static void ov88_0223C860 (UnkStruct_0205AA50 * param0, UnkStruct_02079FF4 * par
     sub_020237BC(v0);
 }
 
-static int ov88_0223C8AC (UnkStruct_ov88_0223C8AC * param0, UnkStruct_02079FF4 * param1, int param2, int param3)
+static int ov88_0223C8AC (UnkStruct_ov88_0223C8AC * param0, Party * param1, int param2, int param3)
 {
     if ((param0->unk_00 == 29) || (param0->unk_00 == 32)) {
         UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param1, param2);
@@ -1322,7 +1322,7 @@ static int ov88_0223C8AC (UnkStruct_ov88_0223C8AC * param0, UnkStruct_02079FF4 *
     return param3;
 }
 
-static void ov88_0223C8D8 (UnkStruct_0205AA50 * param0, int param1, UnkStruct_02079FF4 * param2, int param3, UnkStruct_02095E80 * param4)
+static void ov88_0223C8D8 (UnkStruct_0205AA50 * param0, int param1, Party * param2, int param3, UnkStruct_02095E80 * param4)
 {
     UnkStruct_02023790 * v0, * v1;
     u16 v2, v3;
@@ -1652,14 +1652,14 @@ void ov88_0223D058 (UnkStruct_02095E80 * param0, int param1, int param2)
     }
 }
 
-static void * ov88_0223D08C (UnkStruct_02079FF4 * param0, int param1)
+static void * ov88_0223D08C (Party * param0, int param1)
 {
     u32 v0 = (u32)param0;
 
     return (void *)(v0 + param1 * (236 * 6 + 4 * 2));
 }
 
-void ov88_0223D098 (int param0, UnkStruct_02079FF4 * param1, int param2)
+void ov88_0223D098 (int param0, Party * param1, int param2)
 {
     if (sub_02035D78(param0)) {
         u8 v0 = param2;
@@ -2492,7 +2492,7 @@ static int ov88_0223E5B8 (UnkStruct_02095E80 * param0)
     return 0;
 }
 
-static void ov88_0223E694 (UnkStruct_02079FF4 * param0, UnkStruct_02079FF4 * param1, int param2, int param3, UnkStruct_ov88_0223C370 * param4)
+static void ov88_0223E694 (Party * param0, Party * param1, int param2, int param3, UnkStruct_ov88_0223C370 * param4)
 {
     UnkStruct_02073C74 * v0, * v1;
 
diff --git a/src/overlay094/ov94_0223FB48.c b/src/overlay094/ov94_0223FB48.c
index 22cf71e615..3594bbc7aa 100644
--- a/src/overlay094/ov94_0223FB48.c
+++ b/src/overlay094/ov94_0223FB48.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0205AA50.h"
 #include "struct_defs/struct_02081CF4.h"
@@ -96,8 +96,8 @@ static void ov94_02240EAC(UnkStruct_02073C74_sub1 * param0, UnkStruct_02022550 *
 void * ov94_02240DD0(NARC * param0, u32 param1, NNSG2dCharacterData ** param2, u32 param3);
 static int ov94_02241328(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_ov94_0223BA88_sub3 * param1);
 static void ov94_02241464(UnkStruct_ov94_0223BA88_sub2 * param0, UnkStruct_02022550 ** param1, UnkStruct_ov94_0223BA88_sub3 * param2, UnkStruct_ov94_02240FA0 * param3);
-static int ov94_0224121C(UnkStruct_02079FF4 * param0, UnkStruct_020797DC * param1, int param2, int param3);
-static int ov94_022412F4(UnkStruct_02079FF4 * param0, UnkStruct_020797DC * param1, int param2, int param3);
+static int ov94_0224121C(Party * param0, UnkStruct_020797DC * param1, int param2, int param3);
+static int ov94_022412F4(Party * param0, UnkStruct_020797DC * param1, int param2, int param3);
 static int ov94_02240BB0(UnkStruct_ov94_0223FD4C * param0);
 static int ov94_0224123C(UnkStruct_02073C74_sub1 * param0);
 static int ov94_02241278(UnkStruct_02073C74_sub1 * param0);
@@ -1214,7 +1214,7 @@ int ov94_022411D0 (int param0)
     }
 }
 
-UnkStruct_02073C74_sub1 * ov94_022411DC (UnkStruct_02079FF4 * param0, UnkStruct_020797DC * param1, int param2, int param3)
+UnkStruct_02073C74_sub1 * ov94_022411DC (Party * param0, UnkStruct_020797DC * param1, int param2, int param3)
 {
     if (ov94_022411D0(param2)) {
         if (param3 > (Party_GetCurrentCount(param0) - 1)) {
@@ -1227,7 +1227,7 @@ UnkStruct_02073C74_sub1 * ov94_022411DC (UnkStruct_02079FF4 * param0, UnkStruct_
     return sub_02079C9C(param1, param2, param3);
 }
 
-static int ov94_0224121C (UnkStruct_02079FF4 * param0, UnkStruct_020797DC * param1, int param2, int param3)
+static int ov94_0224121C (Party * param0, UnkStruct_020797DC * param1, int param2, int param3)
 {
     if (ov94_022411D0(param2)) {
         if (Party_GetCurrentCount(param0) < 2) {
@@ -1317,7 +1317,7 @@ static int ov94_022412C8 (UnkStruct_02073C74_sub1 * param0)
     return 0;
 }
 
-static int ov94_022412F4 (UnkStruct_02079FF4 * param0, UnkStruct_020797DC * param1, int param2, int param3)
+static int ov94_022412F4 (Party * param0, UnkStruct_020797DC * param1, int param2, int param3)
 {
     UnkStruct_02073C74_sub1 * v0 = ov94_022411DC(param0, param1, param2, param3);
 
diff --git a/src/overlay104/ov104_0222DCE0.c b/src/overlay104/ov104_0222DCE0.c
index f822d099b3..e698d31fc4 100644
--- a/src/overlay104/ov104_0222DCE0.c
+++ b/src/overlay104/ov104_0222DCE0.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202C878_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_02014A84.h"
@@ -40,7 +40,7 @@
 #include "unk_02092494.h"
 #include "overlay104/ov104_0222DCE0.h"
 
-void ov104_0222E1C0(UnkStruct_021C0794 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2);
+void ov104_0222E1C0(UnkStruct_021C0794 * param0, Party * param1, UnkStruct_02073C74 * param2);
 void ov104_0222E1D8(UnkStruct_02022550 * param0, u8 param1);
 void ov104_0222E204(UnkStruct_02022550 * param0, s16 param1, s16 param2, u8 param3);
 u8 ov104_0222E240(u16 param0, u16 param1);
@@ -377,7 +377,7 @@ void ov104_0222E134 (UnkStruct_021C0794 * param0, UnkStruct_02073C74 * param1)
     return;
 }
 
-void ov104_0222E1C0 (UnkStruct_021C0794 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2)
+void ov104_0222E1C0 (UnkStruct_021C0794 * param0, Party * param1, UnkStruct_02073C74 * param2)
 {
     ov104_0222E134(param0, param2);
     Party_AddPokemon(param1, param2);
diff --git a/src/overlay104/ov104_0222ECE8.c b/src/overlay104/ov104_0222ECE8.c
index 3faf197bcd..bb14544814 100644
--- a/src/overlay104/ov104_0222ECE8.c
+++ b/src/overlay104/ov104_0222ECE8.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_0203041C_decl.h"
 #include "struct_decls/struct_020305B8_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "overlay104/struct_ov104_0223ADA0.h"
 #include "overlay104/struct_ov104_0223B5C0.h"
@@ -140,7 +140,7 @@ void ov104_0222ED2C (int param0, int param1, void * param2, void * param3)
 
 BOOL ov104_0222ED44 (UnkStruct_ov104_0223B5C0 * param0)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     UnkStruct_02073C74 * v1;
     int v2, v3;
     u16 * v4;
@@ -281,7 +281,7 @@ BOOL ov104_0222EE60 (UnkStruct_ov104_0223B5C0 * param0)
 {
     int v0, v1, v2, v3, v4;
     UnkStruct_02073C74 * v5;
-    UnkStruct_02079FF4 * v6;
+    Party * v6;
 
     v1 = 0;
     v3 = 512;
diff --git a/src/overlay104/ov104_0222FBE4.c b/src/overlay104/ov104_0222FBE4.c
index 009ebfae27..73bb6b1102 100644
--- a/src/overlay104/ov104_0222FBE4.c
+++ b/src/overlay104/ov104_0222FBE4.c
@@ -18,7 +18,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202B370_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay063/struct_ov63_0222BEC0_decl.h"
 #include "overlay063/struct_ov63_0222D77C_decl.h"
 #include "overlay104/struct_ov104_0222E930_decl.h"
@@ -2742,7 +2742,7 @@ static BOOL ov104_02231D10 (UnkStruct_ov104_0222E930 * param0)
 
 static BOOL ov104_02231D1C (UnkStruct_ov104_0222E930 * param0)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     UnkStruct_02073C74 * v1;
     UnkStruct_ov104_02230BE4 * v2;
     UnkStruct_ov104_0223C4CC * v3 = ov104_0222E924(param0->unk_00);
diff --git a/src/overlay104/ov104_02234838.c b/src/overlay104/ov104_02234838.c
index 82117c6e5c..c9845e5fd3 100644
--- a/src/overlay104/ov104_02234838.c
+++ b/src/overlay104/ov104_02234838.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay104/struct_ov104_0222E930_decl.h"
 
 #include "constdata/const_020EA358.h"
@@ -96,7 +96,7 @@ BOOL ov104_022348A8 (UnkStruct_ov104_0222E930 * param0)
 BOOL ov104_022348BC (UnkStruct_ov104_0222E930 * param0)
 {
     int v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkStruct_02073C74 * v2;
     UnkStruct_ov104_0223B5C0 * v3;
     UnkStruct_ov104_02235208 * v4;
@@ -190,7 +190,7 @@ BOOL ov104_02234A1C (UnkStruct_ov104_0222E930 * param0)
 {
     UnkStruct_ov104_02230BE4 * v0;
     UnkStruct_02073C74 * v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_ov104_0223B5C0 * v3;
     u8 v4, v5;
     u32 v6;
@@ -406,7 +406,7 @@ BOOL ov104_02234D6C (UnkStruct_ov104_0222E930 * param0)
 {
     UnkStruct_0202440C * v0;
     u16 v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_02073C74 * v3;
     UnkStruct_ov104_0223B5C0 * v4;
     UnkStruct_ov104_02230BE4 * v5 = sub_0209B970(param0->unk_00->unk_00);
diff --git a/src/overlay104/ov104_022358E8.c b/src/overlay104/ov104_022358E8.c
index a441bdbd2f..efb0f2d4b6 100644
--- a/src/overlay104/ov104_022358E8.c
+++ b/src/overlay104/ov104_022358E8.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay104/struct_ov104_0222E930_decl.h"
 
 #include "constdata/const_020EA358.h"
@@ -295,7 +295,7 @@ BOOL ov104_02235BC0 (UnkStruct_ov104_0222E930 * param0)
 {
     UnkStruct_02023790 * v0;
     UnkStruct_02073C74 * v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_ov104_0223BA10 * v3;
     u8 v4;
     u32 v5[9][2];
diff --git a/src/overlay104/ov104_022361B4.c b/src/overlay104/ov104_022361B4.c
index a2a6878ee2..e54d7e10d6 100644
--- a/src/overlay104/ov104_022361B4.c
+++ b/src/overlay104/ov104_022361B4.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_0203041C_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay104/struct_ov104_022320B4_decl.h"
 
@@ -69,7 +69,7 @@ u16 ov104_02237338(UnkStruct_ov104_0223BA10 * param0);
 UnkStruct_ov104_0223BA10 * ov104_022361B4 (UnkStruct_021C0794 * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6)
 {
     u32 v0, v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_02073C74 * v3;
     UnkStruct_020302DC * v4;
     u8 v5, v6;
@@ -181,7 +181,7 @@ static void ov104_02236528 (UnkStruct_ov104_0223BA10 * param0)
     int v1;
     UnkStruct_ov104_0223A348_sub2 v2;
     UnkStruct_02073C74 * v3;
-    UnkStruct_02079FF4 * v4;
+    Party * v4;
     u16 v5[6];
     u16 v6[6];
 
diff --git a/src/overlay104/ov104_02237378.c b/src/overlay104/ov104_02237378.c
index 0214c35b54..51e8155d52 100644
--- a/src/overlay104/ov104_02237378.c
+++ b/src/overlay104/ov104_02237378.c
@@ -6,7 +6,7 @@
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "overlay104/struct_ov104_0222E930_decl.h"
 #include "overlay104/struct_ov104_022320B4_decl.h"
 
@@ -312,7 +312,7 @@ BOOL ov104_02237748 (UnkStruct_ov104_0222E930 * param0)
 {
     UnkStruct_02023790 * v0;
     UnkStruct_02073C74 * v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_ov104_0223BFFC * v3;
     u8 v4, v5, v6;
     u32 v7[9][2];
diff --git a/src/overlay104/ov104_02237DD8.c b/src/overlay104/ov104_02237DD8.c
index 88fa8ae553..76f75b531d 100644
--- a/src/overlay104/ov104_02237DD8.c
+++ b/src/overlay104/ov104_02237DD8.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_020304A0_decl.h"
 #include "struct_decls/struct_020305B8_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0200D0F4.h"
@@ -42,7 +42,7 @@ typedef struct {
     s16 unk_02;
 } UnkStruct_ov104_0223FB18;
 
-typedef void (* UnkFuncPtr_ov104_02238B88)(UnkStruct_ov104_0223BFFC *, UnkStruct_02079FF4 *, u8);
+typedef void (* UnkFuncPtr_ov104_02238B88)(UnkStruct_ov104_0223BFFC *, Party *, u8);
 
 UnkStruct_ov104_0223BFFC * ov104_02237DD8(UnkStruct_021C0794 * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6);
 void ov104_0223806C(UnkStruct_ov104_0223BFFC * param0, u16 param1);
@@ -54,8 +54,8 @@ void ov104_02238240(UnkStruct_ov104_0223BFFC * param0, void * param1);
 u16 ov104_02238264(void * param0, u8 param1);
 void ov104_022384D4(UnkStruct_ov104_0223BFFC * param0);
 void ov104_022384DC(UnkStruct_ov104_0223BFFC * param0);
-int ov104_02238538(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, int param3);
-static int ov104_02238584(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, u8 param3);
+int ov104_02238538(UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, int param3);
+static int ov104_02238584(UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, u8 param3);
 void ov104_02238658(void * param0, UnkStruct_ov104_0223C4CC * param1);
 void ov104_02238728(void * param0, UnkStruct_ov104_0223C4CC * param1);
 void ov104_02238764(UnkStruct_ov104_0223BFFC * param0, UnkStruct_ov104_0223C4CC * param1, u16 param2);
@@ -74,30 +74,30 @@ u16 ov104_02238464(UnkStruct_ov104_0223BFFC * param0, u8 param1);
 u16 ov104_02238498(UnkStruct_ov104_0223BFFC * param0, u8 param1);
 void ov104_022384A8(UnkStruct_ov104_0223BFFC * param0);
 void ov104_022384B4(UnkStruct_ov104_0223BFFC * param0);
-static void ov104_02238BBC(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238C18(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238C9C(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238D14(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238D8C(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238E08(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238E9C(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238EF8(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238F54(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FAC(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FB8(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FC0(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FC8(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FD0(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FD8(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FE4(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FF0(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02238FFC(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02239004(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02239008(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_0223900C(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
-static void ov104_02239010(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2);
+static void ov104_02238BBC(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238C18(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238C9C(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238D14(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238D8C(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238E08(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238E9C(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238EF8(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238F54(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FAC(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FB8(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FC0(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FC8(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FD0(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FD8(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FE4(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FF0(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02238FFC(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02239004(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02239008(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_0223900C(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
+static void ov104_02239010(UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2);
 u16 ov104_02239014(UnkStruct_ov104_0223BFFC * param0);
-void ov104_02239054(UnkStruct_02079FF4 * param0, UnkStruct_02079FF4 * param1, int param2, int param3);
+void ov104_02239054(Party * param0, Party * param1, int param2, int param3);
 
 static const u16 Unk_ov104_0223FBBA[32][3] = {
     {0x59, 0x3A, 0x90},
@@ -143,7 +143,7 @@ static const u8 Unk_ov104_0223FAF8[][2] = {
 UnkStruct_ov104_0223BFFC * ov104_02237DD8 (UnkStruct_021C0794 * param0, u16 param1, u8 param2, u16 param3, u16 param4, u16 param5, u16 * param6)
 {
     u32 v0, v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_02073C74 * v3;
     UnkStruct_020304A0 * v4;
     u8 v5, v6;
@@ -251,7 +251,7 @@ static void ov104_02238080 (UnkStruct_ov104_0223BFFC * param0)
     int v1;
     UnkStruct_ov104_0223A348_sub2 v2;
     UnkStruct_02073C74 * v3;
-    UnkStruct_02079FF4 * v4;
+    Party * v4;
     u16 v5[6];
     u16 v6[6];
 
@@ -549,7 +549,7 @@ static const u8 Unk_ov104_0223FAFE[5][2] = {
     {0xA, 0x0}
 };
 
-int ov104_02238538 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, int param3)
+int ov104_02238538 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, int param3)
 {
     u8 v0;
     int v1;
@@ -571,7 +571,7 @@ int ov104_02238538 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * para
     return v3;
 }
 
-static int ov104_02238584 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, u8 param3)
+static int ov104_02238584 (UnkStruct_ov104_0223BFFC * param0, Party * param1, Party * param2, u8 param3)
 {
     u32 v0;
     u8 v1;
@@ -1086,7 +1086,7 @@ static void * Unk_ov104_02241A38[] = {
 void ov104_02238B88 (UnkStruct_ov104_0223BFFC * param0, u8 param1)
 {
     u8 v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkFuncPtr_ov104_02238B88 v2;
 
     if (param1 < 9) {
@@ -1103,7 +1103,7 @@ void ov104_02238B88 (UnkStruct_ov104_0223BFFC * param0, u8 param1)
     return;
 }
 
-static void ov104_02238BBC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238BBC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     int v0;
     u32 v1, v2;
@@ -1122,7 +1122,7 @@ static void ov104_02238BBC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238C18 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238C18 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     int v0, v1;
     u32 v2, v3, v4, v5;
@@ -1151,7 +1151,7 @@ static void ov104_02238C18 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238C9C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238C9C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     int v0, v1;
     u32 v2, v3, v4, v5;
@@ -1180,7 +1180,7 @@ static void ov104_02238C9C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238D14 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238D14 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     int v0, v1;
     u32 v2, v3, v4, v5;
@@ -1209,7 +1209,7 @@ static void ov104_02238D14 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238D8C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238D8C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     u8 v0;
     int v1, v2;
@@ -1244,7 +1244,7 @@ static void ov104_02238D8C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238E08 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238E08 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     u8 v0;
     int v1, v2;
@@ -1282,7 +1282,7 @@ static void ov104_02238E08 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238E9C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238E9C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     int v0, v1;
     const u16 * v2;
@@ -1312,7 +1312,7 @@ static void ov104_02238E9C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238EF8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238EF8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     int v0, v1;
     const u16 * v2;
@@ -1342,7 +1342,7 @@ static void ov104_02238EF8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238F54 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238F54 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     int v0;
     u32 v1, v2;
@@ -1367,7 +1367,7 @@ static void ov104_02238F54 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FAC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FAC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1375,7 +1375,7 @@ static void ov104_02238FAC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FB8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FB8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1383,7 +1383,7 @@ static void ov104_02238FB8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FC0 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FC0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1391,7 +1391,7 @@ static void ov104_02238FC0 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FC8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FC8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1399,7 +1399,7 @@ static void ov104_02238FC8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FD0 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FD0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1407,7 +1407,7 @@ static void ov104_02238FD0 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FD8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FD8 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1415,7 +1415,7 @@ static void ov104_02238FD8 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FE4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FE4 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1426,7 +1426,7 @@ static void ov104_02238FE4 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FF0 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FF0 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1437,7 +1437,7 @@ static void ov104_02238FF0 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02238FFC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02238FFC (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
 
@@ -1445,13 +1445,13 @@ static void ov104_02238FFC (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_02239004 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02239004 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
     return;
 }
 
-static void ov104_02239008 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02239008 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     u16 v0;
     UnkStruct_02073C74 * v1;
@@ -1459,13 +1459,13 @@ static void ov104_02239008 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF
     return;
 }
 
-static void ov104_0223900C (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_0223900C (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
     return;
 }
 
-static void ov104_02239010 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, u8 param2)
+static void ov104_02239010 (UnkStruct_ov104_0223BFFC * param0, Party * param1, u8 param2)
 {
     UnkStruct_02073C74 * v0;
     return;
@@ -1503,7 +1503,7 @@ u16 ov104_02239014 (UnkStruct_ov104_0223BFFC * param0)
     return v0;
 }
 
-void ov104_02239054 (UnkStruct_02079FF4 * param0, UnkStruct_02079FF4 * param1, int param2, int param3)
+void ov104_02239054 (Party * param0, Party * param1, int param2, int param3)
 {
     u16 v0;
     UnkStruct_02073C74 * v1;
diff --git a/src/overlay104/ov104_0223A0C4.c b/src/overlay104/ov104_0223A0C4.c
index 884ce71d6e..e49117dea4 100644
--- a/src/overlay104/ov104_0223A0C4.c
+++ b/src/overlay104/ov104_0223A0C4.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0202D764.h"
@@ -907,7 +907,7 @@ UnkStruct_ov6_02240D5C * ov104_0223A580 (UnkStruct_0204AFC4 * param0, UnkStruct_
     u32 v2;
     UnkStruct_ov6_02240D5C * v3;
     UnkStruct_021C0794 * v4;
-    UnkStruct_02079FF4 * v5;
+    Party * v5;
     UnkStruct_02073C74 * v6;
 
     v3 = sub_02051D8C(param0->unk_04, ov104_0223A700(param0->unk_0F));
diff --git a/src/overlay104/ov104_0223AF58.c b/src/overlay104/ov104_0223AF58.c
index 43eeb73a38..ee767f9ec5 100644
--- a/src/overlay104/ov104_0223AF58.c
+++ b/src/overlay104/ov104_0223AF58.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0204B184.h"
 #include "overlay006/struct_ov6_02240D5C.h"
@@ -1581,7 +1581,7 @@ UnkStruct_ov6_02240D5C * ov104_0223B250 (UnkStruct_ov104_0223B5C0 * param0, UnkS
     UnkStruct_ov104_0223A348_sub1 v10;
     UnkStruct_0204B184 * v11;
     UnkStruct_02025E6C * v12;
-    UnkStruct_02079FF4 * v13;
+    Party * v13;
 
     v6 = (param0->unk_05 * 2);
     v4 = ov104_0223B500(param0->unk_04);
@@ -1805,7 +1805,7 @@ u8 ov104_0223B5C0 (UnkStruct_ov104_0223B5C0 * param0)
 {
     u32 v0;
     int v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_02073C74 * v3;
 
     v2 = GetPartyFromSavedata(param0->unk_6FC);
@@ -1863,7 +1863,7 @@ static u16 ov104_0223B644 (u8 param0)
 
 u16 ov104_0223B64C (UnkStruct_ov104_0223B5C0 * param0)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     UnkStruct_02073C74 * v1;
     u16 v2, v3;
 
diff --git a/src/overlay104/ov104_0223B6F4.c b/src/overlay104/ov104_0223B6F4.c
index d07d24ef23..2239eda38a 100644
--- a/src/overlay104/ov104_0223B6F4.c
+++ b/src/overlay104/ov104_0223B6F4.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0204B184.h"
 #include "overlay006/struct_ov6_02240D5C.h"
@@ -39,10 +39,10 @@ UnkStruct_ov6_02240D5C * ov104_0223B810(UnkStruct_ov104_0223BA10 * param0, UnkSt
 static u32 ov104_0223B9E4(u8 param0);
 u8 ov104_0223BA10(UnkStruct_ov104_0223BA10 * param0);
 BOOL ov104_0223BA14(u8 param0);
-void ov104_0223BA24(UnkStruct_02079FF4 * param0);
+void ov104_0223BA24(Party * param0);
 void ov104_0223BAB8(UnkStruct_ov104_0223BA10 * param0);
 void ov104_0223BA7C(UnkStruct_ov104_0223BA10 * param0, UnkStruct_02073C74 * param1);
-void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2);
+void ov104_0223BAA0(UnkStruct_ov104_0223BA10 * param0, Party * param1, UnkStruct_02073C74 * param2);
 static u16 ov104_0223BB10(UnkStruct_ov104_0223BA10 * param0);
 u16 ov104_0223BB60(UnkStruct_ov104_0223BA10 * param0);
 u16 ov104_0223BC24(u16 param0);
@@ -279,7 +279,7 @@ BOOL ov104_0223BA14 (u8 param0)
     return 0;
 }
 
-void ov104_0223BA24 (UnkStruct_02079FF4 * param0)
+void ov104_0223BA24 (Party * param0)
 {
     int v0, v1, v2;
     u32 v3;
@@ -312,7 +312,7 @@ void ov104_0223BA7C (UnkStruct_ov104_0223BA10 * param0, UnkStruct_02073C74 * par
     return;
 }
 
-void ov104_0223BAA0 (UnkStruct_ov104_0223BA10 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2)
+void ov104_0223BAA0 (UnkStruct_ov104_0223BA10 * param0, Party * param1, UnkStruct_02073C74 * param2)
 {
     ov104_0223BA7C(param0, param2);
     Party_AddPokemon(param1, param2);
diff --git a/src/overlay104/ov104_0223BCBC.c b/src/overlay104/ov104_0223BCBC.c
index 23674b2b97..3a4e255f4c 100644
--- a/src/overlay104/ov104_0223BCBC.c
+++ b/src/overlay104/ov104_0223BCBC.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0204B184.h"
 #include "overlay006/struct_ov6_02240D5C.h"
@@ -34,7 +34,7 @@ u8 ov104_0223BFFC(UnkStruct_ov104_0223BFFC * param0);
 BOOL ov104_0223C000(u8 param0);
 void ov104_0223C04C(UnkStruct_ov104_0223BFFC * param0);
 void ov104_0223C010(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02073C74 * param1);
-void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2);
+void ov104_0223C034(UnkStruct_ov104_0223BFFC * param0, Party * param1, UnkStruct_02073C74 * param2);
 u16 ov104_0223C0BC(UnkStruct_ov104_0223BFFC * param0, u8 param1);
 static u16 ov104_0223C0D0(UnkStruct_ov104_0223BFFC * param0);
 u16 ov104_0223C124(UnkStruct_ov104_0223BFFC * param0);
@@ -173,8 +173,8 @@ UnkStruct_ov6_02240D5C * ov104_0223BDD8 (UnkStruct_ov104_0223BFFC * param0, UnkS
     UnkStruct_0200B144 * v9;
     UnkStruct_02023790 * v10;
     UnkStruct_02025E6C * v11;
-    UnkStruct_02079FF4 * v12;
-    UnkStruct_02079FF4 * v13;
+    Party * v12;
+    Party * v13;
 
     v2 = ov104_0223BD70(param0->unk_10, 0);
     v3 = ov104_0223BDA4(param0->unk_10, 0);
@@ -300,7 +300,7 @@ void ov104_0223C010 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02073C74 * par
     return;
 }
 
-void ov104_0223C034 (UnkStruct_ov104_0223BFFC * param0, UnkStruct_02079FF4 * param1, UnkStruct_02073C74 * param2)
+void ov104_0223C034 (UnkStruct_ov104_0223BFFC * param0, Party * param1, UnkStruct_02073C74 * param2)
 {
     ov104_0223C010(param0, param2);
     Party_AddPokemon(param1, param2);
@@ -312,7 +312,7 @@ void ov104_0223C04C (UnkStruct_ov104_0223BFFC * param0)
     u32 v0;
     int v1, v2;
     u8 v3;
-    UnkStruct_02079FF4 * v4;
+    Party * v4;
     UnkStruct_02073C74 * v5;
     UnkStruct_02073C74 * v6;
 
diff --git a/src/overlay105/ov105_02241AE0.c b/src/overlay105/ov105_02241AE0.c
index 7ad992cfe4..4999bf2ac2 100644
--- a/src/overlay105/ov105_02241AE0.c
+++ b/src/overlay105/ov105_02241AE0.c
@@ -17,7 +17,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay105/struct_ov105_02241FF4_decl.h"
 #include "overlay105/struct_ov105_02245E1C_decl.h"
@@ -134,8 +134,8 @@ struct UnkStruct_ov105_02241FF4_t {
     UnkStruct_ov105_02246060 * unk_310;
     UnkStruct_ov105_02245E1C * unk_314;
     UnkStruct_ov105_02245E1C * unk_318;
-    UnkStruct_02079FF4 * unk_31C;
-    UnkStruct_02079FF4 * unk_320;
+    Party * unk_31C;
+    Party * unk_320;
     u16 unk_324[6];
     u16 * unk_330;
     int unk_334;
@@ -186,7 +186,7 @@ static void ov105_022451B4(UnkStruct_ov105_02241FF4 * param0);
 static void ov105_022452A0(UnkStruct_ov105_02241FF4 * param0);
 static void ov105_022452E4(void);
 static void ov105_0224531C(UnkStruct_ov105_02241FF4 * param0);
-static void ov105_022453F8(UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2, int param3, const UnkStruct_02079FF4 * param4);
+static void ov105_022453F8(UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2, int param3, const Party * param4);
 static void ov105_0224472C(UnkStruct_ov105_02241FF4 * param0);
 static void ov105_02244678(UnkStruct_ov105_02241FF4 * param0);
 static void ov105_0224473C(UnkStruct_02018340 * param0);
@@ -219,7 +219,7 @@ static void ov105_02244EE8(UnkStruct_ov105_02241FF4 * param0, u32 param1, s32 pa
 static void ov105_02244F00(UnkStruct_ov105_02241FF4 * param0, u32 param1, UnkStruct_02073C74_sub1 * param2);
 static void ov105_02244F0C(UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4);
 static void ov105_02244F84(UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4);
-static void ov105_02244FF8(UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const UnkStruct_02079FF4 * param9);
+static void ov105_02244FF8(UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const Party * param9);
 static void ov105_022450DC(UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u32 param2, u32 param3, u8 param4, u8 param5, u8 param6, u8 param7, u16 param8, u8 param9);
 static void ov105_02245464(UnkStruct_ov105_02241FF4 * param0);
 static BOOL ov105_022454F8(UnkStruct_ov105_02241FF4 * param0, u8 param1);
@@ -2762,7 +2762,7 @@ static void ov105_02244F84 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA5
     return;
 }
 
-static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const UnkStruct_02079FF4 * param9)
+static void ov105_02244FF8 (UnkStruct_ov105_02241FF4 * param0, UnkStruct_0205AA50 * param1, u8 param2, u32 param3, u32 param4, u8 param5, u8 param6, u8 param7, u8 param8, const Party * param9)
 {
     u8 v0;
     u32 v1, v2, v3;
@@ -2951,7 +2951,7 @@ static void ov105_0224531C (UnkStruct_ov105_02241FF4 * param0)
     return;
 }
 
-static void ov105_022453F8 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2, int param3, const UnkStruct_02079FF4 * param4)
+static void ov105_022453F8 (UnkStruct_ov105_02241FF4 * param0, u8 param1, u8 param2, int param3, const Party * param4)
 {
     int v0 = param2;
 
diff --git a/src/overlay106/ov106_02241AE0.c b/src/overlay106/ov106_02241AE0.c
index 4b97c976c8..9e0a296f3d 100644
--- a/src/overlay106/ov106_02241AE0.c
+++ b/src/overlay106/ov106_02241AE0.c
@@ -15,7 +15,7 @@
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay106/struct_ov106_02243118_decl.h"
 #include "overlay106/struct_ov106_02243650_decl.h"
@@ -120,7 +120,7 @@ struct UnkStruct_ov106_02243118_t {
     UnkStruct_ov106_02243650 * unk_284;
     int unk_288;
     u16 * unk_28C;
-    UnkStruct_02079FF4 * unk_290;
+    Party * unk_290;
     u8 * unk_294;
     u16 * unk_298;
     NARC * unk_29C;
@@ -1550,7 +1550,7 @@ void ov106_0224313C (UnkStruct_ov106_02243118 * param0, u16 param1, u16 param2)
 {
     int v0, v1;
     UnkStruct_02073C74 * v2;
-    UnkStruct_02079FF4 * v3;
+    Party * v3;
 
     v1 = 0;
 
diff --git a/src/overlay107/ov107_02241AE0.c b/src/overlay107/ov107_02241AE0.c
index 96eff3b567..e776153c90 100644
--- a/src/overlay107/ov107_02241AE0.c
+++ b/src/overlay107/ov107_02241AE0.c
@@ -20,7 +20,7 @@
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay107/struct_ov107_02241D6C_decl.h"
 #include "overlay107/struct_ov107_02249B8C_decl.h"
@@ -288,7 +288,7 @@ struct UnkStruct_ov107_02241D6C_t {
     UnkStruct_ov107_02249B8C * unk_430;
     UnkStruct_ov107_02249B8C * unk_434;
     u16 * unk_438;
-    UnkStruct_02079FF4 * unk_43C;
+    Party * unk_43C;
     NARC * unk_440;
     u16 unk_444[40];
     u8 unk_494;
diff --git a/src/overlay107/ov107_02245EB0.c b/src/overlay107/ov107_02245EB0.c
index 6717a9a431..1ea4a7c7bc 100644
--- a/src/overlay107/ov107_02245EB0.c
+++ b/src/overlay107/ov107_02245EB0.c
@@ -20,7 +20,7 @@
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay107/struct_ov107_02246170_decl.h"
 #include "overlay107/struct_ov107_02249B8C_decl.h"
@@ -143,7 +143,7 @@ struct UnkStruct_ov107_02246170_t {
     u8 * unk_3D0;
     u8 * unk_3D4;
     u8 * unk_3D8;
-    UnkStruct_02079FF4 * unk_3DC;
+    Party * unk_3DC;
     NARC * unk_3E0;
     u16 unk_3E4[40];
     u8 unk_434;
diff --git a/src/overlay107/ov107_02249604.c b/src/overlay107/ov107_02249604.c
index 26819c670b..f3af872c78 100644
--- a/src/overlay107/ov107_02249604.c
+++ b/src/overlay107/ov107_02249604.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_02009DC8_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "overlay019/struct_ov19_021DA864.h"
 #include "overlay022/struct_ov22_022559F8.h"
@@ -28,7 +28,7 @@
 #include "unk_0207E0B8.h"
 #include "overlay107/ov107_02249604.h"
 
-void ov107_02249604(UnkStruct_ov107_02249954 * param0, UnkStruct_02079FF4 * param1, u8 param2);
+void ov107_02249604(UnkStruct_ov107_02249954 * param0, Party * param1, u8 param2);
 UnkStruct_02022550 * ov107_022498A4(UnkStruct_ov107_02249954 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
 void ov107_02249954(UnkStruct_ov107_02249954 * param0);
 void ov107_022499BC(UnkStruct_ov107_02249954 * param0, u16 param1);
@@ -43,7 +43,7 @@ static const u8 Unk_ov107_0224A204[4] = {
     0x7
 };
 
-void ov107_02249604 (UnkStruct_ov107_02249954 * param0, UnkStruct_02079FF4 * param1, u8 param2)
+void ov107_02249604 (UnkStruct_ov107_02249954 * param0, Party * param1, u8 param2)
 {
     int v0;
     NARC * v1;
diff --git a/src/overlay108/ov108_02241AE0.c b/src/overlay108/ov108_02241AE0.c
index 2c65564477..2311aa5425 100644
--- a/src/overlay108/ov108_02241AE0.c
+++ b/src/overlay108/ov108_02241AE0.c
@@ -17,7 +17,7 @@
 #include "struct_decls/struct_020305B8_decl.h"
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay108/struct_ov108_02241DB0_decl.h"
 #include "overlay108/struct_ov108_02243594_decl.h"
@@ -226,8 +226,8 @@ struct UnkStruct_ov108_02241DB0_t {
     UnkStruct_ov108_02243594 * unk_3BC;
     int * unk_3C0;
     u16 * unk_3C4;
-    UnkStruct_02079FF4 * unk_3C8;
-    UnkStruct_02079FF4 * unk_3CC;
+    Party * unk_3C8;
+    Party * unk_3CC;
     NARC * unk_3D0;
     u16 unk_3D4[40];
     u8 unk_424;
diff --git a/src/overlay108/ov108_02243030.c b/src/overlay108/ov108_02243030.c
index 1911c04e58..a61355d0a2 100644
--- a/src/overlay108/ov108_02243030.c
+++ b/src/overlay108/ov108_02243030.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_02006C24_decl.h"
 #include "struct_decls/struct_02022550_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "overlay019/struct_ov19_021DA864.h"
 #include "overlay022/struct_ov22_022559F8.h"
@@ -30,16 +30,16 @@ static const u8 Unk_ov108_02243760[4] = {
     11, 11, 11, 11,
 };
 
-void ov108_02243030(UnkStruct_ov108_02243030 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, u8 param3);
+void ov108_02243030(UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3);
 UnkStruct_02022550 * ov108_022430F0(UnkStruct_ov108_02243030 * param0, u32 param1, u32 param2, u32 param3, u32 param4, u32 param5, int param6, u8 param7);
 void ov108_02243194(UnkStruct_ov108_02243030 * param0);
 static void ov108_022431FC(void);
 static void ov108_02243230(UnkStruct_ov108_02243030 * param0);
 static void ov108_022432B4(UnkStruct_ov108_02243030 * param0);
-static void ov108_02243360(UnkStruct_ov108_02243030 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, u8 param3);
+static void ov108_02243360(UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3);
 static void ov108_02243490(UnkStruct_ov108_02243030 * param0);
 
-void ov108_02243030 (UnkStruct_ov108_02243030 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, u8 param3)
+void ov108_02243030 (UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3)
 {
     int v0;
 
@@ -181,7 +181,7 @@ static void ov108_022432B4 (UnkStruct_ov108_02243030 * param0)
     return;
 }
 
-static void ov108_02243360 (UnkStruct_ov108_02243030 * param0, UnkStruct_02079FF4 * param1, UnkStruct_02079FF4 * param2, u8 param3)
+static void ov108_02243360 (UnkStruct_ov108_02243030 * param0, Party * param1, Party * param2, u8 param3)
 {
     UnkStruct_02073C74 * v0;
     UnkStruct_02073C74 * v1;
diff --git a/src/overlay109/ov109_021D0D80.c b/src/overlay109/ov109_021D0D80.c
index a6a5044482..8ff8fbfdc2 100644
--- a/src/overlay109/ov109_021D0D80.c
+++ b/src/overlay109/ov109_021D0D80.c
@@ -16,7 +16,7 @@
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0200D0F4.h"
 #include "struct_defs/struct_0205AA50.h"
@@ -289,7 +289,7 @@ typedef struct UnkStruct_ov109_021D0F70_t {
     int unk_18;
     int unk_1C;
     u32 unk_20;
-    UnkStruct_02079FF4 * unk_24;
+    Party * unk_24;
     UnkStruct_ov109_021D2D78 * unk_28;
     UnkStruct_ov109_021D0F70_sub1 unk_2C;
     u8 unk_AC[32];
@@ -429,7 +429,7 @@ static BOOL ov109_021D3B54(UnkStruct_ov109_021D0F70 * param0, int param1);
 static void ov109_021D3B70(UnkStruct_ov109_021D0F70 * param0, int param1);
 static int ov109_021D3BC4(UnkStruct_ov109_021D0F70 * param0);
 static BOOL ov109_021D3C08(UnkStruct_ov109_021D0F70 * param0, fx32 param1, int param2);
-static BOOL ov109_021D3C94(UnkStruct_02079FF4 * param0);
+static BOOL ov109_021D3C94(Party * param0);
 static BOOL ov109_021D3CD8(UnkStruct_ov109_021D0F70 * param0);
 static int ov109_021D3D1C(UnkStruct_ov109_021D0F70 * param0);
 static BOOL ov109_021D3D3C(UnkStruct_ov109_021D0F70 * param0);
@@ -3523,11 +3523,11 @@ static BOOL ov109_021D3B54 (UnkStruct_ov109_021D0F70 * param0, int param1)
 static void ov109_021D3B70 (UnkStruct_ov109_021D0F70 * param0, int param1)
 {
     int v0, v1;
-    UnkStruct_02079FF4 * v2, * v3;
+    Party * v2, * v3;
     UnkStruct_02073C74 * v4, * v5;
 
     v2 = param0->unk_24;
-    v3 = (UnkStruct_02079FF4 *)sub_0209C188(param0->unk_D0, param1);
+    v3 = (Party *)sub_0209C188(param0->unk_D0, param1);
 
     v0 = param0->unk_CC->unk_04;
     v1 = param0->unk_2C.unk_18[param1];
@@ -3597,7 +3597,7 @@ static BOOL ov109_021D3C08 (UnkStruct_ov109_021D0F70 * param0, fx32 param1, int
     return 0;
 }
 
-static BOOL ov109_021D3C94 (UnkStruct_02079FF4 * param0)
+static BOOL ov109_021D3C94 (Party * param0)
 {
     int v0, v1;
     UnkStruct_02073C74 * v2;
@@ -3625,7 +3625,7 @@ static BOOL ov109_021D3CD8 (UnkStruct_ov109_021D0F70 * param0)
 
     {
         int v0;
-        UnkStruct_02079FF4 * v1;
+        Party * v1;
 
         for (v0 = 0; v0 < 5; v0++) {
             if (ov109_021D3B54(param0, v0)) {
diff --git a/src/overlay113/ov113_0225C700.c b/src/overlay113/ov113_0225C700.c
index 285bf9d7d3..6966f310fd 100644
--- a/src/overlay113/ov113_0225C700.c
+++ b/src/overlay113/ov113_0225C700.c
@@ -19,7 +19,7 @@
 #include "struct_decls/struct_020203AC_decl.h"
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0200D0F4.h"
@@ -1339,7 +1339,7 @@ UnkStruct_ov113_022607EC * ov113_0225DD44 (UnkStruct_ov113_0225DBCC * param0)
 
 static void ov113_0225DD4C (int param0, UnkStruct_021C0794 * param1, UnkStruct_ov113_02260818 * param2)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     int v1;
     UnkStruct_02073C74 * v2;
     int v3;
diff --git a/src/party.c b/src/party.c
index 8b1fdb37e1..37d4cf5952 100644
--- a/src/party.c
+++ b/src/party.c
@@ -4,111 +4,111 @@
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_02073C74.h"
-#include "struct_defs/struct_02079FF4.h"
+#include "struct_defs/struct_party.h"
 
 #include "heap.h"
 #include "unk_020244AC.h"
 #include "unk_02073C2C.h"
 #include "party.h"
 
-#define PARTY_ASSERT_SLOT(party, slot) {      \
-    GF_ASSERT(slot >= 0);                     \
-    GF_ASSERT(slot < (party)->unk_04);        \
-    GF_ASSERT(slot < (party)->unk_00);        \
+#define PARTY_ASSERT_SLOT(party, slot) {        \
+    GF_ASSERT(slot >= 0);                       \
+    GF_ASSERT(slot < (party)->currentCount);    \
+    GF_ASSERT(slot < (party)->capacity);        \
 }
 
 int Party_sizeof (void)
 {
-    return sizeof(UnkStruct_02079FF4);
+    return sizeof(Party);
 }
 
-UnkStruct_02079FF4 * sub_02079FF4 (u32 param0)
+Party * sub_02079FF4 (u32 param0)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
 
-    v0 = AllocFromHeap(param0, sizeof(UnkStruct_02079FF4));
+    v0 = AllocFromHeap(param0, sizeof(Party));
     sub_0207A008(v0);
 
     return v0;
 }
 
-void sub_0207A008 (UnkStruct_02079FF4 * param0)
+void sub_0207A008 (Party * param0)
 {
     Party_InitWithCapacity(param0, 6);
 }
 
-void Party_InitWithCapacity (UnkStruct_02079FF4 * party, int capacity)
+void Party_InitWithCapacity (Party * party, int capacity)
 {
     int i;
 
     GF_ASSERT(capacity <= 6);
-    memset(party, 0, sizeof(UnkStruct_02079FF4));
+    memset(party, 0, sizeof(Party));
 
-    party->unk_04 = 0;
-    party->unk_00 = capacity;
+    party->currentCount = 0;
+    party->capacity = capacity;
 
     for (i = 0; i < 6; i++) {
-        sub_02073C2C(&party->unk_08[i]);
+        sub_02073C2C(&party->pokemon[i]);
     }
 }
 
-BOOL Party_AddPokemon (UnkStruct_02079FF4 * party, UnkStruct_02073C74 * pokemon)
+BOOL Party_AddPokemon (Party * party, UnkStruct_02073C74 * pokemon)
 {
-    if (party->unk_04 >= party->unk_00) {
+    if (party->currentCount >= party->capacity) {
         return FALSE;
     }
 
-    party->unk_08[party->unk_04] = *pokemon;
-    party->unk_04++;
+    party->pokemon[party->currentCount] = *pokemon;
+    party->currentCount++;
 
     return TRUE;
 }
 
-BOOL Party_RemovePokemonBySlotIndex (UnkStruct_02079FF4 * party, int slot)
+BOOL Party_RemovePokemonBySlotIndex (Party * party, int slot)
 {
     int i;
 
     PARTY_ASSERT_SLOT(party, slot);
-    GF_ASSERT(party->unk_04 > 0);
+    GF_ASSERT(party->currentCount > 0);
 
-    for (i = slot; i < party->unk_04 - 1; i++) {
-        party->unk_08[i] = party->unk_08[i + 1];
+    for (i = slot; i < party->currentCount - 1; i++) {
+        party->pokemon[i] = party->pokemon[i + 1];
     }
 
-    sub_02073C2C(&party->unk_08[i]);
-    party->unk_04--;
+    sub_02073C2C(&party->pokemon[i]);
+    party->currentCount--;
 
     return TRUE;
 }
 
-int Party_GetCapacity (const UnkStruct_02079FF4 * party)
+int Party_GetCapacity (const Party * party)
 {
-    return party->unk_00;
+    return party->capacity;
 }
 
-int Party_GetCurrentCount (const UnkStruct_02079FF4 * party)
+int Party_GetCurrentCount (const Party * party)
 {
-    return party->unk_04;
+    return party->currentCount;
 }
 
-UnkStruct_02073C74 * Party_GetPokemonBySlotIndex (const UnkStruct_02079FF4 * party, int slot)
+UnkStruct_02073C74 * Party_GetPokemonBySlotIndex (const Party * party, int slot)
 {
     PARTY_ASSERT_SLOT(party, slot);
-    return (UnkStruct_02073C74 *)&party->unk_08[slot];
+    return (UnkStruct_02073C74 *)&party->pokemon[slot];
 }
 
-void sub_0207A128 (UnkStruct_02079FF4 * party, int slot, UnkStruct_02073C74 * param2)
+void sub_0207A128 (Party * party, int slot, UnkStruct_02073C74 * param2)
 {
     int v0;
 
     PARTY_ASSERT_SLOT(party, slot);
 
-    v0 = sub_02074470(&(party->unk_08[slot]), 172, NULL) - sub_02074470(param2, 172, NULL);
-    party->unk_08[slot] = *param2;
-    party->unk_04 += v0;
+    v0 = sub_02074470(&(party->pokemon[slot]), 172, NULL) - sub_02074470(param2, 172, NULL);
+    party->pokemon[slot] = *param2;
+    party->currentCount += v0;
 }
 
-BOOL Party_SwapSlots (UnkStruct_02079FF4 * party, int slotA, int slotB)
+BOOL Party_SwapSlots (Party * party, int slotA, int slotB)
 {
     struct UnkStruct_02073C74_t * tempPokemon;
 
@@ -116,38 +116,38 @@ BOOL Party_SwapSlots (UnkStruct_02079FF4 * party, int slotA, int slotB)
     PARTY_ASSERT_SLOT(party, slotB);
 
     tempPokemon = AllocFromHeap(0, sizeof(struct UnkStruct_02073C74_t));
-    *tempPokemon = party->unk_08[slotA];
+    *tempPokemon = party->pokemon[slotA];
 
-    party->unk_08[slotA] = party->unk_08[slotB];
-    party->unk_08[slotB] = *tempPokemon;
+    party->pokemon[slotA] = party->pokemon[slotB];
+    party->pokemon[slotB] = *tempPokemon;
 
     FreeToHeap(tempPokemon);
 
     return FALSE;
 }
 
-void Party_cpy (const UnkStruct_02079FF4 * src, UnkStruct_02079FF4 * dest)
+void Party_cpy (const Party * src, Party * dest)
 {
     *dest = *src;
 }
 
-BOOL Party_HasPokemon (const UnkStruct_02079FF4 * party, int species)
+BOOL Party_HasPokemon (const Party * party, int species)
 {
     int i;
 
-    for (i = 0; i < party->unk_04; i++) {
-        if (sub_02074470((UnkStruct_02073C74 *)&party->unk_08[i], 5, NULL) == species) {
+    for (i = 0; i < party->currentCount; i++) {
+        if (sub_02074470((UnkStruct_02073C74 *)&party->pokemon[i], 5, NULL) == species) {
             break;
         }
     }
 
-    return i != party->unk_04;
+    return i != party->currentCount;
 }
 
-UnkStruct_02079FF4 * GetPartyFromSavedata (UnkStruct_021C0794 * param0)
+Party * GetPartyFromSavedata (UnkStruct_021C0794 * param0)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
 
-    v0 = (UnkStruct_02079FF4 *)sub_020245BC(param0, 2);
+    v0 = (Party *)sub_020245BC(param0, 2);
     return v0;
 }
diff --git a/src/unk_02028124.c b/src/unk_02028124.c
index c46e856a81..a20fbd0ba9 100644
--- a/src/unk_02028124.c
+++ b/src/unk_02028124.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_02014A84.h"
@@ -95,7 +95,7 @@ void sub_020281AC (UnkStruct_0202818C * param0, u8 param1, u8 param2, UnkStruct_
     u16 v4;
     u32 v5, v6, v7;
     UnkStruct_02025E6C * v8;
-    UnkStruct_02079FF4 * v9;
+    Party * v9;
     UnkStruct_02073C74 * v10;
 
     sub_02028124(param0);
diff --git a/src/unk_0202DF8C.c b/src/unk_0202DF8C.c
index fae7dc16bc..2ae47817c9 100644
--- a/src/unk_0202DF8C.c
+++ b/src/unk_0202DF8C.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_02023790_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0202DF8C.h"
 #include "struct_defs/struct_0202DFA8.h"
@@ -29,7 +29,7 @@ void sub_0202DF94 (UnkStruct_0202DF8C * param0)
     MI_CpuClear32(param0, sizeof(UnkStruct_0202DF8C));
 }
 
-void sub_0202DFA8 (UnkStruct_0202DF8C * param0, const UnkStruct_02079FF4 * param1, const RTCDate * param2)
+void sub_0202DFA8 (UnkStruct_0202DF8C * param0, const Party * param1, const RTCDate * param2)
 {
     UnkStruct_0202DFA8 * v0;
     UnkStruct_02073C74 * v1;
diff --git a/src/unk_0202F1D4.c b/src/unk_0202F1D4.c
index d5f968d711..1ef33aae57 100644
--- a/src/unk_0202F1D4.c
+++ b/src/unk_0202F1D4.c
@@ -14,7 +14,7 @@
 #include "struct_defs/struct_02030A80.h"
 #include "struct_defs/struct_02073C74.h"
 #include "struct_defs/struct_02078B40.h"
-#include "struct_defs/struct_02079FF4.h"
+#include "struct_defs/struct_party.h"
 #include "overlay006/struct_ov6_02240D5C.h"
 
 #include "unk_02006224.h"
@@ -34,8 +34,8 @@
 
 UnkStruct_0202F264 * Unk_021C07A4 = NULL;
 
-static void sub_0202FCE8(const UnkStruct_02079FF4 * param0, UnkStruct_0202FD30 * param1);
-static void sub_0202FD30(UnkStruct_0202FD30 * param0, UnkStruct_02079FF4 * param1);
+static void sub_0202FCE8(const Party * param0, UnkStruct_0202FD30 * param1);
+static void sub_0202FD30(UnkStruct_0202FD30 * param0, Party * param1);
 static BOOL sub_0202F75C(UnkStruct_021C0794 * param0, UnkStruct_0202F264 * param1);
 static BOOL sub_0202F794(UnkStruct_021C0794 * param0, const UnkStruct_0202F264 * param1);
 static void sub_0202F860(void * param0, u32 param1, u32 param2);
@@ -579,7 +579,7 @@ void sub_0202FAFC (UnkStruct_ov6_02240D5C * param0, UnkStruct_021C0794 * param1)
     }
 }
 
-static void sub_0202FCE8 (const UnkStruct_02079FF4 * param0, UnkStruct_0202FD30 * param1)
+static void sub_0202FCE8 (const Party * param0, UnkStruct_0202FD30 * param1)
 {
     int v0;
     UnkStruct_02073C74 * v1;
@@ -595,7 +595,7 @@ static void sub_0202FCE8 (const UnkStruct_02079FF4 * param0, UnkStruct_0202FD30
     }
 }
 
-static void sub_0202FD30 (UnkStruct_0202FD30 * param0, UnkStruct_02079FF4 * param1)
+static void sub_0202FD30 (UnkStruct_0202FD30 * param0, Party * param1)
 {
     int v0;
     UnkStruct_02073C74 * v1;
diff --git a/src/unk_0203A9C8.c b/src/unk_0203A9C8.c
index dd7fefb587..095c79932c 100644
--- a/src/unk_0203A9C8.c
+++ b/src/unk_0203A9C8.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "struct_decls/struct_0207CB08_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
@@ -1329,7 +1329,7 @@ static BOOL sub_0203BC5C (UnkStruct_020508D4 * param0)
     break;
     case 4:
     {
-        UnkStruct_02079FF4 * v7;
+        Party * v7;
         UnkStruct_02073C74 * v8;
         u32 v9;
         u16 v10;
@@ -1936,7 +1936,7 @@ static void sub_0203C7B8 (UnkStruct_020508D4 * param0)
     UnkStruct_0203CDB0 * v0;
     UnkStruct_020708E0 * v1;
     UnkStruct_0203C7B8 * v2;
-    UnkStruct_02079FF4 * v3;
+    Party * v3;
     UnkStruct_02073C74 * v4;
     UnkStruct_0207AE68 * v5;
 
diff --git a/src/unk_0203D1B8.c b/src/unk_0203D1B8.c
index 30ccc84801..f77438f244 100644
--- a/src/unk_0203D1B8.c
+++ b/src/unk_0203D1B8.c
@@ -15,7 +15,7 @@
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_decls/struct_0209747C_decl.h"
@@ -1550,7 +1550,7 @@ void sub_0203E2D4 (UnkStruct_0203CDB0 * param0, void * param1)
 void sub_0203E2FC (UnkStruct_0203CDB0 * param0)
 {
     UnkStruct_0203E2FC v0;
-    UnkStruct_02079FF4 * v1 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v1 = GetPartyFromSavedata(param0->unk_0C);
     UnkStruct_02073C74 * v2 = ov5_021E7278(v1);
 
     GF_ASSERT(v2 != NULL);
diff --git a/src/unk_0203F6C4.c b/src/unk_0203F6C4.c
index 20849d78ad..5be437e00d 100644
--- a/src/unk_0203F6C4.c
+++ b/src/unk_0203F6C4.c
@@ -36,7 +36,7 @@
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay005/struct_ov5_021DC1A4_decl.h"
 #include "overlay005/struct_ov5_021E1FF4_decl.h"
@@ -7005,7 +7005,7 @@ static BOOL sub_02045344 (UnkStruct_0203E724 * param0)
 {
     u16 v0 = inline_02049538(param0);
     u16 * v1 = inline_0204FCAC(param0);
-    UnkStruct_02079FF4 * v2 = GetPartyFromSavedata(param0->unk_34->unk_0C);
+    Party * v2 = GetPartyFromSavedata(param0->unk_34->unk_0C);
 
     *v1 = Party_HasPokemon(v2, v0);
     return 1;
@@ -7014,7 +7014,7 @@ static BOOL sub_02045344 (UnkStruct_0203E724 * param0)
 static BOOL sub_02045384 (UnkStruct_0203E724 * param0)
 {
     u16 v0 = inline_02049538(param0);
-    UnkStruct_02079FF4 * v1 = GetPartyFromSavedata(param0->unk_34->unk_0C);
+    Party * v1 = GetPartyFromSavedata(param0->unk_34->unk_0C);
     int v2;
     int v3;
     int v4 = Party_GetCurrentCount(v1);
@@ -7040,7 +7040,7 @@ static BOOL sub_02045404 (UnkStruct_0203E724 * param0)
     UnkStruct_02073C74 * v0;
     int v1, v2, v3, v4, v5, v6;
     u16 * v7 = inline_0204FCAC(param0);
-    UnkStruct_02079FF4 * v8 = GetPartyFromSavedata(param0->unk_34->unk_0C);
+    Party * v8 = GetPartyFromSavedata(param0->unk_34->unk_0C);
     int v9 = Party_GetCurrentCount(v8);
 
     v3 = 0;
@@ -8288,7 +8288,7 @@ static u32 sub_0204676C (UnkStruct_021C0794 * param0)
     v3 = 0;
 
     {
-        UnkStruct_02079FF4 * v4;
+        Party * v4;
         int v5;
 
         v4 = GetPartyFromSavedata(param0);
@@ -8451,7 +8451,7 @@ static BOOL sub_0204698C (UnkStruct_0203E724 * param0)
 static BOOL sub_020469D0 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     u16 v2 = inline_02049538(param0);
 
     v1 = GetPartyFromSavedata(param0->unk_34->unk_0C);
diff --git a/src/unk_02048DD8.c b/src/unk_02048DD8.c
index 824614df32..f840101e6e 100644
--- a/src/unk_02048DD8.c
+++ b/src/unk_02048DD8.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0203E724_decl.h"
 #include "struct_decls/struct_02056B24_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0202E7D8.h"
 #include "struct_defs/struct_0202E7E4.h"
@@ -130,7 +130,7 @@ BOOL sub_02048F74 (UnkStruct_0203E724 * param0)
 
 BOOL sub_02048F98 (UnkStruct_0203E724 * param0)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_34->unk_0C);
+    Party * v0 = GetPartyFromSavedata(param0->unk_34->unk_0C);
     UnkStruct_02073C74 * v1 = Party_GetPokemonBySlotIndex(v0, inline_02049538(param0));
 
     sub_0206D60C(param0->unk_34, v1);
@@ -217,7 +217,7 @@ BOOL sub_0204912C (UnkStruct_0203E724 * param0)
     switch (sub_0203E838(param0)) {
     case 0:
     {
-        UnkStruct_02079FF4 * v1 = GetPartyFromSavedata(param0->unk_34->unk_0C);
+        Party * v1 = GetPartyFromSavedata(param0->unk_34->unk_0C);
         UnkStruct_02073C74 * v2 = Party_GetPokemonBySlotIndex(v1, inline_02049538(param0));
 
         sub_0206CF48(v0, v2, 4);
@@ -287,7 +287,7 @@ static void sub_0204922C (UnkStruct_0200B358 * param0, int param1, const u16 * p
 
 static void sub_02049268 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param1)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
     UnkStruct_02073C74 * v1 = sub_02054A74(v0);
 
     sub_0200B538(param1, 0, sub_02076B10(v1));
diff --git a/src/unk_02049D08.c b/src/unk_02049D08.c
index 1042c1675d..2f12df2136 100644
--- a/src/unk_02049D08.c
+++ b/src/unk_02049D08.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_0203068C_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
@@ -163,7 +163,7 @@ BOOL sub_02049EC4 (u16 param0, UnkStruct_021C0794 * param1, u8 param2)
 {
     u8 v0, v1, v2, v3;
     u16 v4, v5;
-    UnkStruct_02079FF4 * v6;
+    Party * v6;
     UnkStruct_02073C74 * v7;
     UnkStruct_02049D38 v8[6];
 
@@ -433,7 +433,7 @@ BOOL sub_0204A378 (UnkStruct_0204AFC4 * param0, void ** param1, UnkStruct_021C07
 {
     u16 v0 = 0;
     UnkStruct_02098C44 * v1 = *param1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_02073C74 * v3;
 
     if ((v1->unk_23 != 0) || (v1->unk_22 == 7)) {
@@ -460,7 +460,7 @@ int sub_0204A410 (UnkStruct_0204AFC4 * param0, UnkStruct_021C0794 * param1)
 {
     u16 v0 = 0, v1 = 0;
     u16 v2[4], v3[4];
-    UnkStruct_02079FF4 * v4;
+    Party * v4;
     UnkStruct_02073C74 * v5;
 
     v4 = GetPartyFromSavedata(param1);
@@ -552,7 +552,7 @@ BOOL sub_0204A57C (UnkStruct_0204AFC4 * param0)
 
 static void sub_0204A5A0 (UnkStruct_0204AFC4 * param0, UnkStruct_021C0794 * param1, u16 param2)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
 
     if ((param0->unk_0F != 0) && (param0->unk_0F != 1)) {
         return;
@@ -951,7 +951,7 @@ static u16 sub_0204AC54 (UnkStruct_021C0794 * param0, u8 param1, UnkStruct_0204A
     u8 v0 = 1;
     u8 v1;
     int v2;
-    UnkStruct_02079FF4 * v3;
+    Party * v3;
     UnkStruct_02073C74 * v4;
 
     v3 = GetPartyFromSavedata(param0);
@@ -1026,7 +1026,7 @@ static void sub_0204AE20 (UnkStruct_0204AFC4 * param0, UnkStruct_021C0794 * para
 {
     int v0 = 0;
     UnkStruct_ov104_0223A348_sub2 * v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_02073C74 * v3;
 
     v1 = AllocFromHeapAtEnd(param0->unk_04, sizeof(UnkStruct_ov104_0223A348_sub2) * 3);
diff --git a/src/unk_0204AEE8.c b/src/unk_0204AEE8.c
index eee12db4fd..7f184a5687 100644
--- a/src/unk_0204AEE8.c
+++ b/src/unk_0204AEE8.c
@@ -9,7 +9,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026324_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
@@ -202,7 +202,7 @@ u16 sub_0204B044 (UnkStruct_0203CDB0 * param0, const u16 * param1)
 void sub_0204B060 (UnkStruct_0204AFC4 * param0, UnkStruct_021C0794 * param1)
 {
     int v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkStruct_02073C74 * v2;
     UnkStruct_02025E6C * v3 = sub_02025E38(param1);
 
diff --git a/src/unk_0204B830.c b/src/unk_0204B830.c
index f4c6a78bc1..84936bc64c 100644
--- a/src/unk_0204B830.c
+++ b/src/unk_0204B830.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_02056B24_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 
 #include "struct_defs/struct_0202610C.h"
@@ -163,7 +163,7 @@ BOOL sub_0204B85C (UnkStruct_0203E724 * param0)
 
 static BOOL sub_0204BA50 (UnkStruct_0203CDB0 * param0, void * param1)
 {
-    UnkStruct_02079FF4 * v0 = GetPartyFromSavedata(param0->unk_0C);
+    Party * v0 = GetPartyFromSavedata(param0->unk_0C);
 
     if (Party_GetCurrentCount(v0) < 6) {
         return 1;
@@ -190,7 +190,7 @@ static void sub_0204BAAC (UnkStruct_0203CDB0 * param0, void * param1)
     UnkUnion_0204C4D0 * v0 = sub_0204B844(param0);
     UnkStruct_02025E6C * v1 = sub_02025E38(param0->unk_0C);
     UnkStruct_020507E4 * v2 = sub_020507E4(param0->unk_0C);
-    UnkStruct_02079FF4 * v3;
+    Party * v3;
     UnkStruct_02073C74 * v4;
     BOOL v5;
     UnkStruct_02073C74 * v6 = NULL;
diff --git a/src/unk_0204CA84.c b/src/unk_0204CA84.c
index 03023a7009..24992371ca 100644
--- a/src/unk_0204CA84.c
+++ b/src/unk_0204CA84.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02026310_decl.h"
 #include "struct_decls/struct_0203E724_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
@@ -65,7 +65,7 @@ BOOL sub_0204CAEC (UnkStruct_0203E724 * param0)
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
     UnkStruct_021C0794 * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2 = (UnkStruct_02026310 *)(sub_020245BC(v1, 8));
-    UnkStruct_02079FF4 * v3 = GetPartyFromSavedata(v0->unk_0C);
+    Party * v3 = GetPartyFromSavedata(v0->unk_0C);
     UnkStruct_02025E6C * v4 = sub_02025E38(sub_0203D174(param0->unk_34));
 
     ov5_021E6EA8(v2, v3, v4);
@@ -76,7 +76,7 @@ BOOL sub_0204CB20 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
     UnkStruct_02026310 * v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_0200B358 ** v3 = sub_0203F098(v0, 15);
     UnkStruct_021C0794 * v4 = v0->unk_0C;
     u16 * v5 = inline_0204FCAC(param0);
@@ -122,7 +122,7 @@ BOOL sub_0204CBD4 (UnkStruct_0203E724 * param0)
 BOOL sub_0204CC24 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkStruct_0200B358 ** v2 = sub_0203F098(param0->unk_34, 15);
     u16 v3 = sub_0203E838(param0);
     u16 v4 = inline_02049538(param0);
@@ -139,7 +139,7 @@ BOOL sub_0204CC78 (UnkStruct_0203E724 * param0)
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
     UnkStruct_021C0794 * v1 = v0->unk_0C;
     UnkStruct_02026310 * v2;
-    UnkStruct_02079FF4 * v3;
+    Party * v3;
     u8 v4 = inline_02049538(param0);
 
     v3 = GetPartyFromSavedata(v0->unk_0C);
diff --git a/src/unk_0204CFFC.c b/src/unk_0204CFFC.c
index b0a7e1eebb..71e9c649b7 100644
--- a/src/unk_0204CFFC.c
+++ b/src/unk_0204CFFC.c
@@ -7,7 +7,7 @@
 #include "struct_decls/struct_0203E724_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
 #include "struct_defs/struct_0203E724_t.h"
@@ -34,7 +34,7 @@ BOOL sub_0204CFFC (UnkStruct_0203E724 * param0)
 {
     int v0 = sub_0203A138(param0->unk_34->unk_1C->unk_00);
     int v1 = 24;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_0203CDB0 * v3 = param0->unk_34;
     u16 v4 = inline_02049538(param0);
     u16 v5 = inline_02049538(param0);
@@ -92,7 +92,7 @@ BOOL sub_0204D154 (UnkStruct_0203E724 * param0)
     int v0;
     u8 v1;
     BOOL v2;
-    UnkStruct_02079FF4 * v3;
+    Party * v3;
     UnkStruct_02073C74 * v4;
     UnkStruct_0203CDB0 * v5 = param0->unk_34;
     UnkStruct_02025E6C * v6 = sub_02025E38(v5->unk_0C);
@@ -641,7 +641,7 @@ BOOL sub_0204DC98 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
     UnkStruct_02073C74 * v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     u16 * v3 = inline_0204FCAC(param0);
     u16 v4 = inline_02049538(param0);
     u8 v5, v6;
@@ -671,7 +671,7 @@ BOOL sub_0204DD28 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
     UnkStruct_02073C74 * v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     u16 * v3 = inline_0204FCAC(param0);
     u16 v4 = inline_02049538(param0);
     u8 v5, v6, v7;
@@ -716,7 +716,7 @@ BOOL sub_0204DE00 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_0203CDB0 * v0 = param0->unk_34;
     UnkStruct_02073C74 * v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     u16 * v3 = inline_0204FCAC(param0);
     u16 v4 = inline_02049538(param0);
     u8 v5, v6;
@@ -765,7 +765,7 @@ BOOL sub_0204DE94 (UnkStruct_0203E724 * param0)
 BOOL sub_0204DF08 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02073C74 * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3, v4, v5, v6;
 
@@ -822,7 +822,7 @@ BOOL sub_0204E01C (UnkStruct_0203E724 * param0)
 BOOL sub_0204E094 (UnkStruct_0203E724 * param0)
 {
     UnkStruct_02073C74 * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     u16 * v2 = inline_0204FCAC(param0);
     u16 v3, v4, v5;
 
@@ -857,7 +857,7 @@ BOOL sub_0204E12C (UnkStruct_0203E724 * param0)
     u8 v0, v1;
     u16 v2;
     UnkStruct_02073C74 * v3;
-    UnkStruct_02079FF4 * v4;
+    Party * v4;
     UnkStruct_0203CDB0 * v5 = param0->unk_34;
     u16 * v6 = inline_0204FCAC(param0);
     u16 v7 = inline_02049538(param0);
@@ -887,7 +887,7 @@ BOOL sub_0204E12C (UnkStruct_0203E724 * param0)
 BOOL sub_0204E1D0 (UnkStruct_0203E724 * param0)
 {
     int v0, v1;
-    UnkStruct_02079FF4 * v2;
+    Party * v2;
     UnkStruct_02073C74 * v3;
     UnkStruct_0203CDB0 * v4 = param0->unk_34;
     u16 v5 = inline_02049538(param0);
diff --git a/src/unk_0204F13C.c b/src/unk_0204F13C.c
index c71b003b60..8c5dbd68b3 100644
--- a/src/unk_0204F13C.c
+++ b/src/unk_0204F13C.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0203E724_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "constdata/const_020F1E88.h"
@@ -159,7 +159,7 @@ static BOOL sub_0204F268 (u16 param0, UnkStruct_021C0794 * param1)
 {
     u8 v0, v1, v2, v3;
     u16 v4, v5;
-    UnkStruct_02079FF4 * v6;
+    Party * v6;
     UnkStruct_02073C74 * v7;
     u16 v8[6];
 
diff --git a/src/unk_02050A74.c b/src/unk_02050A74.c
index 297a9a519e..6170318599 100644
--- a/src/unk_02050A74.c
+++ b/src/unk_02050A74.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_020797DC_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0202610C.h"
 #include "struct_defs/struct_0202BE38.h"
@@ -512,7 +512,7 @@ static BOOL sub_02051074 (UnkStruct_020508D4 * param0)
             }
         } else {
             UnkStruct_020797DC * v7 = sub_02024420(v0->unk_0C);
-            UnkStruct_02079FF4 * v8 = GetPartyFromSavedata(v0->unk_0C);
+            Party * v8 = GetPartyFromSavedata(v0->unk_0C);
 
             if ((sub_020799A0(v7) == 18) && (Party_GetCurrentCount(v8) == 6)) {
                 sub_0203E8E0(param0, 8822, NULL, NULL);
@@ -890,7 +890,7 @@ void sub_020517E8 (UnkStruct_0203CDB0 * param0, const u8 * param1, int param2)
     sub_02050904(param0, sub_02051790, v0);
 }
 
-void sub_0205184C (UnkStruct_0203CDB0 * param0, const UnkStruct_02079FF4 * param1, int param2)
+void sub_0205184C (UnkStruct_0203CDB0 * param0, const Party * param1, int param2)
 {
     UnkStruct_02050ACC * v0;
     UnkStruct_ov6_02240D5C * v1;
diff --git a/src/unk_02051B50.c b/src/unk_02051B50.c
index eec13ec7a0..c8d40c5d4d 100644
--- a/src/unk_02051B50.c
+++ b/src/unk_02051B50.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "overlay006/struct_ov6_02240D5C.h"
 
@@ -55,7 +55,7 @@ static const UnkStruct_020EC208 Unk_020EC208[35] = {
 };
 
 static u32 sub_02051C20(u32 param0);
-static u32 sub_02051CD0(UnkStruct_02079FF4 * param0, int param1);
+static u32 sub_02051CD0(Party * param0, int param1);
 static u32 sub_02051B50(const UnkStruct_ov6_02240D5C * param0);
 static u32 sub_02051BBC(u32 param0, const UnkStruct_ov6_02240D5C * param1);
 static u32 sub_02051BE8(u32 param0, const UnkStruct_ov6_02240D5C * param1);
@@ -219,7 +219,7 @@ static u32 sub_02051C20 (u32 param0)
     return v0;
 }
 
-static u32 sub_02051CD0 (UnkStruct_02079FF4 * param0, int param1)
+static u32 sub_02051CD0 (Party * param0, int param1)
 {
     UnkStruct_02073C74 * v0;
     u32 v1;
diff --git a/src/unk_02051D8C.c b/src/unk_02051D8C.c
index 310d67e2af..76402820f8 100644
--- a/src/unk_02051D8C.c
+++ b/src/unk_02051D8C.c
@@ -11,7 +11,7 @@
 #include "struct_decls/struct_0202CC84_decl.h"
 #include "struct_decls/struct_0203A790_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_decls/struct_0207D99C_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
@@ -233,7 +233,7 @@ void sub_0205213C (UnkStruct_ov6_02240D5C * param0, UnkStruct_02073C74 * param1,
     GF_ASSERT(v0);
 }
 
-void sub_02052164 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_02079FF4 * param1, int param2)
+void sub_02052164 (UnkStruct_ov6_02240D5C * param0, const Party * param1, int param2)
 {
     GF_ASSERT(param2 < 4);
     Party_cpy(param1, param0->unk_04[param2]);
@@ -253,7 +253,7 @@ void sub_020521A4 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0202CC84 * p
 void sub_020521B8 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1, UnkStruct_021C0794 * param2, int param3, UnkStruct_0202B628 * param4, UnkStruct_0207D99C * param5, UnkStruct_0209C370 * param6)
 {
     UnkStruct_02025E6C * v0 = sub_02025E38(param2);
-    UnkStruct_02079FF4 * v1 = GetPartyFromSavedata(param2);
+    Party * v1 = GetPartyFromSavedata(param2);
     UnkStruct_0207D3C0 * v2 = sub_0207D990(param2);
     UnkStruct_02026324 * v3 = sub_02027560(param2);
     UnkStruct_0202CC84 * v4 = sub_0202CC98(param2);
@@ -308,7 +308,7 @@ void sub_02052348 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * p
     int v0;
     u32 v1;
     UnkStruct_02025E6C * v2 = sub_02025E38(param1->unk_0C);
-    UnkStruct_02079FF4 * v3 = GetPartyFromSavedata(param1->unk_0C);
+    Party * v3 = GetPartyFromSavedata(param1->unk_0C);
     UnkStruct_0207D3C0 * v4 = sub_0207D990(param1->unk_0C);
     UnkStruct_02026324 * v5 = sub_02027560(param1->unk_0C);
     UnkStruct_0202CC84 * v6 = sub_0202CC98(param1->unk_0C);
@@ -356,7 +356,7 @@ void sub_02052348 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * p
     sub_02052894(param0);
 }
 
-void sub_020524E4 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1, const UnkStruct_02079FF4 * param2, const u8 * param3)
+void sub_020524E4 (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * param1, const Party * param2, const u8 * param3)
 {
     UnkStruct_02025E6C * v0 = sub_02025E38(param1->unk_0C);
     UnkStruct_0207D3C0 * v1 = sub_0207D990(param1->unk_0C);
@@ -442,7 +442,7 @@ void sub_020526CC (UnkStruct_ov6_02240D5C * param0, const UnkStruct_0203CDB0 * p
 void sub_020526E8 (const UnkStruct_ov6_02240D5C * param0, UnkStruct_0203CDB0 * param1)
 {
     UnkStruct_02025E6C * v0 = sub_02025E38(param1->unk_0C);
-    UnkStruct_02079FF4 * v1 = GetPartyFromSavedata(param1->unk_0C);
+    Party * v1 = GetPartyFromSavedata(param1->unk_0C);
     UnkStruct_0207D3C0 * v2 = sub_0207D990(param1->unk_0C);
     UnkStruct_02026324 * v3 = sub_02027560(param1->unk_0C);
     u16 * v4 = sub_0203A784(sub_0203A790(param1->unk_0C));
@@ -458,7 +458,7 @@ void sub_020526E8 (const UnkStruct_ov6_02240D5C * param0, UnkStruct_0203CDB0 * p
 void sub_02052754 (const UnkStruct_ov6_02240D5C * param0, UnkStruct_0203CDB0 * param1)
 {
     UnkStruct_02025E6C * v0 = sub_02025E38(param1->unk_0C);
-    UnkStruct_02079FF4 * v1 = GetPartyFromSavedata(param1->unk_0C);
+    Party * v1 = GetPartyFromSavedata(param1->unk_0C);
     UnkStruct_0207D3C0 * v2 = sub_0207D990(param1->unk_0C);
     UnkStruct_02026324 * v3 = sub_02027560(param1->unk_0C);
 
diff --git a/src/unk_02052C6C.c b/src/unk_02052C6C.c
index ffa0380e97..f5ae09fc74 100644
--- a/src/unk_02052C6C.c
+++ b/src/unk_02052C6C.c
@@ -8,7 +8,7 @@
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_020279FC.h"
 #include "struct_defs/struct_0202DF8C.h"
@@ -73,7 +73,7 @@ static BOOL sub_02052FFC(UnkStruct_0205300C * param0);
 static void sub_02052C6C (UnkStruct_0203CDB0 * param0, BOOL param1)
 {
     UnkStruct_0202DF8C * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     RTCDate v2;
     int v3;
 
@@ -187,7 +187,7 @@ void sub_02052E58 (UnkStruct_020508D4 * param0)
     UnkStruct_02025E6C * v4;
     UnkStruct_0205300C * v5;
     UnkStruct_0202CD88 * v6;
-    UnkStruct_02079FF4 * v7;
+    Party * v7;
 
     v0 = sub_02050A60(param0);
     v5 = AllocFromHeap(32, sizeof(UnkStruct_0205300C));
diff --git a/src/unk_02054884.c b/src/unk_02054884.c
index 98085c2646..1f6f884e52 100644
--- a/src/unk_02054884.c
+++ b/src/unk_02054884.c
@@ -3,7 +3,7 @@
 
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "unk_02017038.h"
@@ -33,7 +33,7 @@ BOOL sub_020548B0 (int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param
     BOOL v0;
     UnkStruct_02073C74 * v1;
     u32 v2;
-    UnkStruct_02079FF4 * v3;
+    Party * v3;
     UnkStruct_02025E6C * v4;
 
     v4 = sub_02025E38(param1);
@@ -62,7 +62,7 @@ BOOL sub_02054930 (int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param
     int v0;
     BOOL v1;
     UnkStruct_02025E6C * v2 = sub_02025E38(param1);
-    UnkStruct_02079FF4 * v3 = GetPartyFromSavedata(param1);
+    Party * v3 = GetPartyFromSavedata(param1);
     UnkStruct_02073C74 * v4 = sub_02073C74(32);
 
     sub_02073C2C(v4);
@@ -76,12 +76,12 @@ BOOL sub_02054930 (int param0, UnkStruct_021C0794 * param1, u16 param2, u8 param
     return v1;
 }
 
-void sub_02054988 (UnkStruct_02079FF4 * param0, int param1, int param2, u16 param3)
+void sub_02054988 (Party * param0, int param1, int param2, u16 param3)
 {
     sub_020771F8(Party_GetPokemonBySlotIndex(param0, param1), param3, param2);
 }
 
-int sub_020549A0 (UnkStruct_02079FF4 * param0, u16 param1)
+int sub_020549A0 (Party * param0, u16 param1)
 {
     int v0, v1;
     UnkStruct_02073C74 * v2;
@@ -104,7 +104,7 @@ int sub_020549A0 (UnkStruct_02079FF4 * param0, u16 param1)
     return 0xff;
 }
 
-int sub_02054A10 (const UnkStruct_02079FF4 * param0)
+int sub_02054A10 (const Party * param0)
 {
     int v0, v1, v2;
     UnkStruct_02073C74 * v3;
@@ -123,7 +123,7 @@ int sub_02054A10 (const UnkStruct_02079FF4 * param0)
     return v2;
 }
 
-UnkStruct_02073C74 * sub_02054A40 (const UnkStruct_02079FF4 * param0)
+UnkStruct_02073C74 * sub_02054A40 (const Party * param0)
 {
     int v0, v1;
     UnkStruct_02073C74 * v2;
@@ -142,7 +142,7 @@ UnkStruct_02073C74 * sub_02054A40 (const UnkStruct_02079FF4 * param0)
     return NULL;
 }
 
-UnkStruct_02073C74 * sub_02054A74 (const UnkStruct_02079FF4 * param0)
+UnkStruct_02073C74 * sub_02054A74 (const Party * param0)
 {
     u16 v0, v1;
     UnkStruct_02073C74 * v2;
@@ -160,7 +160,7 @@ UnkStruct_02073C74 * sub_02054A74 (const UnkStruct_02079FF4 * param0)
     return NULL;
 }
 
-BOOL sub_02054AB0 (const UnkStruct_02079FF4 * param0)
+BOOL sub_02054AB0 (const Party * param0)
 {
     if (sub_02054A10(param0) >= 2) {
         return 1;
@@ -169,7 +169,7 @@ BOOL sub_02054AB0 (const UnkStruct_02079FF4 * param0)
     }
 }
 
-void sub_02054AC4 (UnkStruct_02079FF4 * param0)
+void sub_02054AC4 (Party * param0)
 {
     int v0, v1;
     u8 v2 = 1;
@@ -186,7 +186,7 @@ void sub_02054AC4 (UnkStruct_02079FF4 * param0)
     }
 }
 
-int sub_02054B04 (UnkStruct_02079FF4 * param0, u16 param1)
+int sub_02054B04 (Party * param0, u16 param1)
 {
     int v0 = 0;
     int v1 = 0;
diff --git a/src/unk_020559DC.c b/src/unk_020559DC.c
index ce04aba548..39241677f0 100644
--- a/src/unk_020559DC.c
+++ b/src/unk_020559DC.c
@@ -5,7 +5,7 @@
 
 #include "struct_decls/struct_0202440C_decl.h"
 #include "struct_decls/struct_020507E4_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
 #include "struct_defs/struct_02055BA8.h"
@@ -98,7 +98,7 @@ static void sub_02055AC0 (UnkStruct_0203CDB0 * param0, s32 param1)
     sub_0202D80C(sub_0202D834(param0->unk_0C), sub_0202B428(sub_0202B4A0(param0->unk_0C)));
 
     {
-        UnkStruct_02079FF4 * v0;
+        Party * v0;
 
         v0 = GetPartyFromSavedata(param0->unk_0C);
         sub_020777B4(v0, param1);
@@ -144,7 +144,7 @@ static void sub_02055B64 (UnkStruct_0203CDB0 * param0, s32 param1, const RTCTime
     }
 
     {
-        UnkStruct_02079FF4 * v1;
+        Party * v1;
 
         v1 = GetPartyFromSavedata(param0->unk_0C);
         sub_02077BD8(v1, param1, param2);
diff --git a/src/unk_0205964C.c b/src/unk_0205964C.c
index 327ef189e4..23392ec63a 100644
--- a/src/unk_0205964C.c
+++ b/src/unk_0205964C.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_02029894_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
@@ -436,7 +436,7 @@ static void sub_02059BF4 (void)
     sub_02059B74();
 }
 
-static void sub_02059C2C (BOOL param0, const UnkStruct_02079FF4 * param1)
+static void sub_02059C2C (BOOL param0, const Party * param1)
 {
     if (param1) {
         Unk_021C084C->unk_44 = sub_02079FF4(11);
diff --git a/src/unk_0205A0D8.c b/src/unk_0205A0D8.c
index c3a6d66f56..9373110f6a 100644
--- a/src/unk_0205A0D8.c
+++ b/src/unk_0205A0D8.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "constdata/const_020F1E88.h"
@@ -76,7 +76,7 @@ typedef struct {
     u8 unk_44;
     u8 * unk_48;
     u8 * unk_4C;
-    UnkStruct_02079FF4 * unk_50;
+    Party * unk_50;
     UnkStruct_0205AA50 unk_54;
     UnkStruct_0205AA50 unk_64;
     UnkStruct_02025E6C * unk_74;
@@ -124,7 +124,7 @@ static void sub_0205AAA0(UnkStruct_0205A0D8 * param0, BOOL param1);
 static void sub_0205AF18(UnkStruct_0205A0D8 * param0, int param1);
 static BOOL sub_0205AD20(UnkStruct_0205A0D8 * param0);
 
-static void sub_0205A0D8 (UnkStruct_0205A0D8 * param0, UnkStruct_0203CDB0 * param1, UnkStruct_02079FF4 * param2, int param3, int param4, int param5)
+static void sub_0205A0D8 (UnkStruct_0205A0D8 * param0, UnkStruct_0203CDB0 * param1, Party * param2, int param3, int param4, int param5)
 {
     UnkStruct_02098D38 * v0;
     UnkStruct_021C0794 * v1;
@@ -751,7 +751,7 @@ static UnkStruct_0205A0D8 * sub_0205AC74 (UnkStruct_0203CDB0 * param0)
 
 static void sub_0205AC80 (UnkStruct_0205A0D8 * param0, BOOL param1)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
     UnkStruct_0205AD20 * v1;
     u8 * v2;
     int v3, v4;
diff --git a/src/unk_0205DFC4.c b/src/unk_0205DFC4.c
index aadf3ada62..2c7f0ffb16 100644
--- a/src/unk_0205DFC4.c
+++ b/src/unk_0205DFC4.c
@@ -5,7 +5,7 @@
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02061AB4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
 #include "struct_defs/struct_0203CDB0.h"
@@ -262,7 +262,7 @@ u16 sub_0205E1B4 (UnkStruct_021C0794 * param0)
 BOOL sub_0205E1F8 (UnkStruct_021C0794 * param0)
 {
     int v0, v1, v2, v3 = 0;
-    UnkStruct_02079FF4 * v4;
+    Party * v4;
     static const u16 v5[] = {377, 378, 379};
     u16 v6[6];
 
diff --git a/src/unk_0206CCB0.c b/src/unk_0206CCB0.c
index c7c8ffeb44..cb1033f6c3 100644
--- a/src/unk_0206CCB0.c
+++ b/src/unk_0206CCB0.c
@@ -16,7 +16,7 @@
 #include "struct_decls/struct_020507E4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
 #include "struct_decls/struct_02073C74_sub1_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 #include "overlay006/struct_ov6_022465F4_decl.h"
 
@@ -1040,7 +1040,7 @@ void sub_0206D7C4 (UnkStruct_0203CDB0 * param0)
     u8 v4, v5;
     UnkStruct_02073C74 * v6;
     UnkUnion_0206D1B8 v7;
-    UnkStruct_02079FF4 * v8;
+    Party * v8;
     UnkStruct_0206D8B0 * v9 = &v7.val11;
 
     v0 = 0;
@@ -2966,7 +2966,7 @@ static int sub_0206F160 (UnkStruct_0203CDB0 * param0, UnkStruct_0200B358 * param
     UnkStruct_02023790 * v0;
     u16 v1, v2;
     UnkStruct_02073C74 * v3;
-    UnkStruct_02079FF4 * v4;
+    Party * v4;
     UnkStruct_02025E6C * v5 = sub_02025E38(param0->unk_0C);
     UnkStruct_02026324 * v6 = sub_02027560(param0->unk_0C);
 
diff --git a/src/unk_020722AC.c b/src/unk_020722AC.c
index 7feb776957..f7ed116afa 100644
--- a/src/unk_020722AC.c
+++ b/src/unk_020722AC.c
@@ -14,7 +14,7 @@
 #include "struct_decls/struct_02028430_decl.h"
 #include "struct_decls/struct_020508D4_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 #include "struct_decls/struct_021C0794_decl.h"
 
@@ -1003,7 +1003,7 @@ static BOOL sub_02073060 (UnkStruct_02072334 * param0)
 static void sub_020730B8 (UnkStruct_02072334 * param0, u8 param1, BOOL param2)
 {
     UnkStruct_02072EB8 * v0;
-    UnkStruct_02079FF4 * v1;
+    Party * v1;
     UnkStruct_02073C74 * v2;
 
     v0 = &(param0->unk_1C[param0->unk_18]);
diff --git a/src/unk_02073C2C.c b/src/unk_02073C2C.c
index 14d0b4f3f9..68129abfb3 100644
--- a/src/unk_02073C2C.c
+++ b/src/unk_02073C2C.c
@@ -13,7 +13,7 @@
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202CC84_decl.h"
 #include "struct_decls/struct_02073C74_sub2_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_02007C10.h"
 #include "struct_defs/struct_02008A90.h"
@@ -179,7 +179,7 @@ u8 sub_02076AF8(UnkStruct_02073C74 * param0);
 u8 sub_02076B00(UnkStruct_02073C74_sub1 * param0);
 UnkStruct_02073C74_sub1 * sub_02076B10(UnkStruct_02073C74 * param0);
 u8 sub_02076B14(UnkStruct_02073C74 * param0);
-u16 sub_02076B94(UnkStruct_02079FF4 * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4);
+u16 sub_02076B94(Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4);
 void sub_02077020(UnkStruct_02073C74_sub1 * param0);
 u16 sub_020770C4(UnkStruct_02073C74 * param0, u16 param1);
 u16 sub_020770D4(UnkStruct_02073C74_sub1 * param0, u16 param1);
@@ -194,7 +194,7 @@ void sub_0207734C(UnkStruct_02073C74_sub1 * param0, int param1, int param2);
 void sub_02077408(UnkStruct_02073C74 * param0, u32 param1);
 BOOL sub_0207749C(UnkStruct_02073C74 * param0, u16 param1);
 void sub_020774C8(UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74 * param1);
-u8 sub_02077550(UnkStruct_02079FF4 * param0);
+u8 sub_02077550(Party * param0);
 u16 sub_020775A4(u16 param0);
 u16 sub_020775C4(u16 param0);
 void sub_020775EC(UnkStruct_02073C74 * param0, UnkStruct_02073C74 * param1);
@@ -203,10 +203,10 @@ void sub_02077618(UnkStruct_02073C74 * param0, UnkStruct_02073C74_sub1 * param1)
 s8 sub_0207762C(UnkStruct_02073C74 * param0, int param1);
 s8 sub_02077634(UnkStruct_02073C74_sub1 * param0, int param1);
 s8 sub_02077648(u32 param0, int param1);
-void sub_020776B0(UnkStruct_02079FF4 * param0);
-u8 sub_02077758(UnkStruct_02079FF4 * param0, u8 param1);
-void sub_020777B4(UnkStruct_02079FF4 * param0, s32 param1);
-void sub_0207782C(UnkStruct_02079FF4 * param0);
+void sub_020776B0(Party * param0);
+u8 sub_02077758(Party * param0, u8 param1);
+void sub_020777B4(Party * param0, s32 param1);
+void sub_0207782C(Party * param0);
 BOOL sub_020778D8(UnkStruct_02073C74 * param0);
 BOOL sub_020778E0(UnkStruct_02073C74_sub1 * param0);
 BOOL sub_020778F8(UnkStruct_02073C74 * param0);
@@ -3199,7 +3199,7 @@ u8 sub_02076B14 (UnkStruct_02073C74 * param0)
     return 0;
 }
 
-u16 sub_02076B94 (UnkStruct_02079FF4 * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4)
+u16 sub_02076B94 (Party * param0, UnkStruct_02073C74 * param1, u8 param2, u16 param3, int * param4)
 {
     u16 v0;
     u16 v1;
@@ -3746,7 +3746,7 @@ void sub_020774C8 (UnkStruct_02073C74_sub1 * param0, UnkStruct_02073C74 * param1
     sub_0207418C(param1);
 }
 
-u8 sub_02077550 (UnkStruct_02079FF4 * param0)
+u8 sub_02077550 (Party * param0)
 {
     u8 v0, v1;
     int v2, v3;
@@ -3844,7 +3844,7 @@ int sub_02077660 (int param0, int param1, u16 * param2)
     return v0;
 }
 
-void sub_020776B0 (UnkStruct_02079FF4 * param0)
+void sub_020776B0 (Party * param0)
 {
     u16 v0;
     u8 v1;
@@ -3885,7 +3885,7 @@ void sub_020776B0 (UnkStruct_02079FF4 * param0)
     }
 }
 
-u8 sub_02077758 (UnkStruct_02079FF4 * param0, u8 param1)
+u8 sub_02077758 (Party * param0, u8 param1)
 {
     int v0 = 0;
     int v1 = 1;
@@ -3917,7 +3917,7 @@ u8 sub_02077758 (UnkStruct_02079FF4 * param0, u8 param1)
     return v2;
 }
 
-void sub_020777B4 (UnkStruct_02079FF4 * param0, s32 param1)
+void sub_020777B4 (Party * param0, s32 param1)
 {
     int v0;
     int v1;
@@ -3949,7 +3949,7 @@ void sub_020777B4 (UnkStruct_02079FF4 * param0, s32 param1)
     }
 }
 
-void sub_0207782C (UnkStruct_02079FF4 * param0)
+void sub_0207782C (Party * param0)
 {
     int v0;
     int v1;
@@ -4144,7 +4144,7 @@ void sub_02077A64 (UnkStruct_02073C74 * param0)
     }
 }
 
-void sub_02077A9C (UnkStruct_02079FF4 * param0, int param1)
+void sub_02077A9C (Party * param0, int param1)
 {
     int v0, v1;
     UnkStruct_02073C74 * v2;
@@ -4202,7 +4202,7 @@ BOOL sub_02077B14 (UnkStruct_02073C74 * param0)
     return 0;
 }
 
-void sub_02077B8C (UnkStruct_02079FF4 * param0)
+void sub_02077B8C (Party * param0)
 {
     int v0, v1, v2, v3;
     UnkStruct_02073C74 * v4;
@@ -4221,7 +4221,7 @@ void sub_02077B8C (UnkStruct_02079FF4 * param0)
     }
 }
 
-BOOL sub_02077BD8 (UnkStruct_02079FF4 * param0, int param1, const RTCTime * param2)
+BOOL sub_02077BD8 (Party * param0, int param1, const RTCTime * param2)
 {
     s32 v0, v1;
 
diff --git a/src/unk_0207A2A8.c b/src/unk_0207A2A8.c
index 70c9bfc92e..54cd06429d 100644
--- a/src/unk_0207A2A8.c
+++ b/src/unk_0207A2A8.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_02098700_decl.h"
 
 #include "struct_defs/struct_0202610C.h"
@@ -97,7 +97,7 @@ BOOL sub_0207A2D0 (const UnkStruct_0202610C * param0, UnkStruct_02073C74 * param
     return 1;
 }
 
-int sub_0207A3AC (const UnkStruct_0202610C * param0, UnkStruct_02079FF4 * param1, const UnkStruct_02098700 * param2, u8 * param3)
+int sub_0207A3AC (const UnkStruct_0202610C * param0, Party * param1, const UnkStruct_02098700 * param2, u8 * param3)
 {
     UnkStruct_02073C74 * v0;
     int v1, v2 = 0, v3, v4, v5 = 0;
@@ -204,7 +204,7 @@ static BOOL sub_0207A514 (u16 * param0, u16 * param1, u16 * param2, int param3,
     return 0;
 }
 
-int sub_0207A594 (const UnkStruct_0202610C * param0, UnkStruct_02079FF4 * param1, const UnkStruct_02098700 * param2)
+int sub_0207A594 (const UnkStruct_0202610C * param0, Party * param1, const UnkStruct_02098700 * param2)
 {
     UnkStruct_02073C74 * v0;
     int v1, v2, v3, v4, v5 = 0;
diff --git a/src/unk_0207A6DC.c b/src/unk_0207A6DC.c
index 7d89a8ac8e..52116e344a 100644
--- a/src/unk_0207A6DC.c
+++ b/src/unk_0207A6DC.c
@@ -4,7 +4,7 @@
 #include "struct_decls/struct_0201CD38_decl.h"
 #include "struct_decls/struct_02025E6C_decl.h"
 #include "struct_decls/struct_0202CC84_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207ADB4_decl.h"
 
 #include "struct_defs/struct_02027F8C.h"
@@ -288,7 +288,7 @@ static void sub_0207A8A8 (int param0, int param1, void * param2, void * param3)
 
 BOOL sub_0207A8F4 (UnkStruct_0207A778 * param0, u32 param1)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
 
     if (sub_02035B54() != 264) {
         return 0;
@@ -378,13 +378,13 @@ static void sub_0207AA28 (int param0, int param1, void * param2, void * param3)
 
 BOOL sub_0207AA38 (UnkStruct_0207A778 * param0)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
 
     if (sub_02035B54() != 264) {
         return 0;
     }
 
-    v0 = (UnkStruct_02079FF4 *)&param0->unk_20[0];
+    v0 = (Party *)&param0->unk_20[0];
     Party_cpy(param0->unk_00->unk_04[0], v0);
 
     return 1;
@@ -525,13 +525,13 @@ static void sub_0207AC18 (int param0, int param1, void * param2, void * param3)
 
 BOOL sub_0207AC28 (UnkStruct_0207A778 * param0, int param1)
 {
-    UnkStruct_02079FF4 * v0;
+    Party * v0;
 
     if (sub_02035B54() != 264) {
         return 0;
     }
 
-    v0 = (UnkStruct_02079FF4 *)&param0->unk_20[0];
+    v0 = (Party *)&param0->unk_20[0];
     Party_cpy(param0->unk_00->unk_04[param1], v0);
 
     return 1;
diff --git a/src/unk_0207AE68.c b/src/unk_0207AE68.c
index 1ae3dbf0e8..1d3252066f 100644
--- a/src/unk_0207AE68.c
+++ b/src/unk_0207AE68.c
@@ -10,7 +10,7 @@
 #include "struct_decls/struct_0202CD88_decl.h"
 #include "struct_decls/struct_02056B24_decl.h"
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207AE68_decl.h"
 #include "struct_decls/struct_0207D3C0_decl.h"
 
@@ -68,7 +68,7 @@
 #include "unk_0207D3B8.h"
 #include "unk_0208C324.h"
 
-UnkStruct_0207AE68 * sub_0207AE68(UnkStruct_02079FF4 * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11);
+UnkStruct_0207AE68 * sub_0207AE68(Party * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11);
 static void sub_0207B0A0(UnkStruct_0201CD38 * param0, void * param1);
 BOOL sub_0207B0D0(UnkStruct_0207AE68 * param0);
 void sub_0207B0E0(UnkStruct_0207AE68 * param0);
@@ -98,7 +98,7 @@ static const u8 Unk_020F0A2C[] = {
     0x8
 };
 
-UnkStruct_0207AE68 * sub_0207AE68 (UnkStruct_02079FF4 * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11)
+UnkStruct_0207AE68 * sub_0207AE68 (Party * param0, UnkStruct_02073C74 * param1, int param2, UnkStruct_020279FC * param3, int param4, UnkStruct_02026324 * param5, UnkStruct_0207D3C0 * param6, UnkStruct_0202CD88 * param7, UnkStruct_02056B24 * param8, int param9, int param10, int param11)
 {
     UnkStruct_0207AE68 * v0;
     UnkStruct_02008A90 v1;
diff --git a/src/unk_02096420.c b/src/unk_02096420.c
index e3791530a3..7ad135bce7 100644
--- a/src/unk_02096420.c
+++ b/src/unk_02096420.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 #include "struct_decls/struct_0207D3B0_decl.h"
 
 #include "heap.h"
@@ -260,7 +260,7 @@ u8 sub_02096420 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u32 param3
     return 0;
 }
 
-u8 sub_0209693C (UnkStruct_02079FF4 * param0, u16 param1, u8 param2, u8 param3, u32 param4)
+u8 sub_0209693C (Party * param0, u16 param1, u8 param2, u8 param3, u32 param4)
 {
     UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0, param2);
     return sub_02096420(v0, param1, param3, param4);
@@ -526,7 +526,7 @@ u8 sub_02096954 (UnkStruct_02073C74 * param0, u16 param1, u16 param2, u16 param3
     return v2;
 }
 
-u8 sub_02096F14 (UnkStruct_02079FF4 * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5)
+u8 sub_02096F14 (Party * param0, u16 param1, u8 param2, u8 param3, u16 param4, u32 param5)
 {
     UnkStruct_02073C74 * v0 = Party_GetPokemonBySlotIndex(param0, param2);
 
@@ -752,7 +752,7 @@ static u8 sub_020971D0 (UnkStruct_02073C74 * param0, s32 param1, s32 param2, u16
     return 1;
 }
 
-void sub_02097284 (UnkStruct_02079FF4 * param0)
+void sub_02097284 (Party * param0)
 {
     int v0, v1, v2;
     u32 v3;
diff --git a/src/unk_0209BA80.c b/src/unk_0209BA80.c
index fced457b52..0721255362 100644
--- a/src/unk_0209BA80.c
+++ b/src/unk_0209BA80.c
@@ -2,7 +2,7 @@
 #include <string.h>
 
 #include "struct_decls/struct_02073C74_decl.h"
-#include "struct_decls/struct_02079FF4_decl.h"
+#include "struct_decls/struct_party_decl.h"
 
 #include "struct_defs/struct_02039A58.h"
 #include "struct_defs/struct_0204AFC4.h"
@@ -266,7 +266,7 @@ BOOL sub_0209BC64 (UnkStruct_0209BBA4 * param0, u16 param1, u16 param2)
 {
     int v0, v1;
     UnkStruct_02073C74 * v2;
-    UnkStruct_02079FF4 * v3;
+    Party * v3;
 
     v1 = 40;
     v3 = GetPartyFromSavedata(param0->unk_00);