diff options
| author | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
|---|---|---|
| committer | dannye <33dannye@gmail.com> | 2025-07-02 21:15:13 -0500 |
| commit | ca019eac8fd96559f4d4e712f0b53e95492e5dcb (patch) | |
| tree | 209a500e3bda6c2109e5acec60448e9e52f8c2af /engine/joypad.asm | |
| parent | Use more ldpikacry (diff) | |
| parent | Require RGBDS 0.9.3 for its DMG palette specs (#513) (diff) | |
| download | pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.gz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.tar.xz pokeyellow-ca019eac8fd96559f4d4e712f0b53e95492e5dcb.zip | |
Merge branch 'master' of https://github.com/pret/pokered
Diffstat (limited to 'engine/joypad.asm')
| -rw-r--r-- | engine/joypad.asm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engine/joypad.asm b/engine/joypad.asm index 8b514999..7ebb88ef 100644 --- a/engine/joypad.asm +++ b/engine/joypad.asm @@ -37,8 +37,8 @@ _Joypad:: ldh a, [hJoyInput] ld b, a - and A_BUTTON + B_BUTTON + SELECT + START + D_UP - cp A_BUTTON + B_BUTTON + SELECT + START ; soft reset + and PAD_BUTTONS | PAD_UP + cp PAD_BUTTONS ; soft reset jp z, TrySoftReset ldh a, [hJoyLast] |