diff options
Diffstat (limited to 'arm9/modules')
25 files changed, 38 insertions, 38 deletions
diff --git a/arm9/modules/05/asm/mod05_021D9320.s b/arm9/modules/05/asm/mod05_021D9320.s index ec304548..419b92fd 100644 --- a/arm9/modules/05/asm/mod05_021D9320.s +++ b/arm9/modules/05/asm/mod05_021D9320.s @@ -53,7 +53,7 @@ _021D9374: str r0, [sp, #0x20] ldr r1, [r6] add r0, r4, #0 - bl FUN_020161A4 + bl AllocAndReadFile ldr r1, [sp, #0x20] str r0, [sp, #0x24] add r2, r4, #0 @@ -161,7 +161,7 @@ _021D944A: ldr r1, [sp, #0x10] add r0, r4, #0 ldr r1, [r1, #0x18] - bl FUN_020161A4 + bl AllocAndReadFile mov r3, #0x4e lsl r3, r3, #2 ldr r1, [r5, r3] diff --git a/arm9/modules/05/asm/mod05_021DB44C.s b/arm9/modules/05/asm/mod05_021DB44C.s index eaee32f8..bba92897 100644 --- a/arm9/modules/05/asm/mod05_021DB44C.s +++ b/arm9/modules/05/asm/mod05_021DB44C.s @@ -255,7 +255,7 @@ MOD05_021DB61C: ; 0x021DB61C str r1, [sp] mov r0, #4 add r1, r2, #0 - bl FUN_020161A4 + bl AllocAndReadFile mov r1, #0 str r0, [sp, #0x14] str r1, [sp, #8] diff --git a/arm9/modules/05/asm/mod05_021DBEF4.s b/arm9/modules/05/asm/mod05_021DBEF4.s index f65de9d8..ae93e2a3 100644 --- a/arm9/modules/05/asm/mod05_021DBEF4.s +++ b/arm9/modules/05/asm/mod05_021DBEF4.s @@ -120,7 +120,7 @@ _021DBFA8: add r7, #0x10 mov r0, #4 add r1, sp, #0xc - bl FUN_020161A4 + bl AllocAndReadFile str r0, [r7, r5] add r0, r6, #0 str r0, [sp, #8] @@ -128,7 +128,7 @@ _021DBFA8: str r0, [sp, #8] ldr r0, [r7, r5] mov r1, #4 - bl FUN_02016324 + bl OpenFileCached ldr r1, [sp, #8] str r0, [r1, r5] add r0, r1, #0 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index 006e8bb1..913e5b00 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -13882,7 +13882,7 @@ MOD05_021EF4F8: ; 0x021EF4F8 MOD05_021EF514: ; 0x021EF514 push {r3, r4, r5, r6, r7, lr} add r5, r0, #0 - bl FUN_020162FC + bl ClearFileCache bl NNS_GfdResetLnkTexVramState bl NNS_GfdResetLnkPlttVramState mov r4, #0 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index effb333a..fcb737d8 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -102,7 +102,7 @@ MOD12_0222D5C0: ; 0x0222D5C0 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #0x23 add r1, r4, #0 lsl r2, r2, #4 @@ -3237,7 +3237,7 @@ MOD12_0222EF04: ; 0x0222EF04 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, [r5, #0x30] bl MOD12_0222F548 bl FUN_0201CC08 @@ -5099,7 +5099,7 @@ MOD12_0222FE4C: ; 0x0222FE4C bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r1, r5, #0 ldr r0, [r5] add r1, #0x14 @@ -41182,7 +41182,7 @@ MOD12_02241210: ; 0x02241210 bl FUN_0201C24C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers ldr r0, [r5, #0x30] bl MOD12_02241864 bl FUN_0201CC08 diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index 9b2fdf67..e84656ac 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -43226,7 +43226,7 @@ _0224E848: ; jump table _0224E858: mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD18_0224E01C ldr r3, _0224E940 ; =0x00000504 add r1, r6, #0 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index d070f979..3c747f56 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -60,7 +60,7 @@ _021D74F6: str r0, [r4, #0x10] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD53_021D78D0 ldr r0, [r4] bl MOD53_021D78F0 diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index b11b96cf..04f3927a 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -67,7 +67,7 @@ _021D74F6: str r0, [r4, #0x28] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD54_021D7874 ldr r0, [r4] bl MOD54_021D7894 diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index b9f3c277..f90f346e 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -43,7 +43,7 @@ MOD55_021D7504: ; 0x021D7504 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #0x34 bl FUN_02016B94 str r0, [r4, #4] diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index 531194c6..2f71e04c 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -267,7 +267,7 @@ MOD56_02211FD4: ; 0x02211FD4 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #0x36 bl FUN_02016B94 add r1, r4, #0 diff --git a/arm9/modules/57/asm/module_57.s b/arm9/modules/57/asm/module_57.s index 481488f8..624f332c 100644 --- a/arm9/modules/57/asm/module_57.s +++ b/arm9/modules/57/asm/module_57.s @@ -28,7 +28,7 @@ MOD57_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #0xa mov r0, #3 mov r1, #0x19 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index eb13ddb7..c3ac0512 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -66,7 +66,7 @@ _021D9A36: str r0, [r4, #0x14] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD58_021D9CDC ldr r0, [r4] bl MOD58_021D9CFC diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 5604bf3c..c47887c1 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -56,7 +56,7 @@ _021D7592: str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD59_021D778C add r0, r4, #0 diff --git a/arm9/modules/59/asm/mod59_021D9868.s b/arm9/modules/59/asm/mod59_021D9868.s index 2925c404..78e2c5b2 100644 --- a/arm9/modules/59/asm/mod59_021D9868.s +++ b/arm9/modules/59/asm/mod59_021D9868.s @@ -81,7 +81,7 @@ _021D98C6: str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD59_021D9A20 add r0, r4, #0 diff --git a/arm9/modules/63/asm/mod63_021D74E0.s b/arm9/modules/63/asm/mod63_021D74E0.s index ea96bf3b..d309fdee 100644 --- a/arm9/modules/63/asm/mod63_021D74E0.s +++ b/arm9/modules/63/asm/mod63_021D74E0.s @@ -37,7 +37,7 @@ MOD63_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #1 mov r0, #3 mov r1, #0x1e diff --git a/arm9/modules/63/asm/mod63_021D8890.s b/arm9/modules/63/asm/mod63_021D8890.s index 6f6f8f75..42cbfcd7 100644 --- a/arm9/modules/63/asm/mod63_021D8890.s +++ b/arm9/modules/63/asm/mod63_021D8890.s @@ -582,7 +582,7 @@ MOD63_021D8D10: ; 0x021D8D10 bl GX_DisableEngineBLayers mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r0, #3 mov r1, #0x4c lsl r2, r0, #0x11 diff --git a/arm9/modules/67/asm/module_67.s b/arm9/modules/67/asm/module_67.s index 60bd02b5..cc5e6e22 100644 --- a/arm9/modules/67/asm/module_67.s +++ b/arm9/modules/67/asm/module_67.s @@ -30,7 +30,7 @@ MOD67_021D74E0: ; 0x021D74E0 strh r1, [r3] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers mov r2, #2 mov r0, #3 mov r1, #0x2a diff --git a/arm9/modules/68/asm/module_68.s b/arm9/modules/68/asm/module_68.s index b2170444..3d73e7bd 100644 --- a/arm9/modules/68/asm/module_68.s +++ b/arm9/modules/68/asm/module_68.s @@ -73,7 +73,7 @@ MOD68_021D74E0: ; 0x021D74E0 bl MOD68_021D7870 mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl FUN_0201CC08 mov r0, #4 bl FUN_0201CC24 diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index 303bee40..613e6aa0 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -74,7 +74,7 @@ MOD71_0222D5C0: ; 0x0222D5C0 bl MOD71_0222E76C mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers bl MOD71_0222E558 mov r0, #0x5d lsl r0, r0, #2 @@ -932,7 +932,7 @@ _0222DDA6: mov r0, #0x50 bl FUN_02031588 mov r0, #2 - bl FUN_020166A8 + bl SetSoftResetDisableMask add r0, r4, #0 bl MOD71_02230B88 ldr r0, [r4, #0x4c] @@ -1317,7 +1317,7 @@ _0222E094: mov r2, #1 bl MOD71_02230F40 mov r0, #2 - bl FUN_020166B8 + bl ClearSoftResetDisableMask add sp, #0x10 mov r0, #1 pop {r3, r4, r5, r6, r7, pc} diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 3500c458..fc726042 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -68,7 +68,7 @@ MOD75_021E6BA0: ; 0x021E6BA0 bl FUN_0200E1D0 mov r0, #3 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD75_021E7470 add r0, r4, #0 diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 6affcb88..1f240502 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -100,7 +100,7 @@ _021D7540: bl GX_SwapDisplay mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r5, #0 bl MOD77_021D7C64 mov r0, #1 diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 83e02d71..56c92006 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -1453,7 +1453,7 @@ _0222DFE4: str r0, [r4, r1] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 add r1, r6, #0 bl MOD80_0222E338 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index f1a3e494..b897380f 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -695,7 +695,7 @@ _0222DA48: str r0, [r4, r1] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 add r1, r6, #0 bl MOD82_0222DD04 diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index 09c161b4..354932d5 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -15353,11 +15353,11 @@ MOD83_02234E40: ; 0x02234E40 add r0, r4, #0 bl FUN_0202BF90 mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask ldr r0, [r5, #0x10] bl FUN_02022720 mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask pop {r3, r4, r5, pc} thumb_func_end MOD83_02234E40 @@ -19168,7 +19168,7 @@ _02236CAE: mov r0, #0x15 str r0, [r5] mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask b _02236D90 _02236CF0: ldr r0, _02236DB0 ; =0x0000E88C @@ -19219,7 +19219,7 @@ _02236D36: mov r0, #0x16 str r0, [r5] mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask b _02236D90 _02236D54: ldr r0, _02236DC8 ; =gMain + 0x40 @@ -24577,7 +24577,7 @@ _022394E4: ; jump table .short _02239538 - _022394E4 - 2 ; case 4 _022394EE: mov r0, #4 - bl FUN_020166A8 + bl SetSoftResetDisableMask ldr r0, [r4, #0x14] mov r1, #2 bl FUN_02022840 @@ -24610,7 +24610,7 @@ _02239528: cmp r0, #1 bhi _02239534 mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask _02239534: add r0, r5, #0 pop {r3, r4, r5, pc} @@ -24645,7 +24645,7 @@ MOD83_0223955C: ; 0x0223955C ldr r0, [r0, #0x14] bl FUN_0202287C mov r0, #4 - bl FUN_020166B8 + bl ClearSoftResetDisableMask pop {r3, pc} nop _02239570: .word MOD83_0223BC30 diff --git a/arm9/modules/86/asm/module_86.s b/arm9/modules/86/asm/module_86.s index 2bd7d12a..82dca844 100644 --- a/arm9/modules/86/asm/module_86.s +++ b/arm9/modules/86/asm/module_86.s @@ -57,7 +57,7 @@ MOD86_021D74E0: ; 0x021D74E0 str r0, [r2] mov r0, #4 mov r1, #8 - bl FUN_0201669C + bl SetKeyRepeatTimers add r0, r4, #0 bl MOD86_021D76EC add r0, r4, #0 |