through sub_80963D0

2 files changed, 112 insertions, 320 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index d04e8cec7..ebbc84a5b 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -5,325 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_8096310
-sub_8096310: @ 8096310
-	push {r4,r5,lr}
-	ldr r4, _08096344 @ =gUnknown_02038478
-	ldr r0, [r4]
-	ldr r1, _08096348 @ =0x00000242
-	adds r0, r1
-	ldrh r0, [r0]
-	bl FreeSpritePaletteByTag
-	ldr r0, [r4]
-	movs r5, 0x90
-	lsls r5, 2
-	adds r0, r5
-	ldrh r0, [r0]
-	bl FreeSpriteTilesByTag
-	ldr r0, [r4]
-	adds r0, r5
-	ldrh r0, [r0]
-	adds r0, 0x1
-	lsls r0, 16
-	lsrs r0, 16
-	bl FreeSpriteTilesByTag
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08096344: .4byte gUnknown_02038478
-_08096348: .4byte 0x00000242
-	thumb_func_end sub_8096310
-
-	thumb_func_start sub_809634C
-sub_809634C: @ 809634C
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80963D0
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809634C
-
-	thumb_func_start sub_809635C
-sub_809635C: @ 809635C
-	push {lr}
-	bl sub_809658C
-	pop {r0}
-	bx r0
-	thumb_func_end sub_809635C
-
-	thumb_func_start sub_8096368
-sub_8096368: @ 8096368
-	push {lr}
-	ldr r0, _08096380 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _08096384
-	movs r0, 0x5
-	bl PlaySE
-	movs r0, 0xC9
-	b _080963CC
-	.align 2, 0
-_08096380: .4byte gMain
-_08096384:
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080963A4
-	movs r0, 0x5
-	bl PlaySE
-	ldr r0, _080963A0 @ =gUnknown_02038478
-	ldr r0, [r0]
-	movs r1, 0x8F
-	lsls r1, 2
-	adds r0, r1
-	ldrb r0, [r0]
-	b _080963CC
-	.align 2, 0
-_080963A0: .4byte gUnknown_02038478
-_080963A4:
-	movs r0, 0x20
-	ands r0, r1
-	cmp r0, 0
-	beq _080963B8
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_809662C
-	b _080963CA
-_080963B8:
-	movs r0, 0x10
-	ands r0, r1
-	cmp r0, 0
-	beq _080963CA
-	movs r0, 0x5
-	bl PlaySE
-	bl sub_80965F8
-_080963CA:
-	movs r0, 0xC8
-_080963CC:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8096368
-
-	thumb_func_start sub_80963D0
-sub_80963D0: @ 80963D0
-	push {r4-r6,lr}
-	sub sp, 0x3C
-	adds r5, r0, 0
-	lsls r5, 24
-	lsrs r5, 24
-	movs r0, 0
-	movs r1, 0
-	str r0, [sp, 0x34]
-	str r1, [sp, 0x38]
-	movs r1, 0xC0
-	lsls r1, 24
-	ldr r0, [sp, 0x34]
-	orrs r0, r1
-	str r0, [sp, 0x34]
-	ldr r1, _08096564 @ =0xffff0fff
-	add r4, sp, 0x34
-	ldr r0, [r4, 0x4]
-	ands r0, r1
-	movs r1, 0x80
-	lsls r1, 5
-	orrs r0, r1
-	str r0, [r4, 0x4]
-	add r1, sp, 0x1C
-	movs r2, 0
-	strh r2, [r1]
-	mov r0, sp
-	adds r0, 0x1E
-	strh r2, [r0]
-	str r4, [sp, 0x20]
-	ldr r0, _08096568 @ =gDummySpriteAnimTable
-	str r0, [sp, 0x24]
-	str r2, [sp, 0x28]
-	ldr r0, _0809656C @ =gDummySpriteAffineAnimTable
-	str r0, [sp, 0x2C]
-	ldr r0, _08096570 @ =SpriteCallbackDummy
-	str r0, [sp, 0x30]
-	add r0, sp, 0x4
-	movs r2, 0x18
-	bl memcpy
-	ldr r6, _08096574 @ =gUnknown_02038478
-	ldr r0, [r6]
-	movs r1, 0x8F
-	lsls r1, 2
-	adds r0, r1
-	strb r5, [r0]
-	add r2, sp, 0x4
-	ldr r1, [r6]
-	movs r5, 0x90
-	lsls r5, 2
-	adds r0, r1, r5
-	ldrh r0, [r0]
-	strh r0, [r2]
-	ldr r3, _08096578 @ =0x00000242
-	adds r1, r3
-	ldrh r0, [r1]
-	strh r0, [r2, 0x2]
-	adds r0, r2, 0
-	movs r1, 0xA0
-	movs r2, 0x60
-	movs r3, 0
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r1, r0, 24
-	ldr r3, [r6]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0809657C @ =gSprites
-	adds r0, r1
-	str r0, [r3]
-	ldrb r2, [r4, 0x1]
-	movs r1, 0x3F
-	adds r0, r1, 0
-	ands r0, r2
-	movs r2, 0x80
-	orrs r0, r2
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x3]
-	ands r1, r0
-	movs r0, 0x40
-	orrs r1, r0
-	strb r1, [r4, 0x3]
-	add r1, sp, 0x4
-	adds r3, r5
-	ldrh r0, [r3]
-	adds r0, 0x1
-	strh r0, [r1]
-	ldr r0, _08096580 @ =gSpriteAnimTable_83B604C
-	str r0, [sp, 0xC]
-	movs r4, 0
-_08096488:
-	ldr r0, [r6]
-	ldr r1, _08096584 @ =0x0000023e
-	adds r0, r1
-	ldrb r3, [r0]
-	add r0, sp, 0x4
-	movs r1, 0x7C
-	movs r2, 0x50
-	bl CreateSprite
-	lsls r0, 24
-	lsrs r1, r0, 24
-	ldr r2, [r6]
-	lsls r3, r4, 2
-	adds r2, 0x4
-	adds r2, r3
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, _0809657C @ =gSprites
-	adds r1, r0, r1
-	str r1, [r2]
-	movs r5, 0
-	movs r0, 0x2
-	ands r0, r4
-	cmp r0, 0
-	beq _080964C2
-	movs r0, 0xC4
-	strh r0, [r1, 0x20]
-	movs r5, 0x2
-_080964C2:
-	movs r0, 0x1
-	ands r0, r4
-	cmp r0, 0
-	beq _080964E6
-	ldr r1, [r6]
-	adds r1, 0x4
-	adds r1, r3
-	ldr r2, [r1]
-	movs r0, 0x70
-	strh r0, [r2, 0x22]
-	ldr r2, [r1]
-	ldrb r1, [r2, 0x3]
-	movs r0, 0x3F
-	ands r0, r1
-	strb r0, [r2, 0x3]
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-_080964E6:
-	ldr r0, [r6]
-	adds r0, 0x4
-	adds r0, r3
-	ldr r0, [r0]
-	lsls r1, r5, 24
-	lsrs r1, 24
-	bl StartSpriteAnim
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x3
-	bls _08096488
-	movs r4, 0
-	ldr r5, _08096574 @ =gUnknown_02038478
-_08096504:
-	lsls r0, r4, 3
-	adds r0, r4
-	lsls r0, 19
-	movs r3, 0xF8
-	lsls r3, 15
-	adds r0, r3
-	lsrs r0, 16
-	lsls r2, r4, 24
-	lsrs r2, 24
-	ldr r1, [r5]
-	ldr r3, _08096584 @ =0x0000023e
-	adds r1, r3
-	ldrb r1, [r1]
-	str r1, [sp]
-	movs r1, 0x58
-	movs r3, 0
-	bl sub_809A9A0
-	adds r2, r0, 0
-	ldr r0, [r5]
-	lsls r1, r4, 2
-	adds r0, 0x20
-	adds r0, r1
-	str r2, [r0]
-	cmp r2, 0
-	beq _0809654C
-	movs r1, 0x1
-	cmp r4, 0
-	bne _08096544
-	movs r3, 0x1
-	negs r3, r3
-	adds r1, r3, 0
-_08096544:
-	strh r1, [r2, 0x2E]
-	ldr r1, [r0]
-	ldr r0, _08096588 @ =sub_8096784
-	str r0, [r1, 0x1C]
-_0809654C:
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x1
-	bls _08096504
-	bl sub_809665C
-	add sp, 0x3C
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08096564: .4byte 0xffff0fff
-_08096568: .4byte gDummySpriteAnimTable
-_0809656C: .4byte gDummySpriteAffineAnimTable
-_08096570: .4byte SpriteCallbackDummy
-_08096574: .4byte gUnknown_02038478
-_08096578: .4byte 0x00000242
-_0809657C: .4byte gSprites
-_08096580: .4byte gSpriteAnimTable_83B604C
-_08096584: .4byte 0x0000023e
-_08096588: .4byte sub_8096784
-	thumb_func_end sub_80963D0
-
 	thumb_func_start sub_809658C
 sub_809658C: @ 809658C
 	push {r4-r6,lr}
