From 214f653fb9c04bf216d5fb218c02c394b9c0270b Mon Sep 17 00:00:00 2001
From: Jaby <Jaby>
Date: Tue, 16 Jan 2024 21:54:16 -0500
Subject: [PATCH] Remove support for No screen code all together

---
 .../Overlay/ScreenCenter/screen_center.cpp    | 21 ++++---------------
 src/Library/src/GPU/gpu.cpp                   | 19 ++++++-----------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/examples/PoolBox/application/src/Overlay/ScreenCenter/screen_center.cpp b/examples/PoolBox/application/src/Overlay/ScreenCenter/screen_center.cpp
index a61d62a7..87858a47 100644
--- a/examples/PoolBox/application/src/Overlay/ScreenCenter/screen_center.cpp
+++ b/examples/PoolBox/application/src/Overlay/ScreenCenter/screen_center.cpp
@@ -64,20 +64,7 @@ namespace ScreenCenter {
         static const char*const Name = "PSYQ";
 
         static void set_offset(uint16_t x, uint16_t y) {
-            x += 78;
-            y += 43;
-
-            GPU_IO::GP1.write(GPU_IO::Command::HorizontalDisplayRange((x << 3), (x + GPU::Display::Width) << 3));
-            GPU_IO::GP1.write(GPU_IO::Command::VerticalDisplayRange(y,         y + GPU::Display::Height));
-        }
-    }
-
-    namespace No$PSX {
-        static const char*const Name = "No$PSX";
-
-        static void set_offset(uint16_t x, uint16_t y) {
-            GPU_IO::GP1.write(GPU_IO::Command::HorizontalDisplayRange(x, (x + GPU::Display::Width*8)));
-            GPU_IO::GP1.write(GPU_IO::Command::VerticalDisplayRange(y - (ScanlinesV/2), y + (ScanlinesV/2)));
+            GPU::Display::set_offset(x, y);
         }
     }
 
@@ -87,8 +74,7 @@ namespace ScreenCenter {
     };
 
     static const Formular ScreenFormulars[] = {
-        Formular{.name = PSYQ::Name,   .function = PSYQ::set_offset},
-        Formular{.name = No$PSX::Name, .function = No$PSX::set_offset}
+        Formular{.name = PSYQ::Name, .function = PSYQ::set_offset}
     };
 
     static const auto    frame = Frame::create();
@@ -110,7 +96,8 @@ namespace ScreenCenter {
         const auto controller = Periphery::get_primary_controller_as<Periphery::GenericController>();
 
         if(controller.button.went_up(GenericButton::R1) || controller.button.went_up(GenericButton::L1)) {
-            formular_sel ^= 1;
+            // Only one mode supported
+            //formular_sel ^= 1;
         }
 
         if(controller.button.went_down(GenericButton::ST)) {
diff --git a/src/Library/src/GPU/gpu.cpp b/src/Library/src/GPU/gpu.cpp
index 9862bbb8..bdf903d1 100644
--- a/src/Library/src/GPU/gpu.cpp
+++ b/src/Library/src/GPU/gpu.cpp
@@ -73,20 +73,13 @@ namespace JabyEngine {
             }
         }
 
-        #ifndef USE_NO$PSX
-            void Display :: set_offset(uint16_t x, uint16_t y) {
-                x += 78;
-                y += 43;
+        void Display :: set_offset(uint16_t x, uint16_t y) {
+            x += 78;
+            y += 35;
 
-                GPU_IO::GP1.write(GPU_IO::Command::HorizontalDisplayRange((x << 3), (x + Display::Width) << 3));
-                GPU_IO::GP1.write(GPU_IO::Command::VerticalDisplayRange(y,         y + Display::Height));
-            }
-        #else
-            void Display :: set_offset(uint16_t x, uint16_t y) {
-                GPU_IO::GP1.write(GPU_IO::Command::HorizontalDisplayRange(x, (x + Display::Width*8)));
-                GPU_IO::GP1.write(GPU_IO::Command::VerticalDisplayRange(y - (ScanlinesV/2), y + (ScanlinesV/2)));
-            }
-        #endif //USE_NO$PSX
+            GPU_IO::GP1.write(GPU_IO::Command::HorizontalDisplayRange((x << 3), (x + Display::Width) << 3));
+            GPU_IO::GP1.write(GPU_IO::Command::VerticalDisplayRange(y,         y + Display::Height));
+        }
 
         uint8_t swap_buffers_vsync(uint8_t syncs, bool clear_screen) {
             // Waits for finish FIFO