diff options
Diffstat (limited to 'arm9/modules')
-rw-r--r-- | arm9/modules/05/asm/mod05_021DB44C.s | 4 | ||||
-rw-r--r-- | arm9/modules/05/asm/module_05.s | 4 | ||||
-rw-r--r-- | arm9/modules/06/asm/module_06.s | 16 | ||||
-rw-r--r-- | arm9/modules/11/asm/module_11_thumb1.s | 2 | ||||
-rw-r--r-- | arm9/modules/21/asm/module_21.s | 4 | ||||
-rw-r--r-- | arm9/modules/25/asm/module_25.s | 4 | ||||
-rw-r--r-- | arm9/modules/40/asm/module_40.s | 4 | ||||
-rw-r--r-- | arm9/modules/45/asm/module_45.s | 2 | ||||
-rw-r--r-- | arm9/modules/52/asm/module_52.s | 18 | ||||
-rw-r--r-- | arm9/modules/83/asm/module_83.s | 6 |
10 files changed, 32 insertions, 32 deletions
diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s index 75d5fd9c..b606312e 100644 --- a/arm9/modules/05/asm/mod05_021DB44C.s +++ b/arm9/modules/05/asm/mod05_021DB44C.s @@ -25,7 +25,7 @@ _021DB45A: str r0, [r4] mov r0, #0 str r0, [r4, #8] - bl FUN_020126D8 + bl GF_RTC_TimeToSec lsr r1, r0, #0x1f add r1, r0, r1 asr r3, r1, #1 @@ -79,7 +79,7 @@ MOD05_021DB4D0: ; 0x021DB4D0 bne _021DB4DA bl ErrorHandling _021DB4DA: - bl FUN_020126D8 + bl GF_RTC_TimeToSec lsr r1, r0, #0x1f add r1, r0, r1 asr r0, r1, #1 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index a993374a..daf46f68 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -16198,10 +16198,10 @@ MOD05_021ED320: ; 0x021ED320 MOD05_021ED334: ; 0x021ED334 push {r3, r4, r5, lr} add r4, r0, #0 - bl FUN_0204B2C0 + bl Script_GetDay add r5, r0, #0 add r0, r4, #0 - bl FUN_0204B2B4 + bl Script_GetMonth mov r1, #0x64 mul r1, r0 add r0, r4, #0 diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 5d47188a..fd961cc0 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -4718,7 +4718,7 @@ MOD06_0223B944: ; 0x0223B944 add r5, r0, #0 add r4, r1, #0 add r6, r2, #0 - bl FUN_02012794 + bl GF_RTC_GetTimeOfDay sub r1, r0, #1 cmp r1, #1 bhi _0223B960 @@ -31114,7 +31114,7 @@ MOD06_0224891C: ; 0x0224891C bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x14] add r0, r6, #0 - bl FUN_0204B2A4 + bl Script_GetTimeOfDay cmp r0, #1 bhi _02248996 mov r0, #0 @@ -31562,16 +31562,16 @@ MOD06_02248D00: ; 0x02248D00 push {r3, r4, r5, r6, lr} sub sp, #0xc add r4, r0, #0 - bl FUN_0204B2CC + bl Script_GetWeekday add r0, r0, #6 mov r1, #7 bl _s32_div_f add r0, r4, #0 add r5, r1, #0 - bl FUN_0204B2D8 + bl Script_GetHour add r6, r0, #0 add r0, r4, #0 - bl FUN_0204B2E4 + bl Script_GetMinute mov r1, #0xf bl _s32_div_f add r6, #0x13 @@ -32021,7 +32021,7 @@ _0224905E: ; jump table _02249066: bl ErrorHandling _0224906A: - bl FUN_02012794 + bl GF_RTC_GetTimeOfDay cmp r0, #0 beq _02249078 cmp r0, #1 @@ -32282,7 +32282,7 @@ MOD06_02249230: ; 0x02249230 pop {r3, r4, r5, r6, r7, pc} _02249244: add r0, sp, #0 - bl FUN_020126B4 + bl GF_RTC_CopyDate ldr r0, [sp, #4] cmp r0, #0 bne _02249254 @@ -32465,7 +32465,7 @@ MOD06_02249388: ; 0x02249388 push {r3, r4, r5, r6, r7, lr} sub sp, #0x10 add r5, r1, #0 - bl FUN_02012794 + bl GF_RTC_GetTimeOfDay ldr r1, [r5] add r4, r0, #0 cmp r1, #0 diff --git a/arm9/modules/11/asm/module_11_thumb1.s b/arm9/modules/11/asm/module_11_thumb1.s index 0d4f5c5a..b5cc45b0 100644 --- a/arm9/modules/11/asm/module_11_thumb1.s +++ b/arm9/modules/11/asm/module_11_thumb1.s @@ -676,7 +676,7 @@ MOD11_0222DB50: ; 0x0222DB50 str r0, [r4, r1] add r0, sp, #0x20 add r1, sp, #0x14 - bl CopyRtcBuffersTo + bl GF_RTC_CopyDateTime ldr r0, _0222DF10 ; =gMain ldr r6, [sp, #0x24] ldr r5, [r0, #0x2c] diff --git a/arm9/modules/21/asm/module_21.s b/arm9/modules/21/asm/module_21.s index 787a729f..ad12a682 100644 --- a/arm9/modules/21/asm/module_21.s +++ b/arm9/modules/21/asm/module_21.s @@ -61,7 +61,7 @@ MOD21_0225489C: ; 0x0225489C add r0, r5, #0 str r1, [r5, #0x20] add r0, #0x14 - bl FUN_02012690 + bl GF_RTC_CopyTime ldr r0, [r5, #0x14] cmp r0, #0x18 blo _022548D6 @@ -256,7 +256,7 @@ _02254A0A: strb r0, [r4, #5] add r0, r4, #0 add r0, #0x14 - bl FUN_02012690 + bl GF_RTC_CopyTime ldrb r1, [r4, #5] ldr r0, [r4, #0x18] cmp r1, r0 diff --git a/arm9/modules/25/asm/module_25.s b/arm9/modules/25/asm/module_25.s index 84129725..481c98c2 100644 --- a/arm9/modules/25/asm/module_25.s +++ b/arm9/modules/25/asm/module_25.s @@ -61,7 +61,7 @@ MOD25_0225489C: ; 0x0225489C add r0, r5, #0 str r1, [r5, #0x20] add r0, #0x14 - bl FUN_02012690 + bl GF_RTC_CopyTime ldr r0, [r5, #0x14] cmp r0, #0x18 blo _022548D6 @@ -256,7 +256,7 @@ _02254A0A: strb r0, [r4, #5] add r0, r4, #0 add r0, #0x14 - bl FUN_02012690 + bl GF_RTC_CopyTime ldrb r1, [r4, #5] ldr r0, [r4, #0x18] cmp r1, r0 diff --git a/arm9/modules/40/asm/module_40.s b/arm9/modules/40/asm/module_40.s index 409892d9..90fc4ebd 100644 --- a/arm9/modules/40/asm/module_40.s +++ b/arm9/modules/40/asm/module_40.s @@ -121,7 +121,7 @@ MOD40_02254940: ; 0x02254940 sub sp, #0xc add r4, r0, #0 add r0, sp, #0 - bl FUN_02012690 + bl GF_RTC_CopyTime ldr r0, [sp] cmp r0, #0x18 blo _0225495A @@ -625,7 +625,7 @@ MOD40_02254CE8: ; 0x02254CE8 bne _02254CFE add r0, r4, #0 add r0, #0x20 - bl FUN_02012690 + bl GF_RTC_CopyTime mov r0, #1 str r0, [r4, #0x30] _02254CFE: diff --git a/arm9/modules/45/asm/module_45.s b/arm9/modules/45/asm/module_45.s index 182774aa..e3115193 100644 --- a/arm9/modules/45/asm/module_45.s +++ b/arm9/modules/45/asm/module_45.s @@ -48,7 +48,7 @@ MOD45_0225489C: ; 0x0225489C add r4, r1, #0 add r0, sp, #4 add r6, r2, #0 - bl FUN_020126B4 + bl GF_RTC_CopyDate add r0, r4, #0 bl MOD20_02252C3C add r1, r5, #0 diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 55bb6ed3..829ee276 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -109,7 +109,7 @@ MOD52_021D7594: ; 0x021D7594 bl OverlayManager_GetField18 ldr r4, [r0, #8] add r0, r4, #0 - bl FUN_02023788 + bl Sav2_SysInfo_get add r5, r0, #0 mov r0, #0x4d add r1, r4, #0 @@ -118,19 +118,19 @@ MOD52_021D7594: ; 0x021D7594 mov r1, #0 bl FUN_02024F9C add r0, r5, #0 - bl FUN_020237CC + bl Sav2_SysInfo_MacAddressIsMine cmp r0, #0 beq _021D75C8 add r0, r5, #0 - bl FUN_020237FC + bl Sav2_SysInfo_RTCOffsetIsMine cmp r0, #0 bne _021D75D8 _021D75C8: add r0, r4, #0 - bl FUN_02023794 + bl Sav2_SysInfo_RTC_get bl FUN_020238A4 add r0, r5, #0 - bl FUN_020237A0 + bl Sav2_SysInfo_InitFromSystem _021D75D8: add r0, r4, #0 bl Sav2_PlayerData_GetIGTAddr @@ -162,11 +162,11 @@ MOD52_021D7604: ; 0x021D7604 str r0, [sp] add r0, r5, #0 add r6, r2, #0 - bl FUN_02023788 - bl FUN_020237A0 + bl Sav2_SysInfo_get + bl Sav2_SysInfo_InitFromSystem add r0, r5, #0 - bl FUN_02023794 - bl FUN_02023840 + bl Sav2_SysInfo_RTC_get + bl Sav2_SysInfo_RTC_init add r0, r5, #0 bl FUN_0202881C add r4, r0, #0 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index d16c0493..c21879dd 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -1240,7 +1240,7 @@ MOD83_0222DF40: ; 0x0222DF40 str r0, [r5, #0x34] _0222DF60: ldr r0, [r5, #4] - bl FUN_02023788 + bl Sav2_SysInfo_get bl FUN_02023820 cmp r0, #1 bne _0222DF72 @@ -3436,7 +3436,7 @@ MOD83_0222F074: ; 0x0222F074 add r0, #8 strb r1, [r4, r0] add r0, sp, #8 - bl FUN_020126B4 + bl GF_RTC_CopyDate add r0, sp, #8 bl RTC_ConvertDateToDay mov r1, #0xd5 @@ -4970,7 +4970,7 @@ _0222FD12: strb r0, [r5, r1] _0222FD2C: add r0, sp, #8 - bl FUN_020126B4 + bl GF_RTC_CopyDate add r0, sp, #8 bl RTC_ConvertDateToDay mov r1, #0xd5 |