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

GB I/O: SGB multiplayer cleanup (fixes #1067)

This commit is contained in:
Vicki Pfau 2018-04-24 21:31:53 -07:00
parent 5d0bbcd512
commit 7731516388
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/gb/io.c
View File

@ -113,10 +113,6 @@ static void _writeSGBBits(struct GB* gb, int bits) {
return;
}
gb->currentSgbBits = bits;
if (gb->sgbBit == 128 && bits == 2) {
GBVideoWriteSGBPacket(&gb->video, gb->sgbPacket);
++gb->sgbBit;
}
if (gb->sgbBit > 128) {
switch (bits) {
case 1:
@ -126,13 +122,17 @@ static void _writeSGBBits(struct GB* gb, int bits) {
gb->sgbBit |= 4;
break;
case 3:
if (gb->sgbBit == 135 && bits == 3 && !(gb->video.sgbCommandHeader & 7)) {
if (gb->sgbBit == 135) {
gb->sgbBit &= ~6;
gb->sgbCurrentController = (gb->sgbCurrentController + 1) & gb->sgbControllers;
}
break;
}
}
if (gb->sgbBit == 128 && bits == 2) {
GBVideoWriteSGBPacket(&gb->video, gb->sgbPacket);
++gb->sgbBit;
}
if (gb->sgbBit >= 128) {
return;
}
@ -524,7 +524,7 @@ static uint8_t _readKeys(struct GB* gb) {
}
switch (gb->memory.io[REG_JOYP] & 0x30) {
case 0x30:
keys = 0xF - gb->sgbCurrentController;
keys = gb->sgbCurrentController;
break;
case 0x20:
keys >>= 4;