diff options
| author | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 13:23:47 -0500 |
|---|---|---|
| committer | Rangi <remy.oukaour+rangi42@gmail.com> | 2020-11-05 15:15:37 -0500 |
| commit | 472f5824a65eaa76f6c92e66bfabb1a1eac66442 (patch) | |
| tree | 14b4ba61b32f85c88011ad636f323e1da49b1212 /engine/joypad.asm | |
| parent | Syn base stats' tmhm formatting with pokered (diff) | |
| download | pokeyellow-472f5824a65eaa76f6c92e66bfabb1a1eac66442.tar.gz pokeyellow-472f5824a65eaa76f6c92e66bfabb1a1eac66442.tar.xz pokeyellow-472f5824a65eaa76f6c92e66bfabb1a1eac66442.zip | |
Sync more with pokered
Diffstat (limited to 'engine/joypad.asm')
| -rw-r--r-- | engine/joypad.asm | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/engine/joypad.asm b/engine/joypad.asm index 06a15e4e..d50eea08 100644 --- a/engine/joypad.asm +++ b/engine/joypad.asm @@ -7,7 +7,6 @@ ReadJoypad_:: ret nz ld a, 1 << 5 ; select direction keys - ;ld c, 0 ldh [rJOYP], a ldh a, [rJOYP] @@ -19,9 +18,9 @@ ReadJoypad_:: ld a, 1 << 4 ; select button keys ldh [rJOYP], a - REPT 6 +REPT 6 ldh a, [rJOYP] - ENDR +ENDR cpl and %1111 or b @@ -32,14 +31,13 @@ ReadJoypad_:: ldh [rJOYP], a ret - _Joypad:: ; hJoyReleased: (hJoyLast ^ hJoyInput) & hJoyLast ; hJoyPressed: (hJoyLast ^ hJoyInput) & hJoyInput ldh a, [hJoyInput] ld b, a - and $4F + and A_BUTTON + B_BUTTON + SELECT + START + D_UP cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset jp z, TrySoftReset |