Cleanup nonmatching folder (#646)

* Nuke InitSaveHeader.inc

* Nuke pushableFurniture

* Nuke KinstoneMenu_080A414C.inc

* Nuke sub_080622F4.inc

* Nuke ClearBit.inc

* Nuke WriteBit.inc

6 files changed, 0 insertions, 674 deletions

diff --git a/asm/non_matching/InitSaveHeader.inc b/asm/non_matching/InitSaveHeader.inc
deleted file mode 100644
index c8b17b63..00000000
--- a/asm/non_matching/InitSaveHeader.inc
+++ /dev/null
@@ -1,59 +0,0 @@
-	.syntax unified
-	push {r4, lr}
-	bl CheckHeaderValid
-	cmp r0, #0
-	bne _080560F8
-	movs r0, #0x80
-	lsls r0, r0, #0x12
-	bl ReadSaveHeader
-	adds r1, r0, #0
-	movs r0, #1
-	rsbs r0, r0, #0
-	cmp r1, r0
-	blt _080560E4
-	cmp r1, #0
-	ble _080560E4
-	cmp r1, #1
-	bne _080560E4
-	bl CheckHeaderValid
-	cmp r0, #0
-	bne _080560F8
-_080560E4:
-	ldr r0, _08056128 @ =sDefaultSettings
-	movs r4, #0x80
-	lsls r4, r4, #0x12
-	adds r1, r4, #0
-	movs r2, #0x10
-	bl MemCopy
-	adds r0, r4, #0
-	bl WriteSaveHeader
-_080560F8:
-	ldr r2, _0805612C @ =gUnk_02000010
-	ldr r1, [r2]
-	ldr r0, _08056130 @ =0x4D435A33
-	eors r1, r0
-	rsbs r0, r1, #0
-	orrs r0, r1
-	lsrs r0, r0, #0x1f
-	ldrb r1, [r2, #4]
-	cmp r1, #0
-	beq _08056112
-	cmp r1, #0xc1
-	beq _08056112
-	movs r0, #1
-_08056112:
-	cmp r0, #0
-	beq _08056124
-	ldr r4, _0805612C @ =gUnk_02000010
-	adds r0, r4, #0
-	movs r1, #0x20
-	bl MemClear
-	ldr r0, _08056130 @ =0x4D435A33
-	str r0, [r4]
-_08056124:
-	pop {r4, pc}
-	.align 2, 0
-_08056128: .4byte sDefaultSettings
-_0805612C: .4byte gUnk_02000010
-_08056130: .4byte 0x4D435A33
-    .syntax divided
diff --git a/asm/non_matching/common/ClearBit.inc b/asm/non_matching/common/ClearBit.inc
deleted file mode 100644
index 0d34ceb5..00000000
--- a/asm/non_matching/common/ClearBit.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-    .syntax unified
-	lsrs r2, r1, #3
-	adds r3, r0, r2
-	movs r2, #7
-	ands r1, r2
-	movs r2, #1
-	lsls r2, r1
-	ldrb r0, [r3]
-	adds r1, r0, #0
-	bics r1, r2
-	strb r1, [r3]
-	ands r0, r2
-	bx lr
-    .syntax divided
diff --git a/asm/non_matching/common/WriteBit.inc b/asm/non_matching/common/WriteBit.inc
deleted file mode 100644
index 7986e488..00000000
--- a/asm/non_matching/common/WriteBit.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-    .syntax unified
-	lsrs r2, r1, #3
-	adds r3, r0, r2
-	movs r2, #7
-	ands r1, r2
-	movs r2, #1
-	lsls r2, r1
-	ldrb r0, [r3]
-	adds r1, r0, #0
-	orrs r1, r2
-	strb r1, [r3]
-	ands r0, r2
-	bx lr
-    .syntax divided
diff --git a/asm/non_matching/kid/sub_080622F4.inc b/asm/non_matching/kid/sub_080622F4.inc
deleted file mode 100644
index 66a11664..00000000
--- a/asm/non_matching/kid/sub_080622F4.inc
+++ /dev/null
@@ -1,274 +0,0 @@
-	.syntax unified
-	.text
-
-	push {r4, r5, r6, r7, lr}
-	mov r7, sb
-	mov r6, r8
-	push {r6, r7}
-	adds r7, r0, #0
-	ldr r0, _0806239C @ =gPlayerEntity
-	mov r8, r0
-	ldrh r1, [r0, #0x2e]
-	ldr r3, _080623A0 @ =0xFFFF0000
-	adds r0, r3, #0
-	ands r0, r5
-	orrs r0, r1
-	mov r2, r8
-	ldrh r1, [r2, #0x32]
-	lsls r1, r1, #0x10
-	ldr r2, _080623A4 @ =0x0000FFFF
-	ands r0, r2
-	adds r5, r0, #0
-	orrs r5, r1
-	mov r1, r8
-	ldrh r0, [r1, #0x36]
-	ands r3, r6
-	orrs r3, r0
-	ldr r0, _080623A8 @ =gPlayerState
-	adds r0, #0xa8
-	ldrb r0, [r0]
-	lsls r0, r0, #0x10
-	ldr r2, _080623AC @ =0xFF00FFFF
-	ands r2, r3
-	orrs r2, r0
-	ldrb r1, [r1, #0x14]
-	movs r0, #0x3f
-	ands r1, r0
-	lsls r1, r1, #0x18
-	ldr r0, _080623B0 @ =0xC0FFFFFF
-	ands r0, r2
-	orrs r0, r1
-	mov r1, r8
-	adds r1, #0x38
-	ldrb r1, [r1]
-	lsls r1, r1, #0x1e
-	ldr r2, _080623B4 @ =0x3FFFFFFF
-	ands r0, r2
-	adds r6, r0, #0
-	orrs r6, r1
-	ldr r4, [r7, #0x64]
-	ldrb r0, [r4, #6]
-	cmp r0, #0x16
-	bne _080623BE
-	lsrs r0, r6, #0x10
-	lsls r0, r0, #0x18
-	lsrs r0, r0, #0x18
-	cmp r0, #0x16
-	beq _080623BE
-	movs r2, #0x2e
-	ldrsh r1, [r7, r2]
-	mov r3, r8
-	movs r2, #0x2e
-	ldrsh r0, [r3, r2]
-	subs r2, r1, r0
-	movs r0, #0x32
-	ldrsh r3, [r7, r0]
-	mov sb, r3
-	mov r1, r8
-	movs r3, #0x32
-	ldrsh r0, [r1, r3]
-	mov r3, sb
-	subs r1, r3, r0
-	cmp r2, #0
-	bge _08062382
-	rsbs r2, r2, #0
-_08062382:
-	cmp r1, #0
-	bge _08062388
-	rsbs r1, r1, #0
-_08062388:
-	cmp r2, #0x78
-	bgt _08062390
-	cmp r1, #0x50
-	ble _080623B8
-_08062390:
-	adds r1, r7, #0
-	adds r1, #0x68
-	movs r0, #0
-	strb r0, [r1]
-	b _080624F8
-	.align 2, 0
-_0806239C: .4byte gPlayerEntity
-_080623A0: .4byte 0xFFFF0000
-_080623A4: .4byte 0x0000FFFF
-_080623A8: .4byte gPlayerState
-_080623AC: .4byte 0xFF00FFFF
-_080623B0: .4byte 0xC0FFFFFF
-_080623B4: .4byte 0x3FFFFFFF
-_080623B8:
-	adds r0, r7, #0
-	bl sub_0806252C
-_080623BE:
-	movs r0, #0
-	mov sb, r0
-	ldr r0, [r4]
-	cmp r5, r0
-	bne _080623CE
-	ldr r0, [r4, #4]
-	cmp r6, r0
-	beq _08062410
-_080623CE:
-	ldr r4, [r7, #0x64]
-	adds r4, #0x90
-	movs r1, #0x69
-	adds r1, r1, r7
-	mov r8, r1
-	adds r3, r7, #0
-	adds r3, #0x38
-	movs r2, #0x58
-	adds r2, r2, r7
-	mov ip, r2
-	movs r2, #0x12
-_080623E4:
-	ldr r0, [r4]
-	ldr r1, [r4, #4]
-	str r0, [r4, #8]
-	str r1, [r4, #0xc]
-	subs r4, #8
-	subs r2, #1
-	cmp r2, #0
-	bge _080623E4
-	ldr r4, [r7, #0x64]
-	str r5, [r4]
-	str r6, [r4, #4]
-	movs r0, #4
-	mov sb, r0
-	mov r2, r8
-	ldrb r1, [r2]
-	movs r0, #0
-	ldrsb r0, [r2, r0]
-	cmp r0, #0
-	ble _08062484
-	subs r0, r1, #1
-	strb r0, [r2]
-	b _08062484
-_08062410:
-	adds r4, #0x98
-	movs r3, #4
-	ldrsh r0, [r4, r3]
-	cmp r0, #0
-	bge _08062442
-	ldr r4, [r7, #0x64]
-	adds r4, #0x90
-	movs r0, #0x69
-	adds r0, r0, r7
-	mov r8, r0
-	adds r3, r7, #0
-	adds r3, #0x38
-	movs r1, #0x58
-	adds r1, r1, r7
-	mov ip, r1
-	movs r2, #0x12
-_08062430:
-	ldr r0, [r4]
-	ldr r1, [r4, #4]
-	str r0, [r4, #8]
-	str r1, [r4, #0xc]
-	subs r4, #8
-	subs r2, #1
-	cmp r2, #0
-	bge _08062430
-	b _08062480
-_08062442:
-	ldr r1, _080624E8 @ =gPlayerEntity
-	movs r3, #0x2e
-	ldrsh r0, [r1, r3]
-	movs r2, #0x32
-	ldrsh r1, [r1, r2]
-	ldrh r2, [r4]
-	ldrh r3, [r4, #2]
-	bl sub_080041E8
-	lsrs r0, r0, #4
-	movs r3, #0x69
-	adds r3, r3, r7
-	mov r8, r3
-	adds r3, r7, #0
-	adds r3, #0x38
-	movs r1, #0x58
-	adds r1, r1, r7
-	mov ip, r1
-	cmp r0, #0x18
-	ble _08062484
-	ldr r4, [r7, #0x64]
-	adds r4, #0x90
-	movs r2, #0x12
-_08062470:
-	ldr r0, [r4]
-	ldr r1, [r4, #4]
-	str r0, [r4, #8]
-	str r1, [r4, #0xc]
-	subs r4, #8
-	subs r2, #1
-	cmp r2, #0
-	bge _08062470
-_08062480:
-	movs r2, #4
-	mov sb, r2
-_08062484:
-	ldr r4, [r7, #0x64]
-	adds r4, #0x98
-	ldrh r0, [r4]
-	strh r0, [r7, #0x2e]
-	ldrh r0, [r4, #2]
-	strh r0, [r7, #0x32]
-	ldrh r0, [r4, #4]
-	strh r0, [r7, #0x36]
-	ldrb r0, [r4, #7]
-	lsls r0, r0, #0x1a
-	lsrs r0, r0, #0x1a
-	strb r0, [r7, #0x14]
-	ldrb r0, [r4, #7]
-	lsrs r0, r0, #6
-	strb r0, [r3]
-	mov r1, r8
-	ldrb r2, [r1]
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	cmp r0, #0
-	ble _080624B2
-	subs r0, r2, #1
-	strb r0, [r1]
-_080624B2:
-	mov r2, sb
-	ldrb r0, [r7, #0x14]
-	lsrs r0, r0, #1
-	add sb, r0
-	ldrb r0, [r7, #0xa]
-	cmp r0, #6
-	bne _080624C4
-	movs r3, #0x10
-	add sb, r3
-_080624C4:
-	mov r0, ip
-	ldrb r0, [r0]
-	cmp sb, r0
-	beq _080624EC
-	cmp r2, #0
-	bne _080624D8
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	cmp r0, #0
-	bgt _080624EC
-_080624D8:
-	adds r0, r7, #0
-	mov r1, sb
-	bl InitAnimationForceUpdate
-	movs r0, #0x1e
-	mov r1, r8
-	strb r0, [r1]
-	b _080624F2
-	.align 2, 0
-_080624E8: .4byte gPlayerEntity
-_080624EC:
-	adds r0, r7, #0
-	bl UpdateAnimationSingleFrame
-_080624F2:
-	adds r0, r7, #0
-	bl sub_0800451C
-_080624F8:
-	pop {r3, r4}
-	mov r8, r3
-	mov sb, r4
-	pop {r4, r5, r6, r7, pc}
-
-    .syntax divided
diff --git a/asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc b/asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc
deleted file mode 100644
index 33c4dfdf..00000000
--- a/asm/non_matching/menu/kinstone_menu/KinstoneMenu_080A414C.inc
+++ /dev/null
@@ -1,112 +0,0 @@
-	.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 @ =gSave+0x12b
-	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 gSave+0x12b
-_080A4224: .4byte 0x0000FFFF
-_080A4228: .4byte gSave
-	.syntax divided
diff --git a/asm/non_matching/pushableFurniture/sub_08090094.inc b/asm/non_matching/pushableFurniture/sub_08090094.inc
deleted file mode 100644
index 2662f442..00000000
--- a/asm/non_matching/pushableFurniture/sub_08090094.inc
+++ /dev/null
@@ -1,201 +0,0 @@
-	.syntax unified
-	push {r4, r5, r6, r7, lr}
-	adds r6, r0, #0
-	adds r5, r1, #0
-	adds r7, r2, #0
-	adds r0, r7, #0
-	movs r1, #1
-	bl sub_080B1B44
-	adds r4, r0, #0
-	adds r0, r7, #0
-	movs r1, #1
-	bl GetTileIndex
-	adds r3, r0, #0
-	movs r0, #0x80
-	lsls r0, r0, #7
-	ands r0, r3
-	cmp r0, #0
-	bne _0809012C
-	adds r3, r5, #0
-	ldr r1, _080900D0 @ =0xFFFFBFDC
-	adds r0, r3, r1
-	cmp r0, #0xb
-	bhi _0809011A
-	lsls r0, r0, #2
-	ldr r1, _080900D4 @ =_080900D8
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_080900D0: .4byte 0xFFFFBFDC
-_080900D4: .4byte _080900D8
-_080900D8: @ jump table
-	.4byte _08090114 @ case 0
-	.4byte _08090108 @ case 1
-	.4byte _0809011A @ case 2
-	.4byte _0809011A @ case 3
-	.4byte _0809011A @ case 4
-	.4byte _0809011A @ case 5
-	.4byte _0809011A @ case 6
-	.4byte _0809011A @ case 7
-	.4byte _08090114 @ case 8
-	.4byte _0809010E @ case 9
-	.4byte _08090114 @ case 10
-	.4byte _0809010E @ case 11
-_08090108:
-	cmp r4, #5
-	bne _0809011A
-	b _08090118
-_0809010E:
-	cmp r4, #5
-	bne _0809011A
-	b _08090118
-_08090114:
-	cmp r4, #0xa
-	bne _0809011A
-_08090118:
-	ldr r3, _08090128 @ =0x00004022
-_0809011A:
-	adds r0, r3, #0
-	adds r1, r7, #0
-	movs r2, #1
-	bl SetTile
-	b _08090242
-	.align 2, 0
-_08090128: .4byte 0x00004022
-_0809012C:
-	ldr r1, _08090140 @ =0xFFFFBFDE
-	adds r0, r3, r1
-	cmp r0, #0xd
-	bls _08090136
-	b _08090242
-_08090136:
-	lsls r0, r0, #2
-	ldr r1, _08090144 @ =_08090148
-	adds r0, r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.align 2, 0
-_08090140: .4byte 0xFFFFBFDE
-_08090144: .4byte _08090148
-_08090148: @ jump table
-	.4byte _08090242 @ case 0
-	.4byte _08090242 @ case 1
-	.4byte _080901EC @ case 2
-	.4byte _08090180 @ case 3
-	.4byte _08090242 @ case 4
-	.4byte _08090242 @ case 5
-	.4byte _08090242 @ case 6
-	.4byte _08090242 @ case 7
-	.4byte _08090242 @ case 8
-	.4byte _08090242 @ case 9
-	.4byte _08090210 @ case 10
-	.4byte _080901B4 @ case 11
-	.4byte _08090210 @ case 12
-	.4byte _080901B4 @ case 13
-_08090180:
-	ldr r0, _080901A8 @ =0x00004024
-	cmp r5, r0
-	bne _08090194
-	ldr r3, _080901AC @ =0x00004022
-	adds r2, r6, #0
-	adds r2, #0x83
-	ldrb r1, [r2]
-	movs r0, #0x10
-	orrs r0, r1
-	strb r0, [r2]
-_08090194:
-	ldr r0, _080901B0 @ =0x0000402C
-	cmp r5, r0
-	bne _08090238
-	ldr r3, _080901AC @ =0x00004022
-	adds r2, r6, #0
-	adds r2, #0x83
-	ldrb r1, [r2]
-	movs r0, #0x10
-	b _08090234
-	.align 2, 0
-_080901A8: .4byte 0x00004024
-_080901AC: .4byte 0x00004022
-_080901B0: .4byte 0x0000402C
-_080901B4:
-	ldr r0, _080901DC @ =0x0000402C
-	cmp r5, r0
-	bne _080901C8
-	ldr r3, _080901E0 @ =0x0000402B
-	adds r2, r6, #0
-	adds r2, #0x83
-	ldrb r1, [r2]
-	movs r0, #0x10
-	orrs r0, r1
-	strb r0, [r2]
-_080901C8:
-	ldr r0, _080901E4 @ =0x00004024
-	cmp r5, r0
-	bne _08090238
-	ldr r3, _080901E8 @ =0x00004022
-	adds r2, r6, #0
-	adds r2, #0x83
-	ldrb r1, [r2]
-	movs r0, #0x10
-	b _08090234
-	.align 2, 0
-_080901DC: .4byte 0x0000402C
-_080901E0: .4byte 0x0000402B
-_080901E4: .4byte 0x00004024
-_080901E8: .4byte 0x00004022
-_080901EC:
-	ldr r0, _08090204 @ =0x00004025
-	cmp r5, r0
-	bne _08090200
-	ldr r3, _08090208 @ =0x00004022
-	adds r2, r6, #0
-	adds r2, #0x83
-	ldrb r1, [r2]
-	movs r0, #0x20
-	orrs r0, r1
-	strb r0, [r2]
-_08090200:
-	ldr r0, _0809020C @ =0x0000402D
-	b _08090226
-	.align 2, 0
-_08090204: .4byte 0x00004025
-_08090208: .4byte 0x00004022
-_0809020C: .4byte 0x0000402D
-_08090210:
-	ldr r0, _08090244 @ =0x0000402D
-	cmp r5, r0
-	bne _08090224
-	ldr r3, _08090248 @ =0x0000402B
-	adds r2, r6, #0
-	adds r2, #0x83
-	ldrb r1, [r2]
-	movs r0, #0x20
-	orrs r0, r1
-	strb r0, [r2]
-_08090224:
-	ldr r0, _0809024C @ =0x00004025
-_08090226:
-	cmp r5, r0
-	bne _08090238
-	ldr r3, _08090250 @ =0x00004022
-	adds r2, r6, #0
-	adds r2, #0x83
-	ldrb r1, [r2]
-	movs r0, #0x20
-_08090234:
-	orrs r0, r1
-	strb r0, [r2]
-_08090238:
-	adds r0, r3, #0
-	adds r1, r7, #0
-	movs r2, #1
-	bl SetTile
-_08090242:
-	pop {r4, r5, r6, r7, pc}
-	.align 2, 0
-_08090244: .4byte 0x0000402D
-_08090248: .4byte 0x0000402B
-_0809024C: .4byte 0x00004025
-_08090250: .4byte 0x00004022
-	.syntax divided