A couple more decorations tasks

5 files changed, 85 insertions, 262 deletions

diff --git a/asm/decoration.s b/asm/decoration.s
index 59fb0f923..71d5e3615 100644
--- a/asm/decoration.s
+++ b/asm/decoration.s
@@ -8,268 +8,6 @@
 
 .equiv ewram_1f000, 0x0201f000
 
-	thumb_func_start sub_80FE894
-sub_80FE894: @ 80FE894
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	lsls r1, 24
-	lsrs r5, r1, 24
-	lsls r2, 24
-	lsrs r7, r2, 24
-	movs r0, 0
-	mov r10, r0
-	ldr r6, _080FE920 @ =gUnknown_020388F2
-	ldrb r1, [r6]
-	ldr r4, _080FE924 @ =gUnknown_020388F4
-	ldrb r0, [r4]
-	adds r1, r0
-	ldr r2, _080FE928 @ =gUnknown_020388D5
-	mov r9, r2
-	ldrb r0, [r2]
-	cmp r1, r0
-	bne _080FE8C8
-	movs r1, 0x1
-	mov r10, r1
-_080FE8C8:
-	movs r0, 0x5
-	bl PlaySE
-	lsls r0, r5, 24
-	asrs r0, 24
-	cmp r0, 0
-	beq _080FE8DC
-	bl MoveMenuCursor
-	strb r0, [r6]
-_080FE8DC:
-	cmp r7, 0
-	beq _080FE8EE
-	ldrb r0, [r4]
-	adds r0, r7
-	strb r0, [r4]
-	mov r0, r8
-	movs r1, 0x1
-	bl sub_80FEABC
-_080FE8EE:
-	ldrb r0, [r6]
-	ldrb r1, [r4]
-	adds r0, r1
-	mov r2, r9
-	ldrb r2, [r2]
-	cmp r0, r2
-	beq _080FE92C
-	mov r0, r10
-	cmp r0, 0
-	beq _080FE90E
-	movs r0, 0xF
-	movs r1, 0xC
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuDrawTextWindow
-_080FE90E:
-	ldrb r0, [r4]
-	ldrb r6, [r6]
-	adds r0, r6
-	lsls r0, 24
-	lsrs r0, 24
-	bl sub_80FECE0
-	b _080FE938
-	.align 2, 0
-_080FE920: .4byte gUnknown_020388F2
-_080FE924: .4byte gUnknown_020388F4
-_080FE928: .4byte gUnknown_020388D5
-_080FE92C:
-	movs r0, 0xF
-	movs r1, 0xC
-	movs r2, 0x1D
-	movs r3, 0x13
-	bl MenuZeroFillWindowRect
-_080FE938:
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_80FE894
-
-	thumb_func_start sub_80FE948
-sub_80FE948: @ 80FE948
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	ldr r0, _080FE980 @ =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _080FE95C
-	b _080FEAAC
-_080FE95C:
-	ldr r0, _080FE984 @ =gMain
-	ldrh r1, [r0, 0x30]
-	movs r0, 0xF0
-	ands r0, r1
-	cmp r0, 0x40
-	bne _080FE9A0
-	ldr r0, _080FE988 @ =gUnknown_020388F2
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080FE98C
-	movs r1, 0x1
-	negs r1, r1
-	adds r0, r4, 0
-	movs r2, 0
-	bl sub_80FE894
-	b _080FE9A0
-	.align 2, 0
-_080FE980: .4byte gPaletteFade
-_080FE984: .4byte gMain
-_080FE988: .4byte gUnknown_020388F2
-_080FE98C:
-	ldr r0, _080FE9C4 @ =gUnknown_020388F4
-	ldrb r0, [r0]
-	cmp r0, 0
-	beq _080FE9A0
-	movs r2, 0x1
-	negs r2, r2
-	adds r0, r4, 0
-	movs r1, 0
-	bl sub_80FE894
-_080FE9A0:
-	ldr r0, _080FE9C8 @ =gMain
-	ldrh r1, [r0, 0x30]
-	movs r0, 0xF0
-	ands r0, r1
-	cmp r0, 0x80
-	bne _080FE9EE
-	ldr r2, _080FE9CC @ =gUnknown_020388F2
-	ldr r1, _080FE9D0 @ =gUnknown_020388F3
-	ldrb r0, [r2]
-	ldrb r1, [r1]
-	cmp r0, r1
-	beq _080FE9D4
-	adds r0, r4, 0
-	movs r1, 0x1
-	movs r2, 0
-	bl sub_80FE894
-	b _080FE9EE
-	.align 2, 0
-_080FE9C4: .4byte gUnknown_020388F4
-_080FE9C8: .4byte gMain
-_080FE9CC: .4byte gUnknown_020388F2
-_080FE9D0: .4byte gUnknown_020388F3
-_080FE9D4:
-	ldr r0, _080FEA38 @ =gUnknown_020388F4
-	ldrb r0, [r0]
-	ldrb r1, [r2]
-	adds r0, r1
-	ldr r1, _080FEA3C @ =gUnknown_020388D5
-	ldrb r1, [r1]
-	cmp r0, r1
-	beq _080FE9EE
-	adds r0, r4, 0
-	movs r1, 0
-	movs r2, 0x1
-	bl sub_80FE894
-_080FE9EE:
-	ldr r0, _080FEA40 @ =gMain
-	ldrh r1, [r0, 0x2E]
-	movs r0, 0x1
-	ands r0, r1
-	cmp r0, 0
-	beq _080FEA7C
-	bl sub_8072DEC
-	movs r0, 0x5
-	bl PlaySE
-	ldr r2, _080FEA44 @ =gUnknown_020388F5
-	ldr r1, _080FEA48 @ =gUnknown_020388F2
-	ldr r0, _080FEA38 @ =gUnknown_020388F4
-	ldrb r0, [r0]
-	ldrb r1, [r1]
-	adds r0, r1
-	strb r0, [r2]
-	ldr r1, _080FEA3C @ =gUnknown_020388D5
-	lsls r0, 24
-	lsrs r0, 24
-	ldrb r1, [r1]
-	cmp r0, r1
-	bne _080FEA54
-	ldr r1, _080FEA4C @ =gUnknown_083EC634
-	ldr r2, _080FEA50 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x1E
-	ldrsh r0, [r0, r2]
-	lsls r0, 3
-	adds r1, 0x4
-	adds r0, r1
-	b _080FEA68
-	.align 2, 0
-_080FEA38: .4byte gUnknown_020388F4
-_080FEA3C: .4byte gUnknown_020388D5
-_080FEA40: .4byte gMain
-_080FEA44: .4byte gUnknown_020388F5
-_080FEA48: .4byte gUnknown_020388F2
-_080FEA4C: .4byte gUnknown_083EC634
-_080FEA50: .4byte gTasks
-_080FEA54:
-	ldr r2, _080FEA74 @ =gUnknown_083EC634
-	ldr r1, _080FEA78 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r1
-	movs r1, 0x1E
-	ldrsh r0, [r0, r1]
-	lsls r0, 3
-	adds r0, r2
-_080FEA68:
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-	b _080FEAAC
-	.align 2, 0
-_080FEA74: .4byte gUnknown_083EC634
-_080FEA78: .4byte gTasks
-_080FEA7C:
-	movs r0, 0x2
-	ands r0, r1
-	cmp r0, 0
-	beq _080FEAAC
-	bl sub_8072DEC
-	movs r0, 0x5
-	bl PlaySE
-	ldr r1, _080FEAB4 @ =gUnknown_083EC634
-	ldr r2, _080FEAB8 @ =gTasks
-	lsls r0, r4, 2
-	adds r0, r4
-	lsls r0, 3
-	adds r0, r2
-	movs r2, 0x1E
-	ldrsh r0, [r0, r2]
-	lsls r0, 3
-	adds r1, 0x4
-	adds r0, r1
-	ldr r1, [r0]
-	adds r0, r4, 0
-	bl _call_via_r1
-_080FEAAC:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_080FEAB4: .4byte gUnknown_083EC634
-_080FEAB8: .4byte gTasks
-	thumb_func_end sub_80FE948
-
 	thumb_func_start sub_80FEABC
 sub_80FEABC: @ 80FEABC
 	push {r4-r7,lr}
