through sub_8098350

4 files changed, 68 insertions, 250 deletions

diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s
index eaed44102..a96857b35 100644
--- a/asm/pokemon_storage_system.s
+++ b/asm/pokemon_storage_system.s
@@ -5,254 +5,6 @@
 
 	.text
 
-	thumb_func_start sub_80981F0
-sub_80981F0: @ 80981F0
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0xC
-	adds r7, r1, 0
-	lsls r0, 16
-	lsrs r4, r0, 16
-	ldr r6, _08098274 @ =gSharedMem
-	movs r0, 0x9C
-	lsls r0, 6
-	adds r0, r6
-	mov r8, r0
-	ldr r0, [r0]
-	cmp r0, 0
-	beq _080982A6
-	cmp r4, 0
-	beq _0809829C
-	lsls r0, r4, 3
-	ldr r1, _08098278 @ =gMonFrontPicTable
-	adds r0, r1
-	ldr r2, _0809827C @ =gMonFrontPicCoords
-	lsls r1, r4, 2
-	adds r1, r2
-	ldrb r1, [r1]
-	ldr r2, _08098280 @ =0x00004784
-	adds r3, r6, r2
-	ldr r2, _08098284 @ =0x00002784
-	adds r5, r6, r2
-	str r5, [sp]
-	str r4, [sp, 0x4]
-	str r7, [sp, 0x8]
-	movs r2, 0x1
-	bl HandleLoadSpecialPokePic
-	ldr r1, _08098288 @ =0x000011e8
-	adds r0, r6, r1
-	ldr r0, [r0]
-	ldr r2, _0809828C @ =0x00002704
-	adds r4, r6, r2
-	adds r1, r4, 0
-	bl LZ77UnCompWram
-	ldr r1, _08098290 @ =0x000026fc
-	adds r0, r6, r1
-	ldr r1, [r0]
-	ldr r2, _08098294 @ =0x04000200
-	adds r0, r5, 0
-	bl CpuSet
-	ldr r2, _08098298 @ =0x000026fa
-	adds r0, r6, r2
-	ldrh r1, [r0]
-	adds r0, r4, 0
-	movs r2, 0x20
-	bl LoadPalette
-	mov r0, r8
-	ldr r1, [r0]
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	strb r0, [r1]
-	b _080982A6
-	.align 2, 0
-_08098274: .4byte gSharedMem
-_08098278: .4byte gMonFrontPicTable
-_0809827C: .4byte gMonFrontPicCoords
-_08098280: .4byte 0x00004784
-_08098284: .4byte 0x00002784
-_08098288: .4byte 0x000011e8
-_0809828C: .4byte 0x00002704
-_08098290: .4byte 0x000026fc
-_08098294: .4byte 0x04000200
-_08098298: .4byte 0x000026fa
-_0809829C:
-	adds r0, 0x3E
-	ldrb r1, [r0]
-	movs r2, 0x4
-	orrs r1, r2
-	strb r1, [r0]
-_080982A6:
-	add sp, 0xC
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80981F0
-
-	thumb_func_start sub_80982B4
-sub_80982B4: @ 80982B4
-	push {r4,lr}
-	ldr r4, _080982E4 @ =gSharedMem
-	ldr r1, _080982E8 @ =0x000011f0
-	adds r0, r4, r1
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _080982F4
-	ldr r2, _080982EC @ =0x000011f7
-	adds r0, r4, r2
-	ldrb r0, [r0]
-	adds r2, 0xC1
-	adds r1, r4, r2
-	ldr r1, [r1]
-	bl sub_80F7A10
-	ldr r1, _080982F0 @ =0x000012ac
-	adds r0, r4, r1
-	ldr r1, [r0]
-	adds r1, 0x3E
-	ldrb r2, [r1]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r2
-	b _08098302
-	.align 2, 0
-_080982E4: .4byte gSharedMem
-_080982E8: .4byte 0x000011f0
-_080982EC: .4byte 0x000011f7
-_080982F0: .4byte 0x000012ac
-_080982F4:
-	ldr r2, _08098348 @ =0x000012ac
-	adds r0, r4, r2
-	ldr r1, [r0]
-	adds r1, 0x3E
-	ldrb r0, [r1]
-	movs r2, 0x4
-	orrs r0, r2
-_08098302:
-	strb r0, [r1]
-	movs r0, 0
-	movs r1, 0xB
-	movs r2, 0x9
-	movs r3, 0x11
-	bl MenuZeroFillWindowRect
-	ldr r4, _0809834C @ =gSharedMem + 0x127A
-	adds r0, r4, 0
-	movs r1, 0x1
-	movs r2, 0x10
-	bl MenuPrint
-	adds r0, r4, 0
-	subs r0, 0x6B
-	movs r1, 0x1
-	movs r2, 0xB
-	bl MenuPrint
-	adds r0, r4, 0
-	subs r0, 0x46
-	movs r1, 0
-	movs r2, 0xD
-	bl MenuPrint
-	subs r4, 0x21
-	adds r0, r4, 0
-	movs r1, 0x1
-	movs r2, 0xF
-	bl MenuPrint
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08098348: .4byte 0x000012ac
-_0809834C: .4byte gSharedMem + 0x127A
-	thumb_func_end sub_80982B4
-
-	thumb_func_start sub_8098350
-sub_8098350: @ 8098350
-	push {r4,r5,lr}
-	sub sp, 0x10
-	ldr r5, _080983A0 @ =gSharedMem
-	ldr r1, _080983A4 @ =0x000011f0
-	adds r0, r5, r1
-	ldrh r2, [r0]
-	cmp r2, 0
-	beq _080983B4
-	ldr r0, _080983A8 @ =0x06007800
-	ldr r3, _080983AC @ =gUnknown_02039760
-	movs r1, 0x1
-	str r1, [sp]
-	movs r1, 0
-	str r1, [sp, 0x4]
-	movs r1, 0x8
-	str r1, [sp, 0x8]
-	movs r1, 0x2
-	str r1, [sp, 0xC]
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_809D034
-	movs r4, 0
-	ldr r0, _080983B0 @ =0x000012b0
-	adds r5, r0
-_08098382:
-	lsls r0, r4, 2
-	adds r0, r5
-	ldr r0, [r0]
-	lsls r1, r4, 1
-	adds r1, 0x1
-	lsls r1, 24
-	lsrs r1, 24
-	bl StartSpriteAnimIfDifferent
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x1
-	bls _08098382
-	b _080983EC
-	.align 2, 0
-_080983A0: .4byte gSharedMem
-_080983A4: .4byte 0x000011f0
-_080983A8: .4byte 0x06007800
-_080983AC: .4byte gUnknown_02039760
-_080983B0: .4byte 0x000012b0
-_080983B4:
-	ldr r0, _080983F4 @ =0x06007800
-	ldr r3, _080983F8 @ =gUnknown_02039760
-	movs r1, 0xA
-	str r1, [sp]
-	str r2, [sp, 0x4]
-	movs r1, 0x8
-	str r1, [sp, 0x8]
-	movs r1, 0x2
-	str r1, [sp, 0xC]
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_809D034
-	movs r4, 0
-	ldr r1, _080983FC @ =0x000012b0
-	adds r5, r1
-_080983D4:
-	lsls r0, r4, 2
-	adds r0, r5
-	ldr r0, [r0]
-	lsls r1, r4, 25
-	lsrs r1, 24
-	bl StartSpriteAnim
-	adds r0, r4, 0x1
-	lsls r0, 16
-	lsrs r4, r0, 16
-	cmp r4, 0x1
-	bls _080983D4
-_080983EC:
-	add sp, 0x10
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080983F4: .4byte 0x06007800
-_080983F8: .4byte gUnknown_02039760
-_080983FC: .4byte 0x000012b0
-	thumb_func_end sub_8098350
-
 	thumb_func_start sub_8098400
 sub_8098400: @ 8098400
 	push {r4,r5,lr}
