sub_810C0C8

2 files changed, 57 insertions, 125 deletions

diff --git a/asm/pokeblock.s b/asm/pokeblock.s
index 3244b3586..576a80930 100755
--- a/asm/pokeblock.s
+++ b/asm/pokeblock.s
@@ -6,131 +6,6 @@
 
 	.text
 
-	thumb_func_start sub_810C0C8
-sub_810C0C8: @ 810C0C8
-	push {r4,r5,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r2, _0810C0F4 @ =gMain
-	ldrh r1, [r2, 0x30]
-	movs r0, 0x40
-	ands r0, r1
-	cmp r0, 0
-	beq _0810C110
-	ldr r4, _0810C0F8 @ =gUnknown_02039248
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _0810C0FC
-	movs r0, 0x5
-	movs r1, 0x14
-	bl sub_810BD64
-	ldrb r0, [r4]
-	subs r0, 0x1
-	strb r0, [r4]
-	b _0810C158
-	.align 2, 0
-_0810C0F4: .4byte gMain
-_0810C0F8: .4byte gUnknown_02039248
-_0810C0FC:
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	beq _0810C1BA
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_810C1C8
-	ldrb r0, [r4, 0x1]
-	subs r0, 0x1
-	b _0810C150
-_0810C110:
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0810C168
-	ldr r4, _0810C134 @ =gUnknown_02039248
-	ldrb r0, [r4]
-	ldrb r1, [r4, 0x3]
-	cmp r0, r1
-	beq _0810C138
-	movs r0, 0x5
-	movs r1, 0x14
-	bl sub_810BD64
-	ldrb r0, [r4]
-	adds r0, 0x1
-	strb r0, [r4]
-	b _0810C158
-	.align 2, 0
-_0810C134: .4byte gUnknown_02039248
-_0810C138:
-	ldrb r0, [r4, 0x1]
-	ldrb r1, [r4]
-	adds r0, r1
-	ldrb r1, [r4, 0x2]
-	cmp r0, r1
-	beq _0810C1BA
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_810C1C8
-	ldrb r0, [r4, 0x1]
-	adds r0, 0x1
-_0810C150:
-	strb r0, [r4, 0x1]
-	ldrb r0, [r4, 0x1]
-	bl sub_810BB88
-_0810C158:
-	movs r0, 0x1
-	bl sub_810BF38
-	adds r0, r5, 0
-	movs r1, 0x1
-	bl sub_810C1C8
-	b _0810C1BA
-_0810C168:
-	ldrh r1, [r2, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	bne _0810C17A
-	movs r0, 0x4
-	ands r0, r1
-	cmp r0, 0
-	beq _0810C190
-_0810C17A:
-	movs r0, 0x5
-	bl PlaySE
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_810C1C8
-	adds r0, r5, 0
-	bl sub_810C23C
-	b _0810C1AC
-_0810C190:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _0810C1BA
-	movs r0, 0x5
-	bl PlaySE
-	adds r0, r5, 0
-	movs r1, 0
-	bl sub_810C1C8
-	movs r0, 0
-	bl sub_810BDAC
-_0810C1AC:
-	ldr r0, _0810C1C0 @ =gTasks
-	lsls r1, r5, 2
-	adds r1, r5
-	lsls r1, 3
-	adds r1, r0
-	ldr r0, _0810C1C4 @ =sub_810BF7C
-	str r0, [r1]
-_0810C1BA:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0810C1C0: .4byte gTasks
-_0810C1C4: .4byte sub_810BF7C
-	thumb_func_end sub_810C0C8
-
 	thumb_func_start sub_810C1C8
 sub_810C1C8: @ 810C1C8
 	push {r4-r6,lr}
diff --git a/src/pokeblock.c b/src/pokeblock.c
index e22752253..0f1e36ee7 100755
--- a/src/pokeblock.c
+++ b/src/pokeblock.c
@@ -632,3 +632,60 @@ void sub_810BF7C(u8 taskId)
         }
     }
 }
+
+void sub_810C1C8(u8, u8);
+void sub_810C23C(u8);
+
+void sub_810C0C8(u8 taskId)
+{
+    if (gMain.newAndRepeatedKeys & DPAD_UP)
+    {
+        if (gUnknown_02039248[0] != 0)
+        {
+            sub_810BD64(5, 20);
+            gUnknown_02039248[0]--;
+            sub_810BF38(TRUE);
+            sub_810C1C8(taskId, 1);
+        }
+        else if (gUnknown_02039248[1] != 0)
+        {
+            sub_810C1C8(taskId, 0);
+            gUnknown_02039248[1]--;
+            sub_810BB88(gUnknown_02039248[1]);
+            sub_810BF38(TRUE);
+            sub_810C1C8(taskId, 1);
+        }
+    }
+    else if (gMain.newAndRepeatedKeys & DPAD_DOWN)
+    {
+        if (gUnknown_02039248[0] != gUnknown_02039248[3])
+        {
+            sub_810BD64(5, 20);
+            gUnknown_02039248[0]++;
+            sub_810BF38(TRUE);
+            sub_810C1C8(taskId, 1);
+        }
+        else if (gUnknown_02039248[1] + gUnknown_02039248[0] != gUnknown_02039248[2])
+        {
+            sub_810C1C8(taskId, 0);
+            gUnknown_02039248[1]++;
+            sub_810BB88(gUnknown_02039248[1]);
+            sub_810BF38(TRUE);
+            sub_810C1C8(taskId, 1);
+        }
+    }
+    else if (gMain.newKeys & A_BUTTON || gMain.newKeys & SELECT_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_810C1C8(taskId, 0);
+        sub_810C23C(taskId);
+        gTasks[taskId].func = sub_810BF7C;
+    }
+    else if (gMain.newKeys & B_BUTTON)
+    {
+        PlaySE(SE_SELECT);
+        sub_810C1C8(taskId, 0);
+        sub_810BDAC(0);
+        gTasks[taskId].func = sub_810BF7C;
+    }
+}