blah

diff --git a/lolailo.c b/lolailo.c
index be489d83915f1be2954cba3e05a35b758d209471..69570417ee690fb16de36c324dc3d74c4f27be6a 100644 (file)
--- a/lolailo.c
+++ b/lolailo.c
@@ -97,6 +97,7 @@ void _start()
                 y0=y1;
             }
             SDL_Flip(video);
+           SDL_Delay(20);
         }
     }
     

diff --git a/song.h b/song.h
index b220ee282f8fa5e9bdc815870e879d01b4c0b258..2ae18f202f71bca0cbe4782014748af2b6f11d6c 100644 (file)
--- a/song.h
+++ b/song.h
@@ -10,7 +10,7 @@
 //          + PLAYLIST_LENGTH
 
 #define NUM_PATTERNS 20
-#define NUM_CHANNELS 8
+#define NUM_CHANNELS 9
 #define NUM_TRACKS 15 
 #define TRACK_LENGTH 12 
 #define INSTRUMENT_DATA_LENGTH 200

diff --git a/thesong.c b/thesong.c
index 011d19ba7a513d800d885bdd75925408e990946c..40a3f3d0645f483dffe8651dc929d14235ea309c 100644 (file)
--- a/thesong.c
+++ b/thesong.c
@@ -3,36 +3,50 @@
 
 Song thesong={
     {  // begin patterns
-        {0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00},
-        {0x01, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00},
-        {0x01, 0x02, 0x06, 0x06, 0x06, 0x05, 0x00, 0x00},
-        {0x01, 0x02, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00},
-        {0x01, 0x02, 0x06, 0x06, 0x06, 0x06, 0x05, 0x00},
-        {0x01, 0x02, 0x05, 0x07, 0x00, 0x00, 0x00, 0x00},
+        {0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // wind 1
+        {0x01, 0x00, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // wind 2
+        {0x00, 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, // wind 3
+        {0x01, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, // bongo
+        {0x00, 0x00, 0x05, 0x07, 0x00, 0x00, 0x00, 0x00, 0x0B}, // bongo+bass1
+        {0x00, 0x00, 0x05, 0x08, 0x00, 0x00, 0x00, 0x00, 0x0B}, // bongo+bass2
+        {0x00, 0x00, 0x05, 0x09, 0x00, 0x00, 0x00, 0x00, 0x0B}, // bongo+bass3
+        {0x00, 0x00, 0x05, 0x0a, 0x00, 0x00, 0x00, 0x00, 0x0B}, // bongo+bass2end
+        {0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x07, 0x0B}, // piano chord 1+bongo+bass
+        {0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x08, 0x0B}, // piano chord 2+bongo+bass
+        {0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x09, 0x0B}, // piano chord 3+bongo+bass
+        {0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x05, 0x0A, 0x0B}, // piano chord 2+bongo+bass_end
+        {0x00, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0B}, // bongo+maraca
     }, // end patterns
     {  // begin txpose
-        {-15, 0, 0, 0, 0},
-        {-9, 0, -3, 0, 0},
-        {0, -20, 0, -5, 0},
-        {-15,0,24,0,0},
-        {-15, 0, 12, 15, 19, 24},
-        {-15, 0, 7, 11, 14, 19, 24},
-        {-15, 0, 8, 12, 15, 20, 24},
-        {-15,0,24,-27,0},
+        {-15, 0, 0, 0, 0}, // wind1
+        {-9, 0, -3, 0, 0}, // wind2
+        {0, -20, 0, -5, 0}, // wind3
+        {-15,0,24,0,0},     // bongo
+        {-15,0,24,2,0}, // bongo+bass1
+        {-15,0,24,2,0}, // bongo+bass2
+        {-15,0,24,2,0}, // bongo+bass3
+        {-15,0,24,2,0}, // bongo+bass2end
+        {-15, 0, 7, 12, 15, 19, 24, 2}, // piano chord 1+bongo+bass
+        {-15, 0, 7, 11, 14, 19, 24, 2}, // piano chord 2+bongo+bass
+        {-15, 0, 8, 12, 15, 20, 24, 2}, // piano chord 3+bongo+bass
+        {-15, 0, 7, 11, 14, 19, 24, 2}, // piano chord 2+bongo+bass
+        {-15,0,24,0,0},     // bongo+maraca
     }, // end txpose
     {  // begin tracks
-        {{0x44,0,0,0,0,0,0,0,0,0,0,0}, 19},
-        {{0,0,0,0,0,0,0x31,0,0,0,0,0}, 19},
-        {{0,0,0,0,0,0,0,0,0,0,0x21,0}, 19},
-        {{0,0,0,0x51,0,0,0,0,0,0,0,0}, 19},
-        {{0x94,0x54,0x14,0x94,0x54,0x14,0x94,0x54,0x14,0x94,0x54,0x14,}, 0},
-        {{0xf1,0,0xf1,0,0xf1,0xf1,0,0xf1,0,0xf1,0,0xf1}, 53},
-       {{0x37,0,0,0x3d,0,0,0x37,0,0x3d,0,0x31,0,}, 0},
+        {{0x44,0,0,0,0,0,0,0,0,0,0,0}, 19}, // wind
+        {{0,0,0,0,0,0,0x31,0,0,0,0,0}, 19}, // wind
+        {{0,0,0,0,0,0,0,0,0,0,0x21,0}, 19}, // wind
+        {{0,0,0,0x51,0,0,0,0,0,0,0,0}, 19}, // wind
+        {{0x94,0x54,0x14,0x94,0x54,0x14,0x94,0x54,0x14,0x94,0x54,0x14,}, 0}, // bongo rhythm
+        {{0xf1,0,0xf1,0,0xf1,0xf1,0,0xf1,0,0xf1,0,0xf1}, 53}, // piano rhythm
+       {{0x37,0,0,0x3e,0,0,0x37,0,0x3e,0,0x32,0,}, 93}, // bassline 1
+       {{0x32,0,0,0x3e,0,0,0x32,0,0x3e,0,0x39,0,}, 93}, // bassline 2
+       {{0x33,0,0,0x3f,0,0,0x33,0,0x3f,0,0x3a,0,}, 93}, // bassline 3
+       {{0x32,0,0,0x3e,0,0,0x32,0x3e,0,0x3c,0,0x3a}, 93}, // bassline 2+end
+        {{0xf0,0x70,0xf0,0x70,0xf0,0x70,0xf0,0x70,0xf0,0x70,0xf0,0x70}, 115}, // maraca
     }, // end tracks
     {  // begin instrument data
-        // 0 (bongo/bass)
+        // 0 (bongo)
        SIGMOID,10,1,
         SQUARE,0,20,
         LPF,2,40,
@@ -67,11 +81,33 @@ Song thesong={
        LPF,10,20,
        CONST,0,40,
        MUL,1,2,
+       ENDI,
+       // 93 (bass)
+       SIGMOID, 8,3,
+       SINE,-20,20,
+       SINE,-8,10,
+       SUM,1,2,
+       CONST,0,80,
+       MUL,1,2,
+       MUL,1,6,
+       ENDI,
+       // 115 (maraca)
+       CONST,0,1,
+       SIGMOID,30,1,
+       NOISE,0,0,
+       HPF,3,20,
+       NOISE,0,0,
+       LPF,5,0,
+       MUL,1,6,
+       SUM,1,4,
+       MUL,1,7,
+       CONST,10,0,
+       MUL,1,2,
        END,
-       // 53
+
     }, // end instrument data
     {  // begin playlist
-        0,1,2,1,3,3,3,3,4,4,5,5,6,6,5,5,4,4,5,5,6,6,5,5,255,
+        0,1,2,1,3,3,3,3,8,8,9,9,10,10,9,11,255,
     }, // end playlist
 };