Match sub_8005A24 and sub_8005B04

Author: JaceCear

asm/player.s

@@ -8,192 +8,6 @@
 .if 0
 .endif
 
-	thumb_func_start sub_8005A24
-sub_8005A24: @ 0x08005A24
-	push {r4, r5, r6, r7, lr}
-	adds r4, r0, #0
-	movs r7, #0xff
-	movs r0, #0x1c
-	ldrsh r2, [r4, r0]
-	cmp r2, #0
-	bge _08005A34
-	rsbs r2, r2, #0
-_08005A34:
-	adds r0, r4, #0
-	adds r0, #0x94
-	ldr r1, [r0]
-	lsls r0, r2, #0x10
-	asrs r0, r0, #0x10
-	subs r0, r0, r1
-	lsls r0, r0, #0x10
-	lsrs r6, r0, #0x10
-	ldrh r1, [r4, #0x30]
-	adds r0, r1, #0
-	subs r0, #0x10
-	lsls r0, r0, #0x10
-	lsrs r0, r0, #0x10
-	cmp r0, #2
-	bhi _08005A5A
-	lsls r0, r1, #0x18
-	lsrs r7, r0, #0x18
-	lsls r5, r6, #0x10
-	b _08005A94
-_08005A5A:
-	lsls r0, r6, #0x10
-	ldr r1, _08005A78 @ =0x01FF0000
-	adds r5, r0, #0
-	cmp r5, r1
-	ble _08005A94
-	adds r0, r4, #0
-	adds r0, #0x2e
-	ldrb r0, [r0]
-	lsls r0, r0, #0x1c
-	lsrs r0, r0, #0x1c
-	cmp r0, #3
-	bls _08005A7C
-	movs r7, #0x11
-	b _08005A8C
-	.align 2, 0
-_08005A78: .4byte 0x01FF0000
-_08005A7C:
-	ldr r0, [r4, #4]
-	movs r1, #0x80
-	lsls r1, r1, #0x10
-	ands r0, r1
-	movs r7, #0x10
-	cmp r0, #0
-	beq _08005A8C
-	movs r7, #0x12
-_08005A8C:
-	adds r0, r4, #0
-	movs r1, #0x73
-	bl Player_PlayOrContinueSong
-_08005A94:
-	ldr r0, _08005AD8 @ =0xFFFF0000
-	adds r1, r5, r0
-	movs r0, #0xff
-	lsls r0, r0, #0x11
-	ldrh r3, [r4, #0x1c]
-	cmp r1, r0
-	bhi _08005AE8
-	lsls r0, r3, #0x10
-	asrs r2, r0, #0x10
-	cmp r2, #0
-	bge _08005AB4
-	ldr r1, [r4, #4]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	bne _08005AC2
-_08005AB4:
-	cmp r2, #0
-	ble _08005AE8
-	ldr r1, [r4, #4]
-	movs r0, #1
-	ands r0, r1
-	cmp r0, #0
-	bne _08005AE8
-_08005AC2:
-	ldr r0, _08005ADC @ =gStageData
-	ldrb r0, [r0, #3]
-	cmp r0, #7
-	beq _08005AE4
-	movs r0, #0x80
-	lsls r0, r0, #0x10
-	ands r0, r1
-	cmp r0, #0
-	beq _08005AE4
-	ldr r0, _08005AE0 @ =sub_800E084
-	b _08005AE6
-	.align 2, 0
-_08005AD8: .4byte 0xFFFF0000
-_08005ADC: .4byte gStageData
-_08005AE0: .4byte sub_800E084
-_08005AE4:
-	ldr r0, _08005B00 @ =sub_800D9F4
-_08005AE6:
-	str r0, [r4]
-_08005AE8:
-	lsls r0, r3, #0x10
-	cmp r0, #0
-	bge _08005AF2
-	rsbs r0, r5, #0
-	lsrs r6, r0, #0x10
-_08005AF2:
-	strh r6, [r4, #0x1c]
-	lsls r0, r7, #0x18
-	asrs r0, r0, #0x18
-	pop {r4, r5, r6, r7}
-	pop {r1}
-	bx r1
-	.align 2, 0
-_08005B00: .4byte sub_800D9F4
-
-	thumb_func_start sub_8005B04
-sub_8005B04: @ 0x08005B04
-	push {lr}
-	adds r2, r0, #0
-	movs r1, #0x1c
-	ldrsh r0, [r2, r1]
-	cmp r0, #0
-	bne _08005B24
-	adds r0, r2, #0
-	adds r0, #0x26
-	ldrb r0, [r0]
-	adds r0, #0x20
-	movs r1, #0xc0
-	ands r0, r1
-	cmp r0, #0
-	bne _08005B24
-	movs r0, #0
-	b _08005B72
-_08005B24:
-	movs r1, #0x1c
-	ldrsh r0, [r2, r1]
-	cmp r0, #0
-	bge _08005B2E
-	rsbs r0, r0, #0
-_08005B2E:
-	lsls r0, r0, #0x10
-	ldr r1, _08005B5C @ =0xFFF80000
-	adds r0, r0, r1
-	lsrs r3, r0, #0x10
-	cmp r0, #0
-	bge _08005B60
-	adds r0, r2, #0
-	adds r0, #0x26
-	ldrb r0, [r0]
-	adds r1, r0, #0
-	adds r1, #0x20
-	movs r0, #0xc0
-	ands r1, r0
-	cmp r1, #0
-	bne _08005B60
-	strh r1, [r2, #0x1c]
-	adds r1, r2, #0
-	adds r1, #0x52
-	adds r0, #0xa8
-	strh r0, [r1]
-	movs r0, #0
-	b _08005B72
-	.align 2, 0
-_08005B5C: .4byte 0xFFF80000
-_08005B60:
-	movs r1, #0x1c
-	ldrsh r0, [r2, r1]
-	cmp r0, #0
-	bge _08005B6E
-	lsls r0, r3, #0x10
-	rsbs r0, r0, #0
-	lsrs r3, r0, #0x10
-_08005B6E:
-	strh r3, [r2, #0x1c]
-	movs r0, #8
-_08005B72:
-	pop {r1}
-	bx r1
-	.align 2, 0
-
 	thumb_func_start sub_8005B78
 sub_8005B78: @ 0x08005B78
 	push {r4, r5, lr}