1 files changed, 49 insertions, 31 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.
     {