through sub_809B24C

3 files changed, 96 insertions, 239 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index 5a1853361..d408dc7ea 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -5,244 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_809B150
-sub_809B150: @ 809B150
-	push {r4,r5,lr}
-	ldr r0, _0809B16C @ =gPokemonStorageSystemPtr
-	ldr r5, [r0]
-	ldr r0, _0809B170 @ =0x000012a8
-	adds r4, r5, r0
-	ldrb r0, [r4]
-	cmp r0, 0x1
-	beq _0809B1A0
-	cmp r0, 0x1
-	bgt _0809B174
-	cmp r0, 0
-	beq _0809B17E
-	b _0809B1CE
-	.align 2, 0
-_0809B16C: .4byte gPokemonStorageSystemPtr
-_0809B170: .4byte 0x000012a8
-_0809B174:
-	cmp r0, 0x2
-	beq _0809B1BE
-	cmp r0, 0x3
-	beq _0809B186
-	b _0809B1CE
-_0809B17E:
-	ldr r0, _0809B18C @ =gUnknown_020384E6
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0809B190
-_0809B186:
-	movs r0, 0
-	b _0809B1D0
-	.align 2, 0
-_0809B18C: .4byte gUnknown_020384E6
-_0809B190:
-	movs r1, 0x8E
-	lsls r1, 5
-	adds r0, r5, r1
-	ldr r0, [r0]
-	movs r1, 0x2
-	bl StartSpriteAnim
-	b _0809B1C8
-_0809B1A0:
-	bl sub_809B324
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809B1CE
-	movs r1, 0x8E
-	lsls r1, 5
-	adds r0, r5, r1
-	ldr r0, [r0]
-	movs r1, 0x3
-	bl StartSpriteAnim
-	bl sub_809B384
-	b _0809B1C8
-_0809B1BE:
-	bl sub_809B358
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809B1CE
-_0809B1C8:
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-_0809B1CE:
-	movs r0, 0x1
-_0809B1D0:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809B150
-
-	thumb_func_start sub_809B1D8
-sub_809B1D8: @ 809B1D8
-	push {r4,r5,lr}
-	ldr r0, _0809B1F4 @ =gPokemonStorageSystemPtr
-	ldr r4, [r0]
-	ldr r0, _0809B1F8 @ =0x000012a8
-	adds r5, r4, r0
-	ldrb r0, [r5]
-	cmp r0, 0x1
-	beq _0809B220
-	cmp r0, 0x1
-	bgt _0809B1FC
-	cmp r0, 0
-	beq _0809B202
-	b _0809B244
-	.align 2, 0
-_0809B1F4: .4byte gPokemonStorageSystemPtr
-_0809B1F8: .4byte 0x000012a8
-_0809B1FC:
-	cmp r0, 0x2
-	beq _0809B240
-	b _0809B244
-_0809B202:
-	bl sub_809B324
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809B244
-	movs r1, 0x8E
-	lsls r1, 5
-	adds r0, r4, r1
-	ldr r0, [r0]
-	movs r1, 0x2
-	bl StartSpriteAnim
-	bl sub_809B3E0
-	b _0809B238
-_0809B220:
-	bl sub_809B358
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809B244
-	movs r1, 0x8E
-	lsls r1, 5
-	adds r0, r4, r1
-	ldr r0, [r0]
-	movs r1, 0
-	bl StartSpriteAnim
-_0809B238:
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	b _0809B244
-_0809B240:
-	movs r0, 0
-	b _0809B246
-_0809B244:
-	movs r0, 0x1
-_0809B246:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809B1D8
-
-	thumb_func_start sub_809B24C
-sub_809B24C: @ 809B24C
-	push {r4,r5,lr}
-	ldr r0, _0809B268 @ =gPokemonStorageSystemPtr
-	ldr r4, [r0]
-	ldr r0, _0809B26C @ =0x000012a8
-	adds r5, r4, r0
-	ldrb r0, [r5]
-	cmp r0, 0x1
-	beq _0809B2E0
-	cmp r0, 0x1
-	bgt _0809B270
-	cmp r0, 0
-	beq _0809B276
-	b _0809B31C
-	.align 2, 0
-_0809B268: .4byte gPokemonStorageSystemPtr
-_0809B26C: .4byte 0x000012a8
-_0809B270:
-	cmp r0, 0x2
-	beq _0809B318
-	b _0809B31C
-_0809B276:
-	ldr r0, _0809B290 @ =gUnknown_020384E4
-	ldrb r0, [r0]
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0
-	beq _0809B298
-	cmp r0, 0x1
-	bne _0809B318
-	ldr r2, _0809B294 @ =0x000012a9
-	adds r1, r4, r2
-	movs r0, 0xE
-	b _0809B2A0
-	.align 2, 0
-_0809B290: .4byte gUnknown_020384E4
-_0809B294: .4byte 0x000012a9
-_0809B298:
-	bl get_preferred_box
-	ldr r2, _0809B2D0 @ =0x000012a9
-	adds r1, r4, r2
-_0809B2A0:
-	strb r0, [r1]
-	ldr r0, _0809B2D4 @ =gPokemonStorageSystemPtr
-	ldr r4, [r0]
-	movs r1, 0x8E
-	lsls r1, 5
-	adds r0, r4, r1
-	ldr r0, [r0]
-	movs r1, 0x2
-	bl StartSpriteAnim
-	ldr r2, _0809B2D0 @ =0x000012a9
-	adds r0, r4, r2
-	ldrb r0, [r0]
-	ldr r1, _0809B2D8 @ =gUnknown_020384E5
-	ldrb r1, [r1]
-	bl sub_80996B0
-	ldr r0, _0809B2DC @ =0x000012a8
-	adds r4, r0
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	b _0809B31C
-	.align 2, 0
-_0809B2D0: .4byte 0x000012a9
-_0809B2D4: .4byte gPokemonStorageSystemPtr
-_0809B2D8: .4byte gUnknown_020384E5
-_0809B2DC: .4byte 0x000012a8
-_0809B2E0:
-	bl sub_809971C
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809B31C
-	movs r1, 0x8E
-	lsls r1, 5
-	adds r0, r4, r1
-	ldr r0, [r0]
-	movs r1, 0x3
-	bl StartSpriteAnim
-	ldr r2, _0809B310 @ =0x000012a9
-	adds r0, r4, r2
-	ldrb r0, [r0]
-	ldr r1, _0809B314 @ =gUnknown_020384E5
-	ldrb r1, [r1]
-	bl diegohint1
-	ldrb r0, [r5]
-	adds r0, 0x1
-	strb r0, [r5]
-	b _0809B31C
-	.align 2, 0
-_0809B310: .4byte 0x000012a9
-_0809B314: .4byte gUnknown_020384E5
-_0809B318:
-	movs r0, 0
-	b _0809B31E
-_0809B31C:
-	movs r0, 0x1
-_0809B31E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_809B24C
-
 	thumb_func_start sub_809B324
 sub_809B324: @ 809B324
 	push {lr}
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index 3191b841c..a2b5964d4 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -175,6 +175,7 @@ struct PokemonStorageSystemData {
     u8 unk_127a[0x2a];
     bool8 (*unk_12a4)(void);
     u8 unk_12a8;
+    u8 unk_12a9;
     struct Sprite *unk_12ac;
     struct Sprite *unk_12b0[2];
     u16 *unk_12b8;
@@ -223,10 +224,11 @@ void sub_8099310(void);
 bool8 sub_8099374(void);
 void sub_80994A8(s16 a0);
 void sub_809954C(void);
+void sub_80996B0(u8 a0, u8 a1);
+bool8 sub_809971C(void);
 void sub_8099958(void);
 bool8 sub_8099990(void);
 struct Sprite *sub_809A9A0(u16 x, u16 y, u8 animId, u8 priority, u8 subpriority);
-void sub_809BB90(void);
 void sub_8099BF8(u8 a0);
 void sub_8099C70(u8 whichBox);
 bool8 sub_8099D34(void);
@@ -252,6 +254,7 @@ void sub_809B760(void);
 void sub_809B7AC(void);
 void sub_809B7D4(void);
 s8 sub_809B960(void);
+void sub_809BB90(void);
 void sub_809BBC0(void);
 void sub_809BC18(void);
 void sub_809BD14(void);
diff --git a/src/pokemon/pokemon_storage_system_4.c b/src/pokemon/pokemon_storage_system_4.c
index 2f2091259..9e4865910 100644
--- a/src/pokemon/pokemon_storage_system_4.c
+++ b/src/pokemon/pokemon_storage_system_4.c
@@ -49,6 +49,11 @@ void sub_809A8C8(struct Sprite *sprite);
 bool8 sub_809B150(void);
 bool8 sub_809B1D8(void);
 bool8 sub_809B24C(void);
+bool8 sub_809B324(void);
+bool8 sub_809B358(void);
+void sub_809B384(void);
+void sub_809B3E0(void);
+void diegohint1(u8 a0, u8 a1);
 bool8 sub_809BF2C(void);
 void sub_809BF74(void);
 void sub_809C028(void);
@@ -1389,3 +1394,90 @@ bool8 sub_809B130(void)
 {
     return gPokemonStorageSystemPtr->unk_12a4();
 }
+
+bool8 sub_809B150(void)
+{
+    switch (gPokemonStorageSystemPtr->unk_12a8)
+    {
+        case 0:
+            if (gUnknown_020384E6)
+                return FALSE;
+            StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 2);
+            gPokemonStorageSystemPtr->unk_12a8++;
+            break;
+        case 1:
+            if (!sub_809B324())
+            {
+                StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3);
+                sub_809B384();
+                gPokemonStorageSystemPtr->unk_12a8++;
+            }
+            break;
+        case 2:
+            if (!sub_809B358())
+                gPokemonStorageSystemPtr->unk_12a8++;
+            break;
+        case 3:
+            return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 sub_809B1D8(void)
+{
+    switch (gPokemonStorageSystemPtr->unk_12a8)
+    {
+        case 0:
+            if (!sub_809B324())
+            {
+                StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 2);
+                sub_809B3E0();
+                gPokemonStorageSystemPtr->unk_12a8++;
+            }
+            break;
+        case 1:
+            if (!sub_809B358())
+            {
+                StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 0);
+                gPokemonStorageSystemPtr->unk_12a8++;
+            }
+            break;
+        case 2:
+            return FALSE;
+    }
+    return TRUE;
+}
+
+bool8 sub_809B24C(void)
+{
+    switch (gPokemonStorageSystemPtr->unk_12a8)
+    {
+        case 0:
+            switch (gUnknown_020384E4)
+            {
+                case 1:
+                    gPokemonStorageSystemPtr->unk_12a9 = 14;
+                    break;
+                case 0:
+                    gPokemonStorageSystemPtr->unk_12a9 = get_preferred_box();
+                    break;
+                default:
+                    return FALSE;
+            }
+            StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 2);
+            sub_80996B0(gPokemonStorageSystemPtr->unk_12a9, gUnknown_020384E5);
+            gPokemonStorageSystemPtr->unk_12a8++;
+            break;
+        case 1:
+            if (!sub_809971C())
+            {
+                StartSpriteAnim(gPokemonStorageSystemPtr->unk_11c0, 3);
+                diegohint1(gPokemonStorageSystemPtr->unk_12a9, gUnknown_020384E5);
+                gPokemonStorageSystemPtr->unk_12a8++;
+            }
+            break;
+        case 2:
+            return FALSE;
+    }
+    return TRUE;
+}