From 4f8fe0c1e8cb2a003acb12580f8e2b44c14492bb Mon Sep 17 00:00:00 2001
From: kris <kris.kennaway@gmail.com>
Date: Fri, 3 Feb 2023 00:29:19 +0000
Subject: [PATCH] Fix breakage in refactoring

---
 screen.py | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/screen.py b/screen.py
index 6ca55c2..7d8411b 100644
--- a/screen.py
+++ b/screen.py
@@ -79,16 +79,7 @@ class SHR320Screen:
         self.memory = dump
 
 
-class DHGRScreen:
-    X_RES = 560
-    Y_RES = 192
-
-    MODE = Mode.DOUBLE_HI_RES
-
-    def __init__(self):
-        self.main = np.zeros(8192, dtype=np.uint8)
-        self.aux = np.zeros(8192, dtype=np.uint8)
-
+class BaseDHGRScreen:
     @staticmethod
     def y_to_base_addr(y: int) -> int:
         """Maps y coordinate to screen memory base address."""
@@ -99,6 +90,17 @@ class DHGRScreen:
 
         return 1024 * c + 128 * b + 40 * a
 
+
+class DHGRScreen(BaseDHGRScreen):
+    X_RES = 560
+    Y_RES = 192
+
+    MODE = Mode.DOUBLE_HI_RES
+
+    def __init__(self):
+        self.main = np.zeros(8192, dtype=np.uint8)
+        self.aux = np.zeros(8192, dtype=np.uint8)
+
     def pack(self, bitmap: np.ndarray):
         """Packs an image into memory format (8k AUX + 8K MAIN)."""
         # The DHGR display encodes 7 pixels across interleaved 4-byte sequences
@@ -231,7 +233,7 @@ class DHGRNTSCScreen(DHGRScreen, NTSCScreen):
     NTSC_PHASE_SHIFT = 0
 
 
-class HGRNTSCScreen(NTSCScreen):
+class HGRNTSCScreen(BaseDHGRScreen, NTSCScreen):
     # Hi-Res really is 560 pixels horizontally, not 280 - but unlike DHGR
     # you can only independently control about half of the pixels.
     #