From e8cc0dfabbac1bfdba2629c38a2fb52ed96399c1 Mon Sep 17 00:00:00 2001
From: Rekai Musuka <rekai@musuka.dev>
Date: Fri, 21 Oct 2022 05:12:50 -0300
Subject: [PATCH] fix: implement register reads for Yoshi's Island

---
 src/apu.zig    | 16 ++++++++++++++++
 src/bus/io.zig |  1 +
 2 files changed, 17 insertions(+)

diff --git a/src/apu.zig b/src/apu.zig
index 7438e48..640eda3 100644
--- a/src/apu.zig
+++ b/src/apu.zig
@@ -42,7 +42,9 @@ pub fn read(comptime T: type, apu: *const Apu, addr: u32) T {
         },
         u8 => switch (byte) {
             0x60 => apu.ch1.getSoundCntL(), // NR10
+            0x62 => apu.ch1.duty.raw, // NR11
             0x63 => apu.ch1.envelope.raw, // NR12
+            0x68 => apu.ch2.duty.raw, // NR21
             0x69 => apu.ch2.envelope.raw, // NR22
             0x73 => apu.ch3.vol.raw, // NR32
             0x79 => apu.ch4.envelope.raw, // NR42
@@ -120,6 +122,8 @@ pub fn write(comptime T: type, apu: *Apu, addr: u32, value: T) void {
 
             0x80 => apu.setNr50(value),
             0x81 => apu.setNr51(value),
+            0x82 => apu.setSoundCntHL(value),
+            0x83 => apu.setSoundCntHH(value),
             0x84 => apu.setSoundCntX(value >> 7 & 1 == 1), // NR52
             0x89 => apu.setSoundBiasH(value),
             0x90...0x9F => apu.ch3.wave_dev.write(T, apu.ch3.select, addr, value),
@@ -192,6 +196,18 @@ pub const Apu = struct {
         self.ch4.reset();
     }
 
+    /// SOUNDCNT_H_L
+    fn setSoundCntHL(self: *Self, value: u8) void {
+        const merged = (self.dma_cnt.raw & 0xFF00) | value;
+        self.setSoundCntH(merged);
+    }
+
+    /// SOUNDCNT_H_H
+    fn setSoundCntHH(self: *Self, value: u8) void {
+        const merged = (self.dma_cnt.raw & 0x00FF) | (@as(u16, value) << 8);
+        self.setSoundCntH(merged);
+    }
+
     pub fn setSoundCntH(self: *Self, value: u16) void {
         const new: io.DmaSoundControl = .{ .raw = value };
 
diff --git a/src/bus/io.zig b/src/bus/io.zig
index 77df1d0..49fce0d 100644
--- a/src/bus/io.zig
+++ b/src/bus/io.zig
@@ -296,6 +296,7 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void {
             0x0400_000A => bus.ppu.bg[1].cnt.raw = (bus.ppu.bg[1].cnt.raw & 0xFF00) | value,
             0x0400_000B => bus.ppu.bg[1].cnt.raw = (@as(u16, value) << 8) | (bus.ppu.bg[1].cnt.raw & 0xFF),
             0x0400_0048 => log.debug("Wrote 0x{X:0>2} to WININ_L", .{value}),
+            0x0400_0049 => log.debug("Wrote 0x{X:0>2} to WININ_H", .{value}),
             0x0400_004A => log.debug("Wrote 0x{X:0>2} to WINOUT_L", .{value}),
             0x0400_0054 => log.debug("Wrote 0x{X:0>2} to BLDY_L", .{value}),