feat: implement ch3

src/apu.zig

@@ -39,8 +39,8 @@ pub const Apu = struct {
     pub fn init(sched: *Scheduler) Self {
         const apu: Self = .{
             .ch1 = ToneSweep.init(sched),
-            .ch2 = Tone.init(),
-            .ch3 = Wave.init(),
+            .ch2 = Tone.init(sched),
+            .ch3 = Wave.init(sched),
             .ch4 = Noise.init(),
             .chA = DmaSound(.A).init(),
             .chB = DmaSound(.B).init(),
@@ -59,7 +59,9 @@ pub const Apu = struct {
         };
 
         sched.push(.SampleAudio, sched.now() + apu.sampleTicks());
-        sched.push(.{ .ApuChannel = 0 }, sched.now() + SquareWave.ticks);
+        sched.push(.{ .ApuChannel = 0 }, sched.now() + SquareWave.ticks); // Channel 1
+        sched.push(.{ .ApuChannel = 1 }, sched.now() + SquareWave.ticks); // Channel 2
+        sched.push(.{ .ApuChannel = 2 }, sched.now() + WaveDevice.ticks); // Channel 2
         sched.push(.FrameSequencer, sched.now() + ((1 << 24) / 512));
 
         return apu;
@@ -67,6 +69,7 @@ pub const Apu = struct {
 
     fn reset(self: *Self) void {
         self.ch1.reset();
+        self.ch2.reset();
         // TODO: Reset the rest of the channels
     }
 
@@ -88,10 +91,12 @@ pub const Apu = struct {
         if (value) {
             self.fs.step = 0; // Reset Frame Sequencer
 
-            // TODO: Reset Duty Position for Ch2 Square
+            // Reset Square Wave Offsets
             self.ch1.square.pos = 0;
+            self.ch2.square.pos = 0;
 
-            // TODO: Reset Channel 3 offset ptr
+            // Reset Wave Device Offsets
+            self.ch3.wave_dev.offset = 0;
         } else {
             self.reset();
         }
@@ -130,8 +135,21 @@ pub const Apu = struct {
         const ch1_left = if (self.psg_cnt.ch1_left.read()) ch1_sample else 0;
         const ch1_right = if (self.psg_cnt.ch1_right.read()) ch1_sample else 0;
 
-        const mixed_left = ch1_left;
-        const mixed_right = ch1_right;
+        // Sample Channel 2
+        const ch2_sample = self.highPassFilter(self.ch2.amplitude(), self.ch2.enabled);
+        const ch2_left = if (self.psg_cnt.ch2_left.read()) ch2_sample else 0;
+        const ch2_right = if (self.psg_cnt.ch2_right.read()) ch2_sample else 0;
+
+        // Sample Channel 3
+        const ch3_sample = self.highPassFilter(self.ch3.amplitude(), self.ch3.enabled);
+        const ch3_left = if (self.psg_cnt.ch3_left.read()) ch3_sample else 0;
+        const ch3_right = if (self.psg_cnt.ch3_right.read()) ch3_sample else 0;
+
+        const mixed_left = ch1_left + ch2_left + ch3_left / 3;
+        const mixed_right = ch1_right + ch2_right + ch3_right / 3;
+
+        // const mixed_left = ch3_left;
+        // const mixed_right = ch3_right;
 
         // Apply NR50 Volume Modifications
         const nr50_left = (@intToFloat(f32, self.psg_cnt.left_vol.read()) + 1.0) * mixed_left;
@@ -153,19 +171,17 @@ pub const Apu = struct {
         };
 
         // Sample Dma Channels
-        // const chA = if (self.dma_cnt.chA_vol.read()) self.chA.amplitude() else self.chA.amplitude() / 2;
-        // const chA_left = if (self.dma_cnt.chA_left.read()) chA else 0;
-        // const chA_right = if (self.dma_cnt.chA_right.read()) chA else 0;
+        const chA = if (self.dma_cnt.chA_vol.read()) self.chA.amplitude() else self.chA.amplitude() / 2;
+        const chA_left = if (self.dma_cnt.chA_left.read()) chA else 0;
+        const chA_right = if (self.dma_cnt.chA_right.read()) chA else 0;
 
-        // const chB = if (self.dma_cnt.chB_vol.read()) self.chB.amplitude() else self.chB.amplitude() / 2;
-        // const chB_left = if (self.dma_cnt.chB_left.read()) chB else 0;
-        // const chB_right = if (self.dma_cnt.chB_right.read()) chB else 0;
+        const chB = if (self.dma_cnt.chB_vol.read()) self.chB.amplitude() else self.chB.amplitude() / 2;
+        const chB_left = if (self.dma_cnt.chB_left.read()) chB else 0;
+        const chB_right = if (self.dma_cnt.chB_right.read()) chB else 0;
 
         // Mix all Channels
-        // const left = (chA_left + chB_left + psg_left) / 3;
-        // const right = (chA_right + chB_right + psg_right) / 3
-        const left = psg_left;
-        const right = psg_right;
+        const left = (chA_left + chB_left + (psg_left * 0.1)) / 3;
+        const right = (chA_right + chB_right + (psg_right * 0.1)) / 3;
 
         if (self.sampling_cycle != self.bias.sampling_cycle.read()) {
             log.warn("Sampling Cycle changed from {} to {}", .{ self.sampling_cycle, self.bias.sampling_cycle.read() });
@@ -263,18 +279,18 @@ const ToneSweep = struct {
     freq: io.Frequency,
 
     /// Length Functionality
-    len_dev: Length,
+    len_dev: LengthDevice,
     /// Sweep Functionality
-    sweep_dev: Sweep,
+    sweep_dev: SweepDevice,
     /// Envelope Functionality
-    env_dev: Envelope,
+    env_dev: EnvelopeDevice,
     /// Frequency Timer Functionality
     square: SquareWave,
     enabled: bool,
 
     sample: u8,
 
-    const Sweep = struct {
+    const SweepDevice = struct {
         const This = @This();
 
         timer: u8,
@@ -332,9 +348,9 @@ const ToneSweep = struct {
             .enabled = false,
 
             .square = SquareWave.init(sched),
-            .len_dev = Length.init(),
-            .sweep_dev = Sweep.init(),
-            .env_dev = Envelope.init(),
+            .len_dev = LengthDevice.init(),
+            .sweep_dev = SweepDevice.init(),
+            .env_dev = EnvelopeDevice.init(),
         };
     }
 
@@ -361,7 +377,7 @@ const ToneSweep = struct {
     }
 
     pub fn channelTimerOverflow(self: *Self, late: u64) void {
-        self.square.handleTimerOverflow(self.freq, late);
+        self.square.handleTimerOverflow(.Ch1, self.freq, late);
 
         self.sample = 0;
         if (!self.isDacEnabled()) return;
@@ -381,7 +397,7 @@ const ToneSweep = struct {
     /// NR11
     pub fn setDuty(self: *Self, value: u8) void {
         self.duty.raw = value;
-        self.len_dev.timer = @as(u7, self.duty.length.read() ^ 0x3F);
+        self.len_dev.timer = @intCast(u7, 64 - value);
     }
 
     /// NR12
@@ -416,8 +432,7 @@ const ToneSweep = struct {
                 self.freq.length_enable.write(false);
             }
 
-            // TODO: Reload Frequency Timer
-            self.square.reloadTimer(self.freq.frequency.read());
+            self.square.reloadTimer(.Ch1, self.freq.frequency.read());
 
             // Reload Envelope period and timer
             self.env_dev.timer = self.envelope.period.read();
@@ -435,7 +450,7 @@ const ToneSweep = struct {
             self.enabled = self.isDacEnabled();
         }
 
-        self.square.updateLength(fs, self, new);
+        self.square.updateToneSweepLength(fs, self, new);
         self.freq = new;
     }
 
@@ -455,25 +470,39 @@ const Tone = struct {
     freq: io.Frequency,
 
     /// Length Functionarlity
-    len_dev: Length,
-
+    len_dev: LengthDevice,
     /// Envelope Functionality
-    env_dev: Envelope,
+    env_dev: EnvelopeDevice,
+    /// FrequencyTimer Functionality
+    square: SquareWave,
 
     enabled: bool,
+    sample: u8,
 
-    fn init() Self {
+    fn init(sched: *Scheduler) Self {
         return .{
             .duty = .{ .raw = 0 },
             .envelope = .{ .raw = 0 },
             .freq = .{ .raw = 0 },
             .enabled = false,
 
-            .len_dev = Length.init(),
-            .env_dev = Envelope.init(),
+            .square = SquareWave.init(sched),
+            .len_dev = LengthDevice.init(),
+            .env_dev = EnvelopeDevice.init(),
+
+            .sample = 0,
         };
     }
 
+    fn reset(self: *Self) void {
+        self.duty.raw = 0;
+        self.envelope.raw = 0;
+        self.freq.raw = 0;
+
+        self.sample = 0;
+        self.enabled = false;
+    }
+
     pub fn tickLength(self: *Self) void {
         self.len_dev.tick(self.freq, &self.enabled);
     }
@@ -482,12 +511,78 @@ const Tone = struct {
         self.env_dev.tick(self.envelope);
     }
 
+    pub fn channelTimerOverflow(self: *Self, late: u64) void {
+        self.square.handleTimerOverflow(.Ch2, self.freq, late);
+
+        self.sample = 0;
+        if (!self.isDacEnabled()) return;
+        self.sample = if (self.enabled) self.square.sample(self.duty) * self.env_dev.vol else 0;
+    }
+
+    fn amplitude(self: *const Self) f32 {
+        return (@intToFloat(f32, self.sample) / 7.5) - 1.0;
+    }
+
+    /// NR21, NR22
+    pub fn setSoundCntH(self: *Self, value: u16) void {
+        self.setDuty(@truncate(u8, value));
+        self.setEnvelope(@truncate(u8, value >> 8));
+    }
+
+    /// NR21
+    pub fn setDuty(self: *Self, value: u8) void {
+        self.duty.raw = value;
+        self.len_dev.timer = @intCast(u7, 64 - value);
+    }
+
+    /// NR22
+    pub fn setEnvelope(self: *Self, value: u8) void {
+        self.envelope.raw = value;
+        if (!self.isDacEnabled()) self.enabled = false;
+    }
+
+    /// NR23, NR24
+    pub fn setFreq(self: *Self, fs: *const FrameSequencer, value: u16) void {
+        self.setFreqLow(@truncate(u8, value));
+        self.setFreqHigh(fs, @truncate(u8, value >> 8));
+    }
+
+    /// NR23
     pub fn setFreqLow(self: *Self, byte: u8) void {
         self.freq.raw = (self.freq.raw & 0xFF00) | byte;
     }
 
-    pub fn setFreqHigh(self: *Self, byte: u8) void {
-        self.freq.raw = @as(u16, byte) << 8 | (self.freq.raw & 0xFF);
+    /// NR24
+    pub fn setFreqHigh(self: *Self, fs: *const FrameSequencer, byte: u8) void {
+        var new: io.Frequency = .{ .raw = (@as(u16, byte) << 8) | (self.freq.raw & 0xFF) };
+
+        if (new.trigger.read()) {
+            self.enabled = true; // Same as ch1, is this necessary?
+
+            if (self.len_dev.timer == 0) {
+                self.len_dev.timer = 64;
+
+                // We unset this on the old frequency because of the obscure
+                // behaviour outside of this if statement's scope
+                // FIXME: This wasn't in my ch2 GB implementation
+                self.freq.length_enable.write(false);
+            }
+
+            self.square.reloadTimer(.Ch2, self.freq.frequency.read());
+
+            // Reload Envelope period and timer
+            self.env_dev.timer = self.envelope.period.read();
+            self.env_dev.vol = self.envelope.init_vol.read();
+
+            self.enabled = self.isDacEnabled();
+        }
+
+        self.square.updateToneLength(fs, self, new);
+        self.freq = new;
+    }
+
+    fn isDacEnabled(self: *const Self) bool {
+        return self.envelope.raw & 0xF8 != 0;
     }
 };
 
@@ -505,19 +600,23 @@ const Wave = struct {
     freq: io.Frequency,
 
     /// Length Functionarlity
-    len_dev: Length,
+    len_dev: LengthDevice,
+    wave_dev: WaveDevice,
 
     enabled: bool,
+    sample: u8,
 
-    fn init() Self {
+    fn init(sched: *Scheduler) Self {
         return .{
             .select = .{ .raw = 0 },
             .vol = .{ .raw = 0 },
             .freq = .{ .raw = 0 },
             .length = 0,
 
-            .len_dev = Length.init(),
+            .len_dev = LengthDevice.init(),
+            .wave_dev = WaveDevice.init(sched),
             .enabled = false,
+            .sample = 0,
         };
     }
 
@@ -525,12 +624,72 @@ const Wave = struct {
         self.len_dev.tick(self.freq, &self.enabled);
     }
 
+    /// NR30
+    pub fn setWaveSelect(self: *Self, value: u8) void {
+        self.select.raw = value;
+        if (!self.select.enabled.read()) self.enabled = false;
+    }
+
+    /// NR31, NR32
+    pub fn setSoundCntH(self: *Self, value: u16) void {
+        self.setLength(@truncate(u8, value));
+        self.vol.raw = (@truncate(u8, value >> 8));
+    }
+
+    /// NR31
+    pub fn setLength(self: *Self, len: u8) void {
+        self.length = len;
+        self.len_dev.timer = 256 - @as(u9, len);
+    }
+
+    /// NR33, NR34
+    pub fn setFreq(self: *Self, fs: *const FrameSequencer, value: u16) void {
+        self.setFreqLow(@truncate(u8, value));
+        self.setFreqHigh(fs, @truncate(u8, value >> 8));
+    }
+
+    /// NR33
     pub fn setFreqLow(self: *Self, byte: u8) void {
         self.freq.raw = (self.freq.raw & 0xFF00) | byte;
     }
 
-    pub fn setFreqHigh(self: *Self, byte: u8) void {
-        self.freq.raw = @as(u16, byte) << 8 | (self.freq.raw & 0xFF);
+    /// NR34
+    pub fn setFreqHigh(self: *Self, fs: *const FrameSequencer, byte: u8) void {
+        var new: io.Frequency = .{ .raw = (@as(u16, byte) << 8) | (self.freq.raw & 0xFF) };
+
+        if (new.trigger.read()) {
+            self.enabled = true; // FIXME: Same as ch1, ch2, is this necessary?
+
+            if (self.len_dev.timer == 0) {
+                self.len_dev.timer = 256;
+
+                // We unset this on the old frequency because of the obscure
+                // behaviour outside of this if statement's scope
+                // FIXME: This wasn't in my ch3 GB implementation
+                self.freq.length_enable.write(false);
+            }
+
+            // Update The Frequency Timer
+            self.wave_dev.reloadTimer(self.freq.frequency.read());
+            self.wave_dev.offset = 0;
+
+            self.enabled = self.select.enabled.read();
+        }
+
+        self.wave_dev.updateLength(fs, self, new);
+        self.freq = new;
+    }
+
+    pub fn channelTimerOverflow(self: *Self, late: u64) void {
+        self.wave_dev.handleTimerOverflow(self.freq, self.select, late);
+
+        self.sample = 0;
+        if (!self.select.enabled.read()) return;
+        self.sample = if (self.enabled) self.wave_dev.sample(self.select) >> self.wave_dev.shift(self.vol) else 0;
+    }
+
+    fn amplitude(self: *const Self) f32 {
+        return (@intToFloat(f32, self.sample) / 7.5) - 1.0;
     }
 };
 
@@ -548,10 +707,10 @@ const Noise = struct {
     cnt: io.NoiseControl,
 
     /// Length Functionarlity
-    len_dev: Length,
+    len_dev: LengthDevice,
 
     /// Envelope Functionality
-    env_dev: Envelope,
+    env_dev: EnvelopeDevice,
 
     enabled: bool,
 
@@ -563,8 +722,8 @@ const Noise = struct {
             .cnt = .{ .raw = 0 },
             .enabled = false,
 
-            .len_dev = Length.init(),
-            .env_dev = Envelope.init(),
+            .len_dev = LengthDevice.init(),
+            .env_dev = EnvelopeDevice.init(),
         };
     }
 
@@ -634,10 +793,10 @@ const FrameSequencer = struct {
     }
 };
 
-const Length = struct {
+const LengthDevice = struct {
     const Self = @This();
 
-    timer: u7,
+    timer: u9,
 
     pub fn init() Self {
         return .{ .timer = 0 };
@@ -666,7 +825,7 @@ const Length = struct {
     }
 };
 
-const Envelope = struct {
+const EnvelopeDevice = struct {
     const Self = @This();
 
     /// Period Timer
@@ -695,6 +854,96 @@ const Envelope = struct {
     }
 };
 
+const WaveDevice = struct {
+    const Self = @This();
+    const wave_len = 0x20;
+    const ticks = (1 << 24) / (1 << 22);
+
+    buf: [wave_len]u8,
+    timer: u16,
+    offset: u12,
+
+    sched: *Scheduler,
+
+    pub fn init(sched: *Scheduler) Self {
+        return .{
+            .buf = [_]u8{0x00} ** wave_len,
+            .timer = 0,
+            .offset = 0,
+            .sched = sched,
+        };
+    }
+
+    fn reloadTimer(self: *Self, value: u11) void {
+        self.sched.removeScheduledEvent(.{ .ApuChannel = 2 });
+        const timer = (2048 - @as(u64, value)) * 4;
+        self.timer = @truncate(u11, timer);
+
+        self.sched.push(.{ .ApuChannel = 2 }, self.sched.now() + timer * ticks);
+    }
+
+    fn handleTimerOverflow(self: *Self, cnt_freq: io.Frequency, cnt_sel: io.WaveSelect, late: u64) void {
+        const timer = (2048 - @as(u64, cnt_freq.frequency.read())) * 2;
+
+        self.timer = @truncate(u12, timer);
+
+        if (cnt_sel.dimension.read()) {
+            self.offset = (self.offset + 1) % 0x40; // 0x20 bytes (both banks), which contain 2 samples each
+        } else {
+            self.offset = (self.offset + 1) % 0x20; // 0x10 bytes, which contain 2 samples each
+        }
+
+        self.sched.push(.{ .ApuChannel = 2 }, self.sched.now() + timer * ticks - late);
+    }
+
+    fn sample(self: *const Self, cnt: io.WaveSelect) u4 {
+        const base = if (cnt.bank.read()) @as(u32, 0x10) else 0;
+
+        const value = self.buf[base + self.offset / 2];
+        return if (self.offset & 1 == 0) @truncate(u4, value >> 4) else @truncate(u4, value);
+    }
+
+    fn shift(_: *const Self, cnt: io.WaveVolume) u2 {
+        return switch (cnt.kind.read()) {
+            0b00 => 3, // Mute / Zero
+            0b01 => 0, // 100% Volume
+            0b10 => 1, // 50% Volume
+            0b11 => 2, // 25% Volume
+        };
+    }
+
+    /// Obscure NRx4 Behaviour
+    fn updateLength(_: *Self, fs: *const FrameSequencer, ch3: *Wave, new_cnt: io.Frequency) void {
+        if (!fs.lengthIsNext() and !ch3.freq.length_enable.read() and new_cnt.length_enable.read() and ch3.len_dev.timer != 0) {
+            ch3.len_dev.timer -= 1;
+
+            if (ch3.len_dev.timer == 0 and !new_cnt.trigger.read()) ch3.enabled = false;
+        }
+    }
+
+    pub fn write(self: *Self, comptime T: type, cnt: io.WaveSelect, addr: u32, value: T) void {
+        // TODO: Handle writes when Channel 3 is disabled
+        const base = if (!cnt.bank.read()) @as(u32, 0x10) else 0; // Write to the Opposite Bank in Use
+
+        switch (T) {
+            u32 => {
+                self.buf[base + addr - 0x0400_0090 + 3] = @truncate(u8, value >> 24);
+                self.buf[base + addr - 0x0400_0090 + 2] = @truncate(u8, value >> 16);
+                self.buf[base + addr - 0x0400_0090 + 1] = @truncate(u8, value >> 8);
+                self.buf[base + addr - 0x0400_0090] = @truncate(u8, value);
+            },
+            u16 => {
+                self.buf[base + addr - 0x0400_0090 + 1] = @truncate(u8, value >> 8);
+                self.buf[base + addr - 0x0400_0090] = @truncate(u8, value);
+            },
+            u8 => {
+                self.buf[base + addr - 0x0400_0090] = value;
+            },
+            else => log.err("Unhandled {} write to Ch3 Wave RAM", .{T}),
+        }
+    }
+};
+
 const SquareWave = struct {
     const Self = @This();
     const ticks: u64 = (1 << 24) / (1 << 22);
@@ -711,8 +960,10 @@ const SquareWave = struct {
         };
     }
 
+    const ChannelKind = enum { Ch1, Ch2 };
+
     /// Obscure NRx4 Behaviour
-    fn updateLength(_: *Self, fs: *const FrameSequencer, ch1: *ToneSweep, new_cnt: io.Frequency) void {
+    fn updateToneSweepLength(_: *Self, fs: *const FrameSequencer, ch1: *ToneSweep, new_cnt: io.Frequency) void {
         if (!fs.lengthIsNext() and !ch1.freq.length_enable.read() and new_cnt.length_enable.read() and ch1.len_dev.timer != 0) {
             ch1.len_dev.timer -= 1;
 
@@ -720,23 +971,32 @@ const SquareWave = struct {
         }
     }
 
-    fn handleTimerOverflow(self: *Self, cnt: io.Frequency, late: u64) void {
+    /// Obscure NRx4 Behaviour
+    fn updateToneLength(_: *Self, fs: *const FrameSequencer, ch2: *Tone, new_cnt: io.Frequency) void {
+        if (!fs.lengthIsNext() and !ch2.freq.length_enable.read() and new_cnt.length_enable.read() and ch2.len_dev.timer != 0) {
+            ch2.len_dev.timer -= 1;
+
+            if (ch2.len_dev.timer == 0 and !new_cnt.trigger.read()) ch2.enabled = false;
+        }
+    }
+
+    fn handleTimerOverflow(self: *Self, comptime kind: ChannelKind, cnt: io.Frequency, late: u64) void {
         const timer = (2048 - @as(u64, cnt.frequency.read())) * 4;
 
         self.timer = @truncate(u12, timer);
         self.pos = (self.pos +% 1) & 7;
 
-        self.sched.push(.{ .ApuChannel = 0 }, self.sched.now() + timer * ticks - late);
+        self.sched.push(.{ .ApuChannel = if (kind == .Ch1) 0 else 1 }, self.sched.now() + timer * ticks - late);
     }
 
-    fn reloadTimer(self: *Self, value: u11) void {
-        self.sched.removeScheduledEvent(.{ .ApuChannel = 0 });
+    fn reloadTimer(self: *Self, comptime kind: ChannelKind, value: u11) void {
+        self.sched.removeScheduledEvent(.{ .ApuChannel = if (kind == .Ch1) 0 else 1 });
 
         const tmp: u64 = (2048 - @as(u64, value)) * 4; // What Freq Timer should be assuming no weird behaviour
         const timer = (tmp & ~@as(u64, 0x3)) | self.timer & 0x3; // Keep the last two bits from the old timer
         self.timer = @truncate(u12, timer);
 
-        self.sched.push(.{ .ApuChannel = 0 }, self.sched.now() + timer * ticks);
+        self.sched.push(.{ .ApuChannel = if (kind == .Ch1) 0 else 1 }, self.sched.now() + timer * ticks);
     }
 
     fn sample(self: *const Self, cnt: io.Duty) u1 {

src/bus/io.zig

@@ -156,6 +156,7 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void {
             },
             0x0400_00A0 => bus.apu.chA.push(value),
             0x0400_00A4 => bus.apu.chB.push(value),
+            0x0400_0090...0x0400_009F => bus.apu.ch3.wave_dev.write(T, bus.apu.ch3.select, address, value),
 
             // DMA Transfers
             0x0400_00B0 => bus.dma._0.writeSad(value),
@@ -232,14 +233,19 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void {
             0x0400_004E, 0x0400_0056 => {}, // Not used
 
             // Sound
-            0x0400_0060 => bus.apu.ch1.sweep.raw = @truncate(u8, value),
+            0x0400_0060 => bus.apu.ch1.sweep.raw = @truncate(u8, value), // Channel 1
             0x0400_0062 => bus.apu.ch1.setSoundCntH(value),
             0x0400_0064 => bus.apu.ch1.setFreq(&bus.apu.fs, value),
+            0x0400_0068 => bus.apu.ch2.setSoundCntH(value), // Channel 2
+            0x0400_006C => bus.apu.ch2.setFreq(&bus.apu.fs, value),
+            0x0400_0070 => bus.apu.ch3.setWaveSelect(@truncate(u8, value)), // Channel 3
+            0x0400_0072 => bus.apu.ch3.setSoundCntH(value),
+            0x0400_0074 => bus.apu.ch3.setFreq(&bus.apu.fs, value),
             0x0400_0080 => bus.apu.psg_cnt.raw = value,
             0x0400_0082 => bus.apu.setDmaCnt(value),
             0x0400_0084 => bus.apu.setSoundCntX(value >> 7 & 1 == 1),
             0x0400_0088 => bus.apu.bias.raw = value,
-            0x0400_0090...0x0400_009F => log.warn("Wrote 0x{X:0>4} to WAVE_RAM", .{value}),
+            0x0400_0090...0x0400_009F => bus.apu.ch3.wave_dev.write(T, bus.apu.ch3.select, address, value),
 
             // Dma Transfers
             0x0400_00B0 => bus.dma._0.writeSad(bus.dma._0.sad & 0xFFFF_0000 | value),
@@ -313,20 +319,20 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void {
             0x0400_0005 => bus.ppu.dispstat.raw = (@as(u16, value) << 8) | (bus.ppu.dispstat.raw & 0xFF),
 
             // Sound
-            0x0400_0060 => bus.apu.ch1.sweep.raw = value,
+            0x0400_0060 => bus.apu.ch1.sweep.raw = value, // Channel 1
             0x0400_0062 => bus.apu.ch1.duty.raw = value,
             0x0400_0063 => bus.apu.ch1.envelope.raw = value,
             0x0400_0064 => bus.apu.ch1.setFreqLow(value),
             0x0400_0065 => bus.apu.ch1.setFreqHigh(&bus.apu.fs, value),
-            0x0400_0068 => bus.apu.ch2.duty.raw = value,
+            0x0400_0068 => bus.apu.ch2.duty.raw = value, // Channel 2
             0x0400_0069 => bus.apu.ch2.envelope.raw = value,
             0x0400_006C => bus.apu.ch2.setFreqLow(value),
-            0x0400_006D => bus.apu.ch2.setFreqHigh(value),
-            0x0400_0070 => bus.apu.ch3.select.raw = value,
-            0x0400_0072 => bus.apu.ch3.length = value,
+            0x0400_006D => bus.apu.ch2.setFreqHigh(&bus.apu.fs, value),
+            0x0400_0070 => bus.apu.ch3.setWaveSelect(value), // Channel 3
+            0x0400_0072 => bus.apu.ch3.setLength(value),
             0x0400_0073 => bus.apu.ch3.vol.raw = value,
             0x0400_0074 => bus.apu.ch3.setFreqLow(value),
-            0x0400_0075 => bus.apu.ch3.setFreqHigh(value),
+            0x0400_0075 => bus.apu.ch3.setFreqHigh(&bus.apu.fs, value),
             0x0400_0078 => bus.apu.ch4.len = @truncate(u6, value),
             0x0400_0079 => bus.apu.ch4.envelope.raw = value,
             0x0400_007C => bus.apu.ch4.poly.raw = value,
@@ -335,6 +341,7 @@ pub fn write(bus: *Bus, comptime T: type, address: u32, value: T) void {
             0x0400_0081 => bus.apu.setSoundCntLHigh(value),
             0x0400_0084 => bus.apu.setSoundCntX(value >> 7 & 1 == 1),
             0x0400_0089 => bus.apu.setBiasHigh(value),
+            0x0400_0090...0x0400_009F => bus.apu.ch3.wave_dev.write(T, bus.apu.ch3.select, address, value),
 
             // Serial Communication 1
             0x0400_0128 => log.warn("Wrote 0x{X:0>2} to SIOCNT (low)", .{value}),

src/scheduler.zig

@@ -54,6 +54,8 @@ pub const Scheduler = struct {
                 .ApuChannel => |id| {
                     switch (id) {
                         0 => cpu.bus.apu.ch1.channelTimerOverflow(late),
+                        1 => cpu.bus.apu.ch2.channelTimerOverflow(late),
+                        2 => cpu.bus.apu.ch3.channelTimerOverflow(late),
                         else => {},
                     }
                 },