diff --git a/include/mon_markings.h b/include/mon_markings.h
index 5b6abf356..d06264865 100644
--- a/include/mon_markings.h
+++ b/include/mon_markings.h
@@ -26,5 +26,6 @@ void sub_80F7418(u8 markings, s16 x, s16 y);
 void sub_80F7470(void);
 bool8 sub_80F7500(void);
 struct Sprite *sub_80F7940(u16 tileTag, u16 paletteTag, const u16 *palette);
+void sub_80F7A10(u8 markings, void *dest);
 
 #endif //POKERUBY_MON_MARKINGS_H
diff --git a/include/pokemon_storage_system.h b/include/pokemon_storage_system.h
index cbdec8999..f91a5f08e 100644
--- a/include/pokemon_storage_system.h
+++ b/include/pokemon_storage_system.h
@@ -85,7 +85,8 @@ struct PokemonStorageSystemData {
     u8 filler_08b6[0x4a8];
     s16 unk_0d5e;
     s16 unk_0d60;
-    u8 filler_0d62[0x48a];
+    u8 filler_0d62[0x486];
+    u8 *unk_11e8;
     u32 unk_11ec;
     u16 unk_11f0;
     u16 unk_11f2;
@@ -94,7 +95,11 @@ struct PokemonStorageSystemData {
     u8 unk_11f7;
     u8 unk_11f8;
     u8 unk_11f9;
-    u8 unk_11fa[0xb2];
+    u8 unk_11fa[0x15];
+    u8 unk_120f[0x25];
+    u8 unk_1234[0x25];
+    u8 unk_1259[0x21];
+    u8 unk_127a[0x32];
     struct Sprite *unk_12ac;
     struct Sprite *unk_12b0[2];
     u16 *unk_12b8;
@@ -114,6 +119,8 @@ struct PokemonStorageSystemData {
     u16 unk_2704[0x10];
     u8 filler_2724[0x60];
     u8 unk_2784[0x800];
+    u8 filler_2f84[0x1800];
+    u8 unk_4784[0x800];
 };
 
 extern EWRAM_DATA u16 gUnknown_02039760[0x600];
diff --git a/src/pokemon/pokemon_storage_system_2.c b/src/pokemon/pokemon_storage_system_2.c
index f8ae1c013..7f97d7681 100644
--- a/src/pokemon/pokemon_storage_system_2.c
+++ b/src/pokemon/pokemon_storage_system_2.c
@@ -1,7 +1,10 @@
 
 // Includes
 #include "global.h"
+#include "decompress.h"
 #include "constants/songs.h"
+#include "constants/species.h"
+#include "data2.h"
 #include "sound.h"
 #include "ewram.h"
 #include "task.h"
@@ -1685,6 +1688,61 @@ __attribute__((naked)) void sub_80980D4(void)
 }
 #endif
 
+void sub_80981F0(u16 species, u32 pid)
+{
+    if (gPokemonStorageSystemPtr->unk_2700)
+    {
+        if (species != SPECIES_NONE)
+        {
+            HandleLoadSpecialPokePic(gMonFrontPicTable + species, gMonFrontPicCoords[species].coords, 1, (intptr_t)gPokemonStorageSystemPtr->unk_4784, gPokemonStorageSystemPtr->unk_2784, species, pid);
+            LZ77UnCompWram(gPokemonStorageSystemPtr->unk_11e8, gPokemonStorageSystemPtr->unk_2704);
+            CpuCopy32(gPokemonStorageSystemPtr->unk_2784, gPokemonStorageSystemPtr->unk_26fc, 0x800);
+            LoadPalette(gPokemonStorageSystemPtr->unk_2704, gPokemonStorageSystemPtr->unk_26fa, 0x20);
+            gPokemonStorageSystemPtr->unk_2700->invisible = FALSE;
+        }
+        else
+        {
+            gPokemonStorageSystemPtr->unk_2700->invisible = TRUE;
+        }
+    }
+}
+
+void sub_80982B4(void)
+{
+    if (gPokemonStorageSystemPtr->unk_11f0)
+    {
+        sub_80F7A10(gPokemonStorageSystemPtr->unk_11f7, gPokemonStorageSystemPtr->unk_12b8);
+        gPokemonStorageSystemPtr->unk_12ac->invisible = FALSE;
+    }
+    else
+    {
+        gPokemonStorageSystemPtr->unk_12ac->invisible = TRUE;
+    }
+    MenuZeroFillWindowRect(0, 11, 9, 17);
+    MenuPrint(gPokemonStorageSystemPtr->unk_127a, 1, 16);
+    MenuPrint(gPokemonStorageSystemPtr->unk_120f, 1, 11);
+    MenuPrint(gPokemonStorageSystemPtr->unk_1234, 0, 13);
+    MenuPrint(gPokemonStorageSystemPtr->unk_1259, 1, 15);
+}
+
+void sub_8098350(void)
+{
+    u16 i;
+
+    if (gPokemonStorageSystemPtr->unk_11f0)
+    {
+        sub_809D034(BG_SCREEN_ADDR(15), 1, 0, gUnknown_02039760, 1, 0, 8, 2);
+        for (i = 0; i < 2; i++)
+            StartSpriteAnimIfDifferent(gPokemonStorageSystemPtr->unk_12b0[i], i * 2 + 1);
+    }
+    else
+    {
+        sub_809D034(BG_SCREEN_ADDR(15), 1, 0, gUnknown_02039760, 10, 0, 8, 2);
+        for (i = 0; i < 2; i++)
+            StartSpriteAnim(gPokemonStorageSystemPtr->unk_12b0[i], i * 2);
+    }
+}
+
 extern const struct StorageAction gPCStorageActionTexts[];
 
 asm(".section .text.8098898");