through sub_8097858

3 files changed, 70 insertions, 139 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 8d31aedb4..311b3552a 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -5,143 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8097788
-sub_8097788: @ 8097788
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r5, _0809779C @ =gSharedMem
-	ldrb r4, [r5, 0x4]
-	cmp r4, 0
-	beq _080977A0
-	cmp r4, 0x1
-	beq _080977BC
-	b _080977D4
-	.align 2, 0
-_0809779C: .4byte gSharedMem
-_080977A0:
-	bl sub_809BC18
-	movs r0, 0x1
-	negs r0, r0
-	str r4, [sp]
-	movs r1, 0
-	movs r2, 0
-	movs r3, 0x10
-	bl BeginNormalPaletteFade
-	ldrb r0, [r5, 0x4]
-	adds r0, 0x1
-	strb r0, [r5, 0x4]
-	b _080977D4
-_080977BC:
-	bl UpdatePaletteFade
-	lsls r0, 24
-	lsrs r1, r0, 24
-	cmp r1, 0
-	bne _080977D4
-	ldr r0, _080977DC @ =gUnknown_0203847F
-	strb r1, [r0]
-	strb r1, [r5, 0x6]
-	ldr r0, _080977E0 @ =sub_8096B5C
-	bl SetMainCallback2
-_080977D4:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080977DC: .4byte gUnknown_0203847F
-_080977E0: .4byte sub_8096B5C
-	thumb_func_end sub_8097788
-
-	thumb_func_start sub_80977E4
-sub_80977E4: @ 80977E4
-	push {r4,lr}
-	ldr r4, _080977F4 @ =gSharedMem
-	ldrb r0, [r4, 0x4]
-	cmp r0, 0
-	beq _080977F8
-	cmp r0, 0x1
-	beq _08097824
-	b _0809784C
-	.align 2, 0
-_080977F4: .4byte gSharedMem
-_080977F8:
-	movs r0, 0xC
-	bl PrintStorageActionText
-	ldr r0, _08097820 @ =0x000011f7
-	adds r2, r4, r0
-	ldrb r1, [r2]
-	movs r3, 0x96
-	lsls r3, 5
-	adds r0, r4, r3
-	strb r1, [r0]
-	ldrb r0, [r2]
-	movs r1, 0xB0
-	movs r2, 0x10
-	bl sub_80F7418
-	ldrb r0, [r4, 0x4]
-	adds r0, 0x1
-	strb r0, [r4, 0x4]
-	b _0809784C
-	.align 2, 0
-_08097820: .4byte 0x000011f7
-_08097824:
-	bl sub_80F7500
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809784C
-	bl sub_80F7470
-	bl sub_8098A5C
-	movs r1, 0x96
-	lsls r1, 5
-	adds r0, r4, r1
-	ldrb r0, [r0]
-	bl sub_809BDD8
-	bl sub_809801C
-	ldr r0, _08097854 @ =sub_8096C84
-	bl SetPSSCallback
-_0809784C:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097854: .4byte sub_8096C84
-	thumb_func_end sub_80977E4
-
-	thumb_func_start sub_8097858
-sub_8097858: @ 8097858
-	push {r4,lr}
-	ldr r4, _08097868 @ =gSharedMem
-	ldrb r0, [r4, 0x4]
-	cmp r0, 0
-	beq _0809786C
-	cmp r0, 0x1
-	beq _0809787C
-	b _08097890
-	.align 2, 0
-_08097868: .4byte gSharedMem
-_0809786C:
-	bl party_compaction
-	bl sub_8099310
-	ldrb r0, [r4, 0x4]
-	adds r0, 0x1
-	strb r0, [r4, 0x4]
-	b _08097890
-_0809787C:
-	bl sub_8099374
-	lsls r0, 24
-	cmp r0, 0
-	bne _08097890
-	bl sub_80987DC
-	ldr r0, _08097898 @ =sub_8096C84
-	bl SetPSSCallback
-_08097890:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08097898: .4byte sub_8096C84
-	thumb_func_end sub_8097858
-
 	thumb_func_start sub_809789C
 sub_809789C: @ 809789C
 	push {r4,lr}
