diff options
| author | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
|---|---|---|
| committer | surskitty <surskitty@gmail.com> | 2017-12-11 17:37:34 -0500 |
| commit | 98128cd4d8457948e7136a16e08bacff0bc3529d (patch) | |
| tree | 171c67509afba62571266bd6bebbfdb829d2a876 /home/joypad.asm | |
| parent | 069ae7e2f3bc4f3939a4b97d6200a3fcdacc904b (diff) | |
| parent | 94c7def4883fbdbcd3987a067443a2069b8bb610 (diff) | |
Merge branch 'master' of github.com:pret/pokecrystal
Diffstat (limited to 'home/joypad.asm')
| -rw-r--r-- | home/joypad.asm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/home/joypad.asm b/home/joypad.asm index 0cb2f6206..0f5060c63 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -130,7 +130,7 @@ GetJoypad:: ; 984 ; The player input can be automated using an input stream. ; See more below. ld a, [InputType] - cp a, AUTO_INPUT + cp AUTO_INPUT jr z, .auto ; To get deltas, take this and last frame's input. @@ -197,14 +197,14 @@ GetJoypad:: ; 984 .updateauto ; An input of $ff will end the stream. ld a, [hli] - cp a, -1 + cp -1 jr z, .stopauto ld b, a ; A duration of $ff will end the stream indefinitely. ld a, [hli] ld [AutoInputLength], a - cp a, -1 + cp -1 jr nz, .next ; The current input is overwritten. |