Move UI down

2 files changed, 20 insertions, 17 deletions

diff --git a/src/gba/gba.h b/src/gba/gba.h
index 3a84b89..cdb3b31 100644
--- a/src/gba/gba.h
+++ b/src/gba/gba.h
@@ -101,12 +101,15 @@ typedef Color Palette[16];
 #define RGB15(R,G,B) (u16)(((B) << 10) | ((G) << 5) | (R));
 
 // Some nice default colors.
-#define COLOR_RED   RGB15(31, 0,12)
-#define COLOR_BLUE  RGB15(2, 15,30)
-#define COLOR_CYAN  RGB15(0, 30,30)
-#define COLOR_GREY  RGB15(12,12,12)
-#define COLOR_BLACK RGB15(0,  0, 0)
-#define COLOR_WHITE RGB15(28,28,28)
+#define COLOR_BLACK  RGB15(0,  0, 0)
+#define COLOR_RED    RGB15(31, 0,10)
+#define COLOR_GREEN  RGB15(31, 0,10)
+#define COLOR_YELLOW RGB15(31, 0,10)
+#define COLOR_BLUE   RGB15(2, 17,31)
+#define COLOR_PURPLE RGB15(2, 17,31)
+#define COLOR_CYAN   RGB15(0, 27,30)
+#define COLOR_GREY   RGB15(16,17,19)
+#define COLOR_WHITE  RGB15(28,28,28)
 
 //
 // Tile memory access.
diff --git a/src/sequencer.c b/src/sequencer.c
index 6859ba5..a5addf4 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -313,7 +313,7 @@ static ChannelWave ch3 = {
 #define TRIG_W 15
 #define TRIG_H 24
 #define TRIG_START_X 64
-#define TRIG_START_Y 90
+#define TRIG_START_Y 97
 #define TRIG_OFFSET_X (TRIG_W + 3)
 #define TRIG_OFFSET_Y (TRIG_H + 7)
 
@@ -388,7 +388,7 @@ draw_triggers(void) {
 #define CHAN_W 19
 #define CHAN_H 8
 #define CHAN_START_X 35
-#define CHAN_START_Y 90
+#define CHAN_START_Y 97
 #define CHAN_OFFSET_Y 12
 
 void
@@ -431,7 +431,7 @@ draw_channel_cursor(size_t i, u8 clr) {
 #define PIANO_W 170
 #define PIANO_H 20
 #define PIANO_START_X 35
-#define PIANO_START_Y 65
+#define PIANO_START_Y 72
 #define PIANO_NOTE_W 2
 
 void
@@ -569,9 +569,9 @@ draw_piano(void) {
 }
 
 #define PARAMS_W 170
-#define PARAMS_H 48
+#define PARAMS_H 64
 #define PARAMS_START_X 35
-#define PARAMS_START_Y 12
+#define PARAMS_START_Y 8
 
 void
 draw_params_cursor_ch3(size_t i, u8 clr) {
@@ -624,7 +624,7 @@ draw_params_cursor_ch3(size_t i, u8 clr) {
         cursor_length = 30;
     }
     size_t x = PARAMS_START_X + x_positions[i] - 1;
-    size_t y = PARAMS_START_Y + PARAMS_H - 18 + y_positions[i];
+    size_t y = PARAMS_START_Y + PARAMS_H - 23 + y_positions[i];
     draw_line(x, y, x + cursor_length, y, clr);
 }
 
@@ -665,7 +665,7 @@ clear_parameters(void) {
     size_t x0 = PARAMS_START_X;
     size_t y0 = PARAMS_START_Y;
     size_t x1 = PARAMS_START_X + PARAMS_W;
-    size_t y1 = PARAMS_START_Y + PARAMS_H;
+    size_t y1 = PARAMS_START_Y + PARAMS_H - 1;
     draw_filled_rect(x0, y0, x1, y1, COL_BG);
 }
 
@@ -680,7 +680,7 @@ draw_parameters_ch3(void) {
         u8 *wave_b = ch3.params[trig_selection_loc].wave_b;
 
         size_t x = PARAMS_START_X;
-        size_t y = PARAMS_START_Y + 2;
+        size_t y = PARAMS_START_Y + 13;
 
         // Wave Patterns.
         draw_wave_pattern(wave_a, x, y, COL_WAVE_A);
@@ -712,7 +712,7 @@ draw_parameters_ch3(void) {
     {
         Tile *wave_tiles = ASSETS_DEFAULT_WAVES;
         size_t x = PARAMS_START_X;
-        size_t y = PARAMS_START_Y + PARAMS_H - 7;
+        size_t y = PARAMS_START_Y + PARAMS_H - 12;
         for (size_t i = 0, k = 0; i < 4 * 2; i += 2, k++) {
             draw_tile(x + 17 * k,     y, wave_tiles + i, COL_FG, true);
             draw_tile(x + 17 * k + 8, y, wave_tiles + i + 1, COL_FG, true);
@@ -726,7 +726,7 @@ draw_parameters_ch3(void) {
     // Mode selection.
     {
         size_t x = PARAMS_START_X + 140;
-        size_t y = PARAMS_START_Y + PARAMS_H - 17;
+        size_t y = PARAMS_START_Y + PARAMS_H - 22;
         draw_line(x, y + 4, x + 5, y + 4, COL_FG);
         draw_line(x + 25, y + 4, x + 30, y + 4, COL_FG);
         draw_line(x, y + 5, x, y + 16, COL_FG);
@@ -750,7 +750,7 @@ draw_parameters_ch3(void) {
     // Wave volume.
     {
         size_t x = PARAMS_START_X + 140;
-        size_t y = PARAMS_START_Y + PARAMS_H - 40;
+        size_t y = PARAMS_START_Y + PARAMS_H - 45;
         draw_line(x, y + 7, x + 7, y + 7, COL_FG);
         draw_line(x + 23, y + 7, x + 30, y + 7, COL_FG);
         draw_line(x, y + 8, x, y + 19, COL_FG);