From a1d24400d042d9451e0583154c0226b6709fd540 Mon Sep 17 00:00:00 2001
From: Asnivor <coding@asnitech.co.uk>
Date: Fri, 8 Jun 2018 14:39:23 +0100
Subject: [PATCH] ZXHawk: proper top border height

---
 .../Machine/ZXSpectrum128K/ZX128.Screen.cs          |  2 +-
 .../ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs      | 13 ++++++++++++-
 .../Machine/ZXSpectrum48K/ZX48.Screen.cs            |  2 +-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs
index 461baf266a..54a0fe058f 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128K/ZX128.Screen.cs
@@ -37,7 +37,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             // screen layout
             ScreenWidth = 256;
             ScreenHeight = 192;
-            BorderTopHeight = 48;
+            BorderTopHeight = 55; // 48;
             BorderBottomHeight = 56;
             BorderLeftWidth = 48;
             BorderRightWidth = 48;
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs
index 2cd69dcaa7..2611a7fd43 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum128KPlus2a/ZX128Plus2a.Screen.cs
@@ -16,6 +16,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             // timing
             ClockSpeed = 3546900;
             FrameCycleLength = 70908;
+            /*
             InterruptStartTime = 31;
             InterruptLength = 32;
             ScanlineTime = 228;
@@ -24,6 +25,16 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             PortContentionOffset = 7;
             RenderTableOffset = 1;
             FloatingBusOffset = 1;
+            */
+
+            InterruptStartTime = 33;
+            InterruptLength = 32;
+            ScanlineTime = 228;
+
+            MemoryContentionOffset = 6;
+            PortContentionOffset = 6;
+            RenderTableOffset = -2;
+            FloatingBusOffset = 1;
 
             BorderLeftTime = 24;
             BorderRightTime = 24;
@@ -37,7 +48,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             // screen layout
             ScreenWidth = 256;
             ScreenHeight = 192;
-            BorderTopHeight = 48;
+            BorderTopHeight = 55;
             BorderBottomHeight = 56;
             BorderLeftWidth = 48;
             BorderRightWidth = 48;
diff --git a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs
index 96624fe1d5..119149c5c4 100644
--- a/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs
+++ b/BizHawk.Emulation.Cores/Computers/SinclairSpectrum/Machine/ZXSpectrum48K/ZX48.Screen.cs
@@ -37,7 +37,7 @@ namespace BizHawk.Emulation.Cores.Computers.SinclairSpectrum
             // screen layout
             ScreenWidth = 256;
             ScreenHeight = 192;
-            BorderTopHeight = 48;
+            BorderTopHeight = 55;// 48;
             BorderBottomHeight = 56;
             BorderLeftWidth = 48;
             BorderRightWidth = 48;