through sub_8098BF0

5 files changed, 96 insertions, 36 deletions

diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c
index c91e45d7a..aebd13498 100644
--- a/src/pokemon/pokemon_storage_system.c
+++ b/src/pokemon/pokemon_storage_system.c
@@ -22,6 +22,12 @@ void sub_809665C(void);
 void sub_80966F4(const u8 *sourceString, u16 x, u16 y);
 void sub_8096784(struct Sprite *sprite);
 
+EWRAM_DATA struct PokemonStorage gPokemonStorage = {0};
+EWRAM_DATA u8 gUnknown_02038470[3] = {};
+EWRAM_DATA u8 gUnknown_02038473 = 0;
+EWRAM_DATA u8 gUnknown_02038474 = 0;
+EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478 = NULL;
+
 const struct PSS_MenuStringPtrs gUnknown_083B600C[] = {
     {PCText_WithdrawPoke, PCText_MovePokeToParty},
     {PCText_DepositPoke,  PCText_StorePokeInBox},
@@ -71,13 +77,7 @@ const u8 gBoxSelectionPopupCenterTiles[] = INCBIN_U8("graphics/pokemon_storage/b
 
 const u8 gBoxSelectionPopupSidesTiles[] = INCBIN_U8("graphics/pokemon_storage/box_selection_popup_sides.4bpp");
 
-EWRAM_DATA struct PokemonStorage gPokemonStorage = {0};
-EWRAM_DATA u8 gUnknown_02038470[3] = {};
-EWRAM_DATA u8 gUnknown_02038473 = 0;
-EWRAM_DATA u8 gUnknown_02038474 = 0;
-EWRAM_DATA struct UnkPSSStruct_2002370 *gUnknown_02038478 = NULL;
-
-static u8 CountPokemonInBoxN(u8 boxId)
+u8 CountPokemonInBoxN(u8 boxId)
 {
     u16 i;
     u16 count;
diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c
index 474f16323..2947562d0 100644
--- a/src/pokemon/pokemon_storage_system_2.c
+++ b/src/pokemon/pokemon_storage_system_2.c
@@ -27,15 +27,6 @@ EWRAM_DATA u8 gUnknown_0203847C = 0;
 EWRAM_DATA u8 gUnknown_0203847D = 0;
 EWRAM_DATA u8 gUnknown_0203847E = 0;
 EWRAM_DATA u8 gUnknown_0203847F = 0;
-EWRAM_DATA struct Pokemon gUnknown_02038480 = {};
-EWRAM_DATA u8 gUnknown_020384E4 = 0;
-EWRAM_DATA u8 gUnknown_020384E5 = 0;
-EWRAM_DATA u8 gUnknown_020384E6 = 0;
-EWRAM_DATA u8 gUnknown_020384E7 = 0;
-EWRAM_DATA u8 gUnknown_020384E8 = 0;
-EWRAM_DATA u8 gUnknown_020384E9 = 0;
-EWRAM_DATA u16 gUnknown_020384EA = 0;
-EWRAM_DATA u32 gUnknown_020384EC = 0;
 
 // Static ROM declarations
 
@@ -80,7 +71,6 @@ void sub_8098400(void);
 void add_to_c3_somehow(void);
 void sub_8098780(void);
 void sub_8098690(bool8 flag);
-void sub_8099200(u8 a0);
 bool8 sub_80985CC(void);
 void sub_80986E8(void);
 void sub_8098710(void);
@@ -159,7 +149,6 @@ const struct SpritePalette gWaveformSpritePalette = {
 
 // .text
 
-
 void task_intro_29(u8 whichMenu)
 {
     gUnknown_0203847D = whichMenu;
@@ -2017,22 +2006,6 @@ const struct SpriteTemplate gSpriteTemplate_83B6EFC = {
     SpriteCallbackDummy
 };
 
-const struct OamData gOamData_83B6F2C;
-
-const struct SpriteTemplate gSpriteTemplate_83B6F14 = {
-    0x000f,
-    0xdac0,
-    &gOamData_83B6F2C,
-    gDummySpriteAnimTable,
-    NULL,
-    gDummySpriteAffineAnimTable,
-    SpriteCallbackDummy
-};
-
-const struct OamData gOamData_83B6F2C = {
-    .size = 2
-};
-
 void sub_8098A38(s8 a0)
 {
     DisplayYesNoMenu(23, 10, 0);
diff --git a/src/pokemon/pokemon_storage_system_3.c b/src/pokemon/pokemon_storage_system_3.c
index 9e0052b89..eff542756 100644
--- a/src/pokemon/pokemon_storage_system_3.c
+++ b/src/pokemon/pokemon_storage_system_3.c
@@ -1,16 +1,64 @@
 
 // Includes
 #include "global.h"
+#include "sprite.h"
+#include "pokemon_icon.h"
 #include "pokemon_storage_system.h"
 
 // Static type declarations
 
 // Static RAM declarations
 
-EWRAM_DATA u16 gUnknown_02039760[0x600] = {};
-
 // Static ROM declarations
 
+void sub_80999C4(struct Sprite *sprite);
+struct Sprite *sub_8099AFC(u16 species, u32 personality, u16 a2, u16 a3, u8 a4, u8 a5);
+
 // .rodata
 
+const struct OamData gOamData_83B6F2C;
+
+const struct SpriteTemplate gSpriteTemplate_83B6F14 = {
+    0x000f,
+    0xdac0,
+    &gOamData_83B6F2C,
+    gDummySpriteAnimTable,
+    NULL,
+    gDummySpriteAffineAnimTable,
+    SpriteCallbackDummy
+};
+
+const struct OamData gOamData_83B6F2C = {
+    .size = 2
+};
+
 // .text
+
+u8 get_preferred_box(void)
+{
+    return gPokemonStorage.currentBox;
+}
+
+void sub_8098B48(void)
+{
+    u16 i;
+
+    sub_809D51C();
+    for (i = 0; i < 40; i++)
+        gPokemonStorageSystemPtr->unk_10d0[i] = 0;
+    for (i = 0; i < 40; i++)
+        gPokemonStorageSystemPtr->unk_1120[i] = 0;
+    for (i = 0; i < 6; i++)
+        gPokemonStorageSystemPtr->unk_1038[i] = 0;
+    for (i = 0; i < 30; i++)
+        gPokemonStorageSystemPtr->unk_1050[i] = 0;
+    gPokemonStorageSystemPtr->unk_1034 = NULL;
+    gPokemonStorageSystemPtr->unk_0d5c = 0;
+}
+
+void sub_8098BF0(void)
+{
+    u32 personality = GetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_PERSONALITY);
+    gPokemonStorageSystemPtr->unk_1034 = sub_8099AFC(GetMonData(&gPokemonStorageSystemPtr->unk_25b4, MON_DATA_SPECIES2), personality, 0, 0, 1, 7);
+    gPokemonStorageSystemPtr->unk_1034->callback = sub_80999C4;
+}
diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c
new file mode 100644
index 000000000..f7a008db2
--- /dev/null
+++ b/src/pokemon/pokemon_storage_system_4.c
@@ -0,0 +1,23 @@
+
+// Includes
+#include "global.h"
+#include "pokemon_storage_system.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+EWRAM_DATA struct Pokemon gUnknown_02038480 = {};
+EWRAM_DATA u8 gUnknown_020384E4 = 0;
+EWRAM_DATA u8 gUnknown_020384E5 = 0;
+EWRAM_DATA u8 gUnknown_020384E6 = 0;
+EWRAM_DATA u8 gUnknown_020384E7 = 0;
+EWRAM_DATA u8 gUnknown_020384E8 = 0;
+EWRAM_DATA u8 gUnknown_020384E9 = 0;
+EWRAM_DATA u16 gUnknown_020384EA = 0;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text
diff --git a/src/pokemon/pokemon_storage_system_5.c b/src/pokemon/pokemon_storage_system_5.c
new file mode 100644
index 000000000..f809439ff
--- /dev/null
+++ b/src/pokemon/pokemon_storage_system_5.c
@@ -0,0 +1,16 @@
+
+// Includes
+#include "global.h"
+#include "pokemon_storage_system.h"
+
+// Static type declarations
+
+// Static RAM declarations
+
+EWRAM_DATA u32 gUnknown_020384EC = 0;
+
+// Static ROM declarations
+
+// .rodata
+
+// .text