ShuriZma
/
mgba
mirror of https://github.com/mgba-emu/mgba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GB: Fix SGB controller incrementing (fixes #1104)

This commit is contained in:
Vicki Pfau 2019-09-02 22:06:10 -07:00
parent 5bdaff30b7
commit 4dd6a2930a
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -21,6 +21,7 @@ Other fixes:
- GBA: Set up GPIO mapping on null and ELF ROM regions (fixes mgba.io/i/1481)
- GBA Cheats: Fix value incrementing in CB slide codes (fixes mgba.io/i/1501)
- Qt: Improve cheat view UX
- GB: Fix SGB controller incrementing (fixes mgba.io/i/1104)
Misc:
- Qt: Make mute menu option also toggle fast-forward mute (fixes mgba.io/i/1424)
- Qt: Show error message if file failed to load

9
src/gb/io.c
View File

@ -119,14 +119,11 @@ static void _writeSGBBits(struct GB* gb, int bits) {
if (gb->sgbBit > 128) {
switch (bits) {
case 1:
gb->sgbBit |= 2;
break;
case 2:
gb->sgbBit |= 4;
gb->sgbBit ^= 2;
break;
case 3:
if (gb->sgbBit == 135) {
gb->sgbBit &= ~6;
if (gb->sgbBit == 131) {
gb->sgbBit &= ~2;
gb->sgbCurrentController = (gb->sgbCurrentController + 1) & gb->sgbControllers;
}
break;