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/use_pokeblock.s | |
| parent | 5b526906e1dc4b3dd55cc739670836718a90dff7 (diff) | |
| parent | 6d73bb4b57efb3ff81dcc2aa0d00d5de380add9e (diff) | |
Merge branch 'master' into link
Diffstat (limited to 'asm/use_pokeblock.s')
| -rwxr-xr-x | asm/use_pokeblock.s | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/asm/use_pokeblock.s b/asm/use_pokeblock.s index 3c580654c..f22fd9061 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -1240,7 +1240,7 @@ sub_8166D44: @ 8166D44 thumb_func_start sub_8166DE4 sub_8166DE4: @ 8166DE4 push {r4,lr} - bl sub_8198C58 + bl ProcessMenuInputNoWrap_ lsls r0, 24 lsrs r4, r0, 24 asrs r1, r0, 24 |