diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc index 532c9276..acd1012e 100644 --- a/asm/include/itcm.inc +++ b/asm/include/itcm.inc @@ -30,10 +30,10 @@ .public sub_0201BD80 .public sub_0202760C .public sub_0202796C_JP -.public sub_0207A238 -.public sub_0207A244 +.public DC_InvalidateAll +.public DC_StoreAll .public sub_0207A300 -.public sub_0207A324 +.public IC_InvalidateAll .public sub_02080EF0 .public sub_02080F30 .public TRIG_TABLE diff --git a/asm/include/main_02003DB8.inc b/asm/include/main_02003DB8.inc index 2ba3aca1..0fb622e9 100644 --- a/asm/include/main_02003DB8.inc +++ b/asm/include/main_02003DB8.inc @@ -101,7 +101,7 @@ .public sub_0200B76C .public sub_020184A8 .public sub_02078900 -.public sub_0207A324 +.public IC_InvalidateAll .public sub_0207BE6C .public sub_0207BF04 .public sub_0207BFA4 diff --git a/asm/include/main_0207F894.inc b/asm/include/main_0207F894.inc index d50996a6..47fe3462 100644 --- a/asm/include/main_0207F894.inc +++ b/asm/include/main_0207F894.inc @@ -88,8 +88,8 @@ .public sub_02079A64 .public sub_0207A2C0 .public sub_0207A300 -.public sub_0207A324 -.public sub_0207A330 +.public IC_InvalidateAll +.public IC_InvalidateRange .public OS_GetDTCMAddress .public OS_SetDPermissionsForProtectionRegion .public sub_0207ADCC diff --git a/asm/itcm.s b/asm/itcm.s index 3da56e89..e63974e6 100644 --- a/asm/itcm.s +++ b/asm/itcm.s @@ -2048,11 +2048,11 @@ _01FF990C: ldr sl, [r0, #0x1c] bl EnableIrqFlag mov fp, r0 - bl sub_0207A244 - bl sub_0207A238 + bl DC_StoreAll + bl DC_InvalidateAll mov r0, fp bl SetIrqFlag - bl sub_0207A324 + bl IC_InvalidateAll bl sub_0207A300 add r5, r5, r4 cmp r5, #0x8000 diff --git a/asm/main_02003DB8.s b/asm/main_02003DB8.s index 0a15198b..3fc3eb72 100644 --- a/asm/main_02003DB8.s +++ b/asm/main_02003DB8.s @@ -309,7 +309,7 @@ _020041A4: bl Debug_FatalError _020041C4: bl FileRom_InitDataTransfer - bl sub_0207A324 + bl IC_InvalidateAll bl DC_FlushAll cmp r4, #0x24 addls pc, pc, r4, lsl #2 diff --git a/asm/main_0207F894.s b/asm/main_0207F894.s index 4c208ea0..ff6aa645 100644 --- a/asm/main_0207F894.s +++ b/asm/main_0207F894.s @@ -227,7 +227,7 @@ sub_0207FB40: ; 0x0207FB40 add r6, r5, r1 mov r0, r4 mov r1, r6 - bl sub_0207A330 + bl IC_InvalidateRange mov r0, r4 mov r1, r6 bl DC_InvalidateRange @@ -5417,10 +5417,10 @@ _02083F44: bhs _02083F94 mov r0, sb mov r1, r5 - bl sub_0207A330 + bl IC_InvalidateRange b _02083F98 _02083F94: - bl sub_0207A324 + bl IC_InvalidateAll _02083F98: ldr r0, [r4, #0x11c] cmp r5, r0 diff --git a/lib/NitroSDK/asm/os_cache.s b/lib/NitroSDK/asm/os_cache.s index 2c2f67b4..3f41c8c3 100644 --- a/lib/NitroSDK/asm/os_cache.s +++ b/lib/NitroSDK/asm/os_cache.s @@ -2,15 +2,15 @@ .text - arm_func_start sub_0207A238 -sub_0207A238: ; 0x0207A238 + arm_func_start DC_InvalidateAll +DC_InvalidateAll: ; 0x0207A238 mov r0, #0 mcr p15, 0, r0, c7, c6, 0 bx lr - arm_func_end sub_0207A238 + arm_func_end DC_InvalidateAll - arm_func_start sub_0207A244 -sub_0207A244: ; 0x0207A244 + arm_func_start DC_StoreAll +DC_StoreAll: ; 0x0207A244 mov r1, #0 _0207A248: mov r0, #0 @@ -24,7 +24,7 @@ _0207A24C: cmp r1, #0 bne _0207A248 bx lr - arm_func_end sub_0207A244 + arm_func_end DC_StoreAll arm_func_start DC_FlushAll DC_FlushAll: ; 0x0207A270 @@ -100,15 +100,15 @@ sub_0207A30C: ; 0x0207A30C bx lr arm_func_end sub_0207A30C - arm_func_start sub_0207A324 -sub_0207A324: ; 0x0207A324 + arm_func_start IC_InvalidateAll +IC_InvalidateAll: ; 0x0207A324 mov r0, #0 mcr p15, 0, r0, c7, c5, 0 bx lr - arm_func_end sub_0207A324 + arm_func_end IC_InvalidateAll - arm_func_start sub_0207A330 -sub_0207A330: ; 0x0207A330 + arm_func_start IC_InvalidateRange +IC_InvalidateRange: ; 0x0207A330 add r1, r1, r0 bic r0, r0, #0x1f _0207A338: @@ -117,5 +117,5 @@ _0207A338: cmp r0, r1 blt _0207A338 bx lr - arm_func_end sub_0207A330 + arm_func_end IC_InvalidateRange