Emulation/Mesen2
1
0
Fork 0
mirror of https://github.com/SourMesen/Mesen2.git synced 2025-04-02 10:21:44 -04:00
Code Issues Projects Releases Packages Wiki Activity

SGB: Prevent freeze/lock up when resetting a MBC3 game that has a RTC clock

Browse source
This commit is contained in:
Sour 2025-03-02 11:25:21 +09:00
parent 8d190963da
commit 53f17745d7
3 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Core/Gameboy/Carts/GbMbc3.h
View file

@ -26,6 +26,7 @@ public:
void InitCart() override
{
_memoryManager->MapRegisters(0x0000, 0x7FFF, RegisterAccess::Write);
_rtc.Init();
}
void RefreshMappings() override

9
Core/Gameboy/Carts/GbMbc3Rtc.h
View file

@ -26,8 +26,7 @@ public:
GbMbc3Rtc(Emulator* emu)
{
_emu = emu;
_lastMasterClock = 0;
LoadBattery();
Init();
}
~GbMbc3Rtc()
@ -35,6 +34,12 @@ public:
SaveBattery();
}
void Init()
{
_lastMasterClock = 0;
LoadBattery();
}
void LoadBattery()
{
vector<uint8_t> rtcData = _emu->GetBatteryManager()->LoadBattery(".rtc");

5
Core/SNES/Coprocessors/SGB/SuperGameboy.cpp
View file

@ -46,8 +46,11 @@ SuperGameboy::~SuperGameboy()
void SuperGameboy::Reset()
{
_control = 0;
_control = 0x01;
_effectiveClockRate = 0;
_clockOffset = 0;
_resetClock = 0;
UpdateClockRatio();
memset(_input, 0, sizeof(_input));
_inputIndex = 0;