diff --git a/include/decoration.h b/include/decoration.h
index 663fd5183..223527cc8 100644
--- a/include/decoration.h
+++ b/include/decoration.h
@@ -51,6 +51,7 @@ extern u8 gUnknown_020388D5;
 extern u8 gUnknown_020388F2;
 extern u8 gUnknown_020388F3;
 extern u8 gUnknown_020388F4;
+extern u8 gUnknown_020388F5;
 extern u8 gUnknown_020388F6;
 
 extern const u16 gUnknown_083EC654[3];
@@ -59,6 +60,7 @@ extern const u8 *gUnknown_083EC5E4[];
 extern const u8 *gUnknown_083EC624[];
 extern u8 *gUnknown_020388F7[];
 extern const struct MenuAction2 gUnknown_083EC604[];
+extern const struct MenuAction3 gUnknown_083EC634[];
 
 extern void sub_80B3068(u8); // src/shop
 extern u8 sub_8134194(u8); // src/decoration_inventory
@@ -79,6 +81,7 @@ void sub_80FE728(u8);
 void sub_80FE758(u8);
 void sub_80FE868(u8);
 void sub_80FE948(u8);
+void sub_80FEABC(u8, u8);
 void sub_80FEC94(u8);
 void sub_80FECB8(u8);
 void sub_80FECE0(u8);
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h
index c0874bcbb..d483d4ddc 100644
--- a/include/gba/io_reg.h
+++ b/include/gba/io_reg.h
@@ -639,6 +639,8 @@
 #define KEY_INTR_ENABLE 0x0400
 #define KEY_OR_INTR     0x0000
 #define KEY_AND_INTR    0x8000
