play_time.c

1 files changed, 9 insertions, 125 deletions

diff --git a/asm/rom.s b/asm/rom.s
index a1d9d269f..f98d7cd5d 100644
--- a/asm/rom.s
+++ b/asm/rom.s
@@ -31,7 +31,7 @@ AgbMain: ; 800024C
 	bl CheckForFlashMemory
 	bl init_saveblock_ptrs_and_set_copyright_callback2
 	bl sound_sources_off
-	bl SeedRngAndSetTrainerId
+	bl SeedRngWithRtc
 	ldr r0, _080002EC
 	movs r4, 0
 	strb r4, [r0]
@@ -107,7 +107,7 @@ _08000304:
 	bl CallCallbacksWrapper
 	strb r7, [r4]
 _0800032C:
-	bl sub_8052C7C
+	bl PlayTimeCounter_Update
 	bl sound_something
 	bl WaitForVBlank
 	b _080002A4
@@ -201,8 +201,8 @@ _080003DC: .4byte 0x03001770
 _080003E0: .4byte 0x0000043c
 	thumb_func_end SetMainCallback2
 
-	thumb_func_start SeedRngAndSetTrainerId
-SeedRngAndSetTrainerId: ; 80003E4
+	thumb_func_start SeedRngWithRtc
+SeedRngWithRtc: ; 80003E4
 	push {lr}
 	bl GameFreakRTC_GetNumMinutes
 	adds r2, r0, 0
@@ -215,7 +215,7 @@ SeedRngAndSetTrainerId: ; 80003E4
 	bx r0
 	.align 2
 _080003FC: .4byte 0x0000ffff
-	thumb_func_end SeedRngAndSetTrainerId
+	thumb_func_end SeedRngWithRtc
 
 	thumb_func_start InitKeypadData
 InitKeypadData: ; 8000400
@@ -164965,123 +164965,7 @@ _08052C20: .4byte 0x0000016f
 _08052C24: .4byte 0x03004854
 	thumb_func_end sub_8052BD0
 
-	thumb_func_start sub_8052C28
-sub_8052C28: ; 8052C28
-	ldr r1, _08052C40
-	movs r0, 0
-	strb r0, [r1]
-	ldr r1, _08052C44
-	movs r2, 0
-	movs r0, 0
-	strh r0, [r1, 0xE]
-	strb r2, [r1, 0x10]
-	strb r2, [r1, 0x11]
-	strb r2, [r1, 0x12]
-	bx lr
-	.align 2
-_08052C40: .4byte 0x0300057c
-_08052C44: .4byte 0x02024ea4
-	thumb_func_end sub_8052C28
-
-	thumb_func_start sub_8052C48
-sub_8052C48: ; 8052C48
-	push {lr}
-	ldr r1, _08052C64
-	movs r0, 0x1
-	strb r0, [r1]
-	ldr r0, _08052C68
-	ldrh r1, [r0, 0xE]
-	ldr r0, _08052C6C
-	cmp r1, r0
-	bls _08052C5E
-	bl sub_8052CDC
-_08052C5E:
-	pop {r0}
-	bx r0
-	.align 2
-_08052C64: .4byte 0x0300057c
-_08052C68: .4byte 0x02024ea4
-_08052C6C: .4byte 0x000003e7
-	thumb_func_end sub_8052C48
-
-	thumb_func_start sub_8052C70
-sub_8052C70: ; 8052C70
-	ldr r1, _08052C78
-	movs r0, 0
-	strb r0, [r1]
-	bx lr
-	.align 2
-_08052C78: .4byte 0x0300057c
-	thumb_func_end sub_8052C70
-
-	thumb_func_start sub_8052C7C
-sub_8052C7C: ; 8052C7C
-	push {lr}
-	ldr r0, _08052CD0
-	ldrb r0, [r0]
-	cmp r0, 0x1
-	bne _08052CCC
-	ldr r1, _08052CD4
-	ldrb r0, [r1, 0x12]
-	adds r0, 0x1
-	movs r2, 0
-	strb r0, [r1, 0x12]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3B
-	bls _08052CCC
-	strb r2, [r1, 0x12]
-	ldrb r0, [r1, 0x11]
-	adds r0, 0x1
-	strb r0, [r1, 0x11]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3B
-	bls _08052CCC
-	strb r2, [r1, 0x11]
-	ldrb r0, [r1, 0x10]
-	adds r0, 0x1
-	strb r0, [r1, 0x10]
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3B
-	bls _08052CCC
-	strb r2, [r1, 0x10]
-	ldrh r0, [r1, 0xE]
-	adds r0, 0x1
-	strh r0, [r1, 0xE]
-	lsls r0, 16
-	ldr r1, _08052CD8
-	cmp r0, r1
-	bls _08052CCC
-	bl sub_8052CDC
-_08052CCC:
-	pop {r0}
-	bx r0
-	.align 2
-_08052CD0: .4byte 0x0300057c
-_08052CD4: .4byte 0x02024ea4
-_08052CD8: .4byte 0x03e70000
-	thumb_func_end sub_8052C7C
-
-	thumb_func_start sub_8052CDC
-sub_8052CDC: ; 8052CDC
-	ldr r1, _08052CF4
-	movs r0, 0x2
-	strb r0, [r1]
-	ldr r1, _08052CF8
-	ldr r0, _08052CFC
-	strh r0, [r1, 0xE]
-	movs r0, 0x3B
-	strb r0, [r1, 0x10]
-	strb r0, [r1, 0x11]
-	strb r0, [r1, 0x12]
-	bx lr
-	.align 2
-_08052CF4: .4byte 0x0300057c
-_08052CF8: .4byte 0x02024ea4
-_08052CFC: .4byte 0x000003e7
-	thumb_func_end sub_8052CDC
+	.include "genasm/play_time.s"
 
 	thumb_func_start write_word_to_mem
 write_word_to_mem: ; 8052D00
@@ -165311,7 +165195,7 @@ _08052E7E:
 	movs r5, 0
 	strb r5, [r0, 0x9]
 	bl set_player_trainer_id
-	bl sub_8052C28
+	bl PlayTimeCounter_Reset
 	bl sub_8052D78
 	bl sub_8069030
 	bl sub_80BD7A8
@@ -168182,7 +168066,7 @@ c2_load_new_map_2: ; 8054410
 	bl ResetSafariZoneFlag_
 	bl NewGameInitData
 	bl player_avatar_init_params_reset
-	bl sub_8052C48
+	bl PlayTimeCounter_Start
 	bl script_env_1_init
 	bl script_env_2_disable
 	ldr r1, _08054454
@@ -168546,7 +168430,7 @@ c2_8056854: ; 8054734
 	bl InTrainerHill
 	bl sub_805308C
 	bl sub_8055FC0
-	bl sub_8052C48
+	bl PlayTimeCounter_Start
 	bl script_env_1_init
 	bl script_env_2_disable
 	bl sub_80479F8