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

SystemID is Lynx not LYNX, cuz I said so

This commit is contained in:
adelikat 2014-11-21 01:32:15 +00:00
parent fa5c614641
commit d64be5ed76
8 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.Common/Global.cs
View File

@ -136,7 +136,7 @@ namespace BizHawk.Client.Common
return SystemInfo.DualGB; return SystemInfo.DualGB;
case "WSWAN": case "WSWAN":
return SystemInfo.WonderSwan; return SystemInfo.WonderSwan;
case "LYNX": case "Lynx":
return SystemInfo.Lynx; return SystemInfo.Lynx;
} }
} }

12
BizHawk.Client.Common/config/PathEntry.cs
View File

@ -296,12 +296,12 @@ namespace BizHawk.Client.Common
new PathEntry { System = "WSWAN", SystemDisplayName = "WonderSwan", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 }, new PathEntry { System = "WSWAN", SystemDisplayName = "WonderSwan", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
new PathEntry { System = "WSWAN", SystemDisplayName = "WonderSwan", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 }, new PathEntry { System = "WSWAN", SystemDisplayName = "WonderSwan", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
new PathEntry { System = "LYNX", SystemDisplayName = "Lynx", Type = "Base", Path = Path.Combine(".", "Lynx"), Ordinal = 0 }, new PathEntry { System = "Lynx", SystemDisplayName = "Lynx", Type = "Base", Path = Path.Combine(".", "Lynx"), Ordinal = 0 },
new PathEntry { System = "LYNX", SystemDisplayName = "Lynx", Type = "ROM", Path = ".", Ordinal = 1 }, new PathEntry { System = "Lynx", SystemDisplayName = "Lynx", Type = "ROM", Path = ".", Ordinal = 1 },
new PathEntry { System = "LYNX", SystemDisplayName = "Lynx", Type = "Savestates", Path= Path.Combine(".", "State"), Ordinal = 2 }, new PathEntry { System = "Lynx", SystemDisplayName = "Lynx", Type = "Savestates", Path= Path.Combine(".", "State"), Ordinal = 2 },
new PathEntry { System = "LYNX", SystemDisplayName = "Lynx", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 }, new PathEntry { System = "Lynx", SystemDisplayName = "Lynx", Type = "Save RAM", Path = Path.Combine(".", "SaveRAM"), Ordinal = 3 },
new PathEntry { System = "LYNX", SystemDisplayName = "Lynx", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 }, new PathEntry { System = "Lynx", SystemDisplayName = "Lynx", Type = "Screenshots", Path = Path.Combine(".", "Screenshots"), Ordinal = 4 },
new PathEntry { System = "LYNX", SystemDisplayName = "Lynx", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 }, new PathEntry { System = "Lynx", SystemDisplayName = "Lynx", Type = "Cheats", Path = Path.Combine(".", "Cheats"), Ordinal = 5 },
}; };
} }
} }

2
BizHawk.Client.Common/movie/PlatformFrameRates.cs
View File

@ -28,7 +28,7 @@ namespace BizHawk.Client.Common
{ "SG_PAL", (3546893 / 313.0 / 228.0) }, //49.7014320946 { "SG_PAL", (3546893 / 313.0 / 228.0) }, //49.7014320946
{ "NGP", (6144000.0 / (515 * 198)) }, //60.2530155928 { "NGP", (6144000.0 / (515 * 198)) }, //60.2530155928
{ "VBOY", (20000000 / (259 * 384 * 4)) }, //50.2734877735 { "VBOY", (20000000 / (259 * 384 * 4)) }, //50.2734877735
{ "LYNX", 59.8 }, { "Lynx", 59.8 },
{ "WSWAN", (3072000.0 / (159 * 256)) }, //75.4716981132 { "WSWAN", (3072000.0 / (159 * 256)) }, //75.4716981132
{ "GB", 262144.0 / 4389.0 }, //59.7275005696 { "GB", 262144.0 / 4389.0 }, //59.7275005696
{ "GBC", 262144.0 / 4389.0 }, //59.7275005696 { "GBC", 262144.0 / 4389.0 }, //59.7275005696

2
BizHawk.Client.Common/movie/bk2/Bk2MnemonicConstants.cs
View File

