From d7ee6ba579aa7e320b30318bdc0f5b6303268df4 Mon Sep 17 00:00:00 2001
From: alyosha-tas <alexei.f.k@gmail.com>
Date: Sat, 12 Oct 2019 16:04:13 -0400
Subject: [PATCH] GBHawk: Misc cleanup

---
 BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs       |  9 ++++-----
 .../Consoles/Nintendo/GBHawk/GBC_PPU.cs               | 11 +++++------
 .../Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs            |  3 +--
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
index 941179ed58..79d5e2f62e 100644
--- a/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
+++ b/BizHawk.Emulation.Cores/CPUs/LR35902/LR35902.cs
@@ -312,13 +312,12 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 							if (!Halt_bug_3)
 							{
 								INTERRUPT_GBC_NOP();
-								//INTERRUPT_();
 							}
 							else
 							{
 								INTERRUPT_();
 								Halt_bug_3 = false;
-								Console.WriteLine("Hit INT");
+								//Console.WriteLine("Hit INT");
 							}
 						}
 						else
@@ -353,7 +352,7 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 								RegPC++;
 								FetchInstruction(ReadMemory(RegPC));
 								Halt_bug_3 = false;
-								Console.WriteLine("Hit un");
+								//Console.WriteLine("Hit un");
 							}
 							else
 							{
@@ -538,8 +537,8 @@ namespace BizHawk.Emulation.Common.Components.LR35902
 					{
 						RegPC--;
 						Halt_bug_3 = true;
-						Console.WriteLine("Halt_bug_3");
-						Console.WriteLine(TotalExecutedCycles);
+						//Console.WriteLine("Halt_bug_3");
+						//Console.WriteLine(TotalExecutedCycles);
 					}
 					
 					Halt_bug_2 = false;
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
index 9bc4589dbd..3ffee95b7b 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
@@ -151,7 +151,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 					LY = 0; /*reset*/
 					break;
 				case 0xFF45:  // LYC
-
 					// tests indicate that latching writes to LYC should take place 4 cycles after the write
 					// otherwise tests around LY boundaries will fail
 					LYC_t = value;
@@ -1144,13 +1143,13 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								OAM_access_read = true;
 								OAM_access_write = true;
 								VRAM_access_read = true;
-								VRAM_access_write = true;
-
-								STAT &= 0xFC;
-								STAT |= 0x00;
+								VRAM_access_write = true;						
 							}
 							else
-							{	
+							{
+								STAT &= 0xFC;
+								STAT |= 0x00;
+
 								if (STAT.Bit(3)) { HBL_INT = true; }
 							}
 						}
diff --git a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs
index fef5761b27..717d5d8238 100644
--- a/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs
+++ b/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU_GB.cs
@@ -3,7 +3,7 @@ using BizHawk.Common.NumberExtensions;
 using BizHawk.Common;
 
 // Gameboy compatibility mode for GBC console
-// only entered from writing to register 0xFF4C
+// seperated out so the GBC ppu can focus on double speed mode
 // has several quirks not present in GB ppu
 namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 {
@@ -155,7 +155,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 					LY = 0; /*reset*/
 					break;
 				case 0xFF45:  // LYC
-
 					// tests indicate that latching writes to LYC should take place 4 cycles after the write
 					// otherwise tests around LY boundaries will fail
 					LYC_t = value;