diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2017-11-27 20:09:53 -0500 |
| commit | 88636dfc2a07790d9bdbba1ca56f4ca252d16f5b (patch) | |
| tree | 9b31cc1b61577ee20fa50b8feec5c7780cbce3ef /asm/new_menu_helpers.s | |
| parent | 9840be1f0041e697f1aefbdc839a5227b7100112 (diff) | |
| parent | 18c6b8efc21a509121ab4d6f5b9c8523689d27a2 (diff) | |
Merge branch 'master' into clock
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 |