summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBad Diode <bd@badd10de.dev>2021-05-11 16:48:17 +0200
committerBad Diode <bd@badd10de.dev>2021-05-11 16:48:17 +0200
commitbaa19bbcdd7995236381456953b3d26002a2611f (patch)
treefd4e389caa57af00f23dcb92b851c297111a0a90
parent7bccc14ea476b380ab77f05463fad1cb57149e58 (diff)
downloadgba-experiments-baa19bbcdd7995236381456953b3d26002a2611f.tar.gz
gba-experiments-baa19bbcdd7995236381456953b3d26002a2611f.zip
Adjust spacing on CH3 parametersHEADmain
-rw-r--r--src/sequencer.c48
1 files changed, 28 insertions, 20 deletions
diff --git a/src/sequencer.c b/src/sequencer.c
index 867d3e4..947b498 100644
--- a/src/sequencer.c
+++ b/src/sequencer.c
@@ -16,9 +16,9 @@
16#define SEQ_DUTYCYCLE_POS_Y SEQ_ENV_POS_Y - 8 16#define SEQ_DUTYCYCLE_POS_Y SEQ_ENV_POS_Y - 8
17#define SEQ_SWEEP_POS_X SEQ_DUTYCYCLE_POS_X + SEQ_ENV_DIST 17#define SEQ_SWEEP_POS_X SEQ_DUTYCYCLE_POS_X + SEQ_ENV_DIST
18#define SEQ_SWEEP_POS_Y SEQ_ENV_POS_Y 18#define SEQ_SWEEP_POS_Y SEQ_ENV_POS_Y
19#define SEQ_CH3_PARAM_X SEQ_TRIG_POS_X 19#define SEQ_CH3_PARAM_X SEQ_TRIG_POS_X + 1
20#define SEQ_CH3_PARAM_Y SEQ_ENV_POS_Y - 12 20#define SEQ_CH3_PARAM_Y SEQ_ENV_POS_Y - 12
21#define SEQ_CH3_PARAM_SEL_X SEQ_CH3_PARAM_X - 5 21#define SEQ_CH3_PARAM_SEL_X SEQ_CH3_PARAM_X - 4
22#define SEQ_CH3_PARAM_SEL_Y SEQ_CH3_PARAM_Y + 22 22#define SEQ_CH3_PARAM_SEL_Y SEQ_CH3_PARAM_Y + 22
23#define SEQ_N_CHANNELS 3 23#define SEQ_N_CHANNELS 3
24 24
@@ -1111,25 +1111,33 @@ update_sequencer_sprites(void) {
1111 1111
1112 // Wave A. 1112 // Wave A.
1113 draw_wave_pattern(wave_a, x, y, 2); 1113 draw_wave_pattern(wave_a, x, y, 2);
1114 txt_position(x - 1, y + 20); 1114 txt_position(x, y + 20);
1115 txt_printf("%02x%02x%02x%02x %02x%02x%02x%02x", 1115 txt_printf("%02x%02x%02x%02x",
1116 wave_a[0], wave_a[1], wave_a[2], wave_a[3], 1116 wave_a[0], wave_a[1], wave_a[2], wave_a[3]);
1117 txt_position(x + 34, y + 20);
1118 txt_printf("%02x%02x%02x%02x",
1117 wave_a[4], wave_a[5], wave_a[6], wave_a[7]); 1119 wave_a[4], wave_a[5], wave_a[6], wave_a[7]);
1118 txt_position(x - 1, y + 20 + 8); 1120 txt_position(x, y + 20 + 8);
1119 txt_printf("%02x%02x%02x%02x %02x%02x%02x%02x", 1121 txt_printf("%02x%02x%02x%02x",
1120 wave_a[8], wave_a[9], wave_a[10], wave_a[11], 1122 wave_a[8], wave_a[9], wave_a[10], wave_a[11]);
1123 txt_position(x + 34, y + 20 + 8);
1124 txt_printf("%02x%02x%02x%02x",
1121 wave_a[12], wave_a[13], wave_a[14], wave_a[15]); 1125 wave_a[12], wave_a[13], wave_a[14], wave_a[15]);
1122 1126
1123 // Wave B. 1127 // Wave B.
1124 x += 64 + 12; 1128 x += 64 + 12;
1125 draw_wave_pattern(wave_b, x, y, 3); 1129 draw_wave_pattern(wave_b, x, y, 3);
1126 txt_position(x - 1, y + 20); 1130 txt_position(x, y + 20);
1127 txt_printf("%02x%02x%02x%02x %02x%02x%02x%02x", 1131 txt_printf("%02x%02x%02x%02x",
1128 wave_b[0], wave_b[1], wave_b[2], wave_b[3], 1132 wave_b[0], wave_b[1], wave_b[2], wave_b[3]);
1133 txt_position(x + 34, y + 20);
1134 txt_printf("%02x%02x%02x%02x",
1129 wave_b[4], wave_b[5], wave_b[6], wave_b[7]); 1135 wave_b[4], wave_b[5], wave_b[6], wave_b[7]);
1130 txt_position(x - 1, y + 20 + 8); 1136 txt_position(x, y + 20 + 8);
1131 txt_printf("%02x%02x%02x%02x %02x%02x%02x%02x", 1137 txt_printf("%02x%02x%02x%02x",
1132 wave_b[8], wave_b[9], wave_b[10], wave_b[11], 1138 wave_b[8], wave_b[9], wave_b[10], wave_b[11]);
1139 txt_position(x + 34, y + 20 + 8);
1140 txt_printf("%02x%02x%02x%02x",
1133 wave_b[12], wave_b[13], wave_b[14], wave_b[15]); 1141 wave_b[12], wave_b[13], wave_b[14], wave_b[15]);
1134 1142
1135 // Clear the backbuffer. 1143 // Clear the backbuffer.
@@ -1142,18 +1150,18 @@ update_sequencer_sprites(void) {
1142 u8 x_positions[] = { 1150 u8 x_positions[] = {
1143 // 32 half bytes (Wave A). 1151 // 32 half bytes (Wave A).
1144 0, 4, 8, 12, 16, 20, 24, 28, 1152 0, 4, 8, 12, 16, 20, 24, 28,
1145 36, 40, 44, 48, 52, 56, 60, 64, 1153 34, 38, 42, 46, 50, 54, 58, 62,
1146 0, 4, 8, 12, 16, 20, 24, 28, 1154 0, 4, 8, 12, 16, 20, 24, 28,
1147 36, 40, 44, 48, 52, 56, 60, 64, 1155 34, 38, 42, 46, 50, 54, 58, 62,
1148 // 32 half bytes (Wave B). 1156 // 32 half bytes (Wave B).
1149 76, 80, 84, 88, 92, 96, 100, 104, 1157 76, 80, 84, 88, 92, 96, 100, 104,
1150 112, 116, 120, 124, 128, 132, 136, 140, 1158 110, 114, 118, 122, 126, 130, 134, 138,
1151 76, 80, 84, 88, 92, 96, 100, 104, 1159 76, 80, 84, 88, 92, 96, 100, 104,
1152 112, 116, 120, 124, 128, 132, 136, 140, 1160 110, 114, 118, 122, 126, 130, 134, 138,
1153 // Default wave A. 1161 // Default wave A.
1154 4, 21, 38, 55, 1162 3, 20, 37, 54,
1155 // Default wave B. 1163 // Default wave B.
1156 80, 97, 114, 131, 1164 79, 96, 113, 130,
1157 }; 1165 };
1158 u8 y_positions[] = { 1166 u8 y_positions[] = {
1159 // 32 half bytes (Wave A) 1167 // 32 half bytes (Wave A)