through sub_810BD08

3 files changed, 50 insertions, 127 deletions

diff --git a/asm/pokeblock.s b/asm/pokeblock.s
index 5d12544a6..1a1cc1b0c 100755
--- a/asm/pokeblock.s
+++ b/asm/pokeblock.s
@@ -6,132 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_810BC84
-sub_810BC84: @ 810BC84
-	push {lr}
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_810BB88
-	movs r0, 0
-	bl sub_810BDAC
-	pop {r0}
-	bx r0
-	thumb_func_end sub_810BC84
-
-	thumb_func_start sub_810BC98
-sub_810BC98: @ 810BC98
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	movs r2, 0
-	ldr r0, _0810BD00 @ =gSaveBlock1
-	mov r9, r0
-_0810BCA6:
-	adds r1, r2, 0x1
-	lsls r0, r1, 16
-	lsrs r5, r0, 16
-	mov r8, r1
-	cmp r5, 0x27
-	bhi _0810BCE8
-	lsls r1, r2, 3
-	mov r2, r9
-	adds r0, r1, r2
-	movs r2, 0xFF
-	lsls r2, 3
-	adds r7, r0, r2
-	ldr r0, _0810BD04 @ =gSaveBlock1 + 0x7F8
-	mov r12, r0
-	adds r6, r1, r0
-_0810BCC4:
-	ldrb r0, [r7]
-	cmp r0, 0
-	bne _0810BCDE
-	ldr r3, [r6]
-	ldr r4, [r6, 0x4]
-	lsls r2, r5, 3
-	add r2, r12
-	ldr r0, [r2]
-	ldr r1, [r2, 0x4]
-	str r0, [r6]
-	str r1, [r6, 0x4]
-	str r3, [r2]
-	str r4, [r2, 0x4]
-_0810BCDE:
-	adds r0, r5, 0x1
-	lsls r0, 16
-	lsrs r5, r0, 16
-	cmp r5, 0x27
-	bls _0810BCC4
-_0810BCE8:
-	mov r1, r8
-	lsls r0, r1, 16
-	lsrs r2, r0, 16
-	cmp r2, 0x26
-	bls _0810BCA6
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810BD00: .4byte gSaveBlock1
-_0810BD04: .4byte gSaveBlock1 + 0x7F8
-	thumb_func_end sub_810BC98
-
-	thumb_func_start sub_810BD08
-sub_810BD08: @ 810BD08
-	push {r4,r5,lr}
-	ldr r1, _0810BD5C @ =gUnknown_02039248
-	movs r0, 0
-	strb r0, [r1, 0x2]
-	movs r2, 0
-	ldr r5, _0810BD60 @ =gSaveBlock1
-	movs r4, 0xFF
-	lsls r4, 3
-	adds r3, r1, 0
-_0810BD1A:
-	lsls r0, r2, 3
-	adds r0, r5
-	adds r0, r4
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0810BD2C
-	ldrb r0, [r3, 0x2]
-	adds r0, 0x1
-	strb r0, [r3, 0x2]
-_0810BD2C:
-	adds r0, r2, 0x1
-	lsls r0, 24
-	lsrs r2, r0, 24
-	cmp r2, 0x27
-	bls _0810BD1A
-	ldrb r0, [r1, 0x2]
-	cmp r0, 0x7
-	bls _0810BD3E
-	movs r0, 0x8
-_0810BD3E:
-	strb r0, [r1, 0x3]
-	ldrb r2, [r1, 0x1]
-	adds r0, r2, 0
-	adds r0, 0x8
-	ldrb r3, [r1, 0x2]
-	cmp r0, r3
-	ble _0810BD54
-	cmp r2, 0
-	beq _0810BD54
-	subs r0, r2, 0x1
-	strb r0, [r1, 0x1]
-_0810BD54:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810BD5C: .4byte gUnknown_02039248
-_0810BD60: .4byte gSaveBlock1
-	thumb_func_end sub_810BD08
-
 	thumb_func_start sub_810BD64
 sub_810BD64: @ 810BD64
 	push {r4,r5,lr}
diff --git a/include/pokeblock.h b/include/pokeblock.h
index c90218480..6fdb67369 100755
--- a/include/pokeblock.h
+++ b/include/pokeblock.h
@@ -8,7 +8,7 @@ struct YesNoCBTable {
 
 extern u8 ewram[];
 extern u8 gUnknown_02039244;
-extern u8 gUnknown_02039248[3];
+extern u8 gUnknown_02039248[4];
 extern u8 gUnknown_0203924C;
 extern const u8 *gUnknown_03000758;
 
diff --git a/src/pokeblock.c b/src/pokeblock.c
index 437f25e46..111bf2160 100755
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -425,3 +425,52 @@ void sub_810BB88(u8 a0)
         MenuPrint(gStringVar1, 15, y + 1);
     }
 }
+
+void sub_810BDAC(bool8);
+
+void sub_810BC84(u8 a0)
+{
+    sub_810BB88(a0);
+    sub_810BDAC(FALSE);
+}
+
+void sub_810BC98(void)
+{
+    u16 i, j;
+    struct Pokeblock buf;
+    for (i=0; i<39; i++)
+    {
+        for (j=i+1; j<40; j++)
+        {
+            if (gSaveBlock1.pokeblocks[i].color == 0)
+            {
+                buf = gSaveBlock1.pokeblocks[i];
+                gSaveBlock1.pokeblocks[i] = gSaveBlock1.pokeblocks[j];
+                gSaveBlock1.pokeblocks[j] = buf;
+            }
+        }
+    }
+}
+
+void sub_810BD08(void)
+{
+    u8 i;
+    gUnknown_02039248[2] = 0;
+    for (i=0; i<40; i++)
+    {
+        if (gSaveBlock1.pokeblocks[i].color != 0)
+            gUnknown_02039248[2]++;
+    }
+    if (gUnknown_02039248[2] < 8)
+    {
+        gUnknown_02039248[3] = gUnknown_02039248[2];
+    }
+    else
+    {
+        gUnknown_02039248[3] = 8;
+    }
+    if (gUnknown_02039248[1] + 8 > gUnknown_02039248[2] && gUnknown_02039248[1] != 0)
+    {
+        gUnknown_02039248[1]--;
+    }
+}