diff options
| author | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
|---|---|---|
| committer | DizzyEggg <jajkodizzy@wp.pl> | 2017-12-18 16:58:14 +0100 |
| commit | cb229f56e8951e3f9efc35516447a54e18e8fef0 (patch) | |
| tree | 656599caae716c6cc8e81121f2b1cd061927b99e /asm/use_pokeblock.s | |
| parent | c3abe2863feb8ebb21921c40d3c685a27a4135c4 (diff) | |
| parent | 6a674e1e83db097d7a31a3786d12e42987f09f70 (diff) | |
fix pokeblock conflicts
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 9d7014db7..b01f1eff4 100755 --- a/asm/use_pokeblock.s +++ b/asm/use_pokeblock.s @@ -900,7 +900,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 |