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

fix #2864 (#2869) 

* fix #2864

* attempt to preserve 2c8295b behavior

* misc
This commit is contained in:
CasualPokePlayer 2021-07-25 06:10:51 -07:00 committed by GitHub
parent 4b6fc89a71
commit 62fcf9cc1d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
View File

@ -16,9 +16,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
/// </summary> /// </summary>
/// <param name="game">Game information of game to load</param> /// <param name="game">Game information of game to load</param>
/// <param name="file">Rom that should be loaded</param> /// <param name="file">Rom that should be loaded</param>
/// <param name="rom">rom data with consistent endianness/order</param>
/// <param name="syncSettings">N64SyncSettings object</param> /// <param name="syncSettings">N64SyncSettings object</param>
[CoreConstructor("N64")] [CoreConstructor("N64")]
public N64(GameInfo game, byte[] file, N64Settings settings, N64SyncSettings syncSettings) public N64(GameInfo game, byte[] file, byte[] rom, N64Settings settings, N64SyncSettings syncSettings)
{ {
ServiceProvider = new BasicServiceProvider(this); ServiceProvider = new BasicServiceProvider(this);
InputCallbacks = new InputCallbackSystem(); InputCallbacks = new InputCallbackSystem();
@ -44,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
IsOverridingUserExpansionSlotSetting = true; IsOverridingUserExpansionSlotSetting = true;
} }
byte country_code = file[0x3E]; byte country_code = rom[0x3E];
switch (country_code) switch (country_code)
{ {
// PAL codes // PAL codes