Merge pull request #224 from hatal175/collision

Improve nonmatching state in collision.c

asm/non_matching/arm_proxy/sub_0801766C.inc

@@ -1,68 +0,0 @@
-    .syntax unified
-	push {r4, lr}
-	adds r4, r0, #0
-	adds r3, r4, #0
-	adds r3, #0x29
-	ldrb r1, [r3]
-	movs r0, #0x40
-	ands r0, r1
-	cmp r0, #0
-	beq _08017682
-_0801767E:
-	movs r0, #1
-	b _080176DE
-_08017682:
-	ldr r2, _080176C0 @ =gUnk_03003C70
-	movs r0, #0x80
-	lsls r0, r0, #1
-	adds r1, r2, r0
-	cmp r1, r2
-	bls _080176DC
-_0801768E:
-	ldr r0, [r2, #8]
-	cmp r0, #0
-	bne _080176D6
-	str r4, [r2, #8]
-	strb r0, [r2, #0xc]
-	ldrb r0, [r3]
-	movs r1, #0x40
-	orrs r0, r1
-	strb r0, [r3]
-	ldr r3, _080176C4 @ =gUnk_02018EA0
-	ldr r1, [r3]
-	ldrb r0, [r1, #0xc]
-	cmp r0, #0
-	beq _080176C8
-_080176AA:
-	ldr r1, [r1, #4]
-	ldrb r0, [r1, #0xc]
-	cmp r0, #0
-	bne _080176AA
-	str r1, [r2, #4]
-	ldr r0, [r1]
-	str r0, [r2]
-	str r2, [r0, #4]
-	str r2, [r1]
-	b _0801767E
-	.align 2, 0
-_080176C0: .4byte gUnk_03003C70
-_080176C4: .4byte gUnk_02018EA0
-_080176C8:
-	str r1, [r2, #4]
-	ldr r0, [r1]
-	str r0, [r2]
-	str r2, [r0, #4]
-	str r2, [r1]
-	str r2, [r3]
-	b _0801767E
-_080176D6:
-	adds r2, #0x10
-	cmp r1, r2
-	bhi _0801768E
-_080176DC:
-	movs r0, #0
-_080176DE:
-	pop {r4}
-	pop {r1}
-	bx r1
-    .syntax divided

asm/non_matching/arm_proxy/sub_080176E4.inc

@@ -1,54 +0,0 @@
-    .syntax unified
-	push {lr}
-	adds r2, r0, #0
-	adds r0, #0x29
-	ldrb r1, [r0]
-	movs r0, #0x40
-	ands r0, r1
-	cmp r0, #0
-	beq _08017720
-	movs r0, #1
-	b _0801773A
-_080176F8:
-	str r2, [r3, #8]
-	movs r0, #1
-	strb r0, [r3, #0xc]
-	adds r2, #0x29
-	ldrb r0, [r2]
-	movs r1, #0x40
-	orrs r0, r1
-	strb r0, [r2]
-	ldr r2, _0801771C @ =gUnk_02018EA0
-	ldr r0, [r2]
-	str r0, [r3, #4]
-	ldr r1, [r0]
-	str r1, [r3]
-	str r3, [r1, #4]
-	str r3, [r0]
-	str r3, [r2]
-	movs r0, #1
-	b _0801773A
-	.align 2, 0
-_0801771C: .4byte gUnk_02018EA0
-_08017720:
-	ldr r3, _08017740 @ =gUnk_03003C70
-	movs r0, #0x80
-	lsls r0, r0, #1
-	adds r1, r3, r0
-	cmp r1, r3
-	bls _08017738
-_0801772C:
-	ldr r0, [r3, #8]
-	cmp r0, #0
-	beq _080176F8
-	adds r3, #0x10
-	cmp r1, r3
-	bhi _0801772C
-_08017738:
-	movs r0, #0
-_0801773A:
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08017740: .4byte gUnk_03003C70
-    .syntax divided

asm/non_matching/collision/sub_08017CBC.inc

@@ -1,57 +0,0 @@
-    .syntax unified
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	adds r3, r1, #0
-	movs r5, #0x10
-	eors r2, r5
-	adds r0, r2, #0
-	subs r0, #0xc
-	movs r2, #0x1f
-	ands r0, r2
-	ldrb r1, [r3, #0x15]
-	subs r1, r1, r0
-	ands r1, r2
-	cmp r1, #0x18
-	bhi _08017CF0
-	adds r1, r4, #0
-	adds r1, #0x3d
-	movs r0, #0xf4
-	strb r0, [r1]
-	adds r1, r3, #0
-	adds r1, #0x3d
-	strb r0, [r1]
-	adds r0, r4, #0
-	adds r1, r3, #0
-	bl sub_08017940
-	b _08017D1E
-_08017CF0:
-	adds r1, r3, #0
-	adds r1, #0x42
-	movs r0, #0xc
-	strb r0, [r1]
-	adds r0, r3, #0
-	adds r0, #0x3d
-	strb r5, [r0]
-	adds r1, #1
-	movs r0, #0xf0
-	strb r0, [r1]
-	adds r1, #3
-	movs r0, #0xc0
-	lsls r0, r0, #2
-	strh r0, [r1]
-	adds r1, r4, #0
-	adds r1, #0x3d
-	ldrb r2, [r1]
-	movs r0, #0
-	ldrsb r0, [r1, r0]
-	cmp r0, #0
-	bne _08017D1E
-	movs r0, #0xff
-	strb r0, [r1]
-_08017D1E:
-	movs r0, #1
-	pop {r4, r5}
-	pop {r1}
-	bx r1
-	.align 2, 0
-    .syntax divided

asm/non_matching/collision/sub_0801802C.inc

@@ -1,75 +0,0 @@
-    .syntax unified
-	push {r4, r5, r6, lr}
-	adds r4, r0, #0
-	adds r5, r1, #0
-	adds r6, r2, #0
-	ldrb r0, [r4, #8]
-	cmp r0, #1
-	bne _08018058
-	bl sub_08079F8C
-	cmp r0, #0
-	beq _08018090
-	movs r0, #0x10
-	eors r0, r6
-	ldrb r1, [r5, #0x14]
-	lsls r1, r1, #2
-	subs r0, r0, r1
-	adds r0, #5
-	movs r1, #0x1f
-	ands r0, r1
-	cmp r0, #0xa
-	bhi _08018090
-	b _0801807A
-_08018058:
-	cmp r0, #8
-	bne _08018086
-	ldrb r0, [r4, #0x15]
-	movs r1, #0x10
-	eors r1, r0
-	ldrb r0, [r5, #0x14]
-	lsls r0, r0, #2
-	subs r1, r1, r0
-	adds r1, #5
-	movs r0, #0x1f
-	ands r1, r0
-	cmp r1, #0xa
-	bgt _08018090
-	adds r1, r4, #0
-	adds r1, #0x45
-	movs r0, #0
-	strb r0, [r1]
-_0801807A:
-	adds r0, r4, #0
-	adds r1, r5, #0
-	bl sub_080180BC
-	movs r0, #1
-	b _080180AE
-_08018086:
-	adds r1, r4, #0
-	adds r1, #0x45
-	movs r0, #0
-	strb r0, [r1]
-	b _080180AE
-_08018090:
-	adds r0, r4, #0
-	adds r0, #0x40
-	ldrb r0, [r0]
-	ldr r1, _080180B4 @ =0x000011AA
-	adds r0, r0, r1
-	lsls r3, r0, #1
-	adds r3, r3, r0
-	lsls r3, r3, #2
-	ldr r0, _080180B8 @ =gCollisionMtx
-	adds r3, r3, r0
-	adds r0, r4, #0
-	adds r1, r5, #0
-	adds r2, r6, #0
-	bl sub_08018308
-_080180AE:
-	pop {r4, r5, r6}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080180B4: .4byte 0x000011AA
-_080180B8: .4byte gCollisionMtx
-    .syntax divided