From 62fcf9cc1dc951c2039d1adc7e8bc33aed049123 Mon Sep 17 00:00:00 2001
From: CasualPokePlayer <50538166+CasualPokePlayer@users.noreply.github.com>
Date: Sun, 25 Jul 2021 06:10:51 -0700
Subject: [PATCH] fix #2864 (#2869)
* fix #2864
* attempt to preserve 2c8295b behavior
* misc
---
src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
index 40fc52c6a5..5fed267416 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/N64/N64.cs
@@ -16,9 +16,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
///
/// Game information of game to load
/// Rom that should be loaded
+ /// rom data with consistent endianness/order
/// N64SyncSettings object
[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);
InputCallbacks = new InputCallbackSystem();
@@ -44,7 +45,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.N64
IsOverridingUserExpansionSlotSetting = true;
}
- byte country_code = file[0x3E];
+ byte country_code = rom[0x3E];
switch (country_code)
{
// PAL codes