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

gbahawk: all inputs are no longer delayed by one frame. existing movies will need one blank frame inserted at the beginning to resync.

This commit is contained in:
goyuken 2014-11-14 00:24:15 +00:00
parent aa38ad24a2
commit d1292d8a48
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
output/dll/libvbanext.dll
View File

Binary file not shown.

59
vbanext/instance.cpp
View File

@ -12610,32 +12610,8 @@ updateLoop:
io_registers[REG_DISPSTAT] &= 0xFFFD; io_registers[REG_DISPSTAT] &= 0xFFFD;
if(io_registers[REG_VCOUNT] == 160) if(io_registers[REG_VCOUNT] == 160)
{ {
/* update joystick information */ // moved to start of emulated frame
io_registers[REG_P1] = 0x03FF ^ (joy & 0x3FF); //UpdateJoypad();
#if 0
if(cpuEEPROMSensorEnabled)
systemUpdateMotionSensor();
#endif
UPDATE_REG(0x130, io_registers[REG_P1]);
io_registers[REG_P1CNT] = READ16LE(((uint16_t *)&ioMem[0x132]));
// this seems wrong, but there are cases where the game
// can enter the stop state without requesting an IRQ from
// the joypad.
if((io_registers[REG_P1CNT] & 0x4000) || stopState) {
uint16_t p1 = (0x3FF ^ io_registers[REG_P1CNT]) & 0x3FF;
if(io_registers[REG_P1CNT] & 0x8000) {
if(p1 == (io_registers[REG_P1CNT] & 0x3FF)) {
io_registers[REG_IF] |= 0x1000;
UPDATE_REG(0x202, io_registers[REG_IF]);
}
} else {
if(p1 & io_registers[REG_P1CNT]) {
io_registers[REG_IF] |= 0x1000;
UPDATE_REG(0x202, io_registers[REG_IF]);
}
}
}
io_registers[REG_DISPSTAT] |= 1; io_registers[REG_DISPSTAT] |= 1;
io_registers[REG_DISPSTAT] &= 0xFFFD; io_registers[REG_DISPSTAT] &= 0xFFFD;
@ -13016,6 +12992,36 @@ void systemOnWriteDataToSoundBuffer(int16_t * finalWave, int length)
systemAudioFrameSamp = nullptr; systemAudioFrameSamp = nullptr;
} }
void UpdateJoypad()
{
/* update joystick information */
io_registers[REG_P1] = 0x03FF ^ (joy & 0x3FF);
#if 0
if(cpuEEPROMSensorEnabled)
systemUpdateMotionSensor();
#endif
UPDATE_REG(0x130, io_registers[REG_P1]);
io_registers[REG_P1CNT] = READ16LE(((uint16_t *)&ioMem[0x132]));
// this seems wrong, but there are cases where the game
// can enter the stop state without requesting an IRQ from
// the joypad.
if((io_registers[REG_P1CNT] & 0x4000) || stopState) {
uint16_t p1 = (0x3FF ^ io_registers[REG_P1CNT]) & 0x3FF;
if(io_registers[REG_P1CNT] & 0x8000) {
if(p1 == (io_registers[REG_P1CNT] & 0x3FF)) {
io_registers[REG_IF] |= 0x1000;
UPDATE_REG(0x202, io_registers[REG_IF]);
}
} else {
if(p1 & io_registers[REG_P1CNT]) {
io_registers[REG_IF] |= 0x1000;
UPDATE_REG(0x202, io_registers[REG_IF]);
}
}
}
}
public: public:
template<bool isReader>void SyncState(NewState *ns) template<bool isReader>void SyncState(NewState *ns)
@ -13368,6 +13374,7 @@ template<bool isReader>bool SyncBatteryRam(NewState *ns)
systemAudioFrameDest = audiobuffer; systemAudioFrameDest = audiobuffer;
systemAudioFrameSamp = numsamp; systemAudioFrameSamp = numsamp;
lagged = true; lagged = true;
UpdateJoypad();
do do
{ {
CPULoop(); CPULoop();