From aa6654cf9d68e1c7364d6e7902e2178351dd0fe9 Mon Sep 17 00:00:00 2001 From: adelikat Date: Sun, 16 Feb 2020 12:51:55 -0600 Subject: [PATCH] fix a7800hawk text savestates --- .../Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs | 7 +++++-- .../Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs | 4 ++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs index b631145824..8404c8e835 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/A7800Hawk.IStatable.cs @@ -6,14 +6,17 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk { private void SyncState(Serializer ser) { + ser.BeginSection("Atari7800"); + cpu.SyncState(ser); tia.SyncState(ser); maria.SyncState(ser); m6532.SyncState(ser); + ser.BeginSection("Mapper"); mapper.SyncState(ser); + ser.EndSection(); pokey.SyncState(ser); - ser.BeginSection("Atari7800"); ser.Sync("Lag", ref _lagCount); ser.Sync("Frame", ref _frame); ser.Sync("IsLag", ref _isLag); @@ -35,7 +38,7 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk ser.Sync(nameof(cpu_resume_pending), ref cpu_resume_pending); ser.Sync(nameof(slow_access), ref slow_access); - ser.Sync(nameof(slow_access), ref slow_countdown); + ser.Sync(nameof(slow_countdown), ref slow_countdown); ser.Sync("small flag", ref small_flag); ser.Sync("pal kara", ref PAL_Kara); ser.Sync("Cart RAM", ref cart_RAM); diff --git a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs index 150358532d..bdac1a9b3b 100644 --- a/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs +++ b/BizHawk.Emulation.Cores/Consoles/Atari/A7800Hawk/TIA_Sound/Tia.SyncState.cs @@ -23,8 +23,12 @@ namespace BizHawk.Emulation.Cores.Atari.A7800Hawk ser.Sync("FrameStartCycles", ref _frameStartCycles); ser.Sync("FrameEndCycles", ref _frameEndCycles); + ser.BeginSection("AUD0"); AUD[0].SyncState(ser); + ser.EndSection(); + ser.BeginSection("AUD1"); AUD[1].SyncState(ser); + ser.EndSection(); ser.EndSection(); }