Decompile party.s

1 files changed, 10 insertions, 2 deletions

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);