+#define DPAD_ANY        0x00F0
+#define JOY_EXCL_DPAD   0x030F
 
 // interrupt flags
 #define INTR_FLAG_VBLANK  (1 <<  0)
diff --git a/include/menu.h b/include/menu.h
index 7fce7ef1a..04ab78b27 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -15,6 +15,12 @@ struct MenuAction2
     u8 (*func)(u8);
 };
 
+struct MenuAction3
+{
+    u8 (*func1)(u8);
+    u8 (*func2)(u8);
+};
+
 void CloseMenu(void);
 void AppendToList(u8 *list, u8 *pindex, u32 value);
 void InitMenuWindow(const struct WindowConfig *);
diff --git a/src/decoration.c b/src/decoration.c
index 0898e7a4b..599a51eea 100644
--- a/src/decoration.c
+++ b/src/decoration.c
@@ -272,3 +272,77 @@ void sub_80FE868(u8 taskId)
     sub_80FE7EC(taskId);
     gTasks[taskId].func = sub_80FE948;
 }
+
+void sub_80FE894(u8 taskId /*r8*/, s8 cursorVector /*r5*/, s8 bgVector /*r7*/)
+{
+    int v0 /*r10*/;
+    u8 v1;
+    v0 = gUnknown_020388F2 + gUnknown_020388F4 == gUnknown_020388D5;
+    PlaySE(SE_SELECT);
+    if (cursorVector != 0)
+    {
+        gUnknown_020388F2 = MoveMenuCursor(cursorVector);
+    }
+    if (bgVector != 0)
+    {
+        v1 = gUnknown_020388F4;
+        gUnknown_020388F4 = v1 + bgVector;
+        sub_80FEABC(taskId, 1);
+    }
+    if (gUnknown_020388F2 + gUnknown_020388F4 != gUnknown_020388D5)
+    {
+        if (v0)
+        {
+            MenuDrawTextWindow(15, 12, 29, 19);
+        }
+        sub_80FECE0(gUnknown_020388F2 + gUnknown_020388F4);
+    } else
+    {
+        MenuZeroFillWindowRect(15, 12, 29, 19);
+    }
+}
+
+void sub_80FE948(u8 taskId)
+{
+    if (!gPaletteFade.active)
+    {
+        if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_UP)
+        {
+            if (gUnknown_020388F2 != 0)
+            {
+                sub_80FE894(taskId, -1, 0);
+            } else if (gUnknown_020388F4 != 0)
+            {
+                sub_80FE894(taskId, 0, -1);
+            }
+        }
+        if ((gMain.newAndRepeatedKeys & DPAD_ANY) == DPAD_DOWN)
+        {
+            if (gUnknown_020388F2 != gUnknown_020388F3)
+            {
+                sub_80FE894(taskId, 1, 0);
+            } else if (gUnknown_020388F4 + gUnknown_020388F2 != gUnknown_020388D5)
+            {
+                sub_80FE894(taskId, 0, 1);
+            }
+        }
+        if (gMain.newKeys & A_BUTTON)
+        {
+            sub_8072DEC();
+            PlaySE(SE_SELECT);
+            gUnknown_020388F5 = gUnknown_020388F2 + gUnknown_020388F4;
+            if (gUnknown_020388F5 == gUnknown_020388D5)
+            {
+                gUnknown_083EC634[gTasks[taskId].data[11]].func2(taskId);
+            } else
+            {
+                gUnknown_083EC634[gTasks[taskId].data[11]].func1(taskId);
+            }
+        } else if (gMain.newKeys & B_BUTTON)
+        {
+            sub_8072DEC();
+            PlaySE(SE_SELECT);
+            gUnknown_083EC634[gTasks[taskId].data[11]].func2(taskId);
+        }
+    }
+}