diff --git a/src/pokemon/pokemon_storage_system.c b/src/pokemon/pokemon_storage_system.c
index bc43616a9..37414f32b 100644
--- a/src/pokemon/pokemon_storage_system.c
+++ b/src/pokemon/pokemon_storage_system.c
@@ -1,5 +1,7 @@
 #include "global.h"
 #include "palette.h"
+#include "constants/songs.h"
+#include "sound.h"
 #include "field_weather.h"
 #include "overworld.h"
 #include "field_fadetransition.h"
@@ -28,7 +30,13 @@ struct PokemonStorageSystemData {
 };
 
 struct UnkPSSStruct_2002370 {
-    u8 filler_0000[0x23e];
+    struct Sprite *unk_0000;
+    struct Sprite *unk_0004[4];
+    u32 unk_0014[3];
+    struct Sprite *unk_0020[2];
+    u8 filler_0028[0x214];
+    u8 unk_023c;
+    u8 unk_023d;
     u8 unk_023e;
     u16 unk_0240;
     u16 unk_0242;
@@ -36,6 +44,13 @@ struct UnkPSSStruct_2002370 {
 
 void StorageSystemCreatePrimaryMenu(u8 whichMenu);
 void task_intro_29(u8 whichMenu);
+void sub_80963D0(u8 a0);
+void sub_809658C(void);
+void sub_80965F8(void);
+void sub_809662C(void);
+void sub_809665C(void);
+void sub_8096784(struct Sprite *sprite);
+struct Sprite *sub_809A9A0(u16 a0, u16 a1, u8 a2, u8 a3, u8 a4);
 
 const struct PSS_MenuStringPtrs gUnknown_083B600C[] = {
     {PCText_WithdrawPoke, PCText_MovePokeToParty},
@@ -539,6 +554,102 @@ void sub_8096264(struct UnkPSSStruct_2002370 *a0, u16 tileTag, u16 palTag, u8 a3
     a0->unk_023e = a3;
 }
 
+void sub_8096310(void)
+{
+    FreeSpritePaletteByTag(gUnknown_02038478->unk_0242);
+    FreeSpriteTilesByTag(gUnknown_02038478->unk_0240);
+    FreeSpriteTilesByTag(gUnknown_02038478->unk_0240 + 1);
+}
+
+void sub_809634C(u8 a0)
+{
+    sub_80963D0(a0);
+}
+
+void sub_809635C(void)
+{
+    sub_809658C();
+}
+
+u8 sub_8096368(void)
+{
+    if (gMain.newKeys & B_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        return 201;
+    }
+    if (gMain.newKeys & A_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        return gUnknown_02038478->unk_023c;
+    }
+    if (gMain.newKeys & DPAD_LEFT)
+    {
+        PlaySE(SE_SELECT);
+        sub_809662C();
+    }
+    else if (gMain.newKeys & DPAD_RIGHT)
+    {
+        PlaySE(SE_SELECT);
+        sub_80965F8();
+    }
+    return 200;
+}
+
+void sub_80963D0(u8 a0)
+{
+    u16 i;
+    u8 spriteId;
+    struct SpriteTemplate template;
+    struct OamData oamData = {};
+    oamData.size = 3;
+    oamData.paletteNum = 1;
+    template = (struct SpriteTemplate){
+        0, 0, &oamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+    };
+
+    gUnknown_02038478->unk_023c = a0;
+    template.tileTag = gUnknown_02038478->unk_0240;
+    template.paletteTag = gUnknown_02038478->unk_0242;
+
+    spriteId = CreateSprite(&template, 0xa0, 0x60, 0);
+    gUnknown_02038478->unk_0000 = gSprites + spriteId;
+
+    oamData.shape = ST_OAM_V_RECTANGLE;
+    oamData.size = 1;
+    template.tileTag = gUnknown_02038478->unk_0240 + 1;
+    template.anims = gSpriteAnimTable_83B604C;
+    for (i = 0; i < 4; i++)
+    {
+        u16 r5;
+        spriteId = CreateSprite(&template, 0x7c, 0x50, gUnknown_02038478->unk_023e);
+        gUnknown_02038478->unk_0004[i] = gSprites + spriteId;
+        r5 = 0;
+        if (i & 2)
+        {
+            gUnknown_02038478->unk_0004[i]->pos1.x = 0xc4;
+            r5 = 2;
+        }
+        if (i & 1)
+        {
+            gUnknown_02038478->unk_0004[i]->pos1.y = 0x70;
+            gUnknown_02038478->unk_0004[i]->oam.size = 0;
+            r5++;
+        }
+        StartSpriteAnim(gUnknown_02038478->unk_0004[i], r5);
+    }
+    for (i = 0; i < 2; i++)
+    {
+        gUnknown_02038478->unk_0020[i] = sub_809A9A0(72 * i + 0x7c, 0x58, i, 0, gUnknown_02038478->unk_023e);
+        if (gUnknown_02038478->unk_0020[i])
+        {
+            gUnknown_02038478->unk_0020[i]->data[0] = (i == 0 ? -1 : 1);
+            gUnknown_02038478->unk_0020[i]->callback = sub_8096784;
+        }
+    }
+    sub_809665C();
+}
+
 asm(".section .text.8098898");
 
 void sub_8098898(u8 index) {