sub_8100494

3 files changed, 73 insertions, 261 deletions

diff --git a/asm/decoration.s b/asm/decoration.s
index deb3e7d0d..e8441e9a8 100755
--- a/asm/decoration.s
+++ b/asm/decoration.s
@@ -8,266 +8,6 @@
 
 .equiv ewram_1f000, 0x0201f000
 
-	thumb_func_start sub_810045C
-sub_810045C: @ 810045C
-	push {r4,lr}
-	ldr r1, _08100488 @ =gUnknown_020391AA
-	movs r0, 0
-	strb r0, [r1]
-	ldr r4, _0810048C @ =gSprites
-	ldr r3, _08100490 @ =gUnknown_020391A8
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	movs r2, 0
-	strh r2, [r0, 0x32]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	strh r2, [r0, 0x34]
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08100488: .4byte gUnknown_020391AA
-_0810048C: .4byte gSprites
-_08100490: .4byte gUnknown_020391A8
-	thumb_func_end sub_810045C
-
-	thumb_func_start sub_8100494
-sub_8100494: @ 8100494
-	push {r4-r7,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r5, _081004D0 @ =gSprites
-	ldr r3, _081004D4 @ =gUnknown_020391A8
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x36
-	ldrsh r6, [r0, r1]
-	cmp r6, 0
-	beq _081004B2
-	b _081005DE
-_081004B2:
-	ldr r1, _081004D8 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r2, r0, r1
-	movs r1, 0x1C
-	ldrsh r0, [r2, r1]
-	cmp r0, 0x1
-	bne _081004E0
-	ldr r0, _081004DC @ =gUnknown_083EC96C
-	movs r3, 0x20
-	ldrsh r1, [r2, r3]
-	lsls r1, 3
-	b _081004EE
-	.align 2, 0
-_081004D0: .4byte gSprites
-_081004D4: .4byte gUnknown_020391A8
-_081004D8: .4byte gTasks
-_081004DC: .4byte gUnknown_083EC96C
-_081004E0:
-	cmp r0, 0x2
-	bne _08100500
-	ldr r0, _081004FC @ =gUnknown_083EC96C
-	movs r3, 0x20
-	ldrsh r1, [r2, r3]
-	lsls r1, 3
-	adds r0, 0x4
-_081004EE:
-	adds r1, r0
-	ldr r1, [r1]
-	adds r0, r4, 0
-	bl _call_via_r1
-	b _0810063C
-	.align 2, 0
-_081004FC: .4byte gUnknown_083EC96C
-_08100500:
-	ldr r7, _08100644 @ =gMain
-	ldrh r1, [r7, 0x2C]
-	movs r0, 0xF0
-	mov r12, r0
-	ands r0, r1
-	cmp r0, 0x40
-	bne _08100534
-	ldr r1, _08100648 @ =gUnknown_020391AA
-	movs r0, 0x1
-	strb r0, [r1]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strh r6, [r0, 0x32]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, _0810064C @ =0x0000fffe
-	strh r1, [r0, 0x34]
-	ldrh r0, [r2, 0xA]
-	subs r0, 0x1
-	strh r0, [r2, 0xA]
-_08100534:
-	ldrh r1, [r7, 0x2C]
-	mov r0, r12
-	ands r0, r1
-	cmp r0, 0x80
-	bne _08100564
-	ldr r1, _08100648 @ =gUnknown_020391AA
-	movs r0, 0x2
-	strb r0, [r1]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strh r6, [r0, 0x32]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x2
-	strh r1, [r0, 0x34]
-	ldrh r0, [r2, 0xA]
-	adds r0, 0x1
-	strh r0, [r2, 0xA]
-_08100564:
-	ldrh r1, [r7, 0x2C]
-	mov r0, r12
-	ands r0, r1
-	cmp r0, 0x20
-	bne _08100594
-	ldr r1, _08100648 @ =gUnknown_020391AA
-	movs r0, 0x3
-	strb r0, [r1]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, _0810064C @ =0x0000fffe
-	strh r1, [r0, 0x32]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strh r6, [r0, 0x34]
-	ldrh r0, [r2, 0x8]
-	subs r0, 0x1
-	strh r0, [r2, 0x8]
-_08100594:
-	ldrh r1, [r7, 0x2C]
-	mov r0, r12
-	ands r0, r1
-	cmp r0, 0x10
-	bne _081005C4
-	ldr r1, _08100648 @ =gUnknown_020391AA
-	movs r0, 0x4
-	strb r0, [r1]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	movs r1, 0x2
-	strh r1, [r0, 0x32]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strh r6, [r0, 0x34]
-	ldrh r0, [r2, 0x8]
-	adds r0, 0x1
-	strh r0, [r2, 0x8]
-_081005C4:
-	bl sub_8100430
-	lsls r0, 24
-	cmp r0, 0
-	beq _081005DA
-	adds r0, r4, 0
-	bl sub_810038C
-	lsls r0, 24
-	cmp r0, 0
-	bne _081005DE
-_081005DA:
-	bl sub_810045C
-_081005DE:
-	ldr r0, _08100648 @ =gUnknown_020391AA
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _0810060C
-	ldr r3, _08100650 @ =gSprites
-	ldr r2, _08100654 @ =gUnknown_020391A8
-	ldrb r1, [r2]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r3
-	ldrh r1, [r0, 0x36]
-	adds r1, 0x1
-	strh r1, [r0, 0x36]
-	ldrb r0, [r2]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r3
-	ldrh r2, [r1, 0x36]
-	movs r0, 0x7
-	ands r0, r2
-	strh r0, [r1, 0x36]
-_0810060C:
-	ldr r0, _08100658 @ =gTasks
-	lsls r1, r4, 2
-	adds r1, r4
-	lsls r1, 3
-	adds r2, r1, r0
-	movs r1, 0x1C
-	ldrsh r0, [r2, r1]
-	cmp r0, 0
-	bne _0810063C
-	ldr r4, _08100644 @ =gMain
-	ldrh r1, [r4, 0x2E]
-	movs r3, 0x1
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0810062E
-	strh r3, [r2, 0x1C]
-_0810062E:
-	ldrh r1, [r4, 0x2E]
-	movs r3, 0x2
-	adds r0, r3, 0
-	ands r0, r1
-	cmp r0, 0
-	beq _0810063C
-	strh r3, [r2, 0x1C]
-_0810063C:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_08100644: .4byte gMain
-_08100648: .4byte gUnknown_020391AA
-_0810064C: .4byte 0x0000fffe
-_08100650: .4byte gSprites
-_08100654: .4byte gUnknown_020391A8
-_08100658: .4byte gTasks
-	thumb_func_end sub_8100494
-
 	thumb_func_start sub_810065C
 sub_810065C: @ 810065C
 	push {r4,lr}
diff --git a/include/decoration.h b/include/decoration.h
index c0feade2b..fd25fe27b 100755
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -209,6 +209,7 @@ extern u8 gUnknown_020391A8;
 extern u8 gUnknown_020391A9;
 extern u8 gUnknown_020391AA;
 extern void (*gUnknown_0300485C)(void);
+extern void (*gUnknown_083EC96C[2][2])(u8);
 
 extern const u16 gUnknown_083EC654[3];
 extern const struct DecorationInventory gDecorationInventories[];
diff --git a/src/decoration.c b/src/decoration.c
index a001ffba9..5387ad27d 100755
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -1792,9 +1792,80 @@ bool8 sub_810038C(u8 taskId)
 
 bool8 sub_8100430(void)
 {
-    if ((gMain.heldKeys & 0xF0) != DPAD_UP && (gMain.heldKeys & 0xF0) != DPAD_DOWN && (gMain.heldKeys & 0xF0) != DPAD_LEFT && (gMain.heldKeys & 0xF0) != DPAD_RIGHT)
+    if ((gMain.heldKeys & DPAD_ANY) != DPAD_UP && (gMain.heldKeys & DPAD_ANY) != DPAD_DOWN && (gMain.heldKeys & DPAD_ANY) != DPAD_LEFT && (gMain.heldKeys & DPAD_ANY) != DPAD_RIGHT)
     {
         return FALSE;
     }
     return TRUE;
 }
+
+void sub_810045C(void)
+{
+    gUnknown_020391AA = 0;
+    gSprites[gUnknown_020391A8].data2 = 0;
+    gSprites[gUnknown_020391A8].data3 = 0;
+}
+
+void sub_8100494(u8 taskId)
+{
+    if (!gSprites[gUnknown_020391A8].data4)
+    {
+        if (gTasks[taskId].data[10] == 1)
+        {
+            gUnknown_083EC96C[gTasks[taskId].data[12]][0](taskId);
+            return;
+        } else if (gTasks[taskId].data[10] == 2)
+        {
+            gUnknown_083EC96C[gTasks[taskId].data[12]][1](taskId);
+            return;
+        }
+        if ((gMain.heldKeys & DPAD_ANY) == DPAD_UP)
+        {
+            gUnknown_020391AA = DIR_SOUTH;
+            gSprites[gUnknown_020391A8].data2 =  0;
+            gSprites[gUnknown_020391A8].data3 = -2;
+            gTasks[taskId].data[1]--;
+        }
+        if ((gMain.heldKeys & DPAD_ANY) == DPAD_DOWN)
+        {
+            gUnknown_020391AA = DIR_NORTH;
+            gSprites[gUnknown_020391A8].data2 =  0;
+            gSprites[gUnknown_020391A8].data3 =  2;
+            gTasks[taskId].data[1]++;
+        }
+        if ((gMain.heldKeys & DPAD_ANY) == DPAD_LEFT)
+        {
+            gUnknown_020391AA = DIR_WEST;
+            gSprites[gUnknown_020391A8].data2 = -2;
+            gSprites[gUnknown_020391A8].data3 =  0;
+            gTasks[taskId].data[0]--;
+        }
+        if ((gMain.heldKeys & DPAD_ANY) == DPAD_RIGHT)
+        {
+            gUnknown_020391AA = DIR_EAST;
+            gSprites[gUnknown_020391A8].data2 =  2;
+            gSprites[gUnknown_020391A8].data3 =  0;
+            gTasks[taskId].data[0]++;
+        }
+        if (!sub_8100430() || !sub_810038C(taskId))
+        {
+            sub_810045C();
+        }
+    }
+    if (gUnknown_020391AA)
+    {
+        gSprites[gUnknown_020391A8].data4++;
+        gSprites[gUnknown_020391A8].data4 &= 7;
+    }
+    if (!gTasks[taskId].data[10])
+    {
+        if (gMain.newKeys & A_BUTTON)
+        {
+            gTasks[taskId].data[10] = A_BUTTON;
+        }
+        if (gMain.newKeys & B_BUTTON)
+        {
+            gTasks[taskId].data[10] = B_BUTTON;
+        }
+    }
+}