summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2020-06-12 14:21:06 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2020-06-12 14:21:06 -0400
commit2d8d454dfe8691f4cd1077c50ab6f3c286c28ce1 (patch)
treed886f170831f01d8b163134f757293b467e84efe /include
parente15304cdb698c9350e4d4e80ca2a4076b9b44d6c (diff)
through GetBoxMonData
Diffstat (limited to 'include')
-rw-r--r--include/pokemon.h11
-rw-r--r--include/seals.h3
2 files changed, 5 insertions, 9 deletions
diff --git a/include/pokemon.h b/include/pokemon.h
index 3f5660e9..e2a32e83 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -356,7 +356,7 @@ struct BoxPokemon {
/* 0x000 */ u32 pid;
/* 0x004 */ u16 party_lock:1;
u16 box_lock:1;
- u16 control_4_2:1;
+ u16 checksum_fail:1;
u16 Unused:13; // Might be used for validity checks
/* 0x006 */ u16 checksum; // Stored checksum of pokemon
/* 0x008 */ PokemonDataBlock substructs[4];
@@ -364,14 +364,7 @@ struct BoxPokemon {
struct PartyPokemon
{
- /* 0x088 */ u8 slp:3;
- u8 psn:1;
- u8 brn:1;
- u8 frz:1;
- u8 prz:1;
- u8 tox:1;
- /* 0x089 */ u8 unk89;
- /* 0x08A */ u8 filler8A[2];
+ /* 0x088 */ u32 status; // slp:3, psn:1, brn:1, frz:1, prz:1, tox:1, ...
/* 0x08C */ u8 level;
/* 0x08D */ u8 capsule;
/* 0x08E */ u16 hp;
diff --git a/include/seals.h b/include/seals.h
index 89808176..fc0fc449 100644
--- a/include/seals.h
+++ b/include/seals.h
@@ -9,4 +9,7 @@ struct SealStruct
struct SealStruct * CreateNewSealsObject(u32 heap_id);
+void CopySealsObject(struct SealStruct *, struct SealStruct *);
+void FUN_02029C74(u8 *, u8 *);
+
#endif //POKEDIAMOND_SEALS_H