History

Pushed v1.15 code

- More improvements to S3M loader. Fixes "satellite one.s3m" and other S3Ms. - Up/down pushbutton delay has been increased even more, to prevent accidentally skipping too much. - Some other small miscellaneous changes not worth of a mention

Olav Sørensen committed 6 years ago

Commit 108c3331 parent aaa773b25 files · +435 −644Browse files

Showing the changes to src/ft2_pattern_ed.c (1 of 25 files). Show all

Unified · Split

src/ft2_pattern_ed.c+13−13
@@ -183,10 +183,10 @@ void drawAdvEdit(void) · 182 unmodified lines
183183 textOutShadow( 4, 126, PAL_FORGRND, PAL_DSKTOP2, "New number");
184184 textOutShadow(129, 96, PAL_FORGRND, PAL_DSKTOP2, "Masking enable");
185185 textOutShadow(114, 109, PAL_FORGRND, PAL_DSKTOP2, "Note");
186− textOutShadow(114, 121, PAL_FORGRND, PAL_DSKTOP2, "Instrument number");
187− textOutShadow(114, 134, PAL_FORGRND, PAL_DSKTOP2, "Volume column");
188− textOutShadow(114, 147, PAL_FORGRND, PAL_DSKTOP2, "Effect digit 1");
189− textOutShadow(114, 160, PAL_FORGRND, PAL_DSKTOP2, "Effect digit 2,3");
186+ textOutShadow(114, 122, PAL_FORGRND, PAL_DSKTOP2, "Instrument number");
187+ textOutShadow(114, 135, PAL_FORGRND, PAL_DSKTOP2, "Volume column");
188+ textOutShadow(114, 148, PAL_FORGRND, PAL_DSKTOP2, "Effect digit 1");
189+ textOutShadow(114, 161, PAL_FORGRND, PAL_DSKTOP2, "Effect digit 2,3");
190190
191191 charOutShadow(239, 95, PAL_FORGRND, PAL_DSKTOP2, 'C');
192192 charOutShadow(258, 95, PAL_FORGRND, PAL_DSKTOP2, 'P');
@@ -680,8 +680,8 @@ void patternEditorExtended(void) · 487 unmodified lines
680680
681681 textOutShadow(116, 5, PAL_FORGRND, PAL_DSKTOP2, "Sng.len.");
682682 textOutShadow(116, 19, PAL_FORGRND, PAL_DSKTOP2, "Repst.");
683− textOutShadow(222, 40, PAL_FORGRND, PAL_DSKTOP2, "Ptn.");
684− textOutShadow(305, 40, PAL_FORGRND, PAL_DSKTOP2, "Ln.");
683+ textOutShadow(222, 39, PAL_FORGRND, PAL_DSKTOP2, "Ptn.");
684+ textOutShadow(305, 39, PAL_FORGRND, PAL_DSKTOP2, "Ln.");
685685
686686 editor.ui.instrSwitcherShown = true;
687687 showInstrumentSwitcher();
@@ -2150,12 +2150,12 @@ void drawSongLength(void) · 1462 unmodified lines
21502150 if (editor.ui.extended)
21512151 {
21522152 x = 165;
2153− y = 6;
2153+ y = 5;
21542154 }
21552155 else
21562156 {
21572157 x = 59;
2158− y = 53;
2158+ y = 52;
21592159 }
21602160
21612161 hexOutBg(x, y, PAL_FORGRND, PAL_DESKTOP, (uint8_t)song.len, 2);
@@ -2168,12 +2168,12 @@ void drawSongRepS(void) · 6 unmodified lines
21682168 if (editor.ui.extended)
21692169 {
21702170 x = 165;
2171− y = 20;
2171+ y = 19;
21722172 }
21732173 else
21742174 {
21752175 x = 59;
2176− y = 65;
2176+ y = 64;
21772177 }
21782178
21792179 hexOutBg(x, y, PAL_FORGRND, PAL_DESKTOP, (uint8_t)song.repS, 2);
@@ -2207,8 +2207,8 @@ void drawEditPattern(uint16_t editPattern) · 27 unmodified lines
22072207
22082208 if (editor.ui.extended)
22092209 {
2210− x = 251;
2211− y = 40;
2210+ x = 252;
2211+ y = 39;
22122212 }
22132213 else
22142214 {
@@ -2226,7 +2226,7 @@ void drawPatternLength(uint16_t editPattern) · 11 unmodified lines
22262226 if (editor.ui.extended)
22272227 {
22282228 x = 326;
2229− y = 40;
2229+ y = 39;
22302230 }
22312231 else
22322232 {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t