through sub_8097078

2 files changed, 183 insertions, 341 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 8dab0b2fd..46d6b8502 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -5,340 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8096FC8
-sub_8096FC8: @ 8096FC8
-	push {r4,lr}
-	ldr r4, _08096FD8 @ =gSharedMem
-	ldrb r0, [r4, 0x4]
-	cmp r0, 0
-	beq _08096FDC
-	cmp r0, 0x1
-	beq _08096FE8
-	b _08096FF8
-	.align 2, 0
-_08096FD8: .4byte gSharedMem
-_08096FDC:
-	bl sub_809880C
-	ldrb r0, [r4, 0x4]
-	adds r0, 0x1
-	strb r0, [r4, 0x4]
-	b _08096FF8
-_08096FE8:
-	bl sub_8098830
-	lsls r0, 24
-	cmp r0, 0
-	bne _08096FF8
-	ldr r0, _08097000 @ =sub_8096C84
-	bl SetPSSCallback
-_08096FF8:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097000: .4byte sub_8096C84
-	thumb_func_end sub_8096FC8
-
-	thumb_func_start sub_8097004
-sub_8097004: @ 8097004
-	push {r4,lr}
-	ldr r4, _08097018 @ =gSharedMem
-	ldrb r0, [r4, 0x4]
-	cmp r0, 0x1
-	beq _0809702E
-	cmp r0, 0x1
-	bgt _0809701C
-	cmp r0, 0
-	beq _08097022
-	b _0809706A
-	.align 2, 0
-_08097018: .4byte gSharedMem
-_0809701C:
-	cmp r0, 0x2
-	beq _0809704C
-	b _0809706A
-_08097022:
-	movs r0, 0x5
-	bl PlaySE
-	bl add_to_c3_somehow
-	b _08097044
-_0809702E:
-	bl sub_80985CC
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809706A
-	bl sub_809B0F4
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_809B0C0
-_08097044:
-	ldrb r0, [r4, 0x4]
-	adds r0, 0x1
-	strb r0, [r4, 0x4]
-	b _0809706A
-_0809704C:
-	bl sub_809AC00
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809706A
-	ldr r1, _08097070 @ =0x000011f6
-	adds r0, r4, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08097064
-	bl BoxSetMosaic
-_08097064:
-	ldr r0, _08097074 @ =sub_8096C84
-	bl SetPSSCallback
-_0809706A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097070: .4byte 0x000011f6
-_08097074: .4byte sub_8096C84
-	thumb_func_end sub_8097004
-
-	thumb_func_start sub_8097078
-sub_8097078: @ 8097078
-	push {r4,lr}
-	ldr r0, _08097090 @ =gSharedMem
-	ldrb r0, [r0, 0x4]
-	cmp r0, 0x5
-	bls _08097084
-	b _0809729A
-_08097084:
-	lsls r0, 2
-	ldr r1, _08097094 @ =_08097098
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08097090: .4byte gSharedMem
-_08097094: .4byte _08097098
-	.align 2, 0
-_08097098:
-	.4byte _080970B0
-	.4byte _080970C8
-	.4byte _08097258
-	.4byte _0809726C
-	.4byte _08097262
-	.4byte _08097284
-_080970B0:
-	movs r0, 0x4
-	bl sub_8098898
-	bl sub_809CE84
-	ldr r1, _080970C4 @ =gSharedMem
-	movs r0, 0x1
-	strb r0, [r1, 0x4]
-	b _0809729A
-	.align 2, 0
-_080970C4: .4byte gSharedMem
-_080970C8:
-	bl sub_809CF30
-	adds r0, 0x1
-	lsls r0, 16
-	asrs r0, 16
-	cmp r0, 0x9
-	bls _080970D8
-	b _0809729A
-_080970D8:
-	lsls r0, 2
-	ldr r1, _080970E4 @ =_080970E8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080970E4: .4byte _080970E8
-	.align 2, 0
-_080970E8:
-	.4byte _08097110
-	.4byte _08097110
-	.4byte _08097190
-	.4byte _08097178
-	.4byte _08097120
-	.4byte _08097158
-	.4byte _08097140
-	.4byte _08097230
-	.4byte _080971CC
-	.4byte _08097244
-_08097110:
-	bl sub_8098A5C
-	ldr r0, _0809711C @ =sub_8096C84
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_0809711C: .4byte sub_8096C84
-_08097120:
-	bl sub_809BE80
-	lsls r0, 24
-	cmp r0, 0
-	bne _080971D6
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8098A5C
-	ldr r0, _0809713C @ =sub_80972A8
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_0809713C: .4byte sub_80972A8
-_08097140:
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8098A5C
-	ldr r0, _08097154 @ =sub_80972FC
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_08097154: .4byte sub_80972FC
-_08097158:
-	bl sub_809BEBC
-	lsls r0, 24
-	cmp r0, 0
-	beq _080971D6
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8098A5C
-	ldr r0, _08097174 @ =c3_0808DC50
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_08097174: .4byte c3_0808DC50
-_08097178:
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8098A5C
-	ldr r0, _0809718C @ =sub_8097390
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_0809718C: .4byte sub_8097390
-_08097190:
-	bl sub_809BE80
-	lsls r0, 24
-	cmp r0, 0
-	bne _080971D6
-	ldr r4, _080971C0 @ =gSharedMem
-	ldr r1, _080971C4 @ =0x000011f2
-	adds r0, r4, r1
-	ldrh r0, [r0]
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	bne _08097210
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_8098A5C
-	ldr r0, _080971C8 @ =sub_809746C
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_080971C0: .4byte gSharedMem
-_080971C4: .4byte 0x000011f2
-_080971C8: .4byte sub_809746C
-_080971CC:
-	bl sub_809BE80
-	lsls r0, 24
-	cmp r0, 0
-	beq _080971E4
-_080971D6:
-	ldr r1, _080971E0 @ =gSharedMem
-	movs r0, 0x2
-	strb r0, [r1, 0x4]
-	b _0809729A
-	.align 2, 0
-_080971E0: .4byte gSharedMem
-_080971E4:
-	ldr r4, _080971F8 @ =gSharedMem
-	ldr r1, _080971FC @ =0x000011f9
-	adds r0, r4, r1
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _08097200
-	movs r0, 0x4
-	strb r0, [r4, 0x4]
-	b _0809729A
-	.align 2, 0
-_080971F8: .4byte gSharedMem
-_080971FC: .4byte 0x000011f9
-_08097200:
-	ldr r1, _08097218 @ =0x000011f2
-	adds r0, r4, r1
-	ldrh r0, [r0]
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809721C
-_08097210:
-	movs r0, 0x3
-	strb r0, [r4, 0x4]
-	b _0809729A
-	.align 2, 0
-_08097218: .4byte 0x000011f2
-_0809721C:
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, _0809722C @ =sub_8097594
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_0809722C: .4byte sub_8097594
-_08097230:
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, _08097240 @ =sub_8097788
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_08097240: .4byte sub_8097788
-_08097244:
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, _08097254 @ =sub_80977E4
-	bl SetPSSCallback
-	b _0809729A
-	.align 2, 0
-_08097254: .4byte sub_80977E4
-_08097258:
-	movs r0, 0x20
-	bl PlaySE
-	movs r0, 0xD
-	b _08097274
-_08097262:
-	movs r0, 0x20
-	bl PlaySE
-	movs r0, 0x11
-	b _08097274
-_0809726C:
-	movs r0, 0x20
-	bl PlaySE
-	movs r0, 0x16
-_08097274:
-	bl sub_8098898
-	ldr r1, _08097280 @ =gSharedMem
-	movs r0, 0x5
-	strb r0, [r1, 0x4]
-	b _0809729A
-	.align 2, 0
-_08097280: .4byte gSharedMem
-_08097284:
-	ldr r0, _080972A0 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0xF3
-	ands r0, r1
-	cmp r0, 0
-	beq _0809729A
-	bl sub_8098A5C
-	ldr r0, _080972A4 @ =sub_8096C84
-	bl SetPSSCallback
-_0809729A:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080972A0: .4byte gMain
-_080972A4: .4byte sub_8096C84
-	thumb_func_end sub_8097078
-
 	thumb_func_start sub_80972A8
 sub_80972A8: @ 80972A8
 	push {r4,lr}
diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c
index b0a317cd9..feed68e50 100644
--- a/src/pokemon/pokemon_storage_system.c
+++ b/src/pokemon/pokemon_storage_system.c
@@ -64,7 +64,9 @@ struct PokemonStorageSystemData {
     u16 unk_11f2;
     u8 filler_11f4[2];
     u8 unk_11f6;
-    u8 filler_11f7[0xc5];
+    u8 filler_11f7[2];
+    u8 unk_11f9;
+    u8 filler_11fa[0xc2];
     struct PokemonMarkMenu unk_12bc;
     struct UnkPSSStruct_2002370 unk_2370;
     u8 filler_25b4[0xd8];
@@ -90,6 +92,7 @@ void SetPSSCallback(void (*func)(void));
 void sub_8096BF0(void);
 void sub_8096C68(void);
 void sub_8096C84(void);
+void sub_8096FC8(void);
 void sub_8097004(void);
 void sub_8097078(void);
 void sub_80972A8(void);
@@ -97,21 +100,26 @@ void sub_80972FC(void);
 void c3_0808DC50(void);
 void sub_8097390(void);
 void sub_809746C(void);
+void sub_8097594(void);
+void sub_8097788(void);
+void sub_80977E4(void);
 void sub_809789C(void);
 void sub_8097BA0(void);
 void sub_8097CC0(void);
-void BoxSetMosaic(void);
-void sub_80986E8(void);
-void sub_8098710(void);
-void sub_8098A5C(void);
-void sub_809B440(void);
-void sub_8096FC8(void);
 void sub_8097DE0(void);
 void sub_8097E44(void);
 void sub_8097E70(void);
+void BoxSetMosaic(void);
 void sub_8098400(void);
+void add_to_c3_somehow(void);
+bool8 sub_80985CC(void);
+void sub_80986E8(void);
+void sub_8098710(void);
 void sub_8098734(void);
+void sub_809880C(void);
+bool8 sub_8098830(void);
 void sub_8098898(u8 index);
+void sub_8098A5C(void);
 void sub_8098B48(void);
 void sub_8099BF8(u8 a0);
 void sub_8099C70(u8 whichBox);
@@ -120,7 +128,10 @@ struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4);
 void sub_809AA24(void);
 void sub_809AA98(void);
 bool8 sub_809AC00(void);
