From fe90d4d8d713203554d4e9ae78d206d5c5b53a9f Mon Sep 17 00:00:00 2001
From: xokz <106196742+xokz@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:26:20 -0400
Subject: [PATCH 1/2] Update bitmap4.rs

---
 agb/src/display/bitmap4.rs | 74 ++++++++++++++++++++++++++++++++++++--
 1 file changed, 71 insertions(+), 3 deletions(-)

diff --git a/agb/src/display/bitmap4.rs b/agb/src/display/bitmap4.rs
index 4ef454e2..02284a29 100644
--- a/agb/src/display/bitmap4.rs
+++ b/agb/src/display/bitmap4.rs
@@ -1,3 +1,5 @@
+use core::marker::PhantomData;
+
 use crate::memory_mapped::{MemoryMapped1DArray, MemoryMapped2DArray};
 
 use super::{
@@ -25,13 +27,17 @@ pub enum Page {
 }
 
 #[non_exhaustive]
-pub struct Bitmap4 {}
+pub struct Bitmap4<'gba> {
+    phantom: PhantomData<&'gba ()>,
+}
 
-impl Bitmap4 {
+impl Bitmap4<'_> {
     pub(crate) unsafe fn new() -> Self {
         set_graphics_mode(DisplayMode::Bitmap4);
         set_graphics_settings(GraphicsSettings::LAYER_BG2);
-        Bitmap4 {}
+        Bitmap4 {
+            phantom: PhantomData,
+        }
     }
 
     /// Draws point on specified page at (x, y) coordinates with colour index
@@ -82,4 +88,66 @@ impl Bitmap4 {
         let swapped = display ^ GraphicsSettings::PAGE_SELECT.bits();
         DISPLAY_CONTROL.set(swapped);
     }
+
+    
+    /// Draws 2-pixel wide point on the non-current page at (x, y) coordinates with colour
+    /// index whose colour is specified in the background palette. Panics if (x,
+    /// y) is out of the bounds of the screen.
+    pub fn draw_wide_point(&mut self, x: i32, y: i32, colour: u8) {
+        let display = DISPLAY_CONTROL.get();
+
+        // get other page
+        let page = if display & GraphicsSettings::PAGE_SELECT.bits() != 0 {
+            Page::Front
+        } else {
+            Page::Back
+        };
+
+        self.draw_wide_point_page(x, y, colour, page);
+    }
+
+    /// Draws 2-pixel wide point on specified page at (x, y) coordinates with colour index
+    /// whose colour is specified in the background palette. Panics if (x, y) is
+    /// out of the bounds of the screen.
+    pub fn draw_wide_point_page(&mut self, x: i32, y: i32, colour: u8, page: Page) {
+        let addr = match page {
+            Page::Front => BITMAP_PAGE_FRONT_MODE_4,
+            Page::Back => BITMAP_PAGE_BACK_MODE_4,
+        };
+
+        let x_in_screen = (x / 2) as usize;
+        let y_in_screen = y as usize;
+        let c = u16::from(colour);
+        addr.set(x_in_screen, y_in_screen, c << 8 | c);
+    }
+
+    /// Fills specified page with color.
+    pub fn clear_page(&mut self, colour: u8, page: Page) {
+        let addr = match page {
+            Page::Front => BITMAP_PAGE_FRONT_MODE_4,
+            Page::Back => BITMAP_PAGE_BACK_MODE_4,
+        };
+
+        let c = u16::from(colour);
+
+        for x in 0..(WIDTH/2) as usize {
+            for y in 0..(HEIGHT as usize) {
+                addr.set(x, y, c << 8 | c);
+            }
+        }
+    }
+
+    /// Fills non-current page with color.
+    pub fn clear(&mut self, colour: u8) {
+        let display = DISPLAY_CONTROL.get();
+
+        // get other page
+        let page = if display & GraphicsSettings::PAGE_SELECT.bits() != 0 {
+            Page::Front
+        } else {
+            Page::Back
+        };
+
+        self.clear_page(colour, page);
+    }
 }

From fdab4a3e6f5f6b9f7f6f2fbfd55f8ebe1c257a41 Mon Sep 17 00:00:00 2001
From: xokz <106196742+xokz@users.noreply.github.com>
Date: Mon, 23 Oct 2023 17:28:22 -0400
Subject: [PATCH 2/2] Update bitmap4.rs

---
 agb/src/display/bitmap4.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/agb/src/display/bitmap4.rs b/agb/src/display/bitmap4.rs
index 02284a29..297090c9 100644
--- a/agb/src/display/bitmap4.rs
+++ b/agb/src/display/bitmap4.rs
@@ -89,7 +89,6 @@ impl Bitmap4<'_> {
         DISPLAY_CONTROL.set(swapped);
     }
 
-    
     /// Draws 2-pixel wide point on the non-current page at (x, y) coordinates with colour
     /// index whose colour is specified in the background palette. Panics if (x,
     /// y) is out of the bounds of the screen.
@@ -130,7 +129,7 @@ impl Bitmap4<'_> {
 
         let c = u16::from(colour);
 
-        for x in 0..(WIDTH/2) as usize {
+        for x in 0..(WIDTH / 2) as usize {
             for y in 0..(HEIGHT as usize) {
                 addr.set(x, y, c << 8 | c);
             }
@@ -140,7 +139,6 @@ impl Bitmap4<'_> {
     /// Fills non-current page with color.
     pub fn clear(&mut self, colour: u8) {
         let display = DISPLAY_CONTROL.get();
-
         // get other page
         let page = if display & GraphicsSettings::PAGE_SELECT.bits() != 0 {
             Page::Front