Add probability handling and drawing

3 files changed, 82 insertions, 39 deletions

diff --git a/src/drawing.c b/src/drawing.c
index 653351d..8fef74f 100644
--- a/src/drawing.c
+++ b/src/drawing.c
@@ -667,6 +667,49 @@ clear_parameters(void) {
     draw_filled_rect(x0, y0, x1, y1, COL_BG);
 }
 
+void
+draw_prob(u8 prob, u8 clr) {
+    size_t x = PARAMS_START_X + PARAMS_BOX_OFFSET_X * 4 + 3;
+    size_t y = PARAMS_START_Y + 5;
+    switch (prob) {
+        case PROB_100: {
+            txt_drawf("100", x, y, clr);
+            txt_drawc('%', x + 18, y, clr);
+        } break;
+        case PROB_80: {
+            txt_drawf("80", x + 3, y, clr);
+            txt_drawc('%', x + 15, y, clr);
+        } break;
+        case PROB_60: {
+            txt_drawf("60", x + 3, y, clr);
+            txt_drawc('%', x + 15, y, clr);
+        } break;
+        case PROB_40: {
+            txt_drawf("40", x + 3, y, clr);
+            txt_drawc('%', x + 15, y, clr);
+        } break;
+        case PROB_20: {
+            txt_drawf("20", x + 3, y, clr);
+            txt_drawc('%', x + 15, y, clr);
+        } break;
+        case PROB_FIRST: { txt_drawf("1st", x + 3, y, clr); } break;
+        case PROB_NOT_FIRST: {
+            txt_drawf("1st", x + 3, y, clr);
+            draw_line(x + 3, y - 1, x + 21, y - 1, clr);
+        } break;
+        case PROB_ONE_TWO: { txt_drawf("1:2", x + 3, y, clr); } break;
+        case PROB_TWO_TWO: { txt_drawf("2:2", x + 3, y, clr); } break;
+        case PROB_ONE_THREE: { txt_drawf("1:3", x + 3, y, clr); } break;
+        case PROB_TWO_THREE: { txt_drawf("2:3", x + 3, y, clr); } break;
+        case PROB_THREE_THREE: { txt_drawf("3:3", x + 3, y, clr); } break;
+        case PROB_ONE_FOUR: { txt_drawf("1:4", x + 3, y, clr); } break;
+        case PROB_TWO_FOUR: { txt_drawf("2:4", x + 3, y, clr); } break;
+        case PROB_THREE_FOUR: { txt_drawf("3:4", x + 3, y, clr); } break;
+        case PROB_FOUR_FOUR: { txt_drawf("4:4", x + 3, y, clr); } break;
+        default: break;
+    }
+}
+
 IWRAM_CODE
 void
 draw_parameters_wave(ChannelWaveParams *params, bool global) {
@@ -685,13 +728,8 @@ draw_parameters_wave(ChannelWaveParams *params, bool global) {
         draw_wave_pattern(waves[params->shape_b][params->phase_b], x + PARAMS_BOX_OFFSET_X * 2, y, COL_ACC_2);
     }
 
-    // TODO: Trig probability
-    {
-        size_t x = PARAMS_START_X + PARAMS_BOX_OFFSET_X * 4 + 3;
-        size_t y = PARAMS_START_Y + 5;
-        txt_drawf("100", x, y, col_fg);
-        txt_drawc('%', x + 18, y, col_fg);
-    }
+    // Trig probability.
+    draw_prob(params->prob, col_fg);
 
     // Mode selection.
     {
@@ -814,11 +852,6 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
 
         // Env.
         if (params->env_time == 0) {
-            // TODO: Time 0 vol 0 (dir) doesn't make sense (mute)
-            // TODO: Time 0 vol 100 doesn't make sense (constant max volume)
-            // NOTE: Maybe it's just a matter of handling it better on the
-            // control? Have to check every time we change direction to swap
-            // the conditions.
             draw_line(x0, y0, x2, y0, COL_ACC_2);
         } else {
             draw_line(x0, y0, x1, y1, COL_ACC_2);
@@ -826,13 +859,8 @@ draw_parameters_square(ChannelSquareParams *params, bool sweep, bool global) {
         }
     }
 
-    // TODO: Trig probability
-    {
-        size_t x = PARAMS_START_X + PARAMS_BOX_OFFSET_X * 4 + 3;
-        size_t y = PARAMS_START_Y + 5;
-        txt_drawf("100", x, y, col_fg);
-        txt_drawc('%', x + 18, y, col_fg);
-    }
+    // Trig probability.
+    draw_prob(params->prob, col_fg);
 
     // Sweep.
     if (sweep) {
@@ -943,11 +971,6 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) {
 
         // Env.
         if (params->env_time == 0) {
-            // TODO: Time 0 vol 0 (dir) doesn't make sense (mute)
-            // TODO: Time 0 vol 100 doesn't make sense (constant max volume)
-            // NOTE: Maybe it's just a matter of handling it better on the
-            // control? Have to check every time we change direction to swap
-            // the conditions.
             draw_line(x0, y0, x2, y0, COL_ACC_2);
         } else {
             draw_line(x0, y0, x1, y1, COL_ACC_2);
@@ -955,13 +978,8 @@ draw_parameters_noise(ChannelNoiseParams* params, bool global) {
         }
     }
 
-    // TODO: Trig probability
-    {
-        size_t x = PARAMS_START_X + PARAMS_BOX_OFFSET_X * 4 + 3;
-        size_t y = PARAMS_START_Y + 5;
-        txt_drawf("100", x, y, col_fg);
-        txt_drawc('%', x + 18, y, col_fg);
-    }
+    // Trig probability.
+    draw_prob(params->prob, col_fg);
 
     // Labels.
     {
diff --git a/src/globals.c b/src/globals.c
index 758f3b5..51ef292 100644
--- a/src/globals.c
+++ b/src/globals.c
@@ -160,3 +160,23 @@ typedef struct Chain {
 } Chain;
 
 static Chain chain = {0};
+
+typedef enum Prob {
+    PROB_100,
+    PROB_80,
+    PROB_60,
+    PROB_40,
+    PROB_20,
+    PROB_FIRST,
+    PROB_NOT_FIRST,
+    PROB_ONE_TWO,
+    PROB_TWO_TWO,
+    PROB_ONE_THREE,
+    PROB_TWO_THREE,
+    PROB_THREE_THREE,
+    PROB_ONE_FOUR,
+    PROB_TWO_FOUR,
+    PROB_THREE_FOUR,
+    PROB_FOUR_FOUR,
+    PROB_NUM,
+} Prob;
diff --git a/src/sequencer.c b/src/sequencer.c
index 04153aa..00baebb 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -71,6 +71,11 @@ find_prev_pattern(void) {
     return idx;
 }
 
+bool
+should_play(u8 prob) {
+    return true;
+}
+
 void
 play_step(void) {
     Pattern *pat = &patterns[current_pattern];
@@ -94,7 +99,7 @@ play_step(void) {
     if (pat->ch1.active) {
         TriggerNote *trig = &pat->ch1.notes[step_counter];
         ChannelSquareParams *params = &pat->ch1.params[step_counter];
-        if (trig->active) {
+        if (trig->active && should_play(params->prob)) {
             if (params->sweep_time == 0) {
                 SOUND_SQUARE1_SWEEP = SOUND_SWEEP_DIR(1);
             } else {
@@ -128,7 +133,7 @@ play_step(void) {
     if (pat->ch2.active) {
         TriggerNote *trig = &pat->ch2.notes[step_counter];
         ChannelSquareParams *params = &pat->ch2.params[step_counter];
-        if (trig->active) {
+        if (trig->active && should_play(params->prob)) {
             SOUND_SQUARE2_CTRL = SOUND_SQUARE_ENV_VOL(params->env_volume)
                 | SOUND_SQUARE_ENV_TIME(params->env_time)
                 | SOUND_SQUARE_ENV_DIR(params->env_direction)
@@ -147,7 +152,7 @@ play_step(void) {
     if (pat->ch3.active) {
         TriggerNote *trig = &pat->ch3.notes[step_counter];
         ChannelWaveParams *params = &pat->ch3.params[step_counter];
-        if (trig->active) {
+        if (trig->active && should_play(params->prob)) {
             switch (params->wave_mode) {
                 case 0: {
                     SOUND_WAVE_MODE = SOUND_WAVE_BANK_SELECT(1);
@@ -195,7 +200,7 @@ play_step(void) {
     if (pat->ch4.active) {
         TriggerNote *trig = &pat->ch4.notes[step_counter];
         ChannelNoiseParams *params = &pat->ch4.params[step_counter];
-        if (trig->active) {
+        if (trig->active && should_play(params->prob)) {
             static const u8 div_freq[] = {
                 7, 6, 5, 4, 7, 6, 5, 4, 7, 6, 5, 4,
                 7, 6, 5, 4, 7, 6, 5, 4, 7, 6, 5, 4,
@@ -778,7 +783,7 @@ set_param_selection_sq1(ChannelSquareParams *params, InputHandler return_handler
                 }
             } break;
             case 3: { params->env_direction ^= 1; } break;
-            case 4: { /* TODO: probability */ } break;
+            case 4: { params->prob = CLAMP(params->prob + inc, 0, PROB_NUM - 1); } break;
             case 5: { params->sweep_number = CLAMP(params->sweep_number + inc, 0, 7); } break;
             case 6: { params->sweep_time = CLAMP(params->sweep_time + inc, 0, 7); } break;
             case 7: { params->sweep_direction ^= 1; } break;
@@ -843,7 +848,7 @@ set_param_selection_sq2(ChannelSquareParams *params, InputHandler return_handler
                 }
             } break;
             case 3: { params->env_direction ^= 1; } break;
-            case 4: { /* TODO: probability */ } break;
+            case 4: { params->prob = CLAMP(params->prob + inc, 0, PROB_NUM - 1); } break;
         }
         redraw_params = true;
         return true;
@@ -907,7 +912,7 @@ set_param_selection_wave(ChannelWaveParams *params, InputHandler return_handler)
             case 1: { params->phase_a = CLAMP(params->phase_a + inc, 0, WAVE_VARS - 1); } break;
             case 2: { params->shape_b = CLAMP(params->shape_a + inc, 0, WAVE_MAX - 1); } break;
             case 3: { params->phase_b = CLAMP(params->phase_b + inc, 0, WAVE_VARS - 1); } break;
-            case 4: { /* TODO: probability */ } break;
+            case 4: { params->prob = CLAMP(params->prob + inc, 0, PROB_NUM - 1); } break;
             case 5: { params->wave_mode = CLAMP(params->wave_mode + inc, 0, 2); } break;
             case 6: { params->wave_volume = CLAMP(params->wave_volume + inc, 0, 4); } break;
         }
@@ -971,7 +976,7 @@ set_param_selection_noise(ChannelNoiseParams *params, InputHandler return_handle
                 }
             } break;
             case 3: { params->env_direction ^= 1; } break;
-            case 4: { /* TODO: probability */ } break;
+            case 4: { params->prob = CLAMP(params->prob + inc, 0, PROB_NUM - 1); } break;
         }
         redraw_params = true;
         return true;