+void sub_809B0C0(u8 a0);
 void sub_809B0D4(void);
+u8 sub_809B0F4(void);
+void sub_809B440(void);
 void sub_809BBC0(void);
 void sub_809BD14(void);
 bool8 sub_809BE80(void);
@@ -128,6 +139,8 @@ bool8 sub_809BEBC(void);
 bool8 sub_809BF20(void);
 bool8 sub_809BF48(void);
 u8 sub_809CA40(void);
+void sub_809CE84(void);
+s16 sub_809CF30(void);
 void sub_809CFDC(struct UnkStruct_2000020 *a0, struct UnkStruct_2000020 *a1, u8 a2);
 void sub_809CFF0(void);
 
@@ -1242,6 +1255,169 @@ void sub_8096C84(void)
     }
 }
 
+void sub_8096FC8(void)
+{
+    switch (ePokemonStorageSystem.unk_0004)
+    {
+        case 0:
+            sub_809880C();
+            ePokemonStorageSystem.unk_0004++;
+            break;
+        case 1:
+            if (!sub_8098830())
+                SetPSSCallback(sub_8096C84);
+            break;
+    }
+}
+
+void sub_8097004(void)
+{
+    switch (ePokemonStorageSystem.unk_0004)
+    {
+        case 0:
+            PlaySE(SE_SELECT);
+            add_to_c3_somehow();
+            ePokemonStorageSystem.unk_0004++;
+            break;
+        case 1:
+            if (!sub_80985CC())
+            {
+                sub_809B0C0(sub_809B0F4());
+                ePokemonStorageSystem.unk_0004++;
+            }
+            break;
+        case 2:
+            if (!sub_809AC00())
+            {
+                if (ePokemonStorageSystem.unk_11f6)
+                    BoxSetMosaic();
+                SetPSSCallback(sub_8096C84);
+            }
+            break;
+    }
+}
+
+void sub_8097078(void)
+{
+    switch (ePokemonStorageSystem.unk_0004)
+    {
+        case 0:
+            sub_8098898(4);
+            sub_809CE84();
+            ePokemonStorageSystem.unk_0004 = 1;
+            break;
+        case 1:
+            switch (sub_809CF30())
+            {
+                case -1:
+                case  0:
+                    sub_8098A5C();
+                    SetPSSCallback(sub_8096C84);
+                    break;
+                case 3:
+                    if (sub_809BE80())
+                    {
+                        ePokemonStorageSystem.unk_0004 = 2;
+                    }
+                    else
+                    {
+                        PlaySE(SE_SELECT);
+                        sub_8098A5C();
+                        SetPSSCallback(sub_80972A8);
+                    }
+                    break;
+                case 5:
+                    PlaySE(SE_SELECT);
+                    sub_8098A5C();
+                    SetPSSCallback(sub_80972FC);
+                    break;
+                case 4:
+                    if (!sub_809BEBC())
+                    {
+                        ePokemonStorageSystem.unk_0004 = 2;
+                    }
+                    else
+                    {
+                        PlaySE(SE_SELECT);
+                        sub_8098A5C();
+                        SetPSSCallback(c3_0808DC50);
+                    }
+                    break;
+                case 2:
+                    PlaySE(SE_SELECT);
+                    sub_8098A5C();
+                    SetPSSCallback(sub_8097390);
+                    break;
+                case 1:
+                    if (sub_809BE80())
+                    {
+                        ePokemonStorageSystem.unk_0004 = 2;
+                    }
+                    else if (ItemIsMail(ePokemonStorageSystem.unk_11f2))
+                    {
+                        ePokemonStorageSystem.unk_0004 = 3;
+                    }
+                    else
+                    {
+                        PlaySE(SE_SELECT);
+                        sub_8098A5C();
+                        SetPSSCallback(sub_809746C);
+                    }
+                    break;
+                case 7:
+                    if (sub_809BE80())
+                    {
+                        ePokemonStorageSystem.unk_0004 = 2;
+                    }
+                    else if (ePokemonStorageSystem.unk_11f9)
+                    {
+                        ePokemonStorageSystem.unk_0004 = 4;
+                    }
+                    else if (ItemIsMail(ePokemonStorageSystem.unk_11f2))
+                    {
+                        ePokemonStorageSystem.unk_0004 = 3;
+                    }
+                    else
+                    {
+                        PlaySE(SE_SELECT);
+                        SetPSSCallback(sub_8097594);
+                    }
+                    break;
+                case 6:
+                    PlaySE(SE_SELECT);
+                    SetPSSCallback(sub_8097788);
+                    break;
+                case 8:
+                    PlaySE(SE_SELECT);
+                    SetPSSCallback(sub_80977E4);
+                    break;
+            }
+            break;
+        case 2:
+            PlaySE(SE_HAZURE);
+            sub_8098898(13);
+            ePokemonStorageSystem.unk_0004 = 5;
+            break;
+        case 4:
+            PlaySE(SE_HAZURE);
+            sub_8098898(17);
+            ePokemonStorageSystem.unk_0004 = 5;
+            break;
+        case 3:
+            PlaySE(SE_HAZURE);
+            sub_8098898(22);
+            ePokemonStorageSystem.unk_0004 = 5;
+            break;
+        case 5:
+            if (gMain.newKeys & (A_BUTTON | B_BUTTON | DPAD_ANY))
+            {
+                sub_8098A5C();
+                SetPSSCallback(sub_8096C84);
+            }
+            break;
+    }
+}
+
 asm(".section .text.8098898");
 
 void sub_8098898(u8 index) {