diff options
author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2021-05-31 10:24:28 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-31 10:24:28 -0400 |
commit | fbae3cdf7bbaf4ffc33cbde7cd71074a33c6be6c (patch) | |
tree | ebfab62650b4353f216e551c8e1c2f96a7eefea3 /arm9/asm/scrcmd_12.s | |
parent | 79e77921c30109d29c3d791099aa42696c25ba99 (diff) | |
parent | 57d3832f898694df840f7e43781d5f608a2e8a1f (diff) |
Merge branch 'master' into make_naix
Diffstat (limited to 'arm9/asm/scrcmd_12.s')
-rw-r--r-- | arm9/asm/scrcmd_12.s | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm9/asm/scrcmd_12.s b/arm9/asm/scrcmd_12.s index cc011b0f..25911feb 100644 --- a/arm9/asm/scrcmd_12.s +++ b/arm9/asm/scrcmd_12.s @@ -47,8 +47,8 @@ FUN_02042D10: ; 0x02042D10 bl FUN_0202B020 pop {r3, pc} - thumb_func_start FUN_02042D1C -FUN_02042D1C: ; 0x02042D1C + thumb_func_start ScrCmd_Unk023E +ScrCmd_Unk023E: ; 0x02042D1C push {r3-r7, lr} sub sp, #0x20 add r4, r0, #0x0 |