Merge pull request #341 from Henny022p/subtask

asm/non_matching/fileScreen/sub_08050EF4.inc

@@ -106,7 +106,7 @@ _08050FAC:
 	bl SoundReq
 _08050FBA:
 	adds r0, r5, #0
-	bl sub_080A7114
+	bl SetMenuType
 	ldr r0, _08050FCC @ =gUnk_02019EE0
 	ldrb r0, [r0, #6]
 	bl SetActiveSave

asm/non_matching/fileScreen/sub_08051738.inc

@@ -45,13 +45,13 @@ _08051774:
 	movs r1, #0
 	bl CreateDialogBox
 	movs r0, #3
-	bl sub_080A7114
+	bl SetMenuType
 	b _080517A2
 	.align 2, 0
 _08051798: .4byte gMenu
 _0805179C:
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 _080517A2:
 	adds r4, #1
 	ldr r0, _080517B0 @ =gMenu

asm/non_matching/fileScreen/sub_080610B8.inc

@@ -319,7 +319,7 @@ _08051316:
 	movs r0, #0x6a
 	bl sub_08051574
 	adds r0, r7, #0
-	bl sub_080A7114
+	bl SetMenuType
 _08051322:
 	movs r0, #0x80
 	lsls r0, r0, #0x12

asm/non_matching/menu/figurine_menu/sub_080A4BA0.inc

@@ -0,0 +1,140 @@
+.syntax unified
+	push {r4, r5, r6, lr}
+	sub sp, #0x54
+	adds r5, r0, #0
+	adds r6, r1, #0
+	add r0, sp, #0x18
+	movs r1, #0x30
+	bl MemClear
+	ldr r0, _080A4C08 @ =gUnk_0812816C
+	mov r1, sp
+	movs r2, #0x18
+	bl MemCopy
+	ldr r0, _080A4C0C @ =gUnk_08128184
+	add r4, sp, #0x48
+	adds r1, r4, #0
+	movs r2, #0xc
+	bl MemCopy
+	lsls r1, r6, #1
+	adds r1, r1, r6
+	lsls r2, r1, #9
+	ldr r0, [sp, #4]
+	adds r0, r0, r2
+	str r0, [sp, #4]
+	mov r2, sp
+	mov r0, sp
+	lsls r1, r1, #4
+	ldrh r0, [r0, #0x10]
+	adds r1, r1, r0
+	strh r1, [r2, #0x10]
+	lsls r1, r6, #7
+	ldr r0, [sp]
+	adds r0, r0, r1
+	str r0, [sp]
+	cmp r6, #2
+	bne _080A4BEE
+	mov r0, sp
+	strb r6, [r0, #0x14]
+_080A4BEE:
+	ldr r0, _080A4C10 @ =gSave
+	ldrb r0, [r0, #6]
+	movs r1, #0x88
+	cmp r0, #0
+	bne _080A4BFA
+	movs r1, #0x82
+_080A4BFA:
+	cmp r5, #0
+	ble _080A4C02
+	cmp r1, r5
+	bge _080A4C14
+_080A4C02:
+	movs r5, #1
+	rsbs r5, r5, #0
+	b _080A4C3E
+	.align 2, 0
+_080A4C08: .4byte gUnk_0812816C
+_080A4C0C: .4byte gUnk_08128184
+_080A4C10: .4byte gSave
+_080A4C14:
+	ldr r1, _080A4C30 @ =gUnk_020227E8
+	ldr r2, _080A4C34 @ =0x00303030
+	adds r0, r5, #0
+	bl sub_08057044
+	adds r0, r5, #0
+	bl sub_080A4948
+	cmp r0, #0
+	bne _080A4C38
+	movs r0, #0x80
+	lsls r0, r0, #8
+	b _080A4C3C
+	.align 2, 0
+_080A4C30: .4byte gUnk_020227E8
+_080A4C34: .4byte 0x00303030
+_080A4C38:
+	movs r0, #0x80
+	lsls r0, r0, #4
+_080A4C3C:
+	adds r5, r5, r0
+_080A4C3E:
+	ldr r0, _080A4C94 @ =gMenu
+	lsls r1, r6, #1
+	adds r0, #0x10
+	adds r1, r1, r0
+	ldrh r0, [r1]
+	cmp r0, r5
+	beq _080A4CB2
+	strh r5, [r1]
+	ldr r0, _080A4C98 @ =0x0000F00B
+	cmp r6, #2
+	bne _080A4C56
+	subs r0, #7
+_080A4C56:
+	ldr r1, [sp]
+	movs r2, #0x80
+	bl MemFill16
+	cmp r5, #0
+	ble _080A4CAC
+	ldr r0, _080A4C9C @ =0x00007FFF
+	cmp r5, r0
+	ble _080A4C6A
+	ldr r5, _080A4CA0 @ =0x00000889
+_080A4C6A:
+	adds r0, r5, #0
+	cmp r5, #0
+	bge _080A4C72
+	adds r0, #0xff
+_080A4C72:
+	asrs r0, r0, #8
+	strb r0, [r4, #8]
+	strb r5, [r4, #9]
+	ldr r0, [sp]
+	adds r0, #0x16
+	str r0, [sp]
+	movs r0, #0x80
+	lsls r0, r0, #0x12
+	ldrb r0, [r0, #7]
+	cmp r0, #0
+	bne _080A4CA4
+	adds r0, r4, #0
+	mov r1, sp
+	bl sub_0805F46C
+	b _080A4CAC
+	.align 2, 0
+_080A4C94: .4byte gMenu
+_080A4C98: .4byte 0x0000F00B
+_080A4C9C: .4byte 0x00007FFF
+_080A4CA0: .4byte 0x00000889
+_080A4CA4:
+	adds r0, r5, #0
+	mov r1, sp
+	bl sub_0805F46C
+_080A4CAC:
+	ldr r1, _080A4CB8 @ =gScreen
+	movs r0, #1
+	strh r0, [r1, #0x32]
+_080A4CB2:
+	add sp, #0x54
+	pop {r4, r5, r6, pc}
+	.align 2, 0
+_080A4CB8: .4byte gScreen
+.syntax divided

asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc

@@ -0,0 +1,112 @@
+	.syntax unified
+	push {r4, r5, r6, r7, lr}
+	mov r7, sb
+	mov r6, r8
+	push {r6, r7}
+	ldr r4, _080A4210 @ =gOamCmd
+	movs r0, #0
+	strh r0, [r4, #4]
+	strh r0, [r4, #6]
+	ldr r0, _080A4214 @ =gMenu
+	ldrh r0, [r0, #0x10]
+	ldr r1, _080A4218 @ =0x00000B21
+	bl __divsi3
+	lsls r0, r0, #0x10
+	lsrs r0, r0, #0x10
+	movs r5, #3
+	rsbs r5, r5, #0
+	movs r1, #0xff
+	mov r8, r1
+	adds r7, r4, #0
+	ldr r6, _080A421C @ =gSineTable
+	rsbs r0, r0, #0
+	adds r4, r0, #0
+	subs r4, #0x45
+	ldr r2, _080A4220 @ =gUnk_02002B6B
+	mov sb, r2
+_080A4180:
+	adds r2, r4, #0
+	mov r3, r8
+	ands r2, r3
+	lsls r0, r2, #1
+	adds r0, r0, r6
+	movs r3, #0
+	ldrsh r1, [r0, r3]
+	lsls r0, r1, #4
+	adds r0, r0, r1
+	lsls r0, r0, #2
+	cmp r0, #0
+	bge _080A419A
+	adds r0, #0xff
+_080A419A:
+	asrs r0, r0, #8
+	adds r0, #0x4f
+	strh r0, [r7, #2]
+	adds r0, r2, #0
+	adds r0, #0x40
+	mov r1, r8
+	ands r0, r1
+	lsls r0, r0, #1
+	adds r0, r0, r6
+	movs r2, #0
+	ldrsh r1, [r0, r2]
+	lsls r0, r1, #5
+	adds r0, r0, r1
+	lsls r0, r0, #1
+	cmp r0, #0
+	bge _080A41BC
+	adds r0, #0xff
+_080A41BC:
+	asrs r0, r0, #8
+	subs r0, #0x10
+	strh r0, [r7]
+	ldr r2, _080A4214 @ =gMenu
+	ldr r0, [r2, #0x10]
+	cmp r0, #0
+	bge _080A41CE
+	ldr r3, _080A4224 @ =0x0000FFFF
+	adds r0, r0, r3
+_080A41CE:
+	asrs r0, r0, #0x10
+	adds r3, r0, r5
+	cmp r3, #0
+	blt _080A4200
+	mov r1, sb
+	adds r0, r3, r1
+	ldrb r1, [r0]
+	ldr r0, _080A4228 @ =gSave
+	cmp r5, #0
+	bne _080A41EE
+	ldrb r2, [r2, #1]
+	cmp r2, #4
+	bgt _080A41EE
+	cmp r2, #3
+	blt _080A41EE
+	subs r1, #1
+_080A41EE:
+	cmp r1, #0
+	ble _080A4200
+	movs r2, #0x8c
+	lsls r2, r2, #1
+	adds r0, r0, r2
+	adds r0, r3, r0
+	ldrb r0, [r0]
+	bl sub_080A42E0
+_080A4200:
+	adds r4, #0x17
+	adds r5, #1
+	cmp r5, #3
+	ble _080A4180
+	pop {r3, r4}
+	mov r8, r3
+	mov sb, r4
+	pop {r4, r5, r6, r7, pc}
+	.align 2, 0
+_080A4210: .4byte gOamCmd
+_080A4214: .4byte gMenu
+_080A4218: .4byte 0x00000B21
+_080A421C: .4byte gSineTable
+_080A4220: .4byte gUnk_02002B6B
+_080A4224: .4byte 0x0000FFFF
+_080A4228: .4byte gSave
+	.syntax divided

asm/non_matching/menu/kinstone_menu/KinstoneMenu_Type1.inc

@@ -0,0 +1,172 @@
+	.syntax unified
+	push {r4, r5, lr}
+	ldr r0, _080A3C9C @ =gFadeControl
+	ldrb r0, [r0]
+	cmp r0, #0
+	beq _080A3C78
+	b _080A3DA8
+_080A3C78:
+	ldr r5, _080A3CA0 @ =gMenu
+	movs r0, #2
+	strb r0, [r5, #1]
+	adds r0, r5, #0
+	adds r0, #0x28
+	ldrb r0, [r0]
+	lsls r2, r0, #0x10
+	ldr r0, [r5, #0x10]
+	subs r4, r2, r0
+	adds r1, r4, #0
+	cmp r4, #0
+	bge _080A3C92
+	rsbs r1, r4, #0
+_080A3C92:
+	ldr r0, _080A3CA4 @ =0x00001FFD
+	cmp r1, r0
+	bhi _080A3CA8
+	str r2, [r5, #0x10]
+	b _080A3CDE
+	.align 2, 0
+_080A3C9C: .4byte gFadeControl
+_080A3CA0: .4byte gMenu
+_080A3CA4: .4byte 0x00001FFD
+_080A3CA8:
+	movs r0, #1
+	strb r0, [r5, #1]
+	adds r0, r4, #0
+	bl sub_08000E44
+	adds r2, r0, #0
+	adds r0, r4, #0
+	cmp r0, #0
+	bge _080A3CBE
+	ldr r1, _080A3D18 @ =0x0001FFFF
+	adds r0, r0, r1
+_080A3CBE:
+	asrs r4, r0, #0x11
+	cmp r4, #0
+	bge _080A3CC6
+	rsbs r4, r4, #0
+_080A3CC6:
+	cmp r4, #5
+	ble _080A3CCC
+	movs r4, #5
+_080A3CCC:
+	ldr r0, _080A3D1C @ =gUnk_081280EE
+	adds r0, r4, r0
+	ldrb r1, [r0]
+	ldr r0, _080A3D20 @ =0x00000666
+	muls r0, r2, r0
+	muls r1, r0, r1
+	ldr r0, [r5, #0x10]
+	adds r0, r0, r1
+	str r0, [r5, #0x10]
+_080A3CDE:
+	adds r3, r5, #0
+	adds r3, #0x29
+	ldrb r2, [r3]
+	ldr r0, [r5, #0x10]
+	adds r1, r0, #0
+	cmp r0, #0
+	bge _080A3CF0
+	ldr r4, _080A3D24 @ =0x0000FFFF
+	adds r1, r0, r4
+_080A3CF0:
+	asrs r1, r1, #0x10
+	cmp r2, r1
+	beq _080A3CFE
+	strb r1, [r3]
+	movs r0, #0x69
+	bl SoundReq
+_080A3CFE:
+	ldr r2, _080A3D28 @ =gInput
+	ldrh r1, [r2, #2]
+	ldr r0, _080A3D2C @ =0x0000020A
+	ands r0, r1
+	cmp r0, #0
+	beq _080A3D30
+	movs r0, #2
+	bl SetMenuType
+	movs r0, #0x6c
+	bl SoundReq
+	b _080A3DA8
+	.align 2, 0
+_080A3D18: .4byte 0x0001FFFF
+_080A3D1C: .4byte gUnk_081280EE
+_080A3D20: .4byte 0x00000666
+_080A3D24: .4byte 0x0000FFFF
+_080A3D28: .4byte gInput
+_080A3D2C: .4byte 0x0000020A
+_080A3D30:
+	adds r0, r5, #0
+	adds r0, #0x28
+	ldrb r4, [r0]
+	ldrh r1, [r2, #4]
+	adds r5, r0, #0
+	cmp r1, #0x20
+	beq _080A3D56
+	cmp r1, #0x20
+	bgt _080A3D4C
+	cmp r1, #1
+	beq _080A3D5E
+	cmp r1, #0x10
+	beq _080A3D5A
+	b _080A3D8A
+_080A3D4C:
+	cmp r1, #0x40
+	beq _080A3D56
+	cmp r1, #0x80
+	beq _080A3D5A
+	b _080A3D8A
+_080A3D56:
+	subs r4, #1
+	b _080A3D8A
+_080A3D5A:
+	adds r4, #1
+	b _080A3D8A
+_080A3D5E:
+	ldr r2, _080A3DAC @ =gMenu
+	ldrb r0, [r2, #1]
+	cmp r0, #2
+	bne _080A3D8A
+	ldr r0, [r2, #0x10]
+	cmp r0, #0
+	bge _080A3D70
+	ldr r1, _080A3DB0 @ =0x0000FFFF
+	adds r0, r0, r1
+_080A3D70:
+	asrs r4, r0, #0x10
+	ldr r0, _080A3DB4 @ =gSave
+	movs r1, #0x8c
+	lsls r1, r1, #1
+	adds r0, r0, r1
+	adds r0, r4, r0
+	ldrb r1, [r0]
+	adds r0, r2, #0
+	adds r0, #0x2a
+	strb r1, [r0]
+	movs r0, #3
+	bl SetMenuType
+_080A3D8A:
+	bl sub_080A3B48
+	cmp r0, r4
+	bgt _080A3D94
+	subs r4, r0, #1
+_080A3D94:
+	cmp r0, #1
+	bgt _080A3D9A
+	movs r4, #0
+_080A3D9A:
+	cmp r4, #0
+	bge _080A3DA0
+	movs r4, #0
+_080A3DA0:
+	ldrb r0, [r5]
+	cmp r0, r4
+	beq _080A3DA8
+	strb r4, [r5]
+_080A3DA8:
+	pop {r4, r5, pc}
+	.align 2, 0
+_080A3DAC: .4byte gMenu
+_080A3DB0: .4byte 0x0000FFFF
+_080A3DB4: .4byte gSave
+	.syntax divided

asm/subtask2.s

@@ -134,7 +134,7 @@ _080A5688:
 	movs r0, #1
 	strb r0, [r1, #0x14]
 	strb r0, [r1, #0x15]
-	bl sub_080A7114
+	bl SetMenuType
 	pop {r4, r5, r6, r7, pc}
 	.align 2, 0
 _080A5698: .4byte gMenu
@@ -815,7 +815,7 @@ sub_080A59AC: @ 0x080A59AC
 	movs r1, #0
 	bl SetPopupState
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 	pop {pc}
 	.align 2, 0
 _080A59C4: .4byte gMenu
@@ -870,13 +870,13 @@ _080A5A10:
 	movs r1, #0
 	bl CreateDialogBox
 	movs r0, #2
-	bl sub_080A7114
+	bl SetMenuType
 	movs r0, #0x6a
 	bl SoundReq
 	b _080A5A52
 _080A5A2E:
 	movs r0, #3
-	bl sub_080A7114
+	bl SetMenuType
 	movs r0, #0x6c
 	bl SoundReq
 	b _080A5A52
@@ -921,7 +921,7 @@ _080A5A76:
 	strh r0, [r1, #8]
 _080A5A84:
 	movs r0, #3
-	bl sub_080A7114
+	bl SetMenuType
 _080A5A8A:
 	pop {pc}
 	.align 2, 0
@@ -1019,7 +1019,7 @@ _080A5B24:
 .endif
 _080A5B28:
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 .ifdef EU 
 	pop {pc}
 .else
@@ -1091,7 +1091,7 @@ _080A5B8E:
 	movs r0, #0x3c
 	strh r0, [r6, #8]
 	movs r0, #2
-	bl sub_080A7114
+	bl SetMenuType
 	b _080A5BB6
 _080A5BAA:
 	movs r0, #0x6c
@@ -1182,7 +1182,7 @@ sub_080A5C44: @ 0x080A5C44
 	movs r1, #1
 	bl sub_080A6FB4
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 	ldrb r1, [r4, #3]
 	lsls r1, r1, #1
 	ldr r0, _080A5C94 @ =gUnk_08128D43
@@ -1925,7 +1925,7 @@ sub_080A6024: @ 0x080A6024
 	bl sub_0801E738
 	bl sub_080A4398
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 	pop {pc}
 	.align 2, 0
 _080A6040: .4byte gUnk_08128D60
@@ -2033,7 +2033,7 @@ sub_080A6108: @ 0x080A6108
 	ldr r0, _080A6128 @ =gUnk_08128DBC
 	bl sub_080A70AC
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 	pop {pc}
 	.align 2, 0
 _080A6120: .4byte gMenu
@@ -2893,7 +2893,7 @@ sub_080A6534: @ 0x080A6534
 	movs r0, #0x3c
 	strh r0, [r1, #8]
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 	movs r0, #4
 	movs r1, #8
 	bl SetFade
@@ -3000,7 +3000,7 @@ sub_080A6650: @ 0x080A6650
 	bl sub_080A67C4
 	bl sub_080A68D4
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 	pop {pc}
 	.align 2, 0
 _080A6670: .4byte gUnk_08128E84
@@ -3917,7 +3917,7 @@ _080A6BD4:
 	movs r0, #0x1e
 	strh r0, [r1, #8]
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 	movs r0, #4
 	movs r1, #8
 	bl SetFade
@@ -4020,7 +4020,7 @@ sub_080A6CA8: @ 0x080A6CA8
 	ldr r1, _080A6CD4 @ =gMenu
 	strb r0, [r1, #3]
 	movs r0, #1
-	bl sub_080A7114
+	bl SetMenuType
 	movs r0, #4
 	movs r1, #8
 	bl SetFade
@@ -4083,7 +4083,7 @@ _080A6D34:
 _080A6D38:
 	movs r0, #2
 	strb r0, [r2]
-	bl sub_080A7114
+	bl SetMenuType
 	ldr r0, _080A6D48 @ =0x00000704
 	bl MessageFromTarget
 	b _080A6D54
@@ -4092,7 +4092,7 @@ _080A6D48: .4byte 0x00000704
 _080A6D4C:
 	movs r0, #3
 	strb r0, [r1]
-	bl sub_080A7114
+	bl SetMenuType
 _080A6D54:
 	cmp r4, #0
 	beq _080A6D6E
@@ -4188,7 +4188,7 @@ _080A65DC:
 	cmp r0, #0
 	beq _080A65EA
 	movs r0, #3
-	bl sub_080A7114
+	bl SetMenuType
 _080A65EA:
 	pop {pc}
 	.align 2, 0
@@ -4213,7 +4213,7 @@ _080A6DEC: .4byte gMenu
 _080A6DF0:
 	movs r0, #1
 _080A6DF2:
-	bl sub_080A7114
+	bl SetMenuType
 _080A6DF6:
 	pop {pc}
 .endif
@@ -4226,7 +4226,7 @@ sub_080A6DF8: @ 0x080A6DF8
 	cmp r0, #2
 	bne _080A6E18
 	movs r0, #4
-	bl sub_080A7114
+	bl SetMenuType
 	movs r0, #5
 	movs r1, #8
 	bl SetFade
@@ -4666,8 +4666,8 @@ _080A70FC:
 	.align 2, 0
 _080A7110: .4byte gUnk_0200AF34
 
-	thumb_func_start sub_080A7114
-sub_080A7114: @ 0x080A7114
+	thumb_func_start SetMenuType
+SetMenuType: @ 0x080A7114
 	ldr r1, _080A7120 @ =gMenu
 	movs r2, #0
 	strb r0, [r1, #5]