finish docing PlayTime and fix function - Kermalis

6 files changed, 7 insertions, 203 deletions

diff --git a/asm/code_800D090.s b/asm/code_800D090.s
index 691f0f6..0733546 100644
--- a/asm/code_800D090.s
+++ b/asm/code_800D090.s
@@ -7545,7 +7545,7 @@ sub_8010960:
 	bl sub_80060EC
 	ldr r0, _080109FC
 	ldr r0, [r0]
-	bl sub_8094FB4
+	bl IncrementPlayTime
 	bl sub_800CB20
 	bl sub_800485C
 	bl CopySpritesToOam
@@ -9175,7 +9175,7 @@ sub_801169C:
 	bl sub_80060EC
 	ldr r0, _0801175C
 	ldr r0, [r0]
-	bl sub_8094FB4
+	bl IncrementPlayTime
 	bl sub_800CB20
 	bl sub_800485C
 	bl CopySpritesToOam
diff --git a/asm/code_8027C84.s b/asm/code_8027C84.s
index 91d021d..a099f3d 100644
--- a/asm/code_8027C84.s
+++ b/asm/code_8027C84.s
@@ -35186,7 +35186,7 @@ _08039696:
 	add r1, sp, 0x144
 	add r2, sp, 0x148
 	add r3, sp, 0x14C
-	bl sub_8095014
+	bl DeconstructPlayTime
 	ldr r0, [r7]
 	movs r5, 0x84
 	lsls r5, 2
diff --git a/asm/code_803D110.s b/asm/code_803D110.s
index 88bbc1f..63efd41 100644
--- a/asm/code_803D110.s
+++ b/asm/code_803D110.s
@@ -2673,7 +2673,7 @@ _0803E5A2:
 	str r0, [r1]
 	ldr r0, _0803E65C
 	ldr r0, [r0]
-	bl sub_8094FB4
+	bl IncrementPlayTime
 	bl sub_800CB20
 	bl sub_800485C
 	bl CopySpritesToOam
@@ -2748,7 +2748,7 @@ sub_803E668:
 	str r0, [r1]
 	ldr r0, _0803E6FC
 	ldr r0, [r0]
-	bl sub_8094FB4
+	bl IncrementPlayTime
 	bl sub_800CB20
 	bl sub_800485C
 	bl CopySpritesToOam
diff --git a/asm/code_80521D0.s b/asm/code_80521D0.s
index ee13c00..a2513ac 100644
--- a/asm/code_80521D0.s
+++ b/asm/code_80521D0.s
@@ -26632,7 +26632,7 @@ _0805FA62:
 	add r2, sp, 0x8
 	add r3, sp, 0xC
 	add r1, sp, 0x4
-	bl sub_8095014
+	bl DeconstructPlayTime
 	movs r1, 0x9E
 	lsls r1, 1
 	adds r0, r7, r1
diff --git a/asm/code_8098468.s b/asm/code_8098468.s
index a45dba8..4a9a111 100644
--- a/asm/code_8098468.s
+++ b/asm/code_8098468.s
@@ -510,7 +510,7 @@ _080988F8:
 	bl sub_8011860
 	ldr r0, _08098978
 	ldr r0, [r0]
-	bl sub_8094FB4
+	bl IncrementPlayTime
 	bl sub_800CB20
 	bl sub_800485C
 	bl nullsub_120
diff --git a/asm/code_80A26CC.s b/asm/code_80A26CC.s
index 76736c8..8a533e5 100644
--- a/asm/code_80A26CC.s
+++ b/asm/code_80A26CC.s
@@ -5,202 +5,6 @@
 
 	.text	
 