@ -240,7 +240,7 @@ namespace BizHawk.Client.Common
} }
}, },
{ {
"LYNX", "Lynx",
new Dictionary<string, char> new Dictionary<string, char>
{ {
{ "Option 1", '1' }, { "Option 1", '1' },

2
BizHawk.Client.EmuHawk/config/FirmwaresConfig.cs
View File

@ -47,7 +47,7 @@ namespace BizHawk.Client.EmuHawk
{ "GEN", "Genesis" }, { "GEN", "Genesis" },
{ "SMS", "Sega Master System" }, { "SMS", "Sega Master System" },
{ "PSX", "Sony PlayStation" }, { "PSX", "Sony PlayStation" },
{ "LYNX", "Atari Lynx" }, { "Lynx", "Atari Lynx" },
}; };
public string TargetSystem = null; public string TargetSystem = null;

2
BizHawk.Emulation.Common/Database/Database.cs
View File

@ -333,7 +333,7 @@ namespace BizHawk.Emulation.Common
break; break;
case ".LNX": case ".LNX":
game.System = "LYNX"; game.System = "Lynx";
break; break;
} }

2
BizHawk.Emulation.Common/Database/FirmwareDatabase.cs
View File

@ -39,7 +39,7 @@ namespace BizHawk.Emulation.Common
Option("GBA", "Bios", GBA_JDebug); Option("GBA", "Bios", GBA_JDebug);
} }
FirmwareAndOption("E4ED47FAE31693E016B081C6BDA48DA5B70D7CCB", 512, "LYNX", "Boot", "lynxboot.img", "Boot Rom"); FirmwareAndOption("E4ED47FAE31693E016B081C6BDA48DA5B70D7CCB", 512, "Lynx", "Boot", "lynxboot.img", "Boot Rom");
//FirmwareAndOption("24F67BDEA115A2C847C8813A262502EE1607B7DF", "NDS", "Bios_Arm7", "biosnds7.rom", "ARM7 Bios"); //FirmwareAndOption("24F67BDEA115A2C847C8813A262502EE1607B7DF", "NDS", "Bios_Arm7", "biosnds7.rom", "ARM7 Bios");

8
BizHawk.Emulation.Cores/Consoles/Atari/lynx/Lynx.cs
View File

@ -16,12 +16,12 @@ namespace BizHawk.Emulation.Cores.Atari.Lynx
{ {
IntPtr Core; IntPtr Core;
[CoreConstructor("LYNX")] [CoreConstructor("Lynx")]
public Lynx(byte[] file, GameInfo game, CoreComm comm) public Lynx(byte[] file, GameInfo game, CoreComm comm)
{ {
CoreComm = comm; CoreComm = comm;
byte[] bios = CoreComm.CoreFileProvider.GetFirmware("LYNX", "Boot", true, "Boot rom is required"); byte[] bios = CoreComm.CoreFileProvider.GetFirmware("Lynx", "Boot", true, "Boot rom is required");
if (bios.Length != 512) if (bios.Length != 512)
throw new MissingFirmwareException("Lynx Bootrom must be 512 bytes!"); throw new MissingFirmwareException("Lynx Bootrom must be 512 bytes!");
@ -45,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Atari.Lynx
if (bs93 == "BS93") if (bs93 == "BS93")
throw new InvalidOperationException("Unsupported BS93 Lynx ram image"); throw new InvalidOperationException("Unsupported BS93 Lynx ram image");
if (header == "LYNX" && (ver & 255) == 1) if (header == "Lynx" && (ver & 255) == 1)
{ {
Console.WriteLine("Processing Handy-Lynx header"); Console.WriteLine("Processing Handy-Lynx header");
pagesize0 = p0; pagesize0 = p0;
@ -138,7 +138,7 @@ namespace BizHawk.Emulation.Cores.Atari.Lynx
public int LagCount { get; set; } public int LagCount { get; set; }
public bool IsLagFrame { get; private set; } public bool IsLagFrame { get; private set; }
public string SystemId { get { return "LYNX"; } } public string SystemId { get { return "Lynx"; } }
public bool DeterministicEmulation { get { return true; } } public bool DeterministicEmulation { get { return true; } }