Rename routines in pokemon.c

2 files changed, 41 insertions, 17 deletions

diff --git a/include/pokemon.h b/include/pokemon.h
index a089652d..d107bf85 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -142,8 +142,8 @@ struct PartyPokemon
     /* 0x096 */ u16 speed;
     /* 0x098 */ u16 spatk;
     /* 0x09A */ u16 spdef;
-    /* 0x09C */ struct Mail seal_something; // a struct?
-    /* 0x0D4 */ u8 sealCoords[0x18];     // u8 pairs?
+    /* 0x09C */ struct Mail mail;
+    /* 0x0D4 */ u8 sealCoords[8][3]; // seal coords
 };
 
 struct Pokemon {
@@ -279,21 +279,21 @@ u32 FUN_02069818(struct Pokemon * pokemon, u32 * r5, u16 * sp0);
 void FUN_020698E0(struct Pokemon * pokemon, int slot1, int slot2);
 void FUN_020698E8(struct BoxPokemon * boxmon, int slot1, int slot2);
 void FUN_020699A4(struct Pokemon * pokemon, u32 slot);
-void FUN_02069A64(struct BoxPokemon * src, struct Pokemon * dest);
-u8 FUN_02069AEC(struct PlayerParty * party);
+void CopyBoxPokemonToPokemon(struct BoxPokemon * src, struct Pokemon * dest);
+u8 Party_GetMaxLevel(struct PlayerParty * party);
 u16 SpeciesToSinnohDexNo(u16 species);
-u16 FUN_02069B60(u16 sinnoh_dex);
-void FUN_02069B88(struct Pokemon * src, struct Pokemon * dest);
-void FUN_02069BA0(struct Pokemon * src, struct BoxPokemon * dest);
-void FUN_02069BB4(struct BoxPokemon * src, struct BoxPokemon * dest);
-s8 FUN_02069BC8(struct Pokemon * pokemon, int flavor);
-int FUN_02069BFC(u16 species, u32 forme, u16 * dest);
-void FUN_02069C4C(struct PlayerParty * party);
-void FUN_02069D50(struct PlayerParty * party, int r5);
-void FUN_02069DC8(struct PlayerParty * party);
-BOOL FUN_02069E74(struct Pokemon * pokemon);
-BOOL FUN_02069E94(struct Pokemon * pokemon);
-void FUN_02069EC4(struct Pokemon * pokemon);
+u16 SinnohDexNoToSpecies(u16 sinnoh_dex);
+void CopyPokemonToPokemon(struct Pokemon * src, struct Pokemon * dest);
+void CopyPokemonToBoxPokemon(struct Pokemon * src, struct BoxPokemon * dest);
+void CopyBoxPokemonToBoxPokemon(struct BoxPokemon * src, struct BoxPokemon * dest);
+s8 MonGetFlavorPreference(struct Pokemon * pokemon, int flavor);
+int Species_LoadLearnsetTable(u16 species, u32 forme, u16 * dest);
+void Party_GivePokerusAtRandom(struct PlayerParty * party);
+void Party_UpdatePokerus(struct PlayerParty * party, int r5);
+void Party_SpreadPokerus(struct PlayerParty * party);
+BOOL Pokemon_HasPokerus(struct Pokemon * pokemon);
+BOOL Pokemon_IsImmuneToPokerus(struct Pokemon * pokemon);
+void Pokemon_UpdateArceusForme(struct Pokemon * pokemon);
 void FUN_02069FB0(u32 r7, u32 r5, u32 r4, u32 r6, u32 sp18, u32 sp1C, u32 sp20);
 void FUN_0206A014(struct Pokemon * pokemon, struct PlayerData * a1, u32 pokeball, u32 a3, u32 encounterType, u32 heap_id);
 void FUN_0206A094(struct Pokemon * pokemon, u32 a1, u32 a2);
@@ -305,7 +305,7 @@ BOOL IsPokemonLegendaryOrMythical(u16 species);
 u16 GetLegendaryMon(u32 idx);
 BOOL FUN_0206A998(struct Pokemon * pokemon);
 BOOL FUN_0206A9AC(struct BoxPokemon * boxmon, struct PlayerData * sb2, u32 heap_id);
-void FUN_0206AA84(struct Pokemon * pokemon);
+void Pokemon_RemoveCapsule(struct Pokemon * pokemon);
 void RestoreBoxMonPP(struct BoxPokemon * boxmon);
 
 #endif //POKEDIAMOND_POKEMON_H
diff --git a/include/seal.h b/include/seal.h
new file mode 100644
index 00000000..9e31e2e4
--- /dev/null
+++ b/include/seal.h
@@ -0,0 +1,24 @@
+#ifndef POKEDIAMOND_SEAL_H
+#define POKEDIAMOND_SEAL_H
+
+typedef u8 Coords8[3];
+typedef Coords8 CapsuleArray[8];
+
+struct SealCase
+{
+    CapsuleArray coords[12];
+    u8 padding_120[0x50];
+};
+
+u32 FUN_02029C58(void);
+void FUN_02029C60(struct SealCase * sealCase);
+void FUN_02029C74(const CapsuleArray * a0, CapsuleArray * a1);
+struct SealCase * FUN_02029C80(struct SaveBlock2 * sav2);
+CapsuleArray * FUN_02029C8C(struct SealCase * sealCase, s32 idx);
+void FUN_02029CA4(struct SealCase * sealCase, const CapsuleArray * src, s32 idx);
+Coords8 * FUN_02029CC8(CapsuleArray * a0, s32 a1);
+u8 FUN_02029CE0(Coords8 * a0);
+u8 FUN_02029CE4(Coords8 * a0);
+u8 FUN_02029CE8(Coords8 * a0);
+
+#endif //POKEDIAMOND_SEAL_H