From 206ea9887bb04a2b9f6c8956c409a514fdf22238 Mon Sep 17 00:00:00 2001 From: "J.D. Purcell" Date: Wed, 14 Dec 2016 18:35:03 -0500 Subject: [PATCH] Text savestate fixes. --- BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs | 2 +- BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs | 6 +++--- BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs | 2 +- .../Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs | 2 +- .../Consoles/Nintendo/NES/Boards/SxROM.cs | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs index 755bc572b3..2cb38dbbf9 100644 --- a/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs +++ b/BizHawk.Emulation.Cores/CPUs/CP1610/CP1610.cs @@ -53,7 +53,7 @@ namespace BizHawk.Emulation.Cores.Components.CP1610 ser.Sync("Interruptible", ref Interruptible); ser.Sync("Interrupted", ref Interrupted); ser.Sync("Toal_executed_cycles", ref TotalExecutedCycles); - ser.Sync("Pending Cycles", ref PendingCycles); + ser.Sync("Pending_Cycles", ref PendingCycles); ser.EndSection(); diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs index 7fbfb04004..17293c36ed 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/PSG.cs @@ -114,15 +114,15 @@ namespace BizHawk.Emulation.Cores.Intellivision ser.Sync("Register", ref Register, false); ser.Sync("Toal_executed_cycles", ref TotalExecutedCycles); - ser.Sync("Pending Cycles", ref PendingCycles); + ser.Sync("Pending_Cycles", ref PendingCycles); ser.Sync("sample_count", ref sample_count); ser.Sync("psg_clock", ref psg_clock); ser.Sync("clock_A", ref clock_A); ser.Sync("clock_B", ref clock_B); ser.Sync("clock_C", ref clock_C); - ser.Sync("noise clock", ref noise_clock); - ser.Sync("noise clock", ref env_clock); + ser.Sync("noise_clock", ref noise_clock); + ser.Sync("env_clock", ref env_clock); ser.Sync("A_up", ref A_up); ser.Sync("B_up", ref B_up); ser.Sync("C_up", ref C_up); diff --git a/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs b/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs index c7deda68d5..3a2529e501 100644 --- a/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs +++ b/BizHawk.Emulation.Cores/Consoles/Intellivision/STIC.cs @@ -34,7 +34,7 @@ namespace BizHawk.Emulation.Cores.Intellivision ser.Sync("Sst", ref Sst); ser.Sync("Fgbg", ref Fgbg); ser.Sync("Toal_executed_cycles", ref TotalExecutedCycles); - ser.Sync("Pending Cycles", ref PendingCycles); + ser.Sync("Pending_Cycles", ref PendingCycles); ser.Sync("Registers", ref Register, false); ser.EndSection(); diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs index 3021fa9c2c..6cb98ebfbd 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/Namcot1xx/Namcot1xx.cs @@ -125,7 +125,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES if (NES._isVS) ser.Sync("CIRAM_VS", ref CIRAM_VS, false); - ser.Sync("tko security", ref tko_security); + ser.Sync("tko_security", ref tko_security); mapper.SyncState(ser); } diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs index d70cdcc43d..db2565d3f2 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/NES/Boards/SxROM.cs @@ -399,7 +399,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES base.SyncState(ser); mmc1.SyncState(ser); ser.Sync("ppuclock", ref ppuclock); - ser.Sync("chr wram enable", ref chr_wram_enable); + ser.Sync("chr_wram_enable", ref chr_wram_enable); if (NES._isVS) ser.Sync("VS_CIRAM", ref CIRAM_VS, false); }