5 files changed, 31 insertions, 11 deletions
diff --git a/include/MWC_string.h b/include/MWC_string.h
new file mode 100644
index 00000000..d2980fb6
--- /dev/null
+++ b/include/MWC_string.h
@@ -0,0 +1,8 @@
+#ifndef GUARD_MWC_STRING_H
+#define GUARD_MWC_STRING_H
+
+#include "nitro/types.h"
+
+void * memset(void *, int, u32);
+
+#endif //GUARD_MWC_STRING_H
diff --git a/include/global.h b/include/global.h
index 2574c437..88ca58ff 100644
--- a/include/global.h
+++ b/include/global.h
@@ -2,6 +2,8 @@
 #define GUARD_GLOBAL_H
 
 #include "config.h"
+
+#include "MWC_string.h"
 #include "function_target.h"
 #include "nitro.h"
 #include "constants/global.h"
diff --git a/include/party.h b/include/party.h
index b6065a3f..eca62239 100644
--- a/include/party.h
+++ b/include/party.h
@@ -3,17 +3,18 @@
 
 #include "pokemon.h"
 
-#define PARTY_SIZE 6
-
-struct PlayerParty
-{
-    u32 maxCount;
-    u32 curCount;
-    struct Pokemon mons[PARTY_SIZE];
-};
-
 BOOL PartyHasMon(struct PlayerParty * party_p, u16 species);
 int GetPartyCount(struct PlayerParty * party_p);
 struct Pokemon * GetPartyMonByIndex(struct PlayerParty * party_p, int idx);
+u32 FUN_0206B8A4(void);
+struct PlayerParty * FUN_0206B8AC(u32 heap_id);
+void FUN_0206B8C0(struct PlayerParty * party);
+void FUN_0206B8CC(struct PlayerParty * party, int count);
+BOOL FUN_0206B900(struct PlayerParty * party, struct Pokemon * pokemon);
+BOOL FUN_0206B938(struct PlayerParty * party, int pos);
+void FUN_0206B9DC(struct PlayerParty * party, int pos, struct Pokemon * pokemon);
+BOOL FUN_0206BA38(struct PlayerParty * party, int pos1, int pos2);
+void FUN_0206BAD0(struct PlayerParty * src, struct PlayerParty * dest);
+struct PlayerParty * FUN_0206BB1C(void * ptr);
 
 #endif //POKEDIAMOND_PARTY_H
diff --git a/include/pokemon.h b/include/pokemon.h
index 8e2eec3d..01a03763 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -182,8 +182,6 @@ struct Pokemon {
     /* 0x088 */ struct PartyPokemon party;
 }; // size: 0xEC
 
-#include "party.h"
-
 struct SomeDrawPokemonStruct
 {
     u16 unk0;
@@ -223,6 +221,15 @@ struct Evolution
     u16 target;
 };
 
+#define PARTY_SIZE 6
+
+struct PlayerParty
+{
+    int maxCount;
+    int curCount;
+    struct Pokemon mons[PARTY_SIZE];
+};
+
 void ZeroMonData(struct Pokemon * pokemon);
 void ZeroBoxMonData(struct BoxPokemon * boxmon);
 u32 SizeOfStructPokemon(void);
@@ -289,6 +296,7 @@ u32 FUN_020690C4(void);
 u32 FUN_020690C8(void);
 u8 FUN_020690CC(struct Pokemon * pokemon);
 struct BoxPokemon * FUN_020690E4(struct Pokemon * pokemon);
+
 u16 GetMonEvolution(struct PlayerParty * party, struct Pokemon * pokemon, u32 context, u32 usedItem, u32 * method_ret);
 u16 ReadFromPersonalPmsNarc(u16 species);
 u16 GetEggSpecies(u16 species);
diff --git a/include/proto.h b/include/proto.h
index 6f022d90..2e7d19b3 100644
--- a/include/proto.h
+++ b/include/proto.h
@@ -19,5 +19,6 @@ void FUN_02005E80(int);
 void FUN_02005E90(int, int, int, int);
 void FUN_020056AC(int, int, int, int, int);
 void FUN_020808AC(struct BoxPokemon *, int, int, int, int);
+void * FUN_02022610(void *, int);
 
 #endif //POKEDIAMOND_PROTO_H