summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTwinaphex2015-03-20 04:55:00 +0100
committerTwinaphex2015-03-20 04:55:00 +0100
commitac83fb25f0c7f59350b92819e83e8fdecb7fc397 (patch)
tree080764eb1087d7a0c65ccfdcfbc26c379a9750fa
parentfccecaa7c88b4943d85aebe6412a98f6165a8f36 (diff)
parent9bfbd02b2bfba3bb2362d4cdf566a632d14186cd (diff)
downloadsnes9x2002-ac83fb25f0c7f59350b92819e83e8fdecb7fc397.tar.gz
snes9x2002-ac83fb25f0c7f59350b92819e83e8fdecb7fc397.tar.bz2
snes9x2002-ac83fb25f0c7f59350b92819e83e8fdecb7fc397.zip
Merge pull request #8 from petnic/master
Added multiplayer support
-rw-r--r--src/ppu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ppu.cpp b/src/ppu.cpp
index 19340fb..6d1af27 100644
--- a/src/ppu.cpp
+++ b/src/ppu.cpp
@@ -714,7 +714,7 @@ uint8 S9xGetCPU(uint16 Address)
}
}
return (
- (IPPU.Joypads[0]
+ (IPPU.Joypads[1]
>> (PPU.Joypad2ButtonReadPos++ ^ 15))
& 1);
}