From c16b47cbe4c5de62fea0a30524569350d3f52719 Mon Sep 17 00:00:00 2001 From: alyosha-tas Date: Tue, 25 Feb 2020 08:06:43 -0500 Subject: [PATCH] GBHawk: rename GB compat cpu to have proper dependency --- .../Consoles/Nintendo/GBHawk/{GBC_PPU_GB.cs => GBC_GB_PPU.cs} | 2 +- BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/{GBC_PPU_GB.cs => GBC_GB_PPU.cs} (99%) diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs similarity index 99% rename from BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs rename to BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs index 15a3770287..0436404992 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs @@ -7,7 +7,7 @@ using BizHawk.Common; // has several quirks not present in GB ppu namespace BizHawk.Emulation.Cores.Nintendo.GBHawk { - public class GBC_PPU_GB : PPU + public class GBC_GB_PPU : PPU { // individual byte used in palette colors public byte[] BG_bytes = new byte[64]; diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs index 377fb60fad..e5c38f694c 100644 --- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs +++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBHawk.cs @@ -166,7 +166,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk if (is_GBC && ((header[0x43] != 0x80) && (header[0x43] != 0xC0))) { - ppu = new GBC_PPU_GB(); + ppu = new GBC_GB_PPU(); } Console.WriteLine("MD5: " + rom.HashMD5(0, rom.Length));