diff options
| author | PikalaxALT <PikalaxALT@users.noreply.github.com> | 2019-06-17 13:46:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-17 13:46:53 -0400 |
| commit | e3de3422a8ab5225e6ecffec38c19cac89d17915 (patch) | |
| tree | e12eddb9a126083e308968b56ce69d6dd85c42aa /asm/menu.s | |
| parent | e28c7676126d31efa690f686152be19d5b62f743 (diff) | |
| parent | 2b750cf44491aee3b2fe8265afb4ac6620500afa (diff) | |
Merge pull request #69 from pret/item_pc
Item pc
Diffstat (limited to 'asm/menu.s')
| -rw-r--r-- | asm/menu.s | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/asm/menu.s b/asm/menu.s index d9efcde84..2229f41d8 100644 --- a/asm/menu.s +++ b/asm/menu.s @@ -556,8 +556,8 @@ _0810F258: .4byte 0x00000803 _0810F25C: .4byte 0x00000804 thumb_func_end sub_810EE5C - thumb_func_start sub_810F260 -sub_810F260: @ 810F260 + thumb_func_start ClearMenuWindow_BorderThickness2 +ClearMenuWindow_BorderThickness2: @ 810F260 push {r4,r5,lr} adds r4, r1, 0 lsls r0, 24 @@ -583,7 +583,7 @@ _0810F28E: bx r0 .align 2, 0 _0810F294: .4byte sub_810F298 - thumb_func_end sub_810F260 + thumb_func_end ClearMenuWindow_BorderThickness2 thumb_func_start sub_810F298 sub_810F298: @ 810F298 @@ -866,8 +866,8 @@ _0810F4D0: .4byte gUnknown_203ADF0 _0810F4D4: .4byte gUnknown_203ADF2 thumb_func_end DrawWindowBorder - thumb_func_start sub_810F4D8 -sub_810F4D8: @ 810F4D8 + thumb_func_start ClearMenuWindow +ClearMenuWindow: @ 810F4D8 push {r4,r5,lr} adds r4, r1, 0 lsls r0, 24 @@ -893,7 +893,7 @@ _0810F506: bx r0 .align 2, 0 _0810F50C: .4byte sub_810F510 - thumb_func_end sub_810F4D8 + thumb_func_end ClearMenuWindow thumb_func_start sub_810F510 sub_810F510: @ 810F510 @@ -2469,7 +2469,7 @@ sub_81100E8: @ 81100E8 ldr r4, _08110100 @ =gUnknown_203ADF3 ldrb r0, [r4] movs r1, 0x1 - bl sub_810F4D8 + bl ClearMenuWindow ldrb r0, [r4] bl RemoveWindow pop {r4} |