From 2c763e97721bdc87ac62b03b1143d842be258f46 Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Mon, 11 Apr 2022 22:52:17 -0300
Subject: [PATCH] feat: pass jsmolka memory.gba

---
 src/Bus.zig |  2 +-
 src/ppu.zig | 27 +++++++++++++++++++++++----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/Bus.zig b/src/Bus.zig
index 818e7fc..928f5b5 100644
--- a/src/Bus.zig
+++ b/src/Bus.zig
@@ -123,7 +123,7 @@ pub fn write(self: *Self, comptime T: type, address: u32, value: T) void {
 
         // Internal Display Memory
         0x05 => self.ppu.palette.write(T, align_addr, value),
-        0x06 => self.ppu.vram.write(T, align_addr, value),
+        0x06 => self.ppu.vram.write(T, self.ppu.dispcnt, align_addr, value),
         0x07 => self.ppu.oam.write(T, align_addr, value),
 
         // External Memory (Game Pak)
diff --git a/src/ppu.zig b/src/ppu.zig
index 712aa1c..ec9a13a 100644
--- a/src/ppu.zig
+++ b/src/ppu.zig
@@ -457,7 +457,13 @@ const Palette = struct {
                 self.buf[addr + 1] = @truncate(u8, value >> 8);
                 self.buf[addr + 0] = @truncate(u8, value >> 0);
             },
-            u8 => return,
+            u8 => {
+                const halfword: u16 = @as(u16, value) * 0x0101;
+                const real_addr = addr & ~@as(u32, 1); // *was* 8-bit read so address won't be aligned
+
+                self.buf[real_addr + 1] = @truncate(u8, halfword >> 8);
+                self.buf[real_addr + 0] = @truncate(u8, halfword >> 0);
+            },
             else => @compileError("PALRAM: Unsupported write width"),
         }
     }
@@ -498,7 +504,8 @@ const Vram = struct {
         };
     }
 
-    pub fn write(self: *Self, comptime T: type, address: usize, value: T) void {
+    pub fn write(self: *Self, comptime T: type, dispcnt: io.DisplayControl, address: usize, value: T) void {
+        const mode: u3 = dispcnt.bg_mode.read();
         const addr = Self.mirror(address);
 
         switch (T) {
@@ -512,7 +519,19 @@ const Vram = struct {
                 self.buf[addr + 1] = @truncate(u8, value >> 8);
                 self.buf[addr + 0] = @truncate(u8, value >> 0);
             },
-            u8 => return,
+            u8 => {
+                // Ignore if write is in OBJ
+                switch (mode) {
+                    0, 1, 2 => if (0x0601_0000 <= address and address < 0x0601_8000) return,
+                    else => if (0x0601_4000 <= address and address < 0x0601_8000) return,
+                }
+
+                const halfword: u16 = @as(u16, value) * 0x0101;
+                const real_addr = addr & ~@as(u32, 1);
+
+                self.buf[real_addr + 1] = @truncate(u8, halfword >> 8);
+                self.buf[real_addr + 0] = @truncate(u8, halfword >> 0);
+            },
             else => @compileError("VRAM: Unsupported write width"),
         }
     }
@@ -568,7 +587,7 @@ const Oam = struct {
                 self.buf[addr + 1] = @truncate(u8, value >> 8);
                 self.buf[addr + 0] = @truncate(u8, value >> 0);
             },
-            u8 => return,
+            u8 => return, // 8-bit writes are explicitly ignored
             else => @compileError("OAM: Unsupported write width"),
         }
     }