mirror of
https://github.com/bsnes-emu/bsnes.git
synced 2025-04-02 10:42:14 -04:00
393c2395bb
byuu says:
The problems with the Windows and Qt4 ports have all been resolved,
although there's a fairly gross hack on a few Qt widgets to not destruct
once Application::quit() is called to avoid a double free crash (I'm
unsure where Qt is destructing the widgets internally.) The Cocoa port
compiles again at least, though it's bound to have endless problems. I
improved the Label painting in the GTK ports, which fixes the background
color on labels inside TabFrame widgets.
I've optimized the Makefile system even further.
I added a "redo state" command to bsnes, which is created whenever you
load the undo state. There are also hotkeys for both now, although I
don't think they're really something you want to map hotkeys to.
I moved the nall::Locale object inside hiro::Application, so that it can
be used to translate the BrowserDialog and MessageDialog window strings.
I improved the Super Game Boy emulation of `MLT_REQ`, fixing Pokemon
Yellow's custom border and probably more stuff.
Lots of other small fixes and improvements. Things are finally stable
once again after the harrowing layout redesign catastrophe.
Errata:
- ICD::joypID should be set to 3 on reset(). joypWrite() may as well
take uint1 instead of bool.
- hiro/Qt: remove pWindow::setMaximumSize() comment; found a
workaround for it
- nall/GNUmakefile: don't set object.path if it's already set (allow
overrides before including the file)
93 lines
2.2 KiB
C++
93 lines
2.2 KiB
C++
auto ICD::lcdScanline() -> void {
|
|
if(GameBoy::ppu.status.ly > 143) return; //Vblank
|
|
if((GameBoy::ppu.status.ly & 7) == 0) {
|
|
writeBank = (writeBank + 1) & 3;
|
|
writeAddress = 0;
|
|
}
|
|
}
|
|
|
|
auto ICD::lcdOutput(uint2 color) -> void {
|
|
uint y = writeAddress / 160;
|
|
uint x = writeAddress % 160;
|
|
uint addr = writeBank * 512 + y * 2 + x / 8 * 16;
|
|
output[addr + 0] = (output[addr + 0] << 1) | color.bit(0);
|
|
output[addr + 1] = (output[addr + 1] << 1) | color.bit(1);
|
|
writeAddress = (writeAddress + 1) % 1280;
|
|
}
|
|
|
|
auto ICD::joypRead() -> uint4 {
|
|
return 0xf - joypID;
|
|
}
|
|
|
|
auto ICD::joypWrite(bool p15, bool p14) -> void {
|
|
//joypad handling
|
|
if(p15 == 1 && p14 == 1) {
|
|
if(joyp15Lock == 0 && joyp14Lock == 0) {
|
|
joyp15Lock = 1;
|
|
joyp14Lock = 1;
|
|
joypID++;
|
|
if(mltReq == 0) joypID &= 0; //1-player mode
|
|
if(mltReq == 1) joypID &= 1; //2-player mode
|
|
if(mltReq == 2) joypID &= 3; //4-player mode (unverified; but the most likely behavior)
|
|
if(mltReq == 3) joypID &= 3; //4-player mode
|
|
}
|
|
}
|
|
|
|
if(p15 == 0 && p14 == 1) joyp15Lock = 0;
|
|
if(p15 == 1 && p14 == 0) joyp14Lock = 0;
|
|
|
|
//packet handling
|
|
if(p15 == 0 && p14 == 0) { //pulse
|
|
pulseLock = false;
|
|
packetOffset = 0;
|
|
bitOffset = 0;
|
|
strobeLock = true;
|
|
packetLock = false;
|
|
return;
|
|
}
|
|
|
|
if(pulseLock) return;
|
|
|
|
if(p15 == 1 && p14 == 1) {
|
|
strobeLock = false;
|
|
return;
|
|
}
|
|
|
|
if(strobeLock) {
|
|
if(p15 == 1 || p14 == 1) { //malformed packet
|
|
packetLock = false;
|
|
pulseLock = true;
|
|
bitOffset = 0;
|
|
packetOffset = 0;
|
|
} else {
|
|
return;
|
|
}
|
|
}
|
|
|
|
//p15:1, p14:0 = 0
|
|
//p15:0, p14:1 = 1
|
|
bool bit = (p15 == 0);
|
|
strobeLock = true;
|
|
|
|
if(packetLock) {
|
|
if(p15 == 1 && p14 == 0) {
|
|
if((joypPacket[0] >> 3) == 0x11) {
|
|
mltReq = joypPacket[1] & 3;
|
|
joypID = 3; //required: the next time P14==1 && P15==1; increment and start from ID=0 (Joypad 1)
|
|
}
|
|
|
|
if(packetSize < 64) packet[packetSize++] = joypPacket;
|
|
packetLock = false;
|
|
pulseLock = true;
|
|
}
|
|
return;
|
|
}
|
|
|
|
bitData = (bit << 7) | (bitData >> 1);
|
|
if(++bitOffset < 8) return;
|
|
|
|
bitOffset = 0;
|
|
joypPacket[packetOffset] = bitData;
|
|
if(++packetOffset < 16) return;
|
|
packetLock = true;
|
|
}
|