diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2018-01-21 20:38:34 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-21 20:38:34 -0500 |
| commit | 097da4e0112275a25b99160f5bc409a51f3a13d7 (patch) | |
| tree | bf94ff010c6a0efcba7cdf3cb958805cabc191a6 /asm/script_menu.s | |
| parent | 19864d3cd93e57880da1430489c365907fb0a7a3 (diff) | |
| parent | f57340b729d741acae17213c9c748738fcc1dcb3 (diff) | |
Merge branch 'master' into libc
Diffstat (limited to 'asm/script_menu.s')
| -rw-r--r-- | asm/script_menu.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/script_menu.s b/asm/script_menu.s index 233a5e14c..1f7c86e84 100644 --- a/asm/script_menu.s +++ b/asm/script_menu.s @@ -676,9 +676,9 @@ _080E2360: .pool thumb_func_end sub_80E2308 - thumb_func_start sp109_CreatePCMenu -@ bool sp109_CreatePCMenu() -sp109_CreatePCMenu: @ 80E236C + thumb_func_start ScrSpecial_CreatePCMenu +@ bool ScrSpecial_CreatePCMenu() +ScrSpecial_CreatePCMenu: @ 80E236C push {lr} ldr r0, =sub_80E2058 bl FuncIsActiveTask @@ -698,7 +698,7 @@ _080E2394: _080E2396: pop {r1} bx r1 - thumb_func_end sp109_CreatePCMenu + thumb_func_end ScrSpecial_CreatePCMenu thumb_func_start CreatePCMenu CreatePCMenu: @ 80E239C @@ -858,8 +858,8 @@ _080E24C6: .pool thumb_func_end CreatePCMenu - thumb_func_start sub_80E2514 -sub_80E2514: @ 80E2514 + thumb_func_start ScriptMenu_DisplayPCStartupPrompt +ScriptMenu_DisplayPCStartupPrompt: @ 80E2514 push {lr} sub sp, 0x10 movs r0, 0 @@ -882,7 +882,7 @@ sub_80E2514: @ 80E2514 pop {r0} bx r0 .pool - thumb_func_end sub_80E2514 + thumb_func_end ScriptMenu_DisplayPCStartupPrompt thumb_func_start sub_80E2548 sub_80E2548: @ 80E2548 |