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

NES: Support trainered roms because CHAOTIC NEUTRAL

This commit is contained in:
nattthebear 2015-08-10 19:41:50 -04:00
parent 36f56f3530
commit 6dfc43a0ed
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.BoardSystem.cs
View File

@ -438,6 +438,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
public GameInfo DB_GameInfo;
public string name;
public int trainer_size;
public int chr_size;
public int prg_size;
public int wram_size, vram_size;

24
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.cs
View File

@ -691,21 +691,28 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
}
byte[] trainer = null;
//create the board's rom and vrom
if (iNesHeaderInfo != null)
{
var ms = new MemoryStream(file, false);
ms.Seek(16, SeekOrigin.Begin); // ines header
//pluck the necessary bytes out of the file
if (iNesHeaderInfo.trainer_size != 0)
{
trainer = new byte[512];
ms.Read(trainer, 0, 512);
}
Board.ROM = new byte[choice.prg_size * 1024];
Array.Copy(file, 16, Board.ROM, 0, Board.ROM.Length);
ms.Read(Board.ROM, 0, Board.ROM.Length);
if (choice.chr_size > 0)
{
Board.VROM = new byte[choice.chr_size * 1024];
int vrom_offset = iNesHeaderInfo.prg_size * 1024;
int vrom_copy_size = ms.Read(Board.VROM, 0, Board.VROM.Length);
// if file isn't long enough for VROM, truncate
int vrom_copy_size = Math.Min(Board.VROM.Length, file.Length - 16 - vrom_offset);
Array.Copy(file, 16 + vrom_offset, Board.VROM, 0, vrom_copy_size);
if (vrom_copy_size < Board.VROM.Length)
LoadWriteLine("Less than the expected VROM was found in the file: {0} < {1}", vrom_copy_size, Board.VROM.Length);
}
@ -760,6 +767,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
Console.WriteLine("Using NES system region of {0}", _display_type);
HardReset();
if (trainer != null)
{
Console.WriteLine("Applying trainer");
for (int i = 0; i < 512; i++)
WriteMemory((ushort)(0x7000 + i), trainer[i]);
}
}
static NESSyncSettings.Region DetectRegion(string system)

4
BizHawk.Emulation.Cores/Consoles/Nintendo/NES/NES.iNES.cs
View File

@ -63,6 +63,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
case 1: CartV2.pad_h = 1; break;
}
if ((data[6] & 4) != 0)
CartV2.trainer_size = 512;
}
else
{
@ -99,7 +101,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.NES
}
if (data[6].Bit(2))
Console.WriteLine("DANGER: According to the flags, this iNES has a trainer in it! We don't support this garbage.");
Cart.trainer_size = 512;
return true;
}