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/asm/non_matching/subtask2/sub_080A5F48.inc b/asm/non_matching/subtask2/sub_080A5F48.inc
deleted file mode 100644
index 50fad184..00000000
--- a/asm/non_matching/subtask2/sub_080A5F48.inc
+++ /dev/null
@@ -1,94 +0,0 @@
-	.syntax unified
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	cmp r4, #0x1f
-	bhi _080A5F5C
-	cmp r4, #0x1c
-	blo _080A5F5C
-	ldr r0, _080A5F9C @ =gSave
-	adds r0, r0, r4
-	adds r0, #0x9a
-	ldrb r4, [r0]
-_080A5F5C:
-	lsls r0, r1, #5
-	ldr r1, _080A5FA0 @ =0x06010000
-	adds r5, r0, r1
-	ldr r1, _080A5FA4 @ =gSpriteAnimations_322
-	lsls r0, r4, #2
-	adds r0, r0, r1
-	ldr r0, [r0]
-	ldrb r1, [r0]
-	ldr r3, _080A5FA8 @ =gMoreSpritePtrs
-	lsls r1, r1, #2
-	ldr r0, [r3, #4]
-	adds r0, r0, r1
-	ldr r2, _080A5FAC @ =0x040000D4
-	ldrh r1, [r0, #2]
-	lsls r1, r1, #5
-	ldr r0, [r3, #8]
-	adds r0, r0, r1
-	str r0, [r2]
-	str r5, [r2, #4]
-	ldr r0, _080A5FB0 @ =0x84000040
-	str r0, [r2, #8]
-	ldr r0, [r2, #8]
-	movs r0, #1
-	rsbs r0, r0, #0
-	cmp r4, #7
-	blo _080A5FBE
-	cmp r4, #8
-	bhi _080A5FB4
-	ldr r0, _080A5F9C @ =gSave
-	adds r0, #0xac
-	b _080A5FBC
-	.align 2, 0
-_080A5F9C: .4byte gSave
-_080A5FA0: .4byte 0x06010000
-_080A5FA4: .4byte gSpriteAnimations_322
-_080A5FA8: .4byte gMoreSpritePtrs
-_080A5FAC: .4byte 0x040000D4
-_080A5FB0: .4byte 0x84000040
-_080A5FB4:
-	cmp r4, #0xa
-	bhi _080A5FBE
-	ldr r0, _080A5FF8 @ =gSave
-	adds r0, #0xad
-_080A5FBC:
-	ldrb r0, [r0]
-_080A5FBE:
-	cmp r0, #0
-	blt _080A5FF6
-	movs r1, #0xa
-	bl Div
-	adds r4, r1, #0
-	cmp r0, #9
-	ble _080A5FD0
-	movs r0, #9
-_080A5FD0:
-	ldr r1, _080A5FFC @ =0x040000D4
-	lsls r0, r0, #5
-	ldr r2, _080A6000 @ =gUnk_085C4620
-	adds r0, r0, r2
-	str r0, [r1]
-	str r5, [r1, #4]
-	ldr r3, _080A6004 @ =0x84000008
-	str r3, [r1, #8]
-	ldr r0, [r1, #8]
-	adds r0, r4, #0
-	adds r0, #0xa
-	lsls r0, r0, #5
-	adds r0, r0, r2
-	str r0, [r1]
-	adds r0, r5, #0
-	adds r0, #0x20
-	str r0, [r1, #4]
-	str r3, [r1, #8]
-	ldr r0, [r1, #8]
-_080A5FF6:
-	pop {r4, r5, pc}
-	.align 2, 0
-_080A5FF8: .4byte gSave
-_080A5FFC: .4byte 0x040000D4
-_080A6000: .4byte gUnk_085C4620
-_080A6004: .4byte 0x84000008
-	.syntax divided
diff --git a/asm/non_matching/subtask2/sub_080A6044.inc b/asm/non_matching/subtask2/sub_080A6044.inc
deleted file mode 100644
index 01a29afa..00000000
--- a/asm/non_matching/subtask2/sub_080A6044.inc
+++ /dev/null
@@ -1,75 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	bl sub_080A51F4
-	cmp r0, #0
-	beq _080A60C2
-	ldr r0, _080A60CC @ =gMenu
-	ldr r1, _080A60D0 @ =gUnk_08128D51
-	str r1, [r0, #0xc]
-	ldr r1, _080A60D4 @ =gOamCmd
-	movs r0, #0
-	strh r0, [r1, #4]
-	strh r0, [r1, #6]
-	movs r5, #0
-	movs r4, #0
-	ldr r0, _080A60D8 @ =gSave
-	movs r2, #0x8c
-	lsls r2, r2, #1
-	adds r3, r0, r2
-	ldrb r2, [r3]
-	cmp r2, #0
-	beq _080A60C2
-	adds r6, r1, #0
-	movs r1, #0
-	mov sb, r1
-	adds r7, r0, #0
-	mov r8, r3
-_080A607E:
-	movs r1, #3
-	ands r1, r5
-	lsls r0, r1, #1
-	adds r0, r0, r1
-	lsls r0, r0, #4
-	adds r0, #0x2b
-	strh r0, [r6]
-	lsrs r1, r5, #2
-	lsls r0, r1, #3
-	adds r0, r0, r1
-	lsls r0, r0, #2
-	adds r0, #0x34
-	strh r0, [r6, #2]
-	ldr r3, _080A60DC @ =0x0000012B
-	adds r0, r7, r3
-	adds r0, r4, r0
-	ldrb r1, [r0]
-	ldr r0, _080A60CC @ =gMenu
-	mov r3, sb
-	strb r3, [r0, #1]
-	adds r0, r2, #0
-	bl sub_080A42E0
-	adds r5, #1
-	cmp r5, #0xa
-	bhi _080A60C2
-	adds r4, #1
-	cmp r4, #0x11
-	bhi _080A60C2
-	mov r1, r8
-	adds r0, r4, r1
-	ldrb r2, [r0]
-	cmp r2, #0
-	bne _080A607E
-_080A60C2:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080A60CC: .4byte gMenu
-_080A60D0: .4byte gUnk_08128D51
-_080A60D4: .4byte gOamCmd
-_080A60D8: .4byte gSave
-_080A60DC: .4byte 0x0000012B
-	.syntax divided
diff --git a/asm/non_matching/subtask2/sub_080A617C.inc b/asm/non_matching/subtask2/sub_080A617C.inc
deleted file mode 100644
index 7c4e8fe6..00000000
--- a/asm/non_matching/subtask2/sub_080A617C.inc
+++ /dev/null
@@ -1,234 +0,0 @@
-	.syntax unified
-.ifdef EU
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	ldr r6, _080A5A50 @ =gOamCmd
-	movs r0, #0
-	strh r0, [r6, #4]
-	strh r0, [r6, #6]
-	movs r7, #0xc0
-	lsls r7, r7, #4
-	strh r7, [r6, #8]
-	movs r0, #0x2f
-	mov r8, r0
-	mov r2, r8
-	strh r2, [r6, #2]
-	ldr r4, _080A5A54 @ =gMenu
-	ldrb r1, [r4, #3]
-	lsls r0, r1, #3
-	subs r0, r0, r1
-	lsls r0, r0, #2
-	subs r0, r0, r1
-	adds r0, #0x1a
-	strh r0, [r6]
-	ldr r0, _080A5A58 @ =gMain
-	ldrh r1, [r0, #0xc]
-	movs r0, #0x20
-	ands r0, r1
-	movs r1, #9
-	cmp r0, #0
-	beq _080A59AC
-	movs r1, #8
-_080A59AC:
-	ldr r5, _080A5A5C @ =0x000001FB
-	adds r0, r5, #0
-	bl DrawDirect
-	ldrb r0, [r4, #3]
-	lsls r0, r0, #3
-	ldr r1, _080A5A60 @ =gUnk_08128D70
-	adds r4, r0, r1
-	ldrb r0, [r4]
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _080A5A0E
-	strh r7, [r6, #8]
-	movs r0, #0xcc
-	strh r0, [r6]
-	movs r0, #0x88
-	strh r0, [r6, #2]
-	adds r0, r5, #0
-	movs r1, #0xb
-	bl DrawDirect
-	movs r0, #0x30
-	strh r0, [r6]
-	movs r0, #0x6c
-	strh r0, [r6, #2]
-	ldrb r0, [r4, #1]
-	lsls r0, r0, #0xc
-	movs r2, #0xd8
-	lsls r2, r2, #4
-	adds r1, r2, #0
-	orrs r0, r1
-	strh r0, [r6, #8]
-	ldrb r1, [r4, #2]
-	adds r0, r5, #0
-	bl DrawDirect
-	ldrb r0, [r4, #1]
-	lsls r0, r0, #0xc
-	orrs r0, r7
-	strh r0, [r6, #8]
-	movs r0, #0x78
-	strh r0, [r6]
-	movs r0, #0x68
-	strh r0, [r6, #2]
-	adds r0, r5, #0
-	movs r1, #0xc
-	bl DrawDirect
-_080A5A0E:
-	mov r0, r8
-	strh r0, [r6, #2]
-	movs r5, #0
-	adds r7, r6, #0
-	movs r6, #0x18
-_080A5A18:
-	lsls r1, r5, #3
-	ldr r0, _080A5A60 @ =gUnk_08128D70
-	adds r4, r1, r0
-	ldrb r0, [r4]
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _080A5A40
-	ldrb r0, [r4, #1]
-	lsls r0, r0, #0xc
-	movs r2, #0xc0
-	lsls r2, r2, #4
-	adds r1, r2, #0
-	orrs r0, r1
-	strh r0, [r7, #8]
-	strh r6, [r7]
-	ldr r0, _080A5A5C @ =0x000001FB
-	movs r1, #0xa
-	bl DrawDirect
-_080A5A40:
-	adds r6, #0x1b
-	adds r5, #1
-	cmp r5, #7
-	bls _080A5A18
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080A5A50: .4byte gOamCmd
-_080A5A54: .4byte gMenu
-_080A5A58: .4byte gMain
-_080A5A5C: .4byte 0x000001FB
-_080A5A60: .4byte gUnk_08128D70
-.else
-	push {r4, r5, r6, r7, lr}
-	mov r7, r8
-	push {r7}
-	ldr r6, _080A6260 @ =gOamCmd
-	movs r0, #0
-	strh r0, [r6, #4]
-	strh r0, [r6, #6]
-	movs r7, #0xc0
-	lsls r7, r7, #4
-	strh r7, [r6, #8]
-	movs r0, #0x2f
-	mov r8, r0
-	mov r2, r8
-	strh r2, [r6, #2]
-	ldr r4, _080A6264 @ =gMenu
-	ldrb r1, [r4, #3]
-	lsls r0, r1, #3
-	subs r0, r0, r1
-	lsls r0, r0, #2
-	subs r0, r0, r1
-	adds r0, #0x1a
-	strh r0, [r6]
-	ldr r0, _080A6268 @ =gMain
-	ldrh r1, [r0, #0xc]
-	movs r0, #0x20
-	ands r0, r1
-	movs r1, #9
-	cmp r0, #0
-	beq _080A61B8
-	movs r1, #8
-_080A61B8:
-	movs r5, #0xfe
-	lsls r5, r5, #1
-	adds r0, r5, #0
-	bl DrawDirect
-	ldrb r0, [r4, #3]
-	lsls r0, r0, #3
-	ldr r1, _080A626C @ =gUnk_08128D70
-	adds r4, r0, r1
-	ldrb r0, [r4]
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _080A621C
-	strh r7, [r6, #8]
-	movs r0, #0xcc
-	strh r0, [r6]
-	movs r0, #0x88
-	strh r0, [r6, #2]
-	adds r0, r5, #0
-	movs r1, #0xb
-	bl DrawDirect
-	movs r0, #0x30
-	strh r0, [r6]
-	movs r0, #0x6c
-	strh r0, [r6, #2]
-	ldrb r0, [r4, #1]
-	lsls r0, r0, #0xc
-	movs r2, #0xd8
-	lsls r2, r2, #4
-	adds r1, r2, #0
-	orrs r0, r1
-	strh r0, [r6, #8]
-	ldrb r1, [r4, #2]
-	adds r0, r5, #0
-	bl DrawDirect
-	ldrb r0, [r4, #1]
-	lsls r0, r0, #0xc
-	orrs r0, r7
-	strh r0, [r6, #8]
-	movs r0, #0x78
-	strh r0, [r6]
-	movs r0, #0x68
-	strh r0, [r6, #2]
-	adds r0, r5, #0
-	movs r1, #0xc
-	bl DrawDirect
-_080A621C:
-	mov r0, r8
-	strh r0, [r6, #2]
-	movs r5, #0
-	adds r7, r6, #0
-	movs r6, #0x18
-_080A6226:
-	lsls r1, r5, #3
-	ldr r0, _080A626C @ =gUnk_08128D70
-	adds r4, r1, r0
-	ldrb r0, [r4]
-	bl GetInventoryValue
-	cmp r0, #0
-	beq _080A6250
-	ldrb r0, [r4, #1]
-	lsls r0, r0, #0xc
-	movs r2, #0xc0
-	lsls r2, r2, #4
-	adds r1, r2, #0
-	orrs r0, r1
-	strh r0, [r7, #8]
-	strh r6, [r7]
-	movs r0, #0xfe
-	lsls r0, r0, #1
-	movs r1, #0xa
-	bl DrawDirect
-_080A6250:
-	adds r6, #0x1b
-	adds r5, #1
-	cmp r5, #7
-	bls _080A6226
-	pop {r3}
-	mov r8, r3
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_080A6260: .4byte gOamCmd
-_080A6264: .4byte gMenu
-_080A6268: .4byte gMain
-_080A626C: .4byte gUnk_08128D70
-.endif
-	.syntax divided
diff --git a/asm/non_matching/subtask2/sub_080A62E0.inc b/asm/non_matching/subtask2/sub_080A62E0.inc
deleted file mode 100644
index 1855ca71..00000000
--- a/asm/non_matching/subtask2/sub_080A62E0.inc
+++ /dev/null
@@ -1,81 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	bl sub_080A51F4
-	cmp r0, #0
-	beq _080A6372
-	ldr r0, _080A6310 @ =gMenu
-	ldrb r3, [r0, #3]
-	lsls r1, r3, #3
-	ldr r0, _080A6314 @ =gUnk_08128DE8
-	adds r1, r1, r0
-	movs r4, #1
-	rsbs r4, r4, #0
-	ldr r0, _080A6318 @ =gInput
-	ldrh r2, [r0, #2]
-	cmp r2, #0x20
-	beq _080A634E
-	cmp r2, #0x20
-	bgt _080A631C
-	cmp r2, #1
-	beq _080A6326
-	cmp r2, #0x10
-	beq _080A6354
-	b _080A635A
-	.align 2, 0
-_080A6310: .4byte gMenu
-_080A6314: .4byte gUnk_08128DE8
-_080A6318: .4byte gInput
-_080A631C:
-	cmp r2, #0x40
-	beq _080A6344
-	cmp r2, #0x80
-	beq _080A634A
-	b _080A635A
-_080A6326:
-	ldr r0, _080A6340 @ =gSave
-	lsls r2, r3
-	ldr r0, [r0, #0x40]
-	ands r0, r2
-	cmp r0, #0
-	beq _080A635A
-	movs r0, #0x6a
-	bl SoundReq
-	movs r0, #6
-	bl sub_080A4E84
-	b _080A635A
-	.align 2, 0
-_080A6340: .4byte gSave
-_080A6344:
-	ldrb r0, [r1]
-	lsls r0, r0, #0x1b
-	b _080A6358
-_080A634A:
-	ldrh r0, [r1]
-	b _080A6356
-_080A634E:
-	ldrb r0, [r1, #2]
-	lsls r0, r0, #0x1b
-	b _080A6358
-_080A6354:
-	ldrh r0, [r1, #2]
-_080A6356:
-	lsls r0, r0, #0x16
-_080A6358:
-	lsrs r4, r0, #0x1b
-_080A635A:
-	cmp r4, #0
-	blt _080A6368
-	ldr r0, _080A6374 @ =gMenu
-	strb r4, [r0, #3]
-	movs r0, #0x69
-	bl SoundReq
-_080A6368:
-	ldr r0, _080A6374 @ =gMenu
-	ldrb r0, [r0, #3]
-	movs r1, #0
-	bl sub_080A6FB4
-_080A6372:
-	pop {r4, pc}
-	.align 2, 0
-_080A6374: .4byte gMenu
-	.syntax divided
diff --git a/asm/non_matching/subtask2/sub_080A6378.inc b/asm/non_matching/subtask2/sub_080A6378.inc
deleted file mode 100644
index 2b5b18ef..00000000
--- a/asm/non_matching/subtask2/sub_080A6378.inc
+++ /dev/null
@@ -1,180 +0,0 @@
-	.syntax unified
-.ifdef EU
-	push {r4, r5, r6, lr}
-	ldr r0, _080A5C18 @ =gMenu
-	adds r4, r0, #0
-	adds r4, #0x2c
-	ldrb r0, [r4]
-	adds r0, #1
-	strb r0, [r4]
-	movs r6, #0x20
-	ands r0, r6
-	cmp r0, #0
-	beq _080A5B86
-	bl sub_080A6438
-_080A5B86:
-	ldr r5, _080A5C1C @ =gOamCmd
-	movs r0, #0x80
-	lsls r0, r0, #3
-	strh r0, [r5, #4]
-	movs r0, #0
-	strh r0, [r5, #6]
-	movs r0, #0xe0
-	lsls r0, r0, #7
-	strh r0, [r5, #8]
-	ldrb r1, [r4]
-	adds r0, r6, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _080A5BE0
-	ldr r4, _080A5C20 @ =gRoomTransition
-	ldrh r1, [r4, #0x20]
-	lsls r0, r1, #2
-	adds r0, r0, r1
-	lsls r0, r0, #5
-	movs r1, #0xf9
-	lsls r1, r1, #4
-	bl __divsi3
-	adds r0, #0x28
-	strh r0, [r5]
-	ldrh r0, [r4, #0x22]
-	lsls r0, r0, #7
-	movs r1, #0xc6
-	lsls r1, r1, #4
-	bl __divsi3
-	adds r0, #0xc
-	strh r0, [r5, #2]
-	ldr r0, _080A5C24 @ =gPlayerState
-	ldr r0, [r0, #0x30]
-	movs r1, #8
-	ands r0, r1
-	movs r1, #0x59
-	cmp r0, #0
-	beq _080A5BD8
-	movs r1, #0x5a
-_080A5BD8:
-	movs r0, #0xfd
-	lsls r0, r0, #1
-	bl DrawDirect
-_080A5BE0:
-	ldr r3, _080A5C18 @ =gMenu
-	ldrb r0, [r3, #3]
-	lsls r0, r0, #3
-	ldr r1, _080A5C28 @ =gUnk_08128DE8
-	adds r0, r0, r1
-	ldr r2, _080A5C1C @ =gOamCmd
-	ldrb r1, [r0, #6]
-	strh r1, [r2]
-	ldrb r0, [r0, #7]
-	strh r0, [r2, #2]
-	ldrb r0, [r3, #3]
-	lsls r2, r0, #1
-	adds r2, r2, r0
-	adds r2, #0x26
-	adds r3, #0x2c
-	ldrb r1, [r3]
-	lsrs r1, r1, #4
-	movs r0, #1
-	bics r0, r1
-	adds r1, r2, r0
-	movs r0, #0xfd
-	lsls r0, r0, #1
-	bl DrawDirect
-	bl sub_080A6498
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080A5C18: .4byte gMenu
-_080A5C1C: .4byte gOamCmd
-_080A5C20: .4byte gRoomTransition
-_080A5C24: .4byte gPlayerState
-_080A5C28: .4byte gUnk_08128DE8
-.else
-	push {r4, r5, r6, lr}
-	ldr r0, _080A6420 @ =gMenu
-	adds r4, r0, #0
-	adds r4, #0x2c
-	ldrb r0, [r4]
-	adds r0, #1
-	strb r0, [r4]
-	movs r6, #0x20
-	ands r0, r6
-	cmp r0, #0
-	beq _080A6392
-	bl sub_080A6438
-_080A6392:
-	ldr r5, _080A6424 @ =gOamCmd
-	movs r0, #0x80
-	lsls r0, r0, #3
-	strh r0, [r5, #4]
-	movs r0, #0
-	strh r0, [r5, #6]
-	movs r0, #0xe0
-	lsls r0, r0, #7
-	strh r0, [r5, #8]
-	ldrb r1, [r4]
-	adds r0, r6, #0
-	ands r0, r1
-	cmp r0, #0
-	bne _080A63EA
-	ldr r4, _080A6428 @ =gRoomTransition
-	ldrh r1, [r4, #0x20]
-	lsls r0, r1, #2
-	adds r0, r0, r1
-	lsls r0, r0, #5
-	movs r1, #0xf9
-	lsls r1, r1, #4
-	bl __divsi3
-	adds r0, #0x28
-	strh r0, [r5]
-	ldrh r0, [r4, #0x22]
-	lsls r0, r0, #7
-	movs r1, #0xc6
-	lsls r1, r1, #4
-	bl __divsi3
-	adds r0, #0xc
-	strh r0, [r5, #2]
-	ldr r0, _080A642C @ =gPlayerState
-	ldr r0, [r0, #0x30]
-	movs r1, #8
-	ands r0, r1
-	movs r1, #0x59
-	cmp r0, #0
-	beq _080A63E4
-	movs r1, #0x5a
-_080A63E4:
-	ldr r0, _080A6430 @ =0x000001FB
-	bl DrawDirect
-_080A63EA:
-	ldr r3, _080A6420 @ =gMenu
-	ldrb r0, [r3, #3]
-	lsls r0, r0, #3
-	ldr r1, _080A6434 @ =gUnk_08128DE8
-	adds r0, r0, r1
-	ldr r2, _080A6424 @ =gOamCmd
-	ldrb r1, [r0, #6]
-	strh r1, [r2]
-	ldrb r0, [r0, #7]
-	strh r0, [r2, #2]
-	ldrb r0, [r3, #3]
-	lsls r2, r0, #1
-	adds r2, r2, r0
-	adds r2, #0x26
-	adds r3, #0x2c
-	ldrb r1, [r3]
-	lsrs r1, r1, #4
-	movs r0, #1
-	bics r0, r1
-	adds r1, r2, r0
-	ldr r0, _080A6430 @ =0x000001FB
-	bl DrawDirect
-	bl sub_080A6498
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080A6420: .4byte gMenu
-_080A6424: .4byte gOamCmd
-_080A6428: .4byte gRoomTransition
-_080A642C: .4byte gPlayerState
-_080A6430: .4byte 0x000001FB
-_080A6434: .4byte gUnk_08128DE8
-.endif
-	.syntax divided
diff --git a/asm/non_matching/subtask2/sub_080A68D4.inc b/asm/non_matching/subtask2/sub_080A68D4.inc
deleted file mode 100644
index 6028772c..00000000
--- a/asm/non_matching/subtask2/sub_080A68D4.inc
+++ /dev/null
@@ -1,174 +0,0 @@
-	.syntax unified
-.ifdef EU
-	push {r4, r5, r6, lr}
-	ldr r0, _080A6100EU @ =gPlayerState
-	ldr r0, [r0, #0x30]
-	movs r1, #8
-	ands r0, r1
-	movs r4, #0x64
-	cmp r0, #0
-	beq _080A60DA
-	movs r4, #0x65
-_080A60DA:
-	ldr r1, _080A6104EU @ =gRoomTransition
-	ldrh r0, [r1, #0x20]
-	ldrh r1, [r1, #0x22]
-	movs r2, #0xfd
-	lsls r2, r2, #1
-	movs r3, #0x80
-	lsls r3, r3, #1
-	adds r3, r4, r3
-	bl sub_080A698C
-	bl sub_080A6F40
-	adds r6, r0, #0
-	ldr r0, _080A6108 @ =gSave
-	ldrh r0, [r0, #0x20]
-	ands r6, r0
-	ldr r4, _080A610C @ =gUnk_08128F58
-	movs r5, #0
-	b _080A612C
-	.align 2, 0
-_080A6100EU: .4byte gPlayerState
-_080A6104EU: .4byte gRoomTransition
-_080A6108: .4byte gSave
-_080A610C: .4byte gUnk_08128F58
-_080A6110:
-	movs r0, #1
-	lsls r0, r5
-	ands r0, r6
-	cmp r0, #0
-	beq _080A6128EU
-	ldrh r0, [r4, #4]
-	ldrh r1, [r4, #6]
-	ldrb r3, [r4, #3]
-	movs r2, #0xfd
-	lsls r2, r2, #1
-	bl sub_080A698C
-_080A6128EU:
-	adds r5, #1
-	adds r4, #8
-_080A612C:
-	ldrb r0, [r4]
-	cmp r0, #0
-	bne _080A6110
-	movs r5, #0xa
-_080A6134:
-	adds r0, r5, #0
-	bl CheckKinstoneFused
-	cmp r0, #0
-	beq _080A616A
-	adds r0, r5, #0
-	bl sub_0801E810
-	cmp r0, #0
-	bne _080A616A
-	ldr r1, _080A6174 @ =gUnk_080C9CBC
-	lsls r0, r5, #3
-	adds r0, r0, r1
-	ldrb r3, [r0, #7]
-	ldrb r0, [r0, #4]
-	lsls r1, r0, #2
-	adds r1, r1, r0
-	lsls r1, r1, #2
-	ldr r0, _080A6178EU @ =gUnk_080FE320
-	adds r1, r1, r0
-	ldrh r0, [r1, #0xc]
-	ldrh r1, [r1, #0xe]
-	adds r3, #0x64
-	movs r2, #0xfd
-	lsls r2, r2, #1
-	bl sub_080A698C
-_080A616A:
-	adds r5, #1
-	cmp r5, #0x64
-	bls _080A6134
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080A6174: .4byte gUnk_080C9CBC
-_080A6178EU: .4byte gUnk_080FE320
-.else
-	push {r4, r5, r6, lr}
-	ldr r0, _080A690C @ =gPlayerState
-	ldr r0, [r0, #0x30]
-	movs r1, #8
-	ands r0, r1
-	movs r4, #0x64
-	cmp r0, #0
-	beq _080A68E6
-	movs r4, #0x65
-_080A68E6:
-	ldr r1, _080A6910 @ =gRoomTransition
-	ldrh r0, [r1, #0x20]
-	ldrh r1, [r1, #0x22]
-	ldr r2, _080A6914 @ =0x000001FB
-	movs r3, #0x80
-	lsls r3, r3, #1
-	adds r3, r4, r3
-	bl sub_080A698C
-	bl sub_080A6F40
-	adds r6, r0, #0
-	ldr r0, _080A6918 @ =gSave
-	ldrh r0, [r0, #0x20]
-	ands r6, r0
-	ldr r4, _080A691C @ =gUnk_08128F58
-	movs r5, #0
-	b _080A693A
-	.align 2, 0
-_080A690C: .4byte gPlayerState
-_080A6910: .4byte gRoomTransition
-_080A6914: .4byte 0x000001FB
-_080A6918: .4byte gSave
-_080A691C: .4byte gUnk_08128F58
-_080A6920:
-	movs r0, #1
-	lsls r0, r5
-	ands r0, r6
-	cmp r0, #0
-	beq _080A6936
-	ldrh r0, [r4, #4]
-	ldrh r1, [r4, #6]
-	ldrb r3, [r4, #3]
-	ldr r2, _080A6980 @ =0x000001FB
-	bl sub_080A698C
-_080A6936:
-	adds r5, #1
-	adds r4, #8
-_080A693A:
-	ldrb r0, [r4]
-	cmp r0, #0
-	bne _080A6920
-	movs r5, #0xa
-_080A6942:
-	adds r0, r5, #0
-	bl CheckKinstoneFused
-	cmp r0, #0
-	beq _080A6976
-	adds r0, r5, #0
-	bl sub_0801E810
-	cmp r0, #0
-	bne _080A6976
-	ldr r1, _080A6984 @ =gUnk_080C9CBC
-	lsls r0, r5, #3
-	adds r0, r0, r1
-	ldrb r3, [r0, #7]
-	ldrb r0, [r0, #4]
-	lsls r1, r0, #2
-	adds r1, r1, r0
-	lsls r1, r1, #2
-	ldr r0, _080A6988 @ =gUnk_080FE320
-	adds r1, r1, r0
-	ldrh r0, [r1, #0xc]
-	ldrh r1, [r1, #0xe]
-	adds r3, #0x64
-	ldr r2, _080A6980 @ =0x000001FB
-	bl sub_080A698C
-_080A6976:
-	adds r5, #1
-	cmp r5, #0x64
-	bls _080A6942
-	pop {r4, r5, r6, pc}
-	.align 2, 0
-_080A6980: .4byte 0x000001FB
-_080A6984: .4byte gUnk_080C9CBC
-_080A6988: .4byte gUnk_080FE320
-.endif
-	.syntax divided
diff --git a/include/common.h b/include/common.h
index 62f3acba..4a899e72 100644
--- a/include/common.h
+++ b/include/common.h
@@ -17,6 +17,20 @@ typedef struct {
 } Input;
 extern Input gInput; /**< Input instance. */
 
+typedef struct {
+    u8 evt_type;
+    u8 entity_idx;
+    u8 _2[6];
+    u16 x;
+    u16 y;
+    u16 _c;
+    u16 _e;
+    u8 _10;
+    u8 _11;
+    u16 flag;
+} struct_080FE320;
+extern struct_080FE320 gUnk_080FE320[];
+
 void LoadPalettes(const u8*, s32, s32);
 
 /**
@@ -122,5 +136,6 @@ void sub_0801E1B8(u32, u32);
 void sub_0801E738(u32);
 void sub_0801DFB4(struct Entity_*, u32, u32, u32);
 u32 sub_0801E00C(void);
+bool32 sub_0801E810(u32);
 
 #endif // COMMON_H
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/common.c b/src/common.c
index 412bd202..71f9eb8b 100644
--- a/src/common.c
+++ b/src/common.c
@@ -61,19 +61,6 @@ typedef struct {
 extern struct_02017AA0 gUnk_02017AA0[];
 extern u8 gUnk_03003DE4;
 
-typedef struct {
-    u8 evt_type;
-    u8 entity_idx;
-    u8 _2[6];
-    u16 x;
-    u16 y;
-    u8 _c[4];
-    u8 _10;
-    u8 _11;
-    u16 flag;
-} struct_080FE320;
-extern struct_080FE320 gUnk_080FE320[];
-
 extern const PaletteGroup* gPaletteGroups[];
 extern const u8 gGlobalGfxAndPalettes[];
 extern u32 gUsedPalettes;
@@ -573,9 +560,9 @@ u32 CheckKinstoneFused(u32 idx) {
     return ReadBit(&gSave.unk241, idx);
 }
 
-u32 sub_0801E810(u32 idx) {
+bool32 sub_0801E810(u32 idx) {
     if (idx > 100 || idx < 1) {
-        return 0;
+        return FALSE;
     }
     return ReadBit(&gSave.unk24E, idx);
 }
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 66681f31..1a9d51c5 100644
--- a/src/subtask2.c
+++ b/src/subtask2.c
@@ -11,12 +11,25 @@
 #include "main.h"
 #include "message.h"
 #include "ui.h"
+#include "kinstone.h"
+#include "itemMetaData.h"
+#include "item.h"
+
+#ifdef EU
+#define DRAW_DIRECT_SPRITE_INDEX 0x1fa
+#else
+#define DRAW_DIRECT_SPRITE_INDEX 0x1fb
+#endif
 
 extern u8 gUnk_08128D38[];
 extern u8 gUnk_08128D43[];
 extern u16 gUnk_02017830[];
 extern u8 gUnk_080C9C6C[];
 extern u8 gUnk_020350F0[];
+extern u8 gUnk_08128C00[];
+extern Frame* gSpriteAnimations_322[];
+extern u32 gUnk_085C4620[];
+extern u16* gMoreSpritePtrs[];
 
 void sub_080A5CFC(u32, void*, u32);
 void sub_080A6FB4(u32, u32);
@@ -29,6 +42,9 @@ void sub_080A68D4();
 u32 sub_080A69E0();
 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);
@@ -45,9 +61,19 @@ void sub_080A7040(u32);
 
 extern u8 gUnk_08128DB8[];
 extern u8 gUnk_08128E80[];
-extern u8 gUnk_08128F58[];
 extern KeyButtonLayout gUnk_08128DBC;
 
+typedef struct {
+    u8 frameIndex;
+    u8 unk1;
+    u8 unk2;
+    u8 unk3;
+    u16 unk4;
+    u16 unk6;
+} sturct_gUnk_08128F58;
+
+extern sturct_gUnk_08128F58 gUnk_08128F58[];
+
 extern void (*const gUnk_08128DCC[])(void);
 void sub_080A6378(void);
 
@@ -66,6 +92,7 @@ extern void DeleteAllEntities(void);
 extern void sub_0805E974(void);
 extern bool32 sub_080A51F4(void);
 extern u32 sub_0807CB24(u32, u32);
+extern void sub_080A42E0(u32, u32);
 
 extern void (*const gUnk_0812901C[])(void);
 
@@ -89,10 +116,14 @@ typedef struct {
 extern const struct_gUnk_08128E94 gUnk_08128E94[];
 
 typedef struct {
-    u8 unk0;
-    u8 unk1;
-    u8 unk2;
-    u8 unk3;
+    u8 unk00 : 5;
+    u8 unk05 : 5;
+    u8 unk10 : 6;
+} PACKED gUnk_08128DE8_struct_2;
+
+typedef struct {
+    gUnk_08128DE8_struct_2 unk0;
+    gUnk_08128DE8_struct_2 unk2;
     u8 unk4;
     u8 unk5;
     u8 unk6;
@@ -101,9 +132,9 @@ typedef struct {
 extern gUnk_08128DE8_struct gUnk_08128DE8[];
 
 typedef struct {
-    u8 unk0;
+    u8 item;
     u8 unk1;
-    u8 unk2;
+    u8 frameIndex;
     u8 unk3;
     u8 unk4;
     s8 unk5;
@@ -112,7 +143,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())
 
@@ -358,7 +455,49 @@ bool32 sub_080A5F24(void) {
     return result;
 }
 
-ASM_FUNC("asm/non_matching/subtask2/sub_080A5F48.inc", void sub_080A5F48())
+void sub_080A5F48(u32 param_1, u32 param_2) {
+    extern u32 gSprite_082E68F4[];
+    u32 ammoCount;
+    u32 tensDigit;
+    u8* puVar2;
+    u32 temp1;
+    u16* temp2;
+    u32 temp3;
+    register u32 rem asm("r1");
+
+    switch (param_1) {
+        case 0x1c ... 0x1f:
+            param_1 = (u32)gSave.saved_status.field_0x24[param_1 - 6];
+            break;
+    }
+
+    temp1 = param_2 * 0x20 + 0x6010000;
+    temp3 = gSpriteAnimations_322[param_1]->index;
+    temp2 = &gMoreSpritePtrs[1][temp3 * 2];
+    DmaSet(3, &gMoreSpritePtrs[2][temp2[1] * 0x10], temp1, 0x84000040);
+    ammoCount = -1;
+
+    switch (param_1) {
+        case 7:
+        case 8:
+            ammoCount = gSave.stats.bombCount;
+            break;
+        case 9:
+        case 10:
+            ammoCount = gSave.stats.arrowCount;
+            break;
+    }
+
+    if (-1 < (int)ammoCount) {
+        tensDigit = Div(ammoCount, 10);
+        param_1 = rem;
+        if ((int)tensDigit >= 10) {
+            tensDigit = 9;
+        }
+        DmaSet(3, gUnk_085C4620 + tensDigit * 0x8, temp1, 0x84000008);
+        DmaSet(3, gUnk_085C4620 + (param_1 + 10) * 0x8, temp1 + 0x20, 0x84000008);
+    }
+}
 
 void sub_080A6008(void) {
     gUnk_08128D58[gMenu.menuType]();
@@ -371,7 +510,38 @@ void sub_080A6024(void) {
     SetMenuType(1);
 }
 
-ASM_FUNC("asm/non_matching/subtask2/sub_080A6044.inc", void sub_080A6044())
+void sub_080A6044(void) {
+    extern u8 gUnk_08128D51[];
+    u32 uVar1;
+    u32 uVar2;
+    u32 uVar4;
+    u32 uVar3;
+
+    if (sub_080A51F4() != 0) {
+        gMenu.field_0xc = gUnk_08128D51;
+        gOamCmd._4 = 0;
+        gOamCmd._6 = 0;
+        uVar4 = 0;
+        uVar2 = 0;
+        uVar1 = gSave.unk118[0];
+        while (uVar1 != 0) {
+            gOamCmd.x = (uVar4 & 3) * 0x30 + 0x2b;
+            gOamCmd.y = (uVar4 >> 2) * 0x24 + 0x34;
+            uVar3 = gSave.unk12B[uVar2];
+            gMenu.column_idx = 0;
+            sub_080A42E0(uVar1, uVar3);
+            uVar4++;
+            if (10 < uVar4) {
+                return;
+            }
+            uVar2++;
+            if (0x11 < uVar2) {
+                return;
+            }
+            uVar1 = gSave.unk118[uVar2];
+        }
+    }
+}
 
 void sub_080A60E0(void) {
     gUnk_08128DB0[gMenu.menuType]();
@@ -409,7 +579,48 @@ void sub_080A612C(void) {
     }
 }
 
-ASM_FUNC("asm/non_matching/subtask2/sub_080A617C.inc", void sub_080A617C())
+void sub_080A617C(void) {
+    u32 frameIndex;
+    u32 i;
+    const struct_gUnk_08128D70* ptr;
+
+    gOamCmd._4 = 0;
+    gOamCmd._6 = 0;
+    gOamCmd._8 = 0xc00;
+    gOamCmd.y = 0x2f;
+    gOamCmd.x = gMenu.field_0x3 * 0x1b + 0x1a;
+    if ((gMain.ticks.HWORD & 0x20) != 0) {
+        frameIndex = 8;
+    } else {
+        frameIndex = 9;
+    }
+    DrawDirect(DRAW_DIRECT_SPRITE_INDEX + 1, frameIndex);
+    ptr = &gUnk_08128D70[gMenu.field_0x3];
+    if (GetInventoryValue(ptr->item) != 0) {
+        gOamCmd._8 = 0xc00;
+        gOamCmd.x = 0xcc;
+        gOamCmd.y = 0x88;
+        DrawDirect(DRAW_DIRECT_SPRITE_INDEX + 1, 0xb);
+        gOamCmd.x = 0x30;
+        gOamCmd.y = 0x6c;
+        gOamCmd._8 = ptr->unk1 << 0xc | 0xd80;
+        DrawDirect(DRAW_DIRECT_SPRITE_INDEX + 1, ptr->frameIndex);
+        gOamCmd._8 = ptr->unk1 << 0xc | 0xc00;
+        gOamCmd.x = 0x78;
+        gOamCmd.y = 0x68;
+        DrawDirect(DRAW_DIRECT_SPRITE_INDEX + 1, 0xc);
+    }
+    gOamCmd.y = 0x2f;
+
+    for (i = 0; i < 8; i++) {
+        ptr = &gUnk_08128D70[i];
+        if (GetInventoryValue(ptr->item) != 0) {
+            gOamCmd._8 = ptr->unk1 << 0xc | 0xc00;
+            gOamCmd.x = 0x18 + 0x1b * i;
+            DrawDirect(DRAW_DIRECT_SPRITE_INDEX + 1, 10);
+        }
+    }
+}
 
 void sub_080A6270(void) {
     gUnk_08128DCC[gMenu.menuType]();
@@ -430,28 +641,89 @@ void sub_080A6290(void) {
     gMenu.menuType = 1;
 }
 
-ASM_FUNC("asm/non_matching/subtask2/sub_080A62E0.inc", void sub_080A62E0())
+void sub_080A62E0(void) {
+    u32 uVar1;
+    int windcrest;
+    gUnk_08128DE8_struct* ptr;
 
-ASM_FUNC("asm/non_matching/subtask2/sub_080A6378.inc", void sub_080A6378())
+    if (!sub_080A51F4()) {
+        return;
+    }
+    ptr = &gUnk_08128DE8[gMenu.field_0x3];
+    windcrest = -1;
+
+    switch (gInput.newKeys) {
+        case A_BUTTON:
+            if ((gSave.windcrests & (1 << gMenu.field_0x3)) != 0) {
+                SoundReq(SFX_TEXTBOX_SELECT);
+                sub_080A4E84(6);
+                windcrest = -1;
+            }
+            break;
+        case DPAD_UP:
+            windcrest = ptr->unk0.unk00;
+            break;
+        case DPAD_DOWN:
+            windcrest = ptr->unk0.unk05;
+            break;
+        case DPAD_LEFT:
+            windcrest = ptr->unk2.unk00;
+            break;
+        case DPAD_RIGHT:
+            windcrest = ptr->unk2.unk05;
+            break;
+    }
+
+    if (-1 < windcrest) {
+        gMenu.field_0x3 = windcrest;
+        SoundReq(SFX_TEXTBOX_CHOICE);
+    }
+    sub_080A6FB4(gMenu.field_0x3, 0);
+}
+
+void sub_080A6378(void) {
+    u32 frameIndex;
+    gUnk_08128DE8_struct* ptr;
+
+    gGenericMenu.unk2c++;
+    if ((gGenericMenu.unk2c & 0x20) != 0) {
+        sub_080A6438();
+    }
+    gOamCmd._4 = 0x400;
+    gOamCmd._6 = 0;
+    gOamCmd._8 = 0x7000;
+    if ((gGenericMenu.unk2c & 0x20) == 0) {
+        gOamCmd.x = gRoomTransition.player_status.overworld_map_x * 0xa0 / 0xf90 + 0x28;
+        gOamCmd.y = (gRoomTransition.player_status.overworld_map_y << 7) / 0xc60 + 0xc;
+        if ((gPlayerState.flags & 8) != 0) {
+            frameIndex = 0x5a;
+        } else {
+            frameIndex = 0x59;
+        }
+        DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex);
+    }
+    ptr = &gUnk_08128DE8[gMenu.field_0x3];
+    gOamCmd.x = ptr->unk6;
+    gOamCmd.y = ptr->unk7;
+    frameIndex = gMenu.field_0x3 * 3 + 0x26 + (((gGenericMenu.unk2c >> 4) & 1) == 0);
+    DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex);
+    sub_080A6498();
+}
 
 void sub_080A6438(void) {
     u32 uVar1;
-    u8* pcVar2;
+    sturct_gUnk_08128F58* pcVar2;
     u32 uVar3;
 
     gOamCmd._4 = 0x400;
     gOamCmd._6 = 0;
     gOamCmd._8 = 0;
     uVar1 = gSave.field_0x20 & gGenericMenu.unk10.h[0];
-    for (pcVar2 = gUnk_08128F58, uVar3 = 0; *pcVar2 != 0; uVar3++, pcVar2 += 8) {
+    for (pcVar2 = gUnk_08128F58, uVar3 = 0; pcVar2->frameIndex != 0; uVar3++, pcVar2++) {
         if ((1 << uVar3 & uVar1) != 0) {
-            gOamCmd.x = pcVar2[1];
-            gOamCmd.y = pcVar2[2];
-#ifdef EU
-            DrawDirect(0x1fa, *pcVar2);
-#else
-            DrawDirect(0x1fb, *pcVar2);
-#endif
+            gOamCmd.x = pcVar2->unk1;
+            gOamCmd.y = pcVar2->unk2;
+            DrawDirect(DRAW_DIRECT_SPRITE_INDEX, pcVar2->frameIndex);
         }
     }
 }
@@ -467,11 +739,7 @@ void sub_080A6498(void) {
             gUnk_08128DE8_struct* ptr = &gUnk_08128DE8[i];
             gOamCmd.x = ptr->unk6;
             gOamCmd.y = ptr->unk7;
-#ifdef EU
-            DrawDirect(0x1fa, 0x28 + 3 * i);
-#else
-            DrawDirect(0x1fb, 0x28 + 3 * i);
-#endif
+            DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x28 + 3 * i);
         }
     }
     gScreen.controls.windowOutsideControl = 0x3d3f;
@@ -583,7 +851,38 @@ ASM_FUNC("asm/non_matching/subtask2/sub_080A66D0.inc", void sub_080A66D0())
 
 ASM_FUNC("asm/non_matching/subtask2/sub_080A67C4.inc", void sub_080A67C4(u32 param_1))
 
-ASM_FUNC("asm/non_matching/subtask2/sub_080A68D4.inc", void sub_080A68D4())
+void sub_080A68D4(void) {
+    u32 uVar1;
+    int iVar6;
+    sturct_gUnk_08128F58* pcVar4;
+    u32 i;
+    u32 uVar4;
+    struct_080FE320* ptr;
+
+    if ((gPlayerState.flags & PL_NO_CAP) != 0) {
+        iVar6 = 101;
+    } else {
+        iVar6 = 100;
+    }
+    sub_080A698C(gRoomTransition.player_status.overworld_map_x, gRoomTransition.player_status.overworld_map_y,
+                 DRAW_DIRECT_SPRITE_INDEX, iVar6 + 0x100);
+    uVar1 = sub_080A6F40();
+    uVar1 &= gSave.field_0x20;
+
+    for (pcVar4 = gUnk_08128F58, i = 0; pcVar4->frameIndex != 0; i++, pcVar4++) {
+        if (((1 << i) & uVar1) != 0) {
+            sub_080A698C(pcVar4->unk4, pcVar4->unk6, DRAW_DIRECT_SPRITE_INDEX, pcVar4->unk3);
+        }
+    }
+
+    for (i = 10; i <= 100; i++) {
+        if (CheckKinstoneFused(i) && !sub_0801E810(i)) {
+            uVar4 = gUnk_080C9CBC[i]._5[1];
+            ptr = &gUnk_080FE320[gUnk_080C9CBC[i].evt_type];
+            sub_080A698C(ptr->_c, ptr->_e, DRAW_DIRECT_SPRITE_INDEX, uVar4 + 100);
+        }
+    }
+}
 
 typedef struct {
     u8 unk0;
@@ -822,7 +1121,7 @@ void sub_080A6E44(void) {
 }
 
 void sub_080A6E70(void) {
-    u32 uVar1;
+    u32 frameIndex;
     u32 i;
 
     gOamCmd._4 = 0;
@@ -831,24 +1130,16 @@ void sub_080A6E70(void) {
     gGenericMenu.unk2c++;
     sub_080A6EE0(gMenu.field_0x3);
     if ((gGenericMenu.unk2c & 0x10) != 0) {
-        uVar1 = 0x5d;
+        frameIndex = 0x5d;
     } else {
-        uVar1 = 0x5e;
+        frameIndex = 0x5e;
     }
 
-#ifdef EU
-    DrawDirect(0x1fa, uVar1);
-#else
-    DrawDirect(0x1fb, uVar1);
-#endif
+    DrawDirect(DRAW_DIRECT_SPRITE_INDEX, frameIndex);
     for (i = 0; i < 8; i++) {
         if ((gSave.windcrests & (1 << (i + 0x18))) != 0) {
             sub_080A6EE0(i);
-#ifdef EU
-            DrawDirect(0x1fa, 0x5c);
-#else
-            DrawDirect(0x1fb, 0x5c);
-#endif
+            DrawDirect(DRAW_DIRECT_SPRITE_INDEX, 0x5c);
         }
     }
 }
@@ -921,7 +1212,7 @@ void sub_080A7040(u32 param_1) {
         gGenericMenu.unk2e.HWORD = param_1;
         MemClear(gUnk_02022130, 0x300);
         MemCopy(gUnk_02022130 - 0x200, (void*)0x600e000, 0x800);
-        if (GetInventoryValue(gUnk_08128D70[param_1].unk0) != 0) {
+        if (GetInventoryValue(gUnk_08128D70[param_1].item) != 0) {
             sub_0805F46C(gUnk_08128D70[param_1].unk6, &gUnk_08129004);
         }
         gScreen.bg1.yOffset = 3;