1 files changed, 23 insertions, 18 deletions

diff --git a/src/patterns.c b/src/patterns.c
index 6ce0878..6b68463 100644
--- a/src/patterns.c
+++ b/src/patterns.c
@@ -15,13 +15,17 @@ typedef struct ChannelSquareParams {
     u8 sweep_number;
     u8 sweep_time;
     u8 sweep_direction;
+    u8 prob;
 } ChannelSquareParams;
 
 typedef struct ChannelWaveParams {
     u8 wave_volume;
     u8 wave_mode;
-    u32 wave_a[4];
-    u32 wave_b[4];
+    u8 shape_a;
+    u8 phase_a;
+    u8 shape_b;
+    u8 phase_b;
+    u8 prob;
 } ChannelWaveParams;
 
 typedef struct ChannelNoiseParams {
@@ -29,6 +33,7 @@ typedef struct ChannelNoiseParams {
     u8 env_time;
     u8 env_direction;
     u8 bit_mode;
+    u8 prob;
 } ChannelNoiseParams;
 
 typedef struct ChannelSquare {
@@ -167,22 +172,22 @@ const ChannelWave default_ch3 = {
         {true, NOTE_G_5},
     },
     .params = {
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0xFFFFFFFF, 0x00000000, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0x00000000, 0xFFFFFFFF, 0x00000000, 0xFFFFFFFF},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0x00000000, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
-        {3, 0, {0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000},{0xFFFFFFFF, 0x00000000, 0xFFFFFFFF, 0x00000000}},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
+        {3, 0, WAVE_SIN, 0, WAVE_SAW, 0, 0},
     },
     .active = true,
 };