From a5c90b097045a50df6ecb7cc37ce50f3fc9f142f Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Tue, 1 Mar 2022 19:40:00 -0800
Subject: decomp some more saving functions

---
 include/pokemon.h | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'include/pokemon.h')

diff --git a/include/pokemon.h b/include/pokemon.h
index 912df49..d72f88e 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -34,21 +34,21 @@ struct unkPokeSubStruct_C
 struct PokemonStruct
 {
     // size: 0x58
-    u16 unk0; // recruited??
-    u8 unk2;
-    u8 unkHasNextStage;  // set to a random value?
-    struct unkPokeSubStruct_4 unk4;
+    /* 0x0 */ u16 unk0; // recruited??
+    /* 0x1 */ u8 unk2;
+    /* 0x3 */ u8 unkHasNextStage;  // set to a random value?
+    /* 0x4 */ struct unkPokeSubStruct_4 unk4;
     /* 0x8 */ s16 speciesNum; // species #
-    struct unkPokeSubStruct_C unkC[2];
+    /* 0xC */ struct unkPokeSubStruct_C unkC[2];
     /* 0x14 */ s16 IQ;
     /* 0x16 */ u16 pokeHP; // HP
     /* 0x18 */ struct Offense offense;
-    u32 unk1C;
-    u32 IQSkills;
-    u8 unk24;
-    u8 fill25[3];
-    struct HeldItem heldItem;
-    struct PokemonMove moves[MAX_MON_MOVES];
+    /* 0x1C */ u32 unk1C;
+    /* 0x20 */ u32 IQSkills;
+    /* 0x24 */ u8 unk24;
+    /* 0x25 */ u8 fill25[3];
+    /* 0x28 */ struct HeldItem heldItem;
+    /* 0x2C */ struct PokemonMove moves[MAX_MON_MOVES];
     /* 0x4C */ u8 name[POKEMON_NAME_LENGTH];
 };
 
-- 
cgit v1.2.3


From aa939e0955ec683efb5dd963430eace695a26af9 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sun, 6 Mar 2022 14:41:40 -0600
Subject: All saving functions decomped

- poke_sub_4 was determined to be Dungeon Index/Floor
- Clean up code that references these functions
---
 include/pokemon.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'include/pokemon.h')

diff --git a/include/pokemon.h b/include/pokemon.h
index d72f88e..af6c103 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -20,8 +20,8 @@ struct Offense {
 };
 
 struct unkPokeSubStruct_4 {
-    u8 unk4;
-    u8 unk5;
+    u8 dungeonIndex;
+    u8 dungeonFloor;
     u16 fill6;
 };
 
-- 
cgit v1.2.3


From 3477f61cf2f983e5851f720386128a4410d9e131 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Sun, 13 Mar 2022 17:48:04 -0700
Subject: continue doing some more decomp

---
 include/pokemon.h | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'include/pokemon.h')

diff --git a/include/pokemon.h b/include/pokemon.h
index af6c103..c50dc75 100644
--- a/include/pokemon.h
+++ b/include/pokemon.h
@@ -22,7 +22,6 @@ struct Offense {
 struct unkPokeSubStruct_4 {
     u8 dungeonIndex;
     u8 dungeonFloor;
-    u16 fill6;
 };
 
 struct unkPokeSubStruct_C
@@ -35,7 +34,7 @@ struct PokemonStruct
 {
     // size: 0x58
     /* 0x0 */ u16 unk0; // recruited??
-    /* 0x1 */ u8 unk2;
+    /* 0x1 */ bool8 isLeader;
     /* 0x3 */ u8 unkHasNextStage;  // set to a random value?
     /* 0x4 */ struct unkPokeSubStruct_4 unk4;
     /* 0x8 */ s16 speciesNum; // species #
@@ -76,7 +75,7 @@ struct PokemonStruct2
 {
     // size 0x68
     u16 unk0;  // corresponds to unk0 inPokemonStruct
-    u8 unk2;   // unk2
+    bool8 isLeader;   // unk2
     u8 unkHasNextStage;   // unk3
     struct unkPokeSubStruct_4 unk4;  // unk4
     u16 IQ;    // IQ (other offset)
-- 
cgit v1.2.3


From 57f540b320ae8439fe4b42c6149641b877c7ea73 Mon Sep 17 00:00:00 2001
From: Seth Barberee <seth.barberee@gmail.com>
Date: Mon, 21 Mar 2022 17:48:40 -0700
Subject: fix a few nonmatchings and code cleanup

---
 include/pokemon.h | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'include/pokemon.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;
-- 
cgit v1.2.3