diff options
Diffstat (limited to 'arm9/modules')
28 files changed, 85 insertions, 85 deletions
diff --git a/arm9/modules/05/asm/mod05_021E2B80.s b/arm9/modules/05/asm/mod05_021E2B80.s index 8aa39261..2722d177 100644 --- a/arm9/modules/05/asm/mod05_021E2B80.s +++ b/arm9/modules/05/asm/mod05_021E2B80.s @@ -205,7 +205,7 @@ MOD05_021E2D00: ; 0x021E2D00 ldr r0, [r0] ldr r0, [r0, #0xc] bl Sav2_PlayerData_GetOptionsAddr - bl FUN_02024FF4 + bl Options_GetTextFrameDelay pop {r3, pc} .balign 4, 0 diff --git a/arm9/modules/05/asm/module_05.s b/arm9/modules/05/asm/module_05.s index b7232407..38ca97a9 100644 --- a/arm9/modules/05/asm/module_05.s +++ b/arm9/modules/05/asm/module_05.s @@ -16817,7 +16817,7 @@ _021EFC20: str r1, [r0] ldr r0, [r4, #0x34] bl Sav2_PlayerData_GetOptionsAddr - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] diff --git a/arm9/modules/06/asm/module_06.s b/arm9/modules/06/asm/module_06.s index 1337a593..ac0c3eeb 100644 --- a/arm9/modules/06/asm/module_06.s +++ b/arm9/modules/06/asm/module_06.s @@ -8929,7 +8929,7 @@ _0223DA3E: mov r0, #0x85 lsl r0, r0, #2 ldr r0, [r4, r0] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -41696,12 +41696,12 @@ MOD06_0224DBA8: ; 0x0224DBA8 ldr r0, [r5, #8] bl Sav2_PlayerData_GetOptionsAddr add r4, r0, #0 - bl FUN_02025084 + bl Options_GetFrame mov r1, #0x53 lsl r1, r1, #2 str r0, [r5, r1] add r0, r4, #0 - bl FUN_02024FF4 + bl Options_GetTextFrameDelay mov r1, #0x15 lsl r1, r1, #4 str r0, [r5, r1] diff --git a/arm9/modules/11/asm/module_11_thumb2.s b/arm9/modules/11/asm/module_11_thumb2.s index 15f4c237..f04e67da 100644 --- a/arm9/modules/11/asm/module_11_thumb2.s +++ b/arm9/modules/11/asm/module_11_thumb2.s @@ -120,7 +120,7 @@ _0222F30E: mov r0, #0x13 lsl r0, r0, #4 ldr r0, [r4, r0] - bl FUN_02025084 + bl Options_GetFrame add r4, r0, #0 lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -3600,7 +3600,7 @@ _02230E2E: mov r1, #0x6d lsl r1, r1, #2 ldr r0, [r0, r1] - bl FUN_0202502C + bl Options_GetBattleScene cmp r0, #0 bne _02230E40 mov r0, #1 @@ -3613,11 +3613,11 @@ _02230E40: MOD11_02230E44: ; 0x02230E44 mov r1, #0x6d lsl r1, r1, #2 - ldr r3, _02230E50 ; =FUN_02025084 + ldr r3, _02230E50 ; =Options_GetFrame ldr r0, [r0, r1] bx r3 nop -_02230E50: .word FUN_02025084 +_02230E50: .word Options_GetFrame thumb_func_start MOD11_02230E54 MOD11_02230E54: ; 0x02230E54 @@ -3632,7 +3632,7 @@ _02230E62: mov r1, #0x6d lsl r1, r1, #2 ldr r0, [r0, r1] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay pop {r3, pc} .align 2, 0 @@ -3640,11 +3640,11 @@ _02230E62: MOD11_02230E70: ; 0x02230E70 mov r1, #0x6d lsl r1, r1, #2 - ldr r3, _02230E7C ; =FUN_02025048 + ldr r3, _02230E7C ; =Options_GetBattleStyle ldr r0, [r0, r1] bx r3 nop -_02230E7C: .word FUN_02025048 +_02230E7C: .word Options_GetBattleStyle thumb_func_start MOD11_02230E80 MOD11_02230E80: ; 0x02230E80 diff --git a/arm9/modules/12/asm/module_12.s b/arm9/modules/12/asm/module_12.s index 215acf37..c24f23a7 100644 --- a/arm9/modules/12/asm/module_12.s +++ b/arm9/modules/12/asm/module_12.s @@ -4224,7 +4224,7 @@ MOD12_0222F834: ; 0x0222F834 ldr r1, [r5] ldr r0, _0222F930 ; =0x00001988 ldr r0, [r1, r0] - bl FUN_02025084 + bl Options_GetFrame add r4, r0, #0 lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -6224,7 +6224,7 @@ MOD12_022308F0: ; 0x022308F0 ldr r1, [r5] ldr r0, _022309C4 ; =0x00001988 ldr r0, [r1, r0] - bl FUN_02025084 + bl Options_GetFrame add r4, r0, #0 lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -15253,7 +15253,7 @@ _02234F2A: bne _02234F40 ldr r0, _02234FAC ; =0x00001988 ldr r0, [r1, r0] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r4, r0, #0 b _02234F42 _02234F40: @@ -25497,7 +25497,7 @@ MOD12_02239AD0: ; 0x02239AD0 bne _02239AF2 ldr r0, _02239B44 ; =0x00001988 ldr r0, [r1, r0] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r4, r0, #0 b _02239AF4 _02239AF2: @@ -34742,7 +34742,7 @@ MOD12_0223E1EC: ; 0x0223E1EC bne _0223E20E ldr r0, _0223E26C ; =0x00001988 ldr r0, [r1, r0] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r4, r0, #0 b _0223E210 _0223E20E: @@ -43529,7 +43529,7 @@ MOD12_022425F4: ; 0x022425F4 bne _02242616 ldr r0, _02242674 ; =0x00001988 ldr r0, [r1, r0] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r4, r0, #0 b _02242618 _02242616: @@ -43673,7 +43673,7 @@ MOD12_022426BC: ; 0x022426BC ldr r1, [r5] ldr r0, _02242784 ; =0x00001988 ldr r0, [r1, r0] - bl FUN_02025084 + bl Options_GetFrame add r4, r0, #0 lsl r0, r4, #0x18 lsr r0, r0, #0x18 @@ -43843,7 +43843,7 @@ MOD12_02242804: ; 0x02242804 ldr r1, [r6] ldr r0, _022429D0 ; =0x00001988 ldr r0, [r1, r0] - bl FUN_02025084 + bl Options_GetFrame add r4, r0, #0 lsl r0, r4, #0x18 lsr r0, r0, #0x18 diff --git a/arm9/modules/14/asm/module_14.s b/arm9/modules/14/asm/module_14.s index ae226da3..0bded4bf 100644 --- a/arm9/modules/14/asm/module_14.s +++ b/arm9/modules/14/asm/module_14.s @@ -9849,11 +9849,11 @@ MOD14_021DC3AC: ; 0x021DC3AC MOD14_021DC3B4: ; 0x021DC3B4 mov r1, #0x69 lsl r1, r1, #2 - ldr r3, _021DC3C0 ; =FUN_02025084 + ldr r3, _021DC3C0 ; =Options_GetFrame ldr r0, [r0, r1] bx r3 nop -_021DC3C0: .word FUN_02025084 +_021DC3C0: .word Options_GetFrame thumb_func_start MOD14_021DC3C4 MOD14_021DC3C4: ; 0x021DC3C4 diff --git a/arm9/modules/17/asm/module_17.s b/arm9/modules/17/asm/module_17.s index be4096d7..1f3abbf2 100644 --- a/arm9/modules/17/asm/module_17.s +++ b/arm9/modules/17/asm/module_17.s @@ -4666,7 +4666,7 @@ MOD17_021D9918: ; 0x021D9918 ldr r0, [r5, r0] add r7, r2, #0 add r4, r3, #0 - bl FUN_02025084 + bl Options_GetFrame add r6, r0, #0 mov r0, #0 mov r1, #0xe0 @@ -4847,7 +4847,7 @@ _021D9A7E: bne _021D9ACE add r0, r0, #4 ldr r0, [r5, r0] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay b _021D9AD0 _021D9ACE: mov r0, #1 @@ -11480,12 +11480,12 @@ _021DCA42: ldr r1, [r4, #0xc] bl MOD17_021DCC38 ldr r0, [r4, #0xc] - bl FUN_02025084 + bl Options_GetFrame mov r1, #0x4f lsl r1, r1, #2 str r0, [r5, r1] ldr r0, [r4, #0xc] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay mov r1, #5 lsl r1, r1, #6 str r0, [r5, r1] @@ -11760,7 +11760,7 @@ MOD17_021DCC38: ; 0x021DCC38 sub sp, #8 add r4, r0, #0 add r0, r1, #0 - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] diff --git a/arm9/modules/18/asm/module_18.s b/arm9/modules/18/asm/module_18.s index b611c883..d09c0d20 100644 --- a/arm9/modules/18/asm/module_18.s +++ b/arm9/modules/18/asm/module_18.s @@ -7963,7 +7963,7 @@ MOD18_0223D414: ; 0x0223D414 add r6, r0, #0 ldr r0, [r5, #0xc] bl Sav2_PlayerData_GetOptionsAddr - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r4, r0, #0 ldr r0, _0223D580 ; =0x02251388 mov r2, #0x15 diff --git a/arm9/modules/52/asm/module_52.s b/arm9/modules/52/asm/module_52.s index 3fac1c6f..22824930 100644 --- a/arm9/modules/52/asm/module_52.s +++ b/arm9/modules/52/asm/module_52.s @@ -116,7 +116,7 @@ MOD52_021D7594: ; 0x021D7594 bl MOD52_021D7688 add r0, r4, #0 mov r1, #0 - bl FUN_02024F9C + bl Options_SetButtonModeOnMain add r0, r5, #0 bl Sav2_SysInfo_MacAddressIsMine cmp r0, #0 diff --git a/arm9/modules/53/asm/module_53.s b/arm9/modules/53/asm/module_53.s index d128782b..366c45bd 100644 --- a/arm9/modules/53/asm/module_53.s +++ b/arm9/modules/53/asm/module_53.s @@ -846,7 +846,7 @@ MOD53_021D7B60: ; 0x021D7B60 bl FUN_020068C8 ldr r0, [r5, #8] ldr r0, [r0, #8] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] diff --git a/arm9/modules/54/asm/module_54.s b/arm9/modules/54/asm/module_54.s index 0acfed98..11026c32 100644 --- a/arm9/modules/54/asm/module_54.s +++ b/arm9/modules/54/asm/module_54.s @@ -766,7 +766,7 @@ MOD54_021D7AA0: ; 0x021D7AA0 bl FUN_020068C8 ldr r0, [r5, #8] ldr r0, [r0, #8] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] diff --git a/arm9/modules/55/asm/module_55.s b/arm9/modules/55/asm/module_55.s index eb124639..8c06cc76 100644 --- a/arm9/modules/55/asm/module_55.s +++ b/arm9/modules/55/asm/module_55.s @@ -808,7 +808,7 @@ MOD55_021D7AE0: ; 0x021D7AE0 bl FUN_020068C8 ldr r0, [r5, #8] bl Sav2_PlayerData_GetOptionsAddr - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -5349,7 +5349,7 @@ MOD55_021DA0A4: ; 0x021DA0A4 ldr r0, [r5, #8] add r6, r1, #0 bl Sav2_PlayerData_GetOptionsAddr - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r4, r0, #0 mov r0, #0xce lsl r0, r0, #2 diff --git a/arm9/modules/56/asm/module_56.s b/arm9/modules/56/asm/module_56.s index fbe645b5..309d4cc0 100644 --- a/arm9/modules/56/asm/module_56.s +++ b/arm9/modules/56/asm/module_56.s @@ -1014,7 +1014,7 @@ MOD56_0221257C: ; 0x0221257C add r5, #0xc4 ldr r0, [r5] bl Sav2_PlayerData_GetOptionsAddr - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -8164,7 +8164,7 @@ MOD56_02215EA4: ; 0x02215EA4 add r4, r1, #0 add r6, r2, #0 bl Sav2_PlayerData_GetOptionsAddr - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r7, r0, #0 mov r0, #0xdb lsl r0, r0, #2 diff --git a/arm9/modules/58/asm/module_58.s b/arm9/modules/58/asm/module_58.s index ddcbedd9..a22e6e08 100644 --- a/arm9/modules/58/asm/module_58.s +++ b/arm9/modules/58/asm/module_58.s @@ -662,7 +662,7 @@ MOD58_021D9F14: ; 0x021D9F14 mov r3, #5 bl FUN_020068C8 ldr r0, [r5, #0xc] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -2226,7 +2226,7 @@ MOD58_021DAB94: ; 0x021DAB94 mov r3, #0xa bl FUN_0200D0BC ldr r0, [r5, #0xc] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay mov r3, #0 str r3, [sp] str r0, [sp, #4] diff --git a/arm9/modules/59/asm/mod59_021D74E0_asm.s b/arm9/modules/59/asm/mod59_021D74E0_asm.s index 8358f768..77f574fd 100644 --- a/arm9/modules/59/asm/mod59_021D74E0_asm.s +++ b/arm9/modules/59/asm/mod59_021D74E0_asm.s @@ -936,7 +936,7 @@ _021D7C5E: add r0, r6, #0 bl String_dtor ldr r0, [r5, #8] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r3, r4, #0 str r3, [sp] str r0, [sp, #4] diff --git a/arm9/modules/60/asm/module_60.s b/arm9/modules/60/asm/module_60.s index 28028e5f..81f6d273 100644 --- a/arm9/modules/60/asm/module_60.s +++ b/arm9/modules/60/asm/module_60.s @@ -25,7 +25,7 @@ MOD60_021D74E0: ; 0x021D74E0 add r4, r0, #0 bl memset add r0, r5, #0 - bl FUN_02024FD8 + bl Options_GetTextSpeed ldrh r1, [r4, #0x18] mov r2, #0xf lsl r0, r0, #0x10 @@ -36,7 +36,7 @@ MOD60_021D74E0: ; 0x021D74E0 orr r0, r1 strh r0, [r4, #0x18] add r0, r5, #0 - bl FUN_0202502C + bl Options_GetBattleScene lsl r0, r0, #0x10 lsr r0, r0, #0x10 lsl r0, r0, #0x1f @@ -47,7 +47,7 @@ MOD60_021D74E0: ; 0x021D74E0 orr r0, r1 strh r0, [r4, #0x18] add r0, r5, #0 - bl FUN_02025048 + bl Options_GetBattleStyle lsl r0, r0, #0x10 lsr r0, r0, #0x10 lsl r0, r0, #0x1f @@ -58,7 +58,7 @@ MOD60_021D74E0: ; 0x021D74E0 orr r0, r1 strh r0, [r4, #0x18] add r0, r5, #0 - bl FUN_02025010 + bl Options_GetSoundMethod lsl r0, r0, #0x10 lsr r0, r0, #0x10 lsl r0, r0, #0x1e @@ -69,7 +69,7 @@ MOD60_021D74E0: ; 0x021D74E0 orr r0, r1 strh r0, [r4, #0x18] add r0, r5, #0 - bl FUN_02025064 + bl Options_GetButtonMode lsl r0, r0, #0x10 lsr r0, r0, #0x10 lsl r0, r0, #0x1e @@ -80,7 +80,7 @@ MOD60_021D74E0: ; 0x021D74E0 orr r0, r1 strh r0, [r4, #0x18] add r0, r5, #0 - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x10 lsr r0, r0, #0x10 lsl r0, r0, #0x1b @@ -172,32 +172,32 @@ MOD60_021D75B0: ; 0x021D75B0 ldr r0, [r4, #0x1c] lsl r1, r1, #0x1c lsr r1, r1, #0x1c - bl FUN_02024FE0 + bl Options_SetTextSpeed ldrh r1, [r4, #0x18] ldr r0, [r4, #0x1c] lsl r1, r1, #0x19 lsr r1, r1, #0x1f - bl FUN_02025034 + bl Options_SetBattleScene ldrh r1, [r4, #0x18] ldr r0, [r4, #0x1c] lsl r1, r1, #0x18 lsr r1, r1, #0x1f - bl FUN_02025050 + bl Options_SetBattleStyle ldrh r1, [r4, #0x18] ldr r0, [r4, #0x1c] lsl r1, r1, #0x1a lsr r1, r1, #0x1e - bl FUN_02025018 + bl Options_SetSoundMethod ldrh r1, [r4, #0x18] ldr r0, [r4, #0x1c] lsl r1, r1, #0x16 lsr r1, r1, #0x1e - bl FUN_0202506C + bl Options_SetButtonMode ldrh r1, [r4, #0x18] ldr r0, [r4, #0x1c] lsl r1, r1, #0x11 lsr r1, r1, #0x1b - bl FUN_0202508C + bl Options_SetFrame b _021D769A _021D7680: cmp r0, #2 @@ -210,7 +210,7 @@ _021D7680: mov r0, #0 lsl r1, r1, #0x16 lsr r1, r1, #0x1e - bl FUN_02024F9C + bl Options_SetButtonModeOnMain _021D769A: add r0, r5, #0 bl OverlayManager_FreeData @@ -1270,7 +1270,7 @@ _021D7F3C: add r1, r1, r2 add r1, #0x5e ldrh r1, [r1] - bl FUN_02024F9C + bl Options_SetButtonModeOnMain _021D7F54: ldr r0, [sp, #0x14] mov r1, #0x54 diff --git a/arm9/modules/61/asm/module_61.s b/arm9/modules/61/asm/module_61.s index 5cb5badb..861757e8 100644 --- a/arm9/modules/61/asm/module_61.s +++ b/arm9/modules/61/asm/module_61.s @@ -44,11 +44,11 @@ MOD61_021D74E0: ; 0x021D74E0 strh r1, [r0] ldr r0, [r4, #0x1c] ldr r0, [r0, #4] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay strb r0, [r4, #0x10] ldr r0, [r4, #0x1c] ldr r0, [r0, #4] - bl FUN_02025084 + bl Options_GetFrame strh r0, [r4, #0xa] mov r0, #1 pop {r3, r4, r5, pc} diff --git a/arm9/modules/64/asm/module_64.s b/arm9/modules/64/asm/module_64.s index 1dee0562..71dc63ea 100644 --- a/arm9/modules/64/asm/module_64.s +++ b/arm9/modules/64/asm/module_64.s @@ -35,11 +35,11 @@ _021D7504: bl OverlayManager_GetField18 add r4, r0, #0 ldr r0, [r4, #4] - bl FUN_02025084 + bl Options_GetFrame ldr r1, _021D7634 ; =0x000006A8 str r0, [r5, r1] ldr r0, [r4, #4] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay ldr r1, _021D7638 ; =0x000006AC str r0, [r5, r1] mov r0, #8 diff --git a/arm9/modules/65/asm/module_65.s b/arm9/modules/65/asm/module_65.s index af08a5f3..25ca7a88 100644 --- a/arm9/modules/65/asm/module_65.s +++ b/arm9/modules/65/asm/module_65.s @@ -950,7 +950,7 @@ MOD65_021D7C04: ; 0x021D7C04 bl FUN_0200CB00 ldr r0, [r6, #0x20] ldr r0, [r0, #0x18] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -1103,7 +1103,7 @@ _021D7D42: _021D7D66: ldr r0, [r5, #0x20] ldr r0, [r0, #0x18] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r5, #0x7c strb r0, [r5] pop {r4, r5, r6, pc} diff --git a/arm9/modules/71/asm/module_71.s b/arm9/modules/71/asm/module_71.s index b77c8662..21cf712a 100644 --- a/arm9/modules/71/asm/module_71.s +++ b/arm9/modules/71/asm/module_71.s @@ -278,7 +278,7 @@ MOD71_0222D820: ; 0x0222D820 bl MOD71_0222D780 ldr r0, [r4, #8] ldr r0, [r0, #0x18] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 mov r2, #0x5d @@ -6668,7 +6668,7 @@ MOD71_02230C48: ; 0x02230C48 mov r1, #0 bl FUN_02019620 add r0, r4, #0 - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] diff --git a/arm9/modules/73/asm/module_73.s b/arm9/modules/73/asm/module_73.s index 20e8b507..e06f4d00 100644 --- a/arm9/modules/73/asm/module_73.s +++ b/arm9/modules/73/asm/module_73.s @@ -55,11 +55,11 @@ _021D7536: bl MOD73_021D8DF4 ldr r0, [r4, #0x10] ldr r0, [r0, #0x18] - bl FUN_02025084 + bl Options_GetFrame str r0, [r5, #0x24] ldr r0, [r4, #0x10] ldr r0, [r0, #0x18] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay str r0, [r5, #0x28] mov r0, #0xae mov r1, #1 diff --git a/arm9/modules/75/asm/module_75.s b/arm9/modules/75/asm/module_75.s index 63f45d1d..214736ee 100644 --- a/arm9/modules/75/asm/module_75.s +++ b/arm9/modules/75/asm/module_75.s @@ -841,7 +841,7 @@ MOD75_021E7214: ; 0x021E7214 add r0, r4, #0 add r0, #0xd0 ldr r0, [r0] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -9447,7 +9447,7 @@ MOD75_021EB660: ; 0x021EB660 add r0, r4, #0 add r0, #0xd0 ldr r0, [r0] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay mov r3, #0 str r3, [sp] str r0, [sp, #4] diff --git a/arm9/modules/76/asm/module_76.s b/arm9/modules/76/asm/module_76.s index 12b6e9fc..7f49e675 100644 --- a/arm9/modules/76/asm/module_76.s +++ b/arm9/modules/76/asm/module_76.s @@ -437,7 +437,7 @@ MOD76_021D7814: ; 0x021D7814 bl FUN_0200CB00 ldr r0, [r4] ldr r0, [r0, #8] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -2053,7 +2053,7 @@ MOD76_021D853C: ; 0x021D853C bl FUN_02002B7C ldr r0, [r4] ldr r0, [r0, #8] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay mov r3, #0 str r3, [sp] str r0, [sp, #4] diff --git a/arm9/modules/77/asm/module_77.s b/arm9/modules/77/asm/module_77.s index 1c074133..67824222 100644 --- a/arm9/modules/77/asm/module_77.s +++ b/arm9/modules/77/asm/module_77.s @@ -1383,7 +1383,7 @@ MOD77_021D7FAC: ; 0x021D7FAC add r3, r1, #0 bl FUN_020068C8 ldr r0, [r5, #8] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -1685,7 +1685,7 @@ _021D82B0: ldr r2, [r5, r2] bl ReadMsgDataIntoString ldr r0, [r5, #8] - bl FUN_02024FF4 + bl Options_GetTextFrameDelay add r3, r4, #0 str r3, [sp] str r0, [sp, #4] diff --git a/arm9/modules/80/asm/module_80.s b/arm9/modules/80/asm/module_80.s index 29a329f0..ef7fab2d 100644 --- a/arm9/modules/80/asm/module_80.s +++ b/arm9/modules/80/asm/module_80.s @@ -2328,11 +2328,11 @@ MOD80_0222E7B0: ; 0x0222E7B0 thumb_func_start MOD80_0222E7BC MOD80_0222E7BC: ; 0x0222E7BC ldr r0, [r0] - ldr r3, _0222E7C4 ; =FUN_02024FF4 + ldr r3, _0222E7C4 ; =Options_GetTextFrameDelay ldr r0, [r0, #0x24] bx r3 .align 2, 0 -_0222E7C4: .word FUN_02024FF4 +_0222E7C4: .word Options_GetTextFrameDelay thumb_func_end MOD80_0222E7BC thumb_func_start MOD80_0222E7C8 @@ -2805,7 +2805,7 @@ MOD80_0222EB6C: ; 0x0222EB6C bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x24] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -4099,7 +4099,7 @@ MOD80_0222F5A8: ; 0x0222F5A8 bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x24] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -5388,7 +5388,7 @@ MOD80_02230054: ; 0x02230054 bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x24] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -6395,7 +6395,7 @@ MOD80_02230840: ; 0x02230840 bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x24] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -8807,7 +8807,7 @@ MOD80_02231BF4: ; 0x02231BF4 bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x24] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -11836,7 +11836,7 @@ MOD80_0223346C: ; 0x0223346C bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x24] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -14380,7 +14380,7 @@ MOD80_022348CC: ; 0x022348CC bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x24] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -18024,7 +18024,7 @@ MOD80_02236488: ; 0x02236488 bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x24] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] diff --git a/arm9/modules/81/asm/module_81.s b/arm9/modules/81/asm/module_81.s index 3db42aa1..927b69b6 100644 --- a/arm9/modules/81/asm/module_81.s +++ b/arm9/modules/81/asm/module_81.s @@ -1325,11 +1325,11 @@ _02238840: .word 0x0000014E thumb_func_start MOD81_02238844 MOD81_02238844: ; 0x02238844 ldr r0, [r0] - ldr r3, _0223884C ; =FUN_02025084 + ldr r3, _0223884C ; =Options_GetFrame ldr r0, [r0, #0x14] bx r3 .align 2, 0 -_0223884C: .word FUN_02025084 +_0223884C: .word Options_GetFrame thumb_func_end MOD81_02238844 thumb_func_start MOD81_02238850 diff --git a/arm9/modules/82/asm/module_82.s b/arm9/modules/82/asm/module_82.s index 4e09a3ed..89f24d96 100644 --- a/arm9/modules/82/asm/module_82.s +++ b/arm9/modules/82/asm/module_82.s @@ -1638,7 +1638,7 @@ MOD82_0222E264: ; 0x0222E264 bl FUN_02002EEC ldr r0, [r5] ldr r0, [r0, #0x10] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] diff --git a/arm9/modules/83/asm/module_83.s b/arm9/modules/83/asm/module_83.s index ca3ff8d3..59fd717f 100644 --- a/arm9/modules/83/asm/module_83.s +++ b/arm9/modules/83/asm/module_83.s @@ -2561,7 +2561,7 @@ _0222E960: add r3, r2, #0 bl FUN_0200CB00 ldr r0, [r4, #0x14] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -6152,7 +6152,7 @@ MOD83_02230668: ; 0x02230668 mov r2, #0x56 bl FUN_02002ED0 ldr r0, [r4, #8] - bl FUN_02025084 + bl Options_GetFrame lsl r0, r0, #0x18 lsr r0, r0, #0x18 str r0, [sp] @@ -10287,7 +10287,7 @@ _022327E6: ldr r1, _02232B58 ; =0x00002B48 str r0, [r4, r1] ldr r0, [r4, r1] - bl FUN_02025084 + bl Options_GetFrame ldr r1, _02232B5C ; =0x00002B4C str r0, [r4, r1] sub r1, #0xc @@ -18540,7 +18540,7 @@ MOD83_02236764: ; 0x02236764 ldr r0, [r4, #0x10] bl Sav2_PlayerData_GetOptionsAddr str r0, [r4, #0x18] - bl FUN_02025084 + bl Options_GetFrame str r0, [r4, #0x1c] ldr r1, _022367F8 ; =0x00000496 mov r0, #9 |