diff options
| author | scnorton <scnorton@biociphers.org> | 2017-12-17 14:09:06 -0500 |
|---|---|---|
| committer | scnorton <scnorton@biociphers.org> | 2017-12-17 14:09:06 -0500 |
| commit | 3c2b1731eeb7037a1b681444b1c126fc239a904e (patch) | |
| tree | 62a669899696f21e7991c226e0eb7e999b3c3ee5 /asm/menu.s | |
| parent | 5b526906e1dc4b3dd55cc739670836718a90dff7 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/menu.s')
| -rwxr-xr-x | asm/menu.s | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/asm/menu.s b/asm/menu.s index e1102893a..64644504e 100755 --- a/asm/menu.s +++ b/asm/menu.s @@ -2266,8 +2266,8 @@ sub_8198C34: @ 8198C34 bx r0 thumb_func_end sub_8198C34 - thumb_func_start sub_8198C58 -sub_8198C58: @ 8198C58 + thumb_func_start ProcessMenuInputNoWrap_ +ProcessMenuInputNoWrap_: @ 8198C58 push {r4,lr} bl ProcessMenuInputNoWrapAround lsls r0, 24 @@ -2282,7 +2282,7 @@ _08198C6E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8198C58 + thumb_func_end ProcessMenuInputNoWrap_ thumb_func_start sub_8198C78 sub_8198C78: @ 8198C78 |