diff options
author | ultima-soul <akshayjhanji@hotmail.com> | 2019-04-28 16:55:43 -0700 |
---|---|---|
committer | ultima-soul <akshayjhanji@hotmail.com> | 2019-04-28 16:55:43 -0700 |
commit | e833d3742325698846eb3d394b41a556a76af711 (patch) | |
tree | 68d45add4b819898d3d99064e78a09dbd5ba1c48 /asm/list_menu.s | |
parent | 57603a0d46c785d845a3fa168f94c01dc8b0b253 (diff) | |
parent | 523c53506da69eccebb95af1d1cb76803d0fb88f (diff) |
Merge branch 'master' into fldeff
Diffstat (limited to 'asm/list_menu.s')
-rw-r--r-- | asm/list_menu.s | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/asm/list_menu.s b/asm/list_menu.s index 3119d53bd..4615e249b 100644 --- a/asm/list_menu.s +++ b/asm/list_menu.s @@ -60,7 +60,7 @@ _08106F24: lsls r2, 24 lsrs r2, 24 ldr r1, [sp, 0x4] - bl sub_8150048 + bl DrawTextBorderOuter _08106F34: ldr r0, _08106F64 @ =gMultiuseListMenuTemplate adds r2, r0, 0 @@ -1635,8 +1635,8 @@ sub_8107A9C: @ 8107A9C _08107AE8: .4byte gUnknown_3005E60 thumb_func_end sub_8107A9C - thumb_func_start sub_8107AEC -sub_8107AEC: @ 8107AEC + thumb_func_start ListMenuDefaultCursorMoveFunc +ListMenuDefaultCursorMoveFunc: @ 8107AEC push {lr} lsls r1, 24 cmp r1, 0 @@ -1646,7 +1646,7 @@ sub_8107AEC: @ 8107AEC _08107AFA: pop {r0} bx r0 - thumb_func_end sub_8107AEC + thumb_func_end ListMenuDefaultCursorMoveFunc thumb_func_start sub_8107B00 sub_8107B00: @ 8107B00 |