Match sub_080A5594

4 files changed, 73 insertions, 137 deletions

diff --git a/asm/non_matching/subtask2/sub_080A5594.inc b/asm/non_matching/subtask2/sub_080A5594.inc
deleted file mode 100644
index 15b3e7b9..00000000
--- a/asm/non_matching/subtask2/sub_080A5594.inc
+++ /dev/null
@@ -1,133 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	ldr r4, _080A5620 @ =gMenu
-	ldr r0, _080A5624 @ =gUnk_08128C00
-	str r0, [r4, #0xc]
-	ldr r0, _080A5628 @ =gUnk_08128C04
-	bl sub_080A70AC
-	movs r6, #6
-	movs r5, #0x34
-	adds r7, r4, #0
-	adds r7, #0x10
-_080A55AA:
-	adds r0, r5, #0
-	bl GetInventoryValue
-	cmp r0, #1
-	bne _080A55EA
-	ldr r1, _080A562C @ =gItemMetaData
-	lsls r0, r5, #3
-	adds r0, r0, r1
-	ldrb r1, [r0]
-	cmp r1, #3
-	bne _080A55C8
-	ldrb r0, [r4, #0x13]
-	cmp r0, #0
-	beq _080A55C8
-	movs r1, #0x63
-_080A55C8:
-	cmp r1, #0x63
-	beq _080A55EA
-	cmp r1, #1
-	bne _080A55D8
-	adds r1, r6, #0
-	cmp r1, #7
-	bhi _080A55D8
-	adds r6, r1, #1
-_080A55D8:
-	adds r0, r1, r7
-	strb r5, [r0]
-	lsls r1, r1, #3
-	movs r0, #0xe0
-	lsls r0, r0, #2
-	adds r1, r1, r0
-	adds r0, r5, #0
-	bl sub_080A5F48
-_080A55EA:
-	adds r5, #1
-	cmp r5, #0x46
-	bls _080A55AA
-	movs r0, #0x3d
-	bl GetInventoryValue
-	cmp r0, #0
-	bne _080A564A
-	movs r5, #0
-	movs r0, #0x67
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _080A5646
-	movs r4, #0
-	ldr r1, _080A5630 @ =gUnk_02002B6B
-_080A560A:
-	adds r0, r4, r1
-	ldrb r0, [r0]
-	adds r5, r5, r0
-	adds r4, #1
-	cmp r4, #0x12
-	bls _080A560A
-	cmp r5, #0x4f
-	ble _080A5634
-	movs r5, #4
-	b _080A5646
-	.align 2, 0
-_080A5620: .4byte gMenu
-_080A5624: .4byte gUnk_08128C00
-_080A5628: .4byte gUnk_08128C04
-_080A562C: .4byte gItemMetaData
-_080A5630: .4byte gUnk_02002B6B
-_080A5634:
-	cmp r5, #0x27
-	ble _080A563C
-	movs r5, #3
-	b _080A5646
-_080A563C:
-	cmp r5, #9
-	ble _080A5644
-	movs r5, #2
-	b _080A5646
-_080A5644:
-	movs r5, #1
-_080A5646:
-	ldr r0, _080A5698 @ =gMenu
-	strb r5, [r0, #0x10]
-_080A564A:
-	ldr r0, _080A5698 @ =gMenu
-	ldr r1, _080A569C @ =gSave
-	adds r1, #0xa9
-	ldrb r1, [r1]
-	adds r1, #1
-	strb r1, [r0, #0x11]
-	movs r5, #0
-	movs r4, #0x48
-_080A565A:
-	adds r0, r4, #0
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _080A5666
-	adds r5, #1
-_080A5666:
-	adds r4, #1
-	cmp r4, #0x4f
-	bls _080A565A
-	ldr r4, _080A5698 @ =gMenu
-	strb r5, [r4, #0x12]
-	movs r0, #0x3e
-	bl GetInventoryValue
-	cmp r0, #0
-	bne _080A5688
-	movs r0, #0x3f
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _080A5688
-	movs r0, #0x3f
-	strb r0, [r4, #0x13]
-_080A5688:
-	ldr r1, _080A5698 @ =gMenu
-	movs r0, #1
-	strb r0, [r1, #0x14]
-	strb r0, [r1, #0x15]
-	bl SetMenuType
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080A5698: .4byte gMenu
-_080A569C: .4byte gSave
-	.syntax divided
diff --git a/include/menu.h b/include/menu.h
index 2549e327..609aad82 100644
--- a/include/menu.h
+++ b/include/menu.h
@@ -65,7 +65,7 @@ typedef struct {
     /*0x18*/ u16 unk18;
     /*0x1a*/ union SplitHWord unk1a;
     /*0x1c*/ u8 unk1c;
-    /*0x1s*/ u8 unk1d;
+    /*0x1d*/ u8 unk1d;
     /*0x1e*/ u8 unk1e;
     /*0x1f*/ s8 unk1f;
     /*0x20*/ u8 unk20;
diff --git a/src/object/objectB.c b/src/object/objectB.c
index a970a016..8c500500 100644
--- a/src/object/objectB.c
+++ b/src/object/objectB.c
@@ -25,7 +25,6 @@ typedef struct {
     u16 unk_6;
 } struct_080FD964;
 extern const struct_080FD964 gUnk_080FD964[];
-extern const u16 gUnk_080FD5B4[];
 
 void ObjectB_Init(ObjectBEntity*);
 void ObjectB_Action1(ObjectBEntity*);
diff --git a/src/subtask2.c b/src/subtask2.c
index 7ceb1fc6..d6ab2956 100644
--- a/src/subtask2.c
+++ b/src/subtask2.c
@@ -12,6 +12,8 @@
 #include "message.h"
 #include "ui.h"
 #include "kinstone.h"
+#include "itemMetaData.h"
+#include "item.h"
 
 #ifdef EU
 #define DRAW_DIRECT_SPRITE_INDEX 0x1fa
@@ -24,6 +26,7 @@ extern u8 gUnk_08128D43[];
 extern u16 gUnk_02017830[];
 extern u8 gUnk_080C9C6C[];
 extern u8 gUnk_020350F0[];
+extern u8 gUnk_08128C00[];
 
 void sub_080A5CFC(u32, void*, u32);
 void sub_080A6FB4(u32, u32);
@@ -38,6 +41,7 @@ void sub_080A6EE0(u32 param_1);
 struct_08127F94* sub_080A6A80(u32 param_1, u32 param_2);
 void sub_080A698C(u32 param_1, u32 param_2, u32 param_3, u32 param_4);
 void sub_080A6438();
+void sub_080A5F48(u32, u32);
 
 extern void DrawDungeonMap(u32 floor, struct_02019EE0* data, u32 size);
 extern void LoadDungeonMap(void);
@@ -136,7 +140,73 @@ typedef struct {
 
 extern const struct_gUnk_08128D70 gUnk_08128D70[];
 
-ASM_FUNC("asm/non_matching/subtask2/sub_080A5594.inc", void sub_080A5594())
+void sub_080A5594(void) {
+    extern KeyButtonLayout gUnk_08128C04;
+    int iVar1;
+    u32 uVar2;
+    u32 skillCount;
+    u32 item;
+    int iVar5;
+    u32 i;
+    u32 uVar7;
+
+    gMenu.field_0xc = gUnk_08128C00;
+    sub_080A70AC(&gUnk_08128C04);
+    uVar7 = 6;
+
+    for (item = ITEM_QST_SWORD; item <= ITEM_FLIPPERS; item++) {
+        if (GetInventoryValue(item) == 1) {
+            uVar2 = gItemMetaData[item].menuSlot;
+            if (uVar2 == 3 && gGenericMenu.unk10.a[3] != 0) {
+                uVar2 = 99;
+            }
+            if (uVar2 != 99) {
+                if (uVar2 == 1) {
+                    uVar2 = uVar7;
+                    if (uVar2 < 8) {
+                        uVar7 = uVar2 + 1;
+                    }
+                }
+                gGenericMenu.unk10.a[uVar2] = item;
+                sub_080A5F48(item, uVar2 * 8 + 0x380);
+            }
+        }
+    }
+    if (GetInventoryValue(ITEM_QST_TINGLE_TROPHY) == 0) {
+        iVar5 = 0;
+        if (GetInventoryValue(ITEM_KINSTONE_BAG) != 0) {
+            for (i = 0; i < 0x13; i++) {
+                iVar5 += gSave.unk12B[i];
+            }
+
+            if (iVar5 >= 0x50) {
+                iVar5 = 4;
+            } else if (iVar5 >= 0x28) {
+                iVar5 = 3;
+            } else if (iVar5 >= 10) {
+                iVar5 = 2;
+            } else {
+                iVar5 = 1;
+            }
+        }
+        gGenericMenu.unk10.a[0] = iVar5;
+    }
+    gGenericMenu.unk10.a[1] = gSave.stats.heartPieces + 1;
+    skillCount = 0;
+
+    for (i = ITEM_SKILL_SPIN_ATTACK; i <= ITEM_SKILL_PERIL_BEAM; i++) {
+        if (GetInventoryValue(i) != 0) {
+            skillCount++;
+        }
+    }
+    gGenericMenu.unk10.a[2] = skillCount;
+    if (GetInventoryValue(ITEM_QST_CARLOV_MEDAL) == 0 && GetInventoryValue(ITEM_SHELLS) != 0) {
+        gGenericMenu.unk10.a[3] = ITEM_SHELLS;
+    }
+    gGenericMenu.unk14 = 1;
+    gGenericMenu.unk15 = 1;
+    SetMenuType(1);
+}
 
 ASM_FUNC("asm/non_matching/subtask2/sub_080A56A0.inc", void sub_080A56A0())
 
@@ -382,7 +452,7 @@ bool32 sub_080A5F24(void) {
     return result;
 }
 
-ASM_FUNC("asm/non_matching/subtask2/sub_080A5F48.inc", void sub_080A5F48())
+ASM_FUNC("asm/non_matching/subtask2/sub_080A5F48.inc", void sub_080A5F48(u32 param_1, u32 param_2))
 
 void sub_080A6008(void) {
     gUnk_08128D58[gMenu.menuType]();