-	thumb_func_start sub_80A26CC
-sub_80A26CC:
-	lsls r0, 16
-	movs r1, 0xDC
-	lsls r1, 14
-	adds r0, r1
-	asrs r0, 16
-	bx lr
-	thumb_func_end sub_80A26CC
-
-	thumb_func_start sub_80A26D8
-sub_80A26D8:
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r6, r0, 24
-	movs r5, 0
-_080A26E0:
-	lsls r0, r5, 16
-	asrs r4, r0, 16
-	adds r0, r4, 0
-	bl sub_80A2608
-	adds r1, r0, 0
-	ldrb r0, [r1, 0x11]
-	cmp r0, 0
-	beq _080A26FC
-	ldrb r0, [r1, 0xC]
-	cmp r0, r6
-	bne _080A26FC
-	adds r0, r4, 0
-	b _080A2706
-_080A26FC:
-	adds r5, 0x1
-	cmp r5, 0x52
-	ble _080A26E0
-	movs r0, 0x1
-	negs r0, r0
-_080A2706:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A26D8
-
-	thumb_func_start sub_80A270C
-sub_80A270C:
-	push {lr}
-	lsls r0, 16
-	ldr r1, _080A2724
-	asrs r0, 15
-	adds r0, r1
-	movs r1, 0
-	ldrsh r0, [r0, r1]
-	bl sub_80A2608
-	ldrb r0, [r0, 0xC]
-	pop {r1}
-	bx r1
-	.align 2, 0
-_080A2724: .4byte gUnknown_8116F9A
-	thumb_func_end sub_80A270C
-
-	thumb_func_start sub_80A2728
-sub_80A2728:
-	push {lr}
-	lsls r0, 16
-	movs r1, 0xDC
-	lsls r1, 14
-	adds r0, r1
-	asrs r0, 16
-	bl sub_80A2608
-	ldrb r0, [r0, 0xC]
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A2728
-
-	thumb_func_start sub_80A2740
-sub_80A2740:
-	push {lr}
-	lsls r0, 16
-	asrs r0, 16
-	bl sub_80A2608
-	ldrb r0, [r0, 0xC]
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A2740
-
-        thumb_func_start sub_80A2750
-sub_80A2750:
-	push {r4,lr}
-	lsls r0, 16
-	asrs r1, r0, 16
-	adds r2, r1, 0
-	cmp r1, 0x50
-	bne _080A2760
-	movs r0, 0x3
-	b _080A27C4
-_080A2760:
-	cmp r1, 0x51
-	beq _080A27BE
-	cmp r1, 0x52
-	beq _080A2780
-	adds r0, r1, 0
-	subs r0, 0x28
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xE
-	bls _080A27BE
-	adds r0, r1, 0
-	subs r0, 0x37
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x18
-	bhi _080A2784
-_080A2780:
-	movs r0, 0x4
-	b _080A27C4
-_080A2784:
-	adds r0, r2, 0
-	bl sub_80A2608
-	adds r4, r0, 0
-	movs r0, 0xE
-	ldrsh r1, [r4, r0]
-	movs r0, 0x1
-	negs r0, r0
-	cmp r1, r0
-	beq _080A27C2
-	movs r0, 0x5
-	bl sub_80023E4
-	lsls r0, 24
-	cmp r0, 0
-	bne _080A27C2
-	movs r1, 0xE
-	ldrsh r0, [r4, r1]
-	bl sub_80973F4
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A27C2
-	movs r0, 0x1
-	bl sub_80023E4
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A27C2
-_080A27BE:
-	movs r0, 0x2
-	b _080A27C4
-_080A27C2:
-	movs r0, 0x1
-_080A27C4:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A2750
-
-	thumb_func_start sub_80A27CC
-sub_80A27CC:
-	push {r4,r5,lr}
-	lsls r0, 16
-	asrs r4, r0, 16
-	adds r5, r4, 0
-	adds r0, r4, 0
-	bl sub_80A2620
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	movs r0, 0x1
-	negs r0, r0
-	cmp r1, r0
-	beq _080A281A
-	movs r0, 0x5
-	bl sub_80023E4
-	lsls r0, 24
-	cmp r0, 0
-	bne _080A281A
-	adds r0, r4, 0
-	bl sub_8097384
-	lsls r0, 24
-	cmp r0, 0
-	bne _080A2816
-	movs r0, 0x1
-	bl sub_80023E4
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A281A
-	adds r0, r5, 0
-	bl sub_80973F4
-	lsls r0, 24
-	cmp r0, 0
-	beq _080A281A
-_080A2816:
-	movs r0, 0x1
-	b _080A281C
-_080A281A:
-	movs r0, 0
-_080A281C:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80A27CC
-
 	thumb_func_start sub_80A2824
 sub_80A2824:
 	push {r4-r6,lr}