diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-11-27 13:34:15 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-27 13:34:15 -0600 |
| commit | 64e648098870bbae6f28ede1e391d0bacab60ffa (patch) | |
| tree | 116e6a90c275191d25b9b892fac3851e3674e580 /asm/new_menu_helpers.s | |
| parent | 1e4f12e6fa9e3b22d4f1a60ca69313b5dec0ca38 (diff) | |
| parent | 237261e193d75addf47fc0736b2d9ed10c8d3195 (diff) | |
Merge pull request #116 from DizzyEggg/decompile_berry_blender
Decompile berry blender
Diffstat (limited to 'asm/new_menu_helpers.s')
| -rwxr-xr-x | asm/new_menu_helpers.s | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s index d79f7df32..25f7fe605 100755 --- a/asm/new_menu_helpers.s +++ b/asm/new_menu_helpers.s @@ -185,7 +185,7 @@ AddTextPrinterForMessage: @ 81972C4 ands r1, r2 orrs r1, r0 strb r1, [r3] - bl sav2_get_text_speed + bl GetPlayerTextSpeed adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 @@ -222,7 +222,7 @@ AddTextPrinterForMessage_2: @ 8197310 ands r1, r2 orrs r1, r0 strb r1, [r3] - bl sav2_get_text_speed + bl GetPlayerTextSpeed adds r3, r0, 0 lsls r3, 24 lsrs r3, 24 @@ -945,7 +945,7 @@ DisplayItemMessageOnField: @ 81978EC lsls r4, 24 lsrs r4, 24 bl sub_81973A4 - bl sav2_get_text_speed + bl GetPlayerTextSpeed lsls r0, 24 lsrs r0, 24 movs r2, 0x80 @@ -1021,8 +1021,8 @@ _0819798A: bx r1 thumb_func_end sub_8197964 - thumb_func_start sav2_get_text_speed -sav2_get_text_speed: @ 8197990 + thumb_func_start GetPlayerTextSpeed +GetPlayerTextSpeed: @ 8197990 push {lr} ldr r0, =gSaveBlock2Ptr ldr r2, [r0] @@ -1045,7 +1045,7 @@ _081979AC: pop {r1} bx r1 .pool - thumb_func_end sav2_get_text_speed + thumb_func_end GetPlayerTextSpeed thumb_func_start sub_81979C4 sub_81979C4: @ 81979C4 |