diff options
| author | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
|---|---|---|
| committer | PikalaxALT <pikalaxalt@gmail.com> | 2016-07-21 07:58:36 -0400 |
| commit | 803c6081d7b458f1965c4b9e62be2714b73fcdf4 (patch) | |
| tree | 94632a90406f3b185d82cabee2beb834bd711215 /home/joypad.asm | |
| parent | c33ba049a5a993fc678fd1698645039ce4974022 (diff) | |
| parent | a32b6ccbb5b9ad15befa3b9893659f2ceabd1ba0 (diff) | |
Merge github.com:pikalaxalt/pokecrystal
Diffstat (limited to 'home/joypad.asm')
| -rw-r--r-- | home/joypad.asm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/home/joypad.asm b/home/joypad.asm index d66cdb662..0cb2f6206 100644 --- a/home/joypad.asm +++ b/home/joypad.asm @@ -33,7 +33,7 @@ Joypad:: ; 935 ret nz ; If we're saving, input is disabled. - ld a, [wc2cd] + ld a, [wGameLogicPaused] and a ret nz @@ -42,9 +42,8 @@ Joypad:: ; 935 ld a, R_DPAD ld [rJOYP], a ; Read twice to give the request time to take. -rept 2 ld a, [rJOYP] -endr + ld a, [rJOYP] ; The Joypad register output is in the lo nybble (inversed). ; We make the hi nybble of our new container d-pad input. @@ -209,9 +208,8 @@ GetJoypad:: ; 984 jr nz, .next ; The current input is overwritten. -rept 2 dec hl -endr + dec hl ld b, NO_INPUT jr .finishauto |