diff --git a/include/mon_markings.h b/include/mon_markings.h
index eae80861a..3b4aa333c 100644
--- a/include/mon_markings.h
+++ b/include/mon_markings.h
@@ -20,7 +20,10 @@ struct PokemonMarkMenu
     /*0x10B0*/ u8 tileLoadState;
 }; // 10b4
 
-void sub_80F7404(void);
 void sub_80F727C(struct PokemonMarkMenu *ptr);
+void sub_80F7404(void);
+void sub_80F7418(u8 markings, s16 x, s16 y);
+void sub_80F7470(void);
+bool8 sub_80F7500(void);
 
 #endif //POKERUBY_MON_MARKINGS_H
diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c
index 9e18dadb5..8b0893c73 100644
--- a/src/pokemon/pokemon_storage_system.c
+++ b/src/pokemon/pokemon_storage_system.c
@@ -100,7 +100,8 @@ struct PokemonStorageSystemData {
     u16 unk_11f2;
     u8 filler_11f4[2];
     u8 unk_11f6;
-    u8 filler_11f7[2];
+    u8 unk_11f7;
+    u8 unk_11f8;
     u8 unk_11f9;
     u8 unk_11fa[0xc2];
     struct PokemonMarkMenu unk_12bc;
@@ -191,7 +192,9 @@ void sub_809B7AC(void);
 void sub_809B7D4(void);
 s8 sub_809B960(void);
 void sub_809BBC0(void);
+void sub_809BC18(void);
 void sub_809BD14(void);
+void sub_809BDD8(u8 markings);
 bool8 sub_809BE80(void);
 bool8 sub_809BEBC(void);
 bool8 sub_809BF20(void);
@@ -1778,6 +1781,68 @@ void sub_8097594(void)
     }
 }
 
+void sub_8097788(void)
+{
+    switch (ePokemonStorageSystem.unk_0004)
+    {
+        case 0:
+            sub_809BC18();
+            BeginNormalPaletteFade(0xffffffff, 0, 0, 16, 0);
+            ePokemonStorageSystem.unk_0004++;
+            break;
+        case 1:
+            if (!UpdatePaletteFade())
+            {
+                gUnknown_0203847F = 0;
+                ePokemonStorageSystem.unk_0006 = 0;
+                SetMainCallback2(sub_8096B5C);
+            }
+            break;
+    }
+}
+
+void sub_80977E4(void)
+{
+    switch (ePokemonStorageSystem.unk_0004)
+    {
+        case 0:
+            PrintStorageActionText(PC_TEXT_MARK_POKE);
+            ePokemonStorageSystem.unk_12bc.markings = ePokemonStorageSystem.unk_11f7;
+            sub_80F7418(ePokemonStorageSystem.unk_11f7, 0xb0, 0x10);
+            ePokemonStorageSystem.unk_0004++;
+            break;
+        case 1:
+            if (!sub_80F7500())
+            {
+                sub_80F7470();
+                sub_8098A5C();
+                sub_809BDD8(ePokemonStorageSystem.unk_12bc.markings);
+                sub_809801C();
+                SetPSSCallback(sub_8096C84);
+            }
+            break;
+    }
+}
+
+void sub_8097858(void)
+{
+    switch (ePokemonStorageSystem.unk_0004)
+    {
+        case 0:
+            party_compaction();
+            sub_8099310();
+            ePokemonStorageSystem.unk_0004++;
+            break;
+        case 1:
+            if (!sub_8099374())
+            {
+                sub_80987DC();
+                SetPSSCallback(sub_8096C84);
+            }
+            break;
+    }
+}
+
 asm(".section .text.8098898");
 
 void PrintStorageActionText(u8 index) {