summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/code_8094F88.h2
-rw-r--r--include/global.h5
-rw-r--r--include/pokemon.h9
-rw-r--r--include/sub_8095228.h17
4 files changed, 18 insertions, 15 deletions
diff --git a/include/code_8094F88.h b/include/code_8094F88.h
index 32ef7a5..9af6c7a 100644
--- a/include/code_8094F88.h
+++ b/include/code_8094F88.h
@@ -4,7 +4,7 @@
struct unkStruct_203B480
{
u8 unk0;
- struct unkPokeSubStruct_4 unk4;
+ struct DungeonLocation unk4;
u32 unk8;
u32 unkC;
u32 unk10;
diff --git a/include/global.h b/include/global.h
index 81388a8..5c71009 100644
--- a/include/global.h
+++ b/include/global.h
@@ -32,4 +32,9 @@
#define ARRAY_COUNT(array) (sizeof(array) / sizeof((array)[0]))
+struct DungeonLocation {
+ u8 dungeonIndex;
+ u8 dungeonFloor;
+};
+
#endif // GUARD_GLOBAL_H
diff --git a/include/pokemon.h b/include/pokemon.h
index c50dc75..6b514c8 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -19,11 +19,6 @@ struct Offense {
u8 def[2];
};
-struct unkPokeSubStruct_4 {
- u8 dungeonIndex;
- u8 dungeonFloor;
-};
-
struct unkPokeSubStruct_C
{
u8 unk0;
@@ -36,7 +31,7 @@ struct PokemonStruct
/* 0x0 */ u16 unk0; // recruited??
/* 0x1 */ bool8 isLeader;
/* 0x3 */ u8 unkHasNextStage; // set to a random value?
- /* 0x4 */ struct unkPokeSubStruct_4 unk4;
+ /* 0x4 */ struct DungeonLocation unk4;
/* 0x8 */ s16 speciesNum; // species #
/* 0xC */ struct unkPokeSubStruct_C unkC[2];
/* 0x14 */ s16 IQ;
@@ -77,7 +72,7 @@ struct PokemonStruct2
u16 unk0; // corresponds to unk0 inPokemonStruct
bool8 isLeader; // unk2
u8 unkHasNextStage; // unk3
- struct unkPokeSubStruct_4 unk4; // unk4
+ struct DungeonLocation unk4; // unk4
u16 IQ; // IQ (other offset)
u16 unkA;
u16 unkC;
diff --git a/include/sub_8095228.h b/include/sub_8095228.h
index 3fd5993..9541d20 100644
--- a/include/sub_8095228.h
+++ b/include/sub_8095228.h
@@ -3,13 +3,16 @@
struct unkStruct_8095228
{
- u8 unk0;
- u8 unk1;
- u8 unk2;
- u8 unk3;
- u8 unk4;
- u8 padding[0x10 - 0x5];
- u32 unk10;
+ /* 0x0 */ u8 mailType; // mail type
+ /* 0x1 */ u8 missionType; // mission type
+ /* 0x2 */ u8 unk2;
+ /* 0x3 */ u8 unk3;
+ /* 0x4 */ u8 dungeon; // dungeon
+ /* 0x5 */ u8 floor; // floor
+ /* 0x8 */ u32 unk8;
+ /* 0xC */ s16 clientSpecies; // client pokemon
+ /* 0xE */ s16 targetSpecies; // target
+ u32 unk10; // TODO: verify that this is just a union of the 4 bytes in Wonder Mail
u8 padding2[0x20 - 0x14];
struct ItemSlot unk20;
u8 padding3[0x28 - 0x24];