Merge pull request #371 from hatal175/newbranch

Decompile the rest of playeritem12

asm/non_matching/playerItem12/sub_08070100.inc

@@ -1,121 +0,0 @@
-	.syntax unified
-	push {r4, r5, lr}
-	adds r5, r0, #0
-	movs r2, #1
-	movs r3, #1
-	strb r3, [r5, #0xc]
-	ldrb r1, [r5, #0x18]
-	movs r0, #4
-	rsbs r0, r0, #0
-	ands r0, r1
-	orrs r0, r2
-	strb r0, [r5, #0x18]
-	ldrb r1, [r5, #0x10]
-	movs r0, #0x80
-	orrs r0, r1
-	strb r0, [r5, #0x10]
-	ldrb r0, [r5, #0x14]
-	lsls r0, r0, #2
-	strb r0, [r5, #0x15]
-	movs r0, #0x80
-	lsls r0, r0, #2
-	strh r0, [r5, #0x24]
-	movs r0, #0x40
-	str r0, [r5, #0x74]
-	movs r0, #0xf0
-	lsls r0, r0, #1
-	str r0, [r5, #0x78]
-	ldr r2, _0807017C @ =gPlayerEntity
-	ldr r1, _08070180 @ =gUnk_0811B9A0
-	ldrb r0, [r5, #0x14]
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	ldrh r4, [r2, #0x2e]
-	adds r0, r0, r4
-	strh r0, [r5, #0x2e]
-	ldrb r0, [r5, #0x14]
-	adds r0, #1
-	adds r0, r0, r1
-	ldrb r0, [r0]
-	lsls r0, r0, #0x18
-	asrs r0, r0, #0x18
-	ldrh r1, [r2, #0x32]
-	adds r0, r0, r1
-	strh r0, [r5, #0x32]
-	adds r1, r5, #0
-	adds r1, #0x3c
-	movs r0, #7
-	strb r0, [r1]
-	subs r1, #1
-	movs r0, #0x8a
-	strb r0, [r1]
-	ldr r0, _08070184 @ =gUnk_0811B9D0
-	str r0, [r5, #0x48]
-	adds r0, r5, #0
-	adds r0, #0x38
-	ldrb r0, [r0]
-	cmp r0, #2
-	bne _08070188
-	strb r3, [r5, #0xa]
-	b _0807018C
-	.align 2, 0
-_0807017C: .4byte gPlayerEntity
-_08070180: .4byte gUnk_0811B9A0
-_08070184: .4byte gUnk_0811B9D0
-_08070188:
-	movs r0, #0
-	strb r0, [r5, #0xa]
-_0807018C:
-	ldrb r1, [r2, #0x1b]
-	lsrs r1, r1, #6
-	lsls r1, r1, #6
-	ldrb r2, [r5, #0x1b]
-	movs r0, #0x3f
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, #0x1b]
-	ldrb r3, [r5, #0x14]
-	lsrs r3, r3, #1
-	lsls r3, r3, #3
-	ldr r0, _080701F0 @ =gUnk_0811B9A8
-	adds r3, r3, r0
-	ldrb r1, [r3]
-	movs r0, #1
-	ands r1, r0
-	lsls r1, r1, #6
-	ldrb r2, [r5, #0x18]
-	movs r0, #0x41
-	rsbs r0, r0, #0
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-	ldrb r1, [r3, #1]
-	lsls r1, r1, #7
-	movs r2, #0x7f
-	ands r0, r2
-	orrs r0, r1
-	strb r0, [r5, #0x18]
-	ldrb r0, [r3, #4]
-	adds r4, r5, #0
-	adds r4, #0x58
-	strb r0, [r4]
-	movs r0, #2
-	ldrsb r0, [r3, r0]
-	str r0, [r5, #0x6c]
-	movs r0, #3
-	ldrsb r0, [r3, r0]
-	str r0, [r5, #0x70]
-	adds r0, r5, #0
-	bl sub_0801766C
-	ldrb r1, [r4]
-	adds r0, r5, #0
-	bl InitializeAnimation
-	ldr r0, _080701F4 @ =0x000001DD
-	bl SoundReq
-	pop {r4, r5, pc}
-	.align 2, 0
-_080701F0: .4byte gUnk_0811B9A8
-_080701F4: .4byte 0x000001DD
-	.syntax divided

asm/non_matching/playerItem12/sub_080703BC.inc

@@ -1,82 +0,0 @@
-	.syntax unified
-	push {r4, r5, lr}
-	adds r4, r0, #0
-	bl GetNextFrame
-	movs r1, #0x2e
-	ldrsh r0, [r4, r1]
-	ldr r2, _08070404 @ =gRoomControls
-	ldrh r1, [r2, #6]
-	subs r0, r0, r1
-	asrs r0, r0, #4
-	movs r3, #0x3f
-	ands r0, r3
-	movs r5, #0x32
-	ldrsh r1, [r4, r5]
-	ldrh r2, [r2, #8]
-	subs r1, r1, r2
-	asrs r1, r1, #4
-	ands r1, r3
-	lsls r1, r1, #6
-	orrs r0, r1
-	adds r1, r4, #0
-	adds r1, #0x38
-	ldrb r1, [r1]
-	bl GetTileIndex
-	adds r1, r0, #0
-	ldr r0, _08070408 @ =0x00004021
-	cmp r1, r0
-	beq _0807042E
-	cmp r1, r0
-	bhi _0807040C
-	subs r0, #1
-	cmp r1, r0
-	beq _08070420
-	b _08070412
-	.align 2, 0
-_08070404: .4byte gRoomControls
-_08070408: .4byte 0x00004021
-_0807040C:
-	ldr r0, _08070418 @ =0x00004070
-	cmp r1, r0
-	beq _0807041C
-_08070412:
-	movs r0, #0
-	str r0, [r4, #0x7c]
-	b _0807042E
-	.align 2, 0
-_08070418: .4byte 0x00004070
-_0807041C:
-	movs r0, #0xff
-	str r0, [r4, #0x78]
-_08070420:
-	ldr r0, [r4, #0x78]
-	subs r0, #1
-	str r0, [r4, #0x78]
-	movs r1, #1
-	rsbs r1, r1, #0
-	cmp r0, r1
-	bne _08070436
-_0807042E:
-	adds r0, r4, #0
-	bl sub_08070458
-	b _08070454
-_08070436:
-	adds r0, r4, #0
-	adds r0, #0x41
-	ldrb r1, [r0]
-	cmp r1, #0
-	beq _08070454
-	movs r0, #0x7f
-	ands r0, r1
-	cmp r0, #0
-	bne _0807044E
-	ldrb r0, [r4, #0xc]
-	cmp r0, #0x1a
-	bne _08070454
-_0807044E:
-	adds r0, r4, #0
-	bl sub_08070458
-_08070454:
-	pop {r4, r5, pc}
-	.align 2, 0
-	.syntax divided