diff options
| author | Nebuleon Fumika | 2013-01-05 04:01:01 -0500 |
|---|---|---|
| committer | Nebuleon Fumika | 2013-01-05 04:01:01 -0500 |
| commit | 1c48900fdace9b2ba1cd3b93ecae8aacb1e11168 (patch) | |
| tree | aeebe40a9d6796565ab827c0d01d9e2c8eb1b801 /source | |
| parent | 6df0031bdb8b7de341512e7fb807097243c9f840 (diff) | |
| download | snes9x2005-1c48900fdace9b2ba1cd3b93ecae8aacb1e11168.tar.gz snes9x2005-1c48900fdace9b2ba1cd3b93ecae8aacb1e11168.tar.bz2 snes9x2005-1c48900fdace9b2ba1cd3b93ecae8aacb1e11168.zip | |
Sync ALL bits of the joypad again. This may make controls a bit slower to parse, but is required by Super Mario All-Stars at least.
Diffstat (limited to 'source')
| -rw-r--r-- | source/nds/entry.cpp | 3 | ||||
| -rw-r--r-- | source/ppu.cpp | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/source/nds/entry.cpp b/source/nds/entry.cpp index 9928985..5573f47 100644 --- a/source/nds/entry.cpp +++ b/source/nds/entry.cpp @@ -1001,8 +1001,7 @@ unsigned int S9xReadJoypad (int which1) key |= (inputdata.key & (1<<i)) ? keymap[i] : 0; } - // return (key | 0x80000000); - return key; // ??? [Neb] + return (key | 0x80000000); } else return 0; diff --git a/source/ppu.cpp b/source/ppu.cpp index 91e16a0..9a3230c 100644 --- a/source/ppu.cpp +++ b/source/ppu.cpp @@ -2973,7 +2973,7 @@ void S9xUpdateJoypads () { IPPU.Joypads [i] = 0; // Sync each key - for (k = SNES_TR_MASK /* lowest value */; k != SNES_B_MASK << 1 /* one bit past the highest value */; k <<= 1) + for (k = 1; k != 0; k <<= 1) { KeyValue = IPPU.JoypadsAtHBlanks[i][0] & k; StartedPressed = KeyValue != 0; |