diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs
index 728685c8fa..59c67a060b 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_GB_PPU.cs
@@ -958,7 +958,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							temp_fetch = y_tile * 32 + (x_tile + tile_inc) % 32;
 							tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch];
 							tile_data[2] = Core.VRAM[0x3800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch];
+
 							bus_return = tile_data[2];
+
 							VRAM_sel = tile_data[2].Bit(3) ? 1 : 0;
 
 							BG_V_flip = tile_data[2].Bit(6) & Core.GBC_compat;
@@ -984,7 +986,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							if (LCDC.Bit(4))
 							{
 								tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2];
-								bus_return = tile_data[0];
 							}
 							else
 							{
@@ -993,10 +994,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								{
 									tile_byte -= 256;
 								}
-								tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2];
-								bus_return = tile_data[0];
+								tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2];							
 							}
 
+							bus_return = tile_data[0];
+
 							read_case = 2;
 						}
 						break;
@@ -1023,7 +1025,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 									tile_byte += 256;
 								}
 								tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2 + 1];
-								bus_return = tile_data[1];
 							}
 							else
 							{
@@ -1032,10 +1033,11 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								{
 									tile_byte -= 256;
 								}
-								tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];
-								bus_return = tile_data[1];
+								tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];								
 							}
 
+							bus_return = tile_data[1];
+
 							if (pre_render)
 							{
 								// here we set up rendering
@@ -1068,6 +1070,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							tile_data[2] = Core.VRAM[0x3800 + (LCDC.Bit(6) ? 1 : 0) * 0x400 + temp_fetch];
 							VRAM_sel = tile_data[2].Bit(3) ? 1 : 0;
 							BG_V_flip = tile_data[2].Bit(6) & Core.GBC_compat;
+
 							bus_return = tile_data[2];
 
 							window_tile_inc++;
@@ -1089,7 +1092,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							if (LCDC.Bit(4))
 							{
 								tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2];
-								bus_return = tile_data[0];
 							}
 							else
 							{
@@ -1099,9 +1101,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 									tile_byte -= 256;
 								}
 								tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2];
-								bus_return = tile_data[0];
 							}
 
+							bus_return = tile_data[0];
+
 							read_case = 6;
 						}
 						window_counter++;
@@ -1125,7 +1128,6 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 									tile_byte += 256;
 								}
 								tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + tile_byte * 16 + y_scroll_offset * 2 + 1];
-								bus_return = tile_data[1];
 							}
 							else
 							{
@@ -1135,9 +1137,10 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 									tile_byte -= 256;
 								}
 								tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];
-								bus_return = tile_data[1];
 							}
 
+							bus_return = tile_data[1];
+
 							if (window_pre_render)
 							{
 								// here we set up rendering
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
index 03b4f783a7..c87fbb0f3e 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GBC_PPU.cs
@@ -924,6 +924,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							temp_fetch = y_tile * 32 + (x_tile + tile_inc) % 32;
 							tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch];
 							tile_data[2] = Core.VRAM[0x3800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch];
+
+							bus_return = tile_data[2];
+
 							VRAM_sel = tile_data[2].Bit(3) ? 1 : 0;
 
 							BG_V_flip = tile_data[2].Bit(6);
@@ -960,6 +963,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2];
 							}
 
+							bus_return = tile_data[0];
+
 							read_case = 2;
 						}
 						break;
@@ -997,6 +1002,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];
 							}
 
+							bus_return = tile_data[1];
+
 							if (pre_render)
 							{
 								// here we set up rendering
@@ -1027,6 +1034,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							temp_fetch = window_y_tile * 32 + (window_x_tile + window_tile_inc) % 32;
 							tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(6) ? 1 : 0) * 0x400 + temp_fetch];
 							tile_data[2] = Core.VRAM[0x3800 + (LCDC.Bit(6) ? 1 : 0) * 0x400 + temp_fetch];
+
+							bus_return = tile_data[2];
+
 							VRAM_sel = tile_data[2].Bit(3) ? 1 : 0;
 							BG_V_flip = tile_data[2].Bit(6);
 
@@ -1060,6 +1070,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								tile_data[0] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2];
 							}
 
+							bus_return = tile_data[0];
+
 							read_case = 6;
 						}
 						window_counter++;
@@ -1094,6 +1106,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								tile_data[1] = Core.VRAM[(VRAM_sel * 0x2000) + 0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];
 							}
 
+							bus_return = tile_data[1];
+
 							if (window_pre_render)
 							{
 								// here we set up rendering
diff --git a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs
index 8bc41f4b4c..de014e983f 100644
--- a/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs
+++ b/src/BizHawk.Emulation.Cores/Consoles/Nintendo/GBHawk/GB_PPU.cs
@@ -664,7 +664,9 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							temp_fetch = y_tile * 32 + (x_tile + tile_inc) % 32;
 							tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(3) ? 1 : 0) * 0x400 + temp_fetch];
 
+							bus_return = (byte)tile_byte;
 							read_case = 1;
+
 							if (!pre_render)
 							{
 								tile_inc++;
@@ -691,6 +693,7 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								tile_data[0] = Core.VRAM[0x1000 + tile_byte * 16 + y_scroll_offset * 2];
 							}
 
+							bus_return = tile_data[0];
 							read_case = 2;
 						}
 						break;
@@ -725,6 +728,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								tile_data[1] = Core.VRAM[0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];
 							}
 
+							bus_return = tile_data[1];
+
 							if (pre_render)
 							{
 								// here we set up rendering
@@ -755,6 +760,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 							temp_fetch = window_y_tile * 32 + (window_x_tile + window_tile_inc) % 32;
 							tile_byte = Core.VRAM[0x1800 + (LCDC.Bit(6) ? 1 : 0) * 0x400 + temp_fetch];
 
+							bus_return = (byte)tile_byte;
+
 							window_tile_inc++;
 							read_case = 5;
 						}
@@ -783,6 +790,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								tile_data[0] = Core.VRAM[0x1000 + tile_byte * 16 + y_scroll_offset * 2];
 							}
 
+							bus_return = tile_data[0];
+
 							read_case = 6;
 						}
 						window_counter++;
@@ -813,6 +822,8 @@ namespace BizHawk.Emulation.Cores.Nintendo.GBHawk
 								tile_data[1] = Core.VRAM[0x1000 + tile_byte * 16 + y_scroll_offset * 2 + 1];
 							}
 
+							bus_return = tile_data[1];
+
 							if (window_pre_render)
 							{
 								// here we set up rendering