- 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
Showing the changes to src/ft2_pattern_ed.c (1 of 25 files). Show all
Unified · Split
| @@ -183,10 +183,10 @@ void drawAdvEdit(void) · 182 unmodified lines | |||
| 183 | textOutShadow( 4, 126, PAL_FORGRND, PAL_DSKTOP2, "New number"); | 183 | textOutShadow( 4, 126, PAL_FORGRND, PAL_DSKTOP2, "New number"); |
| 184 | textOutShadow(129, 96, PAL_FORGRND, PAL_DSKTOP2, "Masking enable"); | 184 | textOutShadow(129, 96, PAL_FORGRND, PAL_DSKTOP2, "Masking enable"); |
| 185 | textOutShadow(114, 109, PAL_FORGRND, PAL_DSKTOP2, "Note"); | 185 | textOutShadow(114, 109, PAL_FORGRND, PAL_DSKTOP2, "Note"); |
| 186 | textOutShadow(114, 121, PAL_FORGRND, PAL_DSKTOP2, "Instrument number"); | 186 | textOutShadow(114, 122, PAL_FORGRND, PAL_DSKTOP2, "Instrument number"); |
| 187 | textOutShadow(114, 134, PAL_FORGRND, PAL_DSKTOP2, "Volume column"); | 187 | textOutShadow(114, 135, PAL_FORGRND, PAL_DSKTOP2, "Volume column"); |
| 188 | textOutShadow(114, 147, PAL_FORGRND, PAL_DSKTOP2, "Effect digit 1"); | 188 | textOutShadow(114, 148, PAL_FORGRND, PAL_DSKTOP2, "Effect digit 1"); |
| 189 | textOutShadow(114, 160, PAL_FORGRND, PAL_DSKTOP2, "Effect digit 2,3"); | 189 | textOutShadow(114, 161, PAL_FORGRND, PAL_DSKTOP2, "Effect digit 2,3"); |
| 190 | 190 | ||
| 191 | charOutShadow(239, 95, PAL_FORGRND, PAL_DSKTOP2, 'C'); | 191 | charOutShadow(239, 95, PAL_FORGRND, PAL_DSKTOP2, 'C'); |
| 192 | charOutShadow(258, 95, PAL_FORGRND, PAL_DSKTOP2, 'P'); | 192 | charOutShadow(258, 95, PAL_FORGRND, PAL_DSKTOP2, 'P'); |
| @@ -680,8 +680,8 @@ void patternEditorExtended(void) · 487 unmodified lines | |||
| 680 | 680 | ||
| 681 | textOutShadow(116, 5, PAL_FORGRND, PAL_DSKTOP2, "Sng.len."); | 681 | textOutShadow(116, 5, PAL_FORGRND, PAL_DSKTOP2, "Sng.len."); |
| 682 | textOutShadow(116, 19, PAL_FORGRND, PAL_DSKTOP2, "Repst."); | 682 | textOutShadow(116, 19, PAL_FORGRND, PAL_DSKTOP2, "Repst."); |
| 683 | textOutShadow(222, 40, PAL_FORGRND, PAL_DSKTOP2, "Ptn."); | 683 | textOutShadow(222, 39, PAL_FORGRND, PAL_DSKTOP2, "Ptn."); |
| 684 | textOutShadow(305, 40, PAL_FORGRND, PAL_DSKTOP2, "Ln."); | 684 | textOutShadow(305, 39, PAL_FORGRND, PAL_DSKTOP2, "Ln."); |
| 685 | 685 | ||
| 686 | editor.ui.instrSwitcherShown = true; | 686 | editor.ui.instrSwitcherShown = true; |
| 687 | showInstrumentSwitcher(); | 687 | showInstrumentSwitcher(); |
| @@ -2150,12 +2150,12 @@ void drawSongLength(void) · 1462 unmodified lines | |||
| 2150 | if (editor.ui.extended) | 2150 | if (editor.ui.extended) |
| 2151 | { | 2151 | { |
| 2152 | x = 165; | 2152 | x = 165; |
| 2153 | y = 6; | 2153 | y = 5; |
| 2154 | } | 2154 | } |
| 2155 | else | 2155 | else |
| 2156 | { | 2156 | { |
| 2157 | x = 59; | 2157 | x = 59; |
| 2158 | y = 53; | 2158 | y = 52; |
| 2159 | } | 2159 | } |
| 2160 | 2160 | ||
| 2161 | hexOutBg(x, y, PAL_FORGRND, PAL_DESKTOP, (uint8_t)song.len, 2); | 2161 | hexOutBg(x, y, PAL_FORGRND, PAL_DESKTOP, (uint8_t)song.len, 2); |
| @@ -2168,12 +2168,12 @@ void drawSongRepS(void) · 6 unmodified lines | |||
| 2168 | if (editor.ui.extended) | 2168 | if (editor.ui.extended) |
| 2169 | { | 2169 | { |
| 2170 | x = 165; | 2170 | x = 165; |
| 2171 | y = 20; | 2171 | y = 19; |
| 2172 | } | 2172 | } |
| 2173 | else | 2173 | else |
| 2174 | { | 2174 | { |
| 2175 | x = 59; | 2175 | x = 59; |
| 2176 | y = 65; | 2176 | y = 64; |
| 2177 | } | 2177 | } |
| 2178 | 2178 | ||
| 2179 | hexOutBg(x, y, PAL_FORGRND, PAL_DESKTOP, (uint8_t)song.repS, 2); | 2179 | hexOutBg(x, y, PAL_FORGRND, PAL_DESKTOP, (uint8_t)song.repS, 2); |
| @@ -2207,8 +2207,8 @@ void drawEditPattern(uint16_t editPattern) · 27 unmodified lines | |||
| 2207 | 2207 | ||
| 2208 | if (editor.ui.extended) | 2208 | if (editor.ui.extended) |
| 2209 | { | 2209 | { |
| 2210 | x = 251; | 2210 | x = 252; |
| 2211 | y = 40; | 2211 | y = 39; |
| 2212 | } | 2212 | } |
| 2213 | else | 2213 | else |
| 2214 | { | 2214 | { |
| @@ -2226,7 +2226,7 @@ void drawPatternLength(uint16_t editPattern) · 11 unmodified lines | |||
| 2226 | if (editor.ui.extended) | 2226 | if (editor.ui.extended) |
| 2227 | { | 2227 | { |
| 2228 | x = 326; | 2228 | x = 326; |
| 2229 | y = 40; | 2229 | y = 39; |
| 2230 | } | 2230 | } |
| 2231 | else | 2231 | else |
| 2232 | { | 2232 | { |