diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-03 09:42:19 -0500 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2018-02-03 09:42:19 -0500 |
| commit | d52f52fa734b856361b04ea5d70877a6f265df0c (patch) | |
| tree | 60444b7ba53b8e4c9030a694acb03c54e4144778 /asm/new_menu_helpers.s | |
| parent | d4e8c20f840996049f269ffcd22d7e3feb489696 (diff) | |
| parent | eb6aed50e56f36ce416f7ecc8edfacea1da61bf1 (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/new_menu_helpers.s')
| -rw-r--r-- | asm/new_menu_helpers.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/new_menu_helpers.s b/asm/new_menu_helpers.s index 25f7fe605..5089ae909 100644 --- a/asm/new_menu_helpers.s +++ b/asm/new_menu_helpers.s @@ -95,9 +95,9 @@ sub_8197224: @ 8197224 bx r1 thumb_func_end sub_8197224 - thumb_func_start AddTextPrinterParametrized -@ u16 AddTextPrinterParametrized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor) -AddTextPrinterParametrized: @ 8197238 + thumb_func_start AddTextPrinterParameterized +@ u16 AddTextPrinterParameterized(u8 windowId, u8 fontId, u8 *str, u8 speed, void ( *callback)(u16, struct TextPrinter *), u8 fgColor, u8 bgColor, u8 shadowColor) +AddTextPrinterParameterized: @ 8197238 push {r4-r7,lr} mov r7, r8 push {r7} @@ -166,7 +166,7 @@ AddTextPrinterParametrized: @ 8197238 pop {r1} bx r1 .pool - thumb_func_end AddTextPrinterParametrized + thumb_func_end AddTextPrinterParameterized thumb_func_start AddTextPrinterForMessage @ void AddTextPrinterForMessage(u8 allowSkippingDelayWithButtonPress) @@ -198,7 +198,7 @@ AddTextPrinterForMessage: @ 81972C4 str r0, [sp, 0xC] movs r0, 0 movs r1, 0x1 - bl AddTextPrinterParametrized + bl AddTextPrinterParameterized add sp, 0x10 pop {r4,r5} pop {r0} @@ -236,7 +236,7 @@ AddTextPrinterForMessage_2: @ 8197310 str r0, [sp, 0xC] movs r0, 0 movs r1, 0x1 - bl AddTextPrinterParametrized + bl AddTextPrinterParameterized add sp, 0x10 pop {r4} pop {r0} @@ -273,7 +273,7 @@ AddTextPrinterWithCustomSpeedForMessage: @ 819735C str r0, [sp, 0xC] movs r0, 0 movs r1, 0x1 - bl AddTextPrinterParametrized + bl AddTextPrinterParameterized add sp, 0x10 pop {r4,r5} pop {r0} |