diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/clock.s | 10 | ||||
| -rw-r--r-- | asm/main_menu.s | 2 | ||||
| -rw-r--r-- | asm/new_game.s | 2 | ||||
| -rw-r--r-- | asm/pokemon_3.s | 8 | ||||
| -rw-r--r-- | asm/reset_rtc_screen.s | 16 | ||||
| -rw-r--r-- | asm/rom6.s | 10 | ||||
| -rw-r--r-- | asm/rom_8184DA4.s | 10 | ||||
| -rw-r--r-- | asm/roulette.s | 10 | ||||
| -rw-r--r-- | asm/rtc.s | 819 | ||||
| -rw-r--r-- | asm/scrcmd.s | 6 | ||||
| -rw-r--r-- | asm/tv.s | 2 | ||||
| -rw-r--r-- | asm/wallclock.s | 6 |
12 files changed, 41 insertions, 860 deletions
diff --git a/asm/clock.s b/asm/clock.s index c0a94d090..9a40213f5 100644 --- a/asm/clock.s +++ b/asm/clock.s @@ -10,11 +10,11 @@ sub_809E778: @ 809E778 push {lr} ldr r0, =0x00000895 bl FlagSet - bl GameFreakRTC_CalcLocalDateTime + bl RtcCalcLocalTime ldr r0, =gSaveBlock2Ptr ldr r2, [r0] adds r2, 0xA0 - ldr r3, =gUnknown_03005CF8 + ldr r3, =gLocalTime ldr r0, [r3] ldr r1, [r3, 0x4] str r0, [r2] @@ -39,8 +39,8 @@ sub_809E7B0: @ 809E7B0 lsls r0, 24 cmp r0, 0 bne _0809E7DA - bl GameFreakRTC_CalcLocalDateTime - ldr r4, =gUnknown_03005CF8 + bl RtcCalcLocalTime + ldr r4, =gLocalTime adds r0, r4, 0 bl sub_809E7E8 adds r0, r4, 0 @@ -111,7 +111,7 @@ sub_809E858: @ 809E858 adds r1, 0xA0 mov r0, sp adds r2, r5, 0 - bl GameFreakRTC_GetDelta + bl CalcTimeDifference mov r0, sp movs r2, 0 ldrsh r1, [r0, r2] diff --git a/asm/main_menu.s b/asm/main_menu.s index 2709edfc4..559c351ef 100644 --- a/asm/main_menu.s +++ b/asm/main_menu.s @@ -479,7 +479,7 @@ Task_MainMenuCheckBattery: @ 802FAB0 movs r0, 0x54 movs r1, 0x7 bl SetGpuReg - bl GameFreakRTC_GetErrorFlags + bl RtcGetErrorStatus movs r1, 0xFF lsls r1, 4 ands r1, r0 diff --git a/asm/new_game.s b/asm/new_game.s index 732ea5837..3faf99744 100644 --- a/asm/new_game.s +++ b/asm/new_game.s @@ -256,7 +256,7 @@ NewGameInitData: @ 80844A0 cmp r0, 0x2 bne _080844B2 _080844AE: - bl GameFreakRTC_Reset + bl RtcReset _080844B2: ldr r1, =gUnknown_020322D4 movs r0, 0x1 diff --git a/asm/pokemon_3.s b/asm/pokemon_3.s index 6b02a99de..ca77a64a4 100644 --- a/asm/pokemon_3.s +++ b/asm/pokemon_3.s @@ -2507,8 +2507,8 @@ _0806D1DC: adds r0, r3 b _0806D228 _0806D1E6: - bl GameFreakRTC_CalcLocalDateTime - ldr r0, =gUnknown_03005CF8 + bl RtcCalcLocalTime + ldr r0, =gLocalTime ldrb r0, [r0, 0x2] subs r0, 0xC lsls r0, 24 @@ -2525,8 +2525,8 @@ _0806D202: b _0806D21E .pool _0806D208: - bl GameFreakRTC_CalcLocalDateTime - ldr r0, =gUnknown_03005CF8 + bl RtcCalcLocalTime + ldr r0, =gLocalTime ldrb r0, [r0, 0x2] cmp r0, 0xB bls _0806D216 diff --git a/asm/reset_rtc_screen.s b/asm/reset_rtc_screen.s index 92658d4b8..06fba72d5 100644 --- a/asm/reset_rtc_screen.s +++ b/asm/reset_rtc_screen.s @@ -707,7 +707,7 @@ _0809EE66: ands r0, r1 cmp r0, 0 beq _0809EEF4 - ldr r1, =gUnknown_03005CF8 + ldr r1, =gLocalTime ldrh r0, [r5, 0x6] strh r0, [r1] ldrh r0, [r5, 0x8] @@ -787,7 +787,7 @@ sub_809EF00: @ 809EF00 adds r5, r6, r0 movs r0, 0 strh r0, [r5] - ldr r1, =gUnknown_03005CF8 + ldr r1, =gLocalTime ldrh r0, [r1] strh r0, [r5, 0x6] movs r0, 0x2 @@ -1021,7 +1021,7 @@ _0809F11C: movs r1, 0x1 movs r3, 0 bl Print - ldr r1, =gUnknown_03005CF8 + ldr r1, =gLocalTime ldrh r3, [r1] ldrb r0, [r1, 0x2] str r0, [sp] @@ -1168,7 +1168,7 @@ _0809F282: b _0809F404 .pool _0809F29C: - bl GameFreakRTC_CalcLocalDateTime + bl RtcCalcLocalTime ldr r0, =sub_809F0F8 movs r1, 0x50 bl CreateTask @@ -1195,7 +1195,7 @@ _0809F2CA: bl sub_8198070 ldr r0, =gUnknown_085ECA38 bl sub_809F0C0 - ldr r2, =gUnknown_03005CF8 + ldr r2, =gLocalTime ldr r0, =gSaveBlock2Ptr ldr r0, [r0] adds r0, 0xA0 @@ -1239,8 +1239,8 @@ _0809F334: _0809F340: ldrb r0, [r5, 0x2] bl DestroyTask - bl GameFreakRTC_Reset - ldr r4, =gUnknown_03005CF8 + bl RtcReset + ldr r4, =gLocalTime movs r1, 0 ldrsh r0, [r4, r1] movs r1, 0x2 @@ -1249,7 +1249,7 @@ _0809F340: ldrsb r2, [r4, r2] movs r3, 0x4 ldrsb r3, [r4, r3] - bl GameFreakRTC_CalcRTCToLocalDelta + bl RtcCalcLocalTimeOffset ldr r0, =gSaveBlock2Ptr ldr r2, [r0] adds r2, 0xA0 diff --git a/asm/rom6.s b/asm/rom6.s index 2907db9e2..e192a4738 100644 --- a/asm/rom6.s +++ b/asm/rom6.s @@ -4321,9 +4321,9 @@ sub_8137988: @ 8137988 lsls r0, 24 cmp r0, 0 beq _081379CE - bl GameFreakRTC_CalcLocalDateTime + bl RtcCalcLocalTime ldr r1, =gUnknown_085B2B44 - ldr r0, =gUnknown_03005CF8 + ldr r0, =gLocalTime ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 @@ -6517,7 +6517,7 @@ sub_8138BC8: @ 8138BC8 thumb_func_start sub_8138BDC sub_8138BDC: @ 8138BDC push {lr} - ldr r0, =gUnknown_03005CF8 + ldr r0, =gLocalTime movs r1, 0 ldrsh r0, [r0, r1] movs r1, 0x7 @@ -7960,7 +7960,7 @@ sub_813970C: @ 813970C lsls r0, 16 lsrs r0, 16 adds r3, r0, 0 - ldr r2, =gUnknown_03005CF8 + ldr r2, =gLocalTime movs r1, 0 ldrsh r0, [r2, r1] subs r0, r3 @@ -7993,7 +7993,7 @@ _0813974C: sub_8139754: @ 8139754 push {r4,lr} ldr r0, =0x000040c2 - ldr r4, =gUnknown_03005CF8 + ldr r4, =gLocalTime ldrh r1, [r4] bl VarSet ldrh r0, [r4] diff --git a/asm/rom_8184DA4.s b/asm/rom_8184DA4.s index a84ea33d8..dcbad8efb 100644 --- a/asm/rom_8184DA4.s +++ b/asm/rom_8184DA4.s @@ -31564,8 +31564,8 @@ _08195E06: thumb_func_start sub_8195E10 sub_8195E10: @ 8195E10 push {lr} - bl GameFreakRTC_CalcLocalDateTime - ldr r0, =gUnknown_03005CF8 + bl RtcCalcLocalTime + ldr r0, =gLocalTime bl sub_8195E34 ldr r1, =gUnknown_0203CD80 adds r0, 0xA @@ -31602,8 +31602,8 @@ sub_8195E34: @ 8195E34 thumb_func_start sub_8195E58 sub_8195E58: @ 8195E58 push {lr} - bl GameFreakRTC_CalcLocalDateTime - ldr r0, =gUnknown_03005CF8 + bl RtcCalcLocalTime + ldr r0, =gLocalTime bl sub_8195E34 adds r1, r0, 0 ldr r2, =gUnknown_0203CD80 @@ -33538,7 +33538,7 @@ sub_8196D74: @ 8196D74 bl sub_8196D4C cmp r0, 0x4 ble _08196DF4 - bl GameFreakRTC_GetNumDays + bl RtcGetLocalDayCount adds r4, r0, 0 ldr r0, =gSaveBlock2Ptr ldr r0, [r0] diff --git a/asm/roulette.s b/asm/roulette.s index b09ce9f38..a0edead88 100644 --- a/asm/roulette.s +++ b/asm/roulette.s @@ -383,7 +383,7 @@ _081405B6: lsrs r4, r0, 24 cmp r4, 0x5 bls _0814056C - bl GameFreakRTC_CalcLocalDateTime + bl RtcCalcLocalTime add sp, 0x8 pop {r4-r6} pop {r0} @@ -1770,7 +1770,7 @@ _081411AC: beq _08141214 b _08141280 _081411B2: - ldr r0, =gUnknown_03005CF8 + ldr r0, =gLocalTime ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 @@ -1817,7 +1817,7 @@ _08141200: b _0814133A .pool _08141214: - ldr r0, =gUnknown_03005CF8 + ldr r0, =gLocalTime ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 @@ -1868,7 +1868,7 @@ _08141268: b _0814133A .pool _08141280: - ldr r0, =gUnknown_03005CF8 + ldr r0, =gLocalTime ldrb r0, [r0, 0x2] subs r0, 0x4 lsls r0, 24 @@ -2020,7 +2020,7 @@ sub_8141344: @ 8141344 subs r0, r4 lsls r0, 24 lsrs r4, r0, 24 - ldr r0, =gUnknown_03005CF8 + ldr r0, =gLocalTime ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 @@ -1,819 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .syntax unified - - .text - - thumb_func_start GameFreakRTC_ClearIME -@ void GameFreakRTC_ClearIME() -GameFreakRTC_ClearIME: @ 802F0CC - ldr r2, =gUnknown_03000DCE - ldr r1, =0x04000208 - ldrh r0, [r1] - strh r0, [r2] - movs r0, 0 - strh r0, [r1] - bx lr - .pool - thumb_func_end GameFreakRTC_ClearIME - - thumb_func_start GameFreakRTC_RestoreIME -@ void GameFreakRTC_RestoreIME() -GameFreakRTC_RestoreIME: @ 802F0E4 - ldr r0, =0x04000208 - ldr r1, =gUnknown_03000DCE - ldrh r1, [r1] - strh r1, [r0] - bx lr - .pool - thumb_func_end GameFreakRTC_RestoreIME - - thumb_func_start GameFreakRTC_ConvertFromBCD -@ u8 GameFreakRTC_ConvertFromBCD(u8 bcdByte) -GameFreakRTC_ConvertFromBCD: @ 802F0F8 - push {lr} - lsls r0, 24 - lsrs r2, r0, 24 - cmp r2, 0x9F - bhi _0802F10A - movs r3, 0xF - ands r3, r2 - cmp r3, 0x9 - bls _0802F10E -_0802F10A: - movs r0, 0xFF - b _0802F11C -_0802F10E: - lsrs r1, r0, 28 - movs r0, 0xF - ands r1, r0 - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 1 - adds r0, r3 -_0802F11C: - pop {r1} - bx r1 - thumb_func_end GameFreakRTC_ConvertFromBCD - - thumb_func_start GameFreakRTC_IsLeapYear -@ bool8 GameFreakRTC_IsLeapYear(u32 year) -GameFreakRTC_IsLeapYear: @ 802F120 - push {r4,lr} - adds r4, r0, 0 - movs r0, 0x3 - ands r0, r4 - cmp r0, 0 - bne _0802F138 - adds r0, r4, 0 - movs r1, 0x64 - bl __umodsi3 - cmp r0, 0 - bne _0802F146 -_0802F138: - movs r1, 0xC8 - lsls r1, 1 - adds r0, r4, 0 - bl __umodsi3 - cmp r0, 0 - bne _0802F14A -_0802F146: - movs r0, 0x1 - b _0802F14C -_0802F14A: - movs r0, 0 -_0802F14C: - pop {r4} - pop {r1} - bx r1 - thumb_func_end GameFreakRTC_IsLeapYear - - thumb_func_start GameFreakRTC_ConvertYearMonthDayToNumDays -@ u16 GameFreakRTC_ConvertYearMonthDayToNumDays(u8 year, u8 month, u8 dayOfMonth) -GameFreakRTC_ConvertYearMonthDayToNumDays: @ 802F154 - push {r4-r7,lr} - mov r7, r8 - push {r7} - lsls r0, 24 - lsrs r7, r0, 24 - lsls r1, 24 - lsrs r6, r1, 24 - lsls r2, 24 - lsrs r2, 24 - mov r8, r2 - movs r5, 0 - subs r4, r7, 0x1 - cmp r4, 0 - blt _0802F192 -_0802F170: - ldr r1, =0x0000016d - adds r0, r5, r1 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r4, 0 - bl GameFreakRTC_IsLeapYear - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0802F18C - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_0802F18C: - subs r4, 0x1 - cmp r4, 0 - bge _0802F170 -_0802F192: - subs r0, r6, 0x1 - cmp r0, 0 - ble _0802F1AA - ldr r1, =gDaysInEachMonth - adds r4, r0, 0 -_0802F19C: - ldm r1!, {r0} - adds r0, r5, r0 - lsls r0, 16 - lsrs r5, r0, 16 - subs r4, 0x1 - cmp r4, 0 - bne _0802F19C -_0802F1AA: - cmp r6, 0x2 - bls _0802F1C2 - adds r0, r7, 0 - bl GameFreakRTC_IsLeapYear - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - bne _0802F1C2 - adds r0, r5, 0x1 - lsls r0, 16 - lsrs r5, r0, 16 -_0802F1C2: - mov r1, r8 - adds r0, r5, r1 - lsls r0, 16 - lsrs r5, r0, 16 - adds r0, r5, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end GameFreakRTC_ConvertYearMonthDayToNumDays - - thumb_func_start GameFreakRTC_GetNumDaysInternal -@ u16 GameFreakRTC_GetNumDaysInternal(struct RTCInfo *rtc) -GameFreakRTC_GetNumDaysInternal: @ 802F1E0 - push {r4-r6,lr} - adds r6, r0, 0 - ldrb r0, [r6] - bl GameFreakRTC_ConvertFromBCD - adds r5, r0, 0 - lsls r5, 24 - lsrs r5, 24 - ldrb r0, [r6, 0x1] - bl GameFreakRTC_ConvertFromBCD - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - ldrb r0, [r6, 0x2] - bl GameFreakRTC_ConvertFromBCD - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl GameFreakRTC_ConvertYearMonthDayToNumDays - lsls r0, 16 - lsrs r0, 16 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end GameFreakRTC_GetNumDaysInternal - - thumb_func_start RtcInit -@ void GameFreakRTC_Init() -RtcInit: @ 802F21C - push {r4,r5,lr} - ldr r5, =gUnknown_03000DB8 - movs r0, 0 - strh r0, [r5] - bl GameFreakRTC_ClearIME - bl SiiRtcUnprotect - bl SiiRtcProbe - ldr r4, =gUnknown_03000DCC - strb r0, [r4] - bl GameFreakRTC_RestoreIME - ldrb r4, [r4] - movs r0, 0xF - ands r0, r4 - cmp r0, 0x1 - beq _0802F250 - movs r0, 0x1 - strh r0, [r5] - b _0802F26E - .pool -_0802F250: - movs r0, 0xF0 - ands r0, r4 - cmp r0, 0 - beq _0802F25A - movs r0, 0x2 -_0802F25A: - strh r0, [r5] - ldr r4, =gUnknown_03000DC0 - adds r0, r4, 0 - bl GameFreakRTC_GetControlRegAndRTCDateTime - adds r0, r4, 0 - bl GameFreakRTC_TestForErrors - ldr r1, =gUnknown_03000DB8 - strh r0, [r1] -_0802F26E: - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end RtcInit - - thumb_func_start GameFreakRTC_GetErrorFlags -@ u16 GameFreakRTC_GetErrorFlags() -GameFreakRTC_GetErrorFlags: @ 802F27C - ldr r0, =gUnknown_03000DB8 - ldrh r0, [r0] - bx lr - .pool - thumb_func_end GameFreakRTC_GetErrorFlags - - thumb_func_start GameFreakRTC_GetRTCDateTime -@ void GameFreakRTC_GetRTCDateTime(struct RTCInfo *rtc) -GameFreakRTC_GetRTCDateTime: @ 802F288 - push {r4,lr} - adds r2, r0, 0 - ldr r0, =gUnknown_03000DB8 - ldrh r1, [r0] - movs r0, 0xFF - lsls r0, 4 - ands r0, r1 - cmp r0, 0 - beq _0802F2AC - adds r1, r2, 0 - ldr r0, =gDefaultRTCInfo - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - b _0802F2B2 - .pool -_0802F2AC: - adds r0, r2, 0 - bl GameFreakRTC_GetControlRegAndRTCDateTime -_0802F2B2: - pop {r4} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_GetRTCDateTime - - thumb_func_start GameFreakRTC_GetRTCDateTimeInternal -@ void GameFreakRTC_GetRTCDateTimeInternal(struct RTCInfo *rtc) -GameFreakRTC_GetRTCDateTimeInternal: @ 802F2B8 - push {r4,lr} - adds r4, r0, 0 - bl GameFreakRTC_ClearIME - adds r0, r4, 0 - bl SiiRtcGetDateTime - bl GameFreakRTC_RestoreIME - pop {r4} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_GetRTCDateTimeInternal - - thumb_func_start GameFreakRTC_GetControlReg -@ void GameFreakRTC_GetControlReg(struct RTCInfo *rtc) -GameFreakRTC_GetControlReg: @ 802F2D0 - push {r4,lr} - adds r4, r0, 0 - bl GameFreakRTC_ClearIME - adds r0, r4, 0 - bl SiiRtcGetStatus - bl GameFreakRTC_RestoreIME - pop {r4} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_GetControlReg - - thumb_func_start GameFreakRTC_GetControlRegAndRTCDateTime -@ void GameFreakRTC_GetControlRegAndRTCDateTime(struct RTCInfo *rtc) -GameFreakRTC_GetControlRegAndRTCDateTime: @ 802F2E8 - push {r4,lr} - adds r4, r0, 0 - bl GameFreakRTC_GetControlReg - adds r0, r4, 0 - bl GameFreakRTC_GetRTCDateTimeInternal - pop {r4} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_GetControlRegAndRTCDateTime - - thumb_func_start GameFreakRTC_TestForErrors -@ u16 GameFreakRTC_TestForErrors(struct RTCInfo *rtc) -GameFreakRTC_TestForErrors: @ 802F2FC - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r7, r0, 0 - ldrb r1, [r7, 0x7] - movs r0, 0x80 - ands r0, r1 - lsls r0, 24 - lsrs r0, 24 - negs r0, r0 - asrs r4, r0, 31 - movs r0, 0x20 - ands r4, r0 - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - bne _0802F322 - movs r0, 0x10 - orrs r4, r0 -_0802F322: - ldrb r0, [r7] - bl GameFreakRTC_ConvertFromBCD - mov r8, r0 - cmp r0, 0xFF - bne _0802F336 - movs r0, 0x40 - orrs r4, r0 - lsls r0, r4, 16 - lsrs r4, r0, 16 -_0802F336: - ldrb r0, [r7, 0x1] - bl GameFreakRTC_ConvertFromBCD - adds r6, r0, 0 - cmp r6, 0xFF - beq _0802F34A - cmp r6, 0 - beq _0802F34A - cmp r6, 0xC - ble _0802F352 -_0802F34A: - movs r0, 0x80 - orrs r4, r0 - lsls r0, r4, 16 - lsrs r4, r0, 16 -_0802F352: - ldrb r0, [r7, 0x2] - bl GameFreakRTC_ConvertFromBCD - adds r5, r0, 0 - cmp r5, 0xFF - bne _0802F36A - movs r1, 0x80 - lsls r1, 1 - adds r0, r1, 0 - orrs r4, r0 - lsls r0, r4, 16 - lsrs r4, r0, 16 -_0802F36A: - cmp r6, 0x2 - bne _0802F384 - mov r0, r8 - bl GameFreakRTC_IsLeapYear - lsls r0, 24 - lsrs r0, 24 - ldr r1, =gDaysInEachMonth - ldr r1, [r1, 0x4] - adds r0, r1 - b _0802F38E - .pool -_0802F384: - ldr r0, =gDaysInEachMonth - subs r1, r6, 0x1 - lsls r1, 2 - adds r1, r0 - ldr r0, [r1] -_0802F38E: - cmp r5, r0 - ble _0802F39E - movs r1, 0x80 - lsls r1, 1 - adds r0, r1, 0 - orrs r4, r0 - lsls r0, r4, 16 - lsrs r4, r0, 16 -_0802F39E: - ldrb r0, [r7, 0x4] - bl GameFreakRTC_ConvertFromBCD - adds r5, r0, 0 - cmp r5, 0x18 - ble _0802F3B6 - movs r1, 0x80 - lsls r1, 2 - adds r0, r1, 0 - orrs r4, r0 - lsls r0, r4, 16 - lsrs r4, r0, 16 -_0802F3B6: - ldrb r0, [r7, 0x5] - bl GameFreakRTC_ConvertFromBCD - adds r5, r0, 0 - cmp r5, 0x3C - ble _0802F3CE - movs r1, 0x80 - lsls r1, 3 - adds r0, r1, 0 - orrs r4, r0 - lsls r0, r4, 16 - lsrs r4, r0, 16 -_0802F3CE: - ldrb r0, [r7, 0x6] - bl GameFreakRTC_ConvertFromBCD - adds r5, r0, 0 - cmp r5, 0x3C - ble _0802F3E6 - movs r1, 0x80 - lsls r1, 4 - adds r0, r1, 0 - orrs r4, r0 - lsls r0, r4, 16 - lsrs r4, r0, 16 -_0802F3E6: - adds r0, r4, 0 - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - .pool - thumb_func_end GameFreakRTC_TestForErrors - - thumb_func_start GameFreakRTC_Reset -@ void GameFreakRTC_Reset() -GameFreakRTC_Reset: @ 802F3F8 - push {lr} - bl GameFreakRTC_ClearIME - bl SiiRtcReset - bl GameFreakRTC_RestoreIME - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_Reset - - thumb_func_start GameFreakRTC_FormatDecimalTimeString -@ void GameFreakRTC_FormatDecimalTimeString(u8 *dest, s32 hour, s32 minute, s32 second) -GameFreakRTC_FormatDecimalTimeString: @ 802F40C - push {r4-r6,lr} - adds r5, r2, 0 - adds r6, r3, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - movs r4, 0xF0 - strb r4, [r0] - adds r0, 0x1 - adds r1, r5, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - strb r4, [r0] - adds r0, 0x1 - adds r1, r6, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - movs r1, 0xFF - strb r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_FormatDecimalTimeString - - thumb_func_start GameFreakRTC_FormatHexTimeString -@ void GameFreakRTC_FormatHexTimeString(u8 *dest, s32 hour, s32 minute, s32 second) -GameFreakRTC_FormatHexTimeString: @ 802F444 - push {r4-r6,lr} - adds r5, r2, 0 - adds r6, r3, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToHexStringN - movs r4, 0xF0 - strb r4, [r0] - adds r0, 0x1 - adds r1, r5, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToHexStringN - strb r4, [r0] - adds r0, 0x1 - adds r1, r6, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToHexStringN - movs r1, 0xFF - strb r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_FormatHexTimeString - - thumb_func_start GameFreakRTC_FormatHexTimeStringFromRTCInfo -@ void GameFreakRTC_FormatHexTimeStringFromRTCInfo() -GameFreakRTC_FormatHexTimeStringFromRTCInfo: @ 802F47C - push {lr} - ldr r3, =gUnknown_03000DC0 - ldrb r1, [r3, 0x4] - ldrb r2, [r3, 0x5] - ldrb r3, [r3, 0x6] - bl GameFreakRTC_FormatHexTimeString - pop {r0} - bx r0 - .pool - thumb_func_end GameFreakRTC_FormatHexTimeStringFromRTCInfo - - thumb_func_start GameFreakRTC_FormatDecimalYearMonthDayString -@ void GameFreakRTC_FormatDecimalYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth) -GameFreakRTC_FormatDecimalYearMonthDayString: @ 802F494 - push {r4-r6,lr} - adds r5, r2, 0 - adds r6, r3, 0 - movs r2, 0x2 - movs r3, 0x4 - bl ConvertIntToDecimalStringN - movs r4, 0xAE - strb r4, [r0] - adds r0, 0x1 - adds r1, r5, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - strb r4, [r0] - adds r0, 0x1 - adds r1, r6, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToDecimalStringN - movs r1, 0xFF - strb r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_FormatDecimalYearMonthDayString - - thumb_func_start GameFreakRTC_FormatHexYearMonthDayString -@ void GameFreakRTC_FormatHexYearMonthDayString(u8 *dest, s32 year, s32 month, s32 dayOfMonth) -GameFreakRTC_FormatHexYearMonthDayString: @ 802F4CC - push {r4-r6,lr} - adds r5, r2, 0 - adds r6, r3, 0 - movs r2, 0x2 - movs r3, 0x4 - bl ConvertIntToHexStringN - movs r4, 0xAE - strb r4, [r0] - adds r0, 0x1 - adds r1, r5, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToHexStringN - strb r4, [r0] - adds r0, 0x1 - adds r1, r6, 0 - movs r2, 0x2 - movs r3, 0x2 - bl ConvertIntToHexStringN - movs r1, 0xFF - strb r1, [r0] - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_FormatHexYearMonthDayString - - thumb_func_start GameFreakRTC_GetRTCDelta -@ void GameFreakRTC_GetRTCDelta(RTCInfo *rtc, GameDateTime *delta, GameDateTime *dateTime) -GameFreakRTC_GetRTCDelta: @ 802F504 - push {r4-r7,lr} - adds r5, r0, 0 - adds r7, r1, 0 - adds r6, r2, 0 - bl GameFreakRTC_GetNumDaysInternal - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - ldrb r0, [r5, 0x6] - bl GameFreakRTC_ConvertFromBCD - ldrb r1, [r6, 0x4] - subs r0, r1 - strb r0, [r7, 0x4] - ldrb r0, [r5, 0x5] - bl GameFreakRTC_ConvertFromBCD - ldrb r1, [r6, 0x3] - subs r0, r1 - strb r0, [r7, 0x3] - ldrb r0, [r5, 0x4] - bl GameFreakRTC_ConvertFromBCD - ldrb r1, [r6, 0x2] - subs r0, r1 - strb r0, [r7, 0x2] - ldrh r0, [r6] - subs r4, r0 - strh r4, [r7] - ldrb r1, [r7, 0x4] - movs r0, 0x4 - ldrsb r0, [r7, r0] - cmp r0, 0 - bge _0802F556 - adds r0, r1, 0 - adds r0, 0x3C - strb r0, [r7, 0x4] - ldrb r0, [r7, 0x3] - subs r0, 0x1 - strb r0, [r7, 0x3] -_0802F556: - ldrb r1, [r7, 0x3] - movs r0, 0x3 - ldrsb r0, [r7, r0] - cmp r0, 0 - bge _0802F56C - adds r0, r1, 0 - adds r0, 0x3C - strb r0, [r7, 0x3] - ldrb r0, [r7, 0x2] - subs r0, 0x1 - strb r0, [r7, 0x2] -_0802F56C: - ldrb r1, [r7, 0x2] - movs r0, 0x2 - ldrsb r0, [r7, r0] - cmp r0, 0 - bge _0802F582 - adds r0, r1, 0 - adds r0, 0x18 - strb r0, [r7, 0x2] - ldrh r0, [r7] - subs r0, 0x1 - strh r0, [r7] -_0802F582: - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_GetRTCDelta - - thumb_func_start GameFreakRTC_CalcLocalDateTime -@ void GameFreakRTC_CalcLocalDateTime() -GameFreakRTC_CalcLocalDateTime: @ 802F588 - push {r4,lr} - ldr r4, =gUnknown_03000DC0 - adds r0, r4, 0 - bl GameFreakRTC_GetRTCDateTime - ldr r1, =gUnknown_03005CF8 - ldr r0, =gSaveBlock2Ptr - ldr r2, [r0] - adds r2, 0x98 - adds r0, r4, 0 - bl GameFreakRTC_GetRTCDelta - pop {r4} - pop {r0} - bx r0 - .pool - thumb_func_end GameFreakRTC_CalcLocalDateTime - - thumb_func_start GameFreakRTC_CalcRTCToLocalDelta_DayZero -@ void GameFreakRTC_CalcRTCToLocalDelta_DayZero(u8 hour, u8 minute) -GameFreakRTC_CalcRTCToLocalDelta_DayZero: @ 802F5B4 - push {lr} - adds r3, r0, 0 - adds r2, r1, 0 - movs r0, 0 - adds r1, r3, 0 - movs r3, 0 - bl GameFreakRTC_CalcRTCToLocalDelta - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_CalcRTCToLocalDelta_DayZero - - thumb_func_start GameFreakRTC_CalcRTCToLocalDelta -@ void GameFreakRTC_CalcRTCToLocalDelta(u16 numDays, u8 hour, u8 minute, u8 second) -GameFreakRTC_CalcRTCToLocalDelta: @ 802F5C8 - push {r4,r5,lr} - ldr r4, =gUnknown_03005CF8 - strh r0, [r4] - strb r1, [r4, 0x2] - strb r2, [r4, 0x3] - strb r3, [r4, 0x4] - ldr r5, =gUnknown_03000DC0 - adds r0, r5, 0 - bl GameFreakRTC_GetRTCDateTime - ldr r0, =gSaveBlock2Ptr - ldr r1, [r0] - adds r1, 0x98 - adds r0, r5, 0 - adds r2, r4, 0 - bl GameFreakRTC_GetRTCDelta - pop {r4,r5} - pop {r0} - bx r0 - .pool - thumb_func_end GameFreakRTC_CalcRTCToLocalDelta - - thumb_func_start GameFreakRTC_GetDelta -@ void GameFreakRTC_GetDelta(GameDateTime *delta, GameDateTime *dateTime1, GameDateTime *dateTime2) -GameFreakRTC_GetDelta: @ 802F5FC - push {r4-r6,lr} - adds r4, r0, 0 - ldrb r3, [r2, 0x4] - ldrb r0, [r1, 0x4] - subs r5, r3, r0 - strb r5, [r4, 0x4] - ldrb r3, [r2, 0x3] - ldrb r0, [r1, 0x3] - subs r6, r3, r0 - strb r6, [r4, 0x3] - ldrb r0, [r2, 0x2] - ldrb r3, [r1, 0x2] - subs r0, r3 - strb r0, [r4, 0x2] - ldrh r0, [r2] - ldrh r1, [r1] - subs r0, r1 - strh r0, [r4] - lsls r0, r5, 24 - cmp r0, 0 - bge _0802F630 - adds r0, r5, 0 - adds r0, 0x3C - strb r0, [r4, 0x4] - subs r0, r6, 0x1 - strb r0, [r4, 0x3] -_0802F630: - ldrb r1, [r4, 0x3] - movs r0, 0x3 - ldrsb r0, [r4, r0] - cmp r0, 0 - bge _0802F646 - adds r0, r1, 0 - adds r0, 0x3C - strb r0, [r4, 0x3] - ldrb r0, [r4, 0x2] - subs r0, 0x1 - strb r0, [r4, 0x2] -_0802F646: - ldrb r1, [r4, 0x2] - movs r0, 0x2 - ldrsb r0, [r4, r0] - cmp r0, 0 - bge _0802F65C - adds r0, r1, 0 - adds r0, 0x18 - strb r0, [r4, 0x2] - ldrh r0, [r4] - subs r0, 0x1 - strh r0, [r4] -_0802F65C: - pop {r4-r6} - pop {r0} - bx r0 - thumb_func_end GameFreakRTC_GetDelta - - thumb_func_start GameFreakRTC_GetNumMinutes -@ u16 GameFreakRTC_GetNumMinutes() -GameFreakRTC_GetNumMinutes: @ 802F664 - push {r4,lr} - ldr r4, =gUnknown_03000DC0 - adds r0, r4, 0 - bl GameFreakRTC_GetRTCDateTime - adds r0, r4, 0 - bl GameFreakRTC_GetNumDaysInternal - lsls r0, 16 - lsrs r0, 16 - lsls r1, r0, 1 - adds r1, r0 - lsls r0, r1, 4 - subs r0, r1 - lsls r0, 5 - ldrb r2, [r4, 0x4] - lsls r1, r2, 4 - subs r1, r2 - lsls r1, 2 - adds r0, r1 - ldrb r4, [r4, 0x5] - adds r0, r4 - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end GameFreakRTC_GetNumMinutes - - thumb_func_start GameFreakRTC_GetNumDays -@ u16 GameFreakRTC_GetNumDays() -GameFreakRTC_GetNumDays: @ 802F69C - push {lr} - ldr r0, =gUnknown_03000DC0 - bl GameFreakRTC_GetNumDaysInternal - lsls r0, 16 - lsrs r0, 16 - pop {r1} - bx r1 - .pool - thumb_func_end GameFreakRTC_GetNumDays - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/scrcmd.s b/asm/scrcmd.s index 0dfd6503f..eb34c29e4 100644 --- a/asm/scrcmd.s +++ b/asm/scrcmd.s @@ -1507,7 +1507,7 @@ s2C_unknown: @ 8099DD8 lsls r1, 24 lsrs r1, 24 adds r0, r4, 0 - bl GameFreakRTC_CalcRTCToLocalDelta_DayZero + bl RtcInitLocalTimeOffset movs r0, 0 pop {r4,r5} pop {r1} @@ -1528,9 +1528,9 @@ s2D_unknown: @ 8099E10 @ int s2E_unknown(script_env *env) s2E_unknown: @ 8099E1C push {lr} - bl GameFreakRTC_CalcLocalDateTime + bl RtcCalcLocalTime ldr r2, =gSpecialVar_0x8000 - ldr r1, =gUnknown_03005CF8 + ldr r1, =gLocalTime movs r0, 0x2 ldrsb r0, [r1, r0] strh r0, [r2] @@ -5676,7 +5676,7 @@ _080EEF84: adds r1, r2 movs r0, 0x2 strb r0, [r1] - ldr r0, =gUnknown_03005CF8 + ldr r0, =gLocalTime ldrb r0, [r0, 0x2] lsls r0, 24 asrs r0, 24 diff --git a/asm/wallclock.s b/asm/wallclock.s index 3ba217531..b74ac29b2 100644 --- a/asm/wallclock.s +++ b/asm/wallclock.s @@ -785,7 +785,7 @@ sub_8134EA4: @ 8134EA4 ldrsh r0, [r4, r1] movs r2, 0xE ldrsh r1, [r4, r2] - bl GameFreakRTC_CalcRTCToLocalDelta_DayZero + bl RtcInitLocalTimeOffset movs r0, 0x1 negs r0, r0 movs r1, 0 @@ -1128,13 +1128,13 @@ sub_8135130: @ 8135130 adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 - bl GameFreakRTC_CalcLocalDateTime + bl RtcCalcLocalTime ldr r1, =gTasks lsls r0, r4, 2 adds r0, r4 lsls r0, 3 adds r6, r0, r1 - ldr r5, =gUnknown_03005CF8 + ldr r5, =gLocalTime movs r0, 0x2 ldrsb r0, [r5, r0] strh r0, [r6, 0xC] |