From 0ec89c43671831ca491eadeca2cbfa52a53338d5 Mon Sep 17 00:00:00 2001
From: Bad Diode <bd@badd10de.dev>
Date: Mon, 31 Jul 2023 18:30:00 +0200
Subject: Add more waves to ch3 and make them flow better

---
 Makefile     |  2 +-
 src/assets.c | 13 +++----------
 src/main.c   | 12 ++++++++----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Makefile b/Makefile
index 149494f..913795a 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ INC_FLAGS   := $(addprefix -I,$(INC_DIRS))
 INC_FLAGS   += -I$(LIBGBA_SRC)
 
 # Output library names and executables.
-TARGET         := STEPPER-v1.6-dev-v3
+TARGET         := STEPPER-v1.6-dev-rc
 ELF            := $(BUILD_DIR)/$(TARGET).elf
 BIN            := $(BUILD_DIR)/$(TARGET).gba
 
diff --git a/src/assets.c b/src/assets.c
index 2dfc89a..661d012 100644
--- a/src/assets.c
+++ b/src/assets.c
@@ -121,28 +121,21 @@ typedef u32 Wave[WAVE_VARS];
 static const Wave waves[][WAVE_VARS] = {
     {
         {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201},
+        {0xefcdab89, 0x98badcfe, 0x10325476, 0x67452301},
         {0xcadebc89, 0x87b9dcce, 0x02215376, 0x67230142},
-        {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201}, // triangle?
-        {0xdbfede8b, 0x36013186, 0xdbfede8b, 0x36013186}, // don't love this
+        {0xa5ddbc89, 0x87badcad, 0x14214376, 0x46231184},
     }, // Sine
     {
         {0x33221100, 0x77665544, 0xbbaa9988, 0xffeeddcc},
         {0x33221100, 0x77665544, 0x56769888, 0xedcdab79},
         {0x52682401, 0xefbd7935, 0x894653c8, 0x6487a9ab},
-        {0x67452301, 0xefcdab89, 0x67452301, 0xefcdab89},
-        // {0xffffffff, 0xffffffff, 0x00000000, 0x00000000},
-        // {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201},
-        // {0xffffffff, 0xffffffff, 0x00000000, 0x00000000},
+        {0x72692501, 0xffce7935, 0x45231084, 0x52bc8967},
     }, // Saw
     {
         {0xffffffff, 0xffffffff, 0x00000000, 0x00000000},
         {0xffff0000, 0xffffffff, 0x00000000, 0x00000000},
         {0x00000000, 0xffffffff, 0x00000000, 0x00000000},
         {0x00000000, 0xffffffff, 0xffffffff, 0x0000ffff},
-        {0xffffffff, 0xffffffff, 0x0000ffff, 0x00000000},
-        // {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201},
-        // {0x67452301, 0xefcdab89, 0x67452301, 0xefcdab89},
-        // {0xefdebc89, 0x98cbedfe, 0x10214376, 0x67341201},
     }, // Square
 };
 
diff --git a/src/main.c b/src/main.c
index a0832a2..54eb2ef 100644
--- a/src/main.c
+++ b/src/main.c
@@ -38,12 +38,16 @@ WITH REGARD TO THIS SOFTWARE.
 //  - Add an envelope to ch3, would need to work with a timer in order to make
 //    it work I think.
 //  - Sync via MIDI via arduinoboy or something similar.
+//  - Per trig LFO? How would we go about this? There is at least one empty slot
+//    in all channels. LFO amount? LFO speed? Would need a dedicated page for
+//    configuring LFOs
 //
 //  Bugfixes
-//  - Sound can get hung up sometimes, but I can't reproduce when this happens.
-//    Not sure if this is an emulator thing or happens also in hardware.
-//  - Cursor can stay in position instead of dissapering, again I can't
-//    reproduce this right now, just happened randomly. Needs investigation.
+//  + Sound can get hung up sometimes, but I can't reproduce when this happens.
+//    Not sure if this is an emulator thing or happens also in hardware. Seems
+//    to only happen on mGBA. After running for a time it just stops working,
+//    the sound returns after a while without issue. On `ares` or real hardware
+//    it works just fine.
 //
 
 #include "gba/gba.h"
-- 
cgit v1.2.1