diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc index 8c783879..22511e10 100644 --- a/asm/include/overlay_00.inc +++ b/asm/include/overlay_00.inc @@ -1129,8 +1129,8 @@ .public sub_0207ADCC .public sub_0207AE44 .public sub_0207AFF0 -.public sub_0207B030 -.public sub_0207B040 +.public OS_IsAlarmAvailable +.public OS_CreateAlarm .public sub_0207B17C .public sub_0207B1E8 .public sub_0207B854 diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc index 8aedfcf2..0b33edd8 100644 --- a/asm/include/overlay_02.inc +++ b/asm/include/overlay_02.inc @@ -195,8 +195,8 @@ .public sub_0207A2C0 .public sub_0207ADCC .public sub_0207AE44 -.public sub_0207B030 -.public sub_0207B040 +.public OS_IsAlarmAvailable +.public OS_CreateAlarm .public sub_0207B17C .public sub_0207B1E8 .public sub_0207B854 diff --git a/asm/overlay_00.s b/asm/overlay_00.s index f92087b3..92f3ab28 100644 --- a/asm/overlay_00.s +++ b/asm/overlay_00.s @@ -29218,7 +29218,7 @@ _022D4ADC: bne _022D4B50 bl sub_0207AD54 _022D4B50: - bl sub_0207B030 + bl OS_IsAlarmAvailable cmp r0, #0 bne _022D4B60 bl sub_0207AFF0 @@ -29227,7 +29227,7 @@ _022D4B60: ldr r0, [r0] add r0, r0, #0x2cc add r0, r0, #0x2000 - bl sub_0207B040 + bl OS_CreateAlarm mov r0, r4 bl SetIrqFlag mov r0, #0 diff --git a/asm/overlay_02.s b/asm/overlay_02.s index b6aee494..3e71ecee 100644 --- a/asm/overlay_02.s +++ b/asm/overlay_02.s @@ -10470,7 +10470,7 @@ _02330270: b _02330388 _02330284: add r0, sp, #0x18 - bl sub_0207B040 + bl OS_CreateAlarm mov r0, #0x13 str r0, [sp] ldr r1, _023303A0 ; =0x003FEC42 @@ -10696,7 +10696,7 @@ _02330438: mov r0, #0 str r0, [sp, #8] add r0, sp, #0x14 - bl sub_0207B040 + bl OS_CreateAlarm mov r0, #0x12 str r0, [sp] ldr r1, _02330568 ; =0x003FEC42 @@ -12890,7 +12890,7 @@ _0233147E: pop {r3, r4, r5, r6, r7, pc} _02331492: add r0, sp, #4 - bl sub_0207B040 + bl OS_CreateAlarm mov r0, #0x12 str r0, [sp] ldr r1, _02331574 ; =0x003FEC42 @@ -13358,7 +13358,7 @@ _023317F4: b _02331A12 _02331816: add r0, sp, #0x24 - bl sub_0207B040 + bl OS_CreateAlarm mov r0, #0x13 str r0, [sp] ldr r1, _02331A38 ; =0x000FFB10 @@ -24321,7 +24321,7 @@ ov02_023389D8: ; 0x023389D8 bne _02338A10 bl WaitForever2 _02338A10: - bl sub_0207B030 + bl OS_IsAlarmAvailable cmp r0, #0 bne _02338A20 bl WaitForever2 diff --git a/lib/NitroSDK/asm/include/os_thread.inc b/lib/NitroSDK/asm/include/os_thread.inc index 8c2fd4c4..aa4fa1f3 100644 --- a/lib/NitroSDK/asm/include/os_thread.inc +++ b/lib/NitroSDK/asm/include/os_thread.inc @@ -134,5 +134,5 @@ .public WaitForInterrupt .public sub_0207B1E8 -.public sub_0207B040 +.public OS_CreateAlarm .public sub_0207B17C diff --git a/lib/NitroSDK/asm/os_alarm.s b/lib/NitroSDK/asm/os_alarm.s index 9cea36c4..b40318dc 100644 --- a/lib/NitroSDK/asm/os_alarm.s +++ b/lib/NitroSDK/asm/os_alarm.s @@ -3,8 +3,8 @@ .text - arm_func_start sub_0207AF64 -sub_0207AF64: ; 0x0207AF64 + arm_func_start OSi_SetTimer +OSi_SetTimer: ; 0x0207AF64 stmdb sp!, {r3, r4, r5, lr} mov r4, r0 bl sub_0207AE44 @@ -15,7 +15,7 @@ sub_0207AF64: ; 0x0207AF64 ldr r3, [r4, #0x10] subs r5, ip, r0 sbc r4, r3, r1 - ldr r1, _0207AFE4 ; =sub_0207B270 + ldr r1, _0207AFE4 ; =OSi_AlarmHandler mov r0, #1 bl sub_02078BF4 subs r0, r5, #0 @@ -39,10 +39,10 @@ _0207AFC4: ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0207AFE0: .word 0x04000106 -_0207AFE4: .word sub_0207B270 +_0207AFE4: .word OSi_AlarmHandler _0207AFE8: .word 0x0000FFFE _0207AFEC: .word 0x04000104 - arm_func_end sub_0207AF64 + arm_func_end OSi_SetTimer arm_func_start sub_0207AFF0 sub_0207AFF0: ; 0x0207AFF0 @@ -65,25 +65,25 @@ sub_0207AFF0: ; 0x0207AFF0 _0207B02C: .word _022B99B0 arm_func_end sub_0207AFF0 - arm_func_start sub_0207B030 -sub_0207B030: ; 0x0207B030 + arm_func_start OS_IsAlarmAvailable +OS_IsAlarmAvailable: ; 0x0207B030 ldr r0, _0207B03C ; =_022B99B0 ldrh r0, [r0] bx lr .align 2, 0 _0207B03C: .word _022B99B0 - arm_func_end sub_0207B030 + arm_func_end OS_IsAlarmAvailable - arm_func_start sub_0207B040 -sub_0207B040: ; 0x0207B040 + arm_func_start OS_CreateAlarm +OS_CreateAlarm: ; 0x0207B040 mov r1, #0 str r1, [r0] str r1, [r0, #8] bx lr - arm_func_end sub_0207B040 + arm_func_end OS_CreateAlarm - arm_func_start sub_0207B050 -sub_0207B050: ; 0x0207B050 + arm_func_start OS_InsertAlarm +OS_InsertAlarm: ; 0x0207B050 stmdb sp!, {r4, r5, r6, r7, r8, lr} mov r8, r0 ldr r0, [r8, #0x20] @@ -141,7 +141,7 @@ _0207B0E4: ldr r1, _0207B178 ; =_022B99B0 mov r0, r8 str r8, [r1, #4] - bl sub_0207AF64 + bl OSi_SetTimer ldmia sp!, {r4, r5, r6, r7, r8, pc} _0207B134: ldr r5, [r5, #0x18] @@ -160,11 +160,11 @@ _0207B140: str r8, [r1, #8] mov r0, r8 str r8, [r1, #4] - bl sub_0207AF64 + bl OSi_SetTimer ldmia sp!, {r4, r5, r6, r7, r8, pc} .align 2, 0 _0207B178: .word _022B99B0 - arm_func_end sub_0207B050 + arm_func_end OS_InsertAlarm arm_func_start sub_0207B17C sub_0207B17C: ; 0x0207B17C @@ -193,7 +193,7 @@ _0207B1A4: adc r2, r4, r1 mov r0, r6 mov r1, r3 - bl sub_0207B050 + bl OS_InsertAlarm mov r0, r7 bl SetIrqFlag ldmia sp!, {r3, r4, r5, r6, r7, pc} @@ -228,7 +228,7 @@ _0207B22C: cmp r0, #0 str r0, [r1, #4] beq _0207B250 - bl sub_0207AF64 + bl OSi_SetTimer _0207B250: mov r1, #0 str r1, [r5] @@ -241,16 +241,16 @@ _0207B250: _0207B26C: .word _022B99B0 arm_func_end sub_0207B1E8 - arm_func_start sub_0207B270 -sub_0207B270: ; 0x0207B270 + arm_func_start OSi_AlarmHandler +OSi_AlarmHandler: ; 0x0207B270 stmdb sp!, {r0, lr} - bl sub_0207B280 + bl OSi_ArrangeTimer ldmia sp!, {r0, lr} bx lr - arm_func_end sub_0207B270 + arm_func_end OSi_AlarmHandler - arm_func_start sub_0207B280 -sub_0207B280: ; 0x0207B280 + arm_func_start OSi_ArrangeTimer +OSi_ArrangeTimer: ; 0x0207B280 stmdb sp!, {r3, r4, r5, lr} ldr r1, _0207B364 ; =0x04000106 mov r2, #0 @@ -273,7 +273,7 @@ sub_0207B280: ; 0x0207B280 cmpeq r0, ip bhs _0207B2E0 mov r0, r4 - bl sub_0207AF64 + bl OSi_SetTimer ldmia sp!, {r3, r4, r5, pc} _0207B2E0: ldr r1, [r4, #0x18] @@ -303,18 +303,18 @@ _0207B324: mov r0, r4 mov r2, r1 str r5, [r4] - bl sub_0207B050 + bl OS_InsertAlarm _0207B34C: ldr r0, _0207B36C ; =_022B99B0 ldr r0, [r0, #4] cmp r0, #0 ldmeqia sp!, {r3, r4, r5, pc} - bl sub_0207AF64 + bl OSi_SetTimer ldmia sp!, {r3, r4, r5, pc} .align 2, 0 _0207B364: .word 0x04000106 _0207B368: .word OS_IRQTable _0207B36C: .word _022B99B0 - arm_func_end sub_0207B280 + arm_func_end OSi_ArrangeTimer diff --git a/lib/NitroSDK/asm/os_thread.s b/lib/NitroSDK/asm/os_thread.s index 701fb43a..8d9961c4 100644 --- a/lib/NitroSDK/asm/os_thread.s +++ b/lib/NitroSDK/asm/os_thread.s @@ -805,7 +805,7 @@ sub_02079B14: ; 0x02079B14 sub sp, sp, #0x34 mov r4, r0 add r0, sp, #8 - bl sub_0207B040 + bl OS_CreateAlarm ldr r0, _02079BB0 ; =THREAD_INFO_STRUCT ldr r0, [r0, #8] ldr r0, [r0]