lyhyemmät musat

2024-07-29 19:33:06 +03:00
parent 7fbe712d53
commit f8371d479f
9 changed files with 228 additions and 246 deletions
--- a/4klang.asm
+++ b/4klang.asm
@ -1,4 +1,4 @@
-%define SU_LENGTH_IN_SAMPLES    3740512
+%define SU_LENGTH_IN_SAMPLES    3010656
 %define SU_SAMPLE_RATE          44100
 %define SU_BPM                  116.

@ -118,7 +118,7 @@ su_render_sampleloop:                   ; loop through every sample in the row
            jl      su_render_sampleloop
        pop     eax      ; eax = Row, Stack: GlobalTick, RandSeed, VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr                   ; Stack: pushad ptr
        inc     eax
-        cmp     eax, 656
+        cmp     eax, 528
        jl      su_render_rowloop
    ; rewind the stack the entropy of multiple pop eax is probably lower than add
    pop     eax      ; eax = GlobalTick, Stack: RandSeed, VoiceTrackBitmask, edi, esi, ebp, esp, ebx, edx, ecx, eax, retaddr_su_render_song, OutputBufPtr 
@ -183,7 +183,7 @@ su_update_voices_skipreset:
 su_update_voices_nexttrack:
        pop     ebx                                 ; ebx=first voice of next instrument, Stack: ptrnrow
        pop     edx                                 ; edx=patrnrow
-        add     esi, 41
+        add     esi, 33
        inc     ebp        
        cmp     ebp,su_synth_obj + 10
        jl      su_update_voices_trackloop
@ -868,10 +868,7 @@ su_patterns:
    db 23,0,0,0,23,23,23,23,0,0,23,0,0,23,0,0
    db 28,0,0,0,28,28,28,30,0,0,30,0,0,30,0,0
    db 32,0,0,0,32,32,32,32,0,0,32,0,0,32,0,0
-    db 26,1,1,1,1,1,1,1,1,1,25,1,1,1,1,1
-    db 23,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 28,1,1,1,1,1,1,1,30,1,1,1,1,1,32,1
-    db 21,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+    db 33,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
    db 33,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
    db 45,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
    db 45,0,0,0,45,45,45,45,0,0,45,0,0,45,0,0
@ -880,42 +877,30 @@ su_patterns:
    db 35,0,0,0,35,35,35,35,0,0,35,0,0,35,0,0
    db 40,0,0,0,40,40,40,42,0,0,42,0,0,42,0,0
    db 47,0,0,0,47,47,47,47,0,0,47,0,0,47,0,0
-    db 38,1,1,1,1,1,1,1,1,1,37,1,1,1,1,1
-    db 35,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 40,1,1,1,1,1,1,1,42,1,1,1,1,1,44,1
+    db 45,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
+    db 21,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
    db 40,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
    db 44,0,0,0,44,44,44,44,0,0,44,0,0,44,0,0
-    db 57,1,1,1,1,1,1,1,1,1,57,1,1,1,1,1
-    db 57,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 59,1,1,1,1,1,1,1,59,1,1,1,1,1,59,1
+    db 40,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
    db 49,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
    db 49,0,0,0,49,49,49,49,0,0,49,0,0,49,0,0
    db 42,0,0,0,42,42,42,42,0,0,42,0,0,42,0,0
    db 59,0,0,0,59,59,59,59,0,0,59,0,0,59,0,0
-    db 54,1,1,1,1,1,1,1,1,1,54,1,1,1,1,1
-    db 54,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 56,1,1,1,1,1,1,1,56,1,1,1,1,1,56,1
+    db 49,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
    db 64,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
    db 1,1,1,1,50,1,52,1,53,1,1,1,55,1,1,1
+    db 57,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
    db 65,1,1,1,1,1,1,1,1,1,1,1,1,1,52,50
    db 52,1,1,1,1,1,1,1,57,1,1,1,1,1,1,1
    db 52,0,0,0,52,52,52,52,0,0,52,0,0,52,0,0
    db 57,0,0,0,57,57,57,57,0,0,57,0,0,57,0,0
-    db 62,1,1,1,1,1,1,1,1,1,62,1,1,1,1,1
-    db 62,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 64,1,1,1,1,1,1,1,64,1,1,1,1,1,64,1
+    db 52,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0
    db 33,1,1,1,33,33,33,33,1,1,33,1,1,33,1,1
    db 32,1,1,1,32,32,32,32,1,1,32,1,1,32,1,1
    db 30,1,1,1,30,30,30,30,1,1,30,1,1,30,1,1
-    db 50,1,1,1,50,1,1,1,50,1,1,1,50,1,1,1
-    db 52,1,1,1,52,1,1,1,52,1,1,1,52,1,1,1
-    db 52,1,1,1,52,1,1,1,0,0,0,0,0,0,0,0
    db 45,1,1,1,45,45,45,45,1,1,45,1,1,45,1,1
    db 44,1,1,1,44,44,44,44,1,1,44,1,1,44,1,1
    db 42,1,1,1,42,42,42,42,1,1,42,1,1,42,1,1
-    db 62,1,1,1,62,1,1,1,62,1,1,1,62,1,1,1
-    db 64,1,1,1,64,1,1,1,64,1,1,1,64,1,1,1
-    db 64,1,1,1,64,1,1,1,0,0,0,0,0,0,0,0
    db 0,0,0,0,0,0,0,0,0,0,0,0,69,1,1,1
    db 73,1,1,1,1,1,1,1,1,1,1,1,1,1,0,0
    db 74,1,1,1,1,1,1,1,1,1,0,0,73,1,0,71
@ -928,42 +913,32 @@ su_patterns:
    db 81,1,1,1,1,1,1,1,1,1,0,0,78,1,1,80
    db 81,1,1,1,1,1,1,1,1,0,0,0,83,1,1,81
    db 80,1,1,1,1,1,1,1,81,1,1,1,1,1,1,1
-    db 83,1,1,1,1,1,0,0,81,1,1,1,1,1,1,83
+    db 83,1,1,1,1,1,0,0,81,1,1,1,1,1,83,1
    db 85,1,1,1,1,1,1,1,0,0,0,0,85,1,1,83
    db 85,1,1,1,1,1,1,1,0,0,0,0,81,1,1,85
-    db 83,1,1,1,1,1,1,1,81,1,1,1,1,1,83,81
-    db 80,1,1,1,1,1,1,1,0,0,0,0,76,1,1,1
-    db 86,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 1,1,1,1,0,0,0,0,86,1,1,1,85,1,1,1
-    db 83,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 1,1,1,1,0,0,0,0,83,1,1,1,88,1,1,1
-    db 1,1,1,1,1,1,0,0,86,1,1,1,88,1,1,1
-    db 88,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 1,1,1,1,0,0,0,0,76,1,1,1,1,1,1,1
+    db 83,1,1,1,1,1,1,1,81,1,1,1,1,1,1,1
+    db 80,1,1,1,1,1,1,1,0,0,0,0,80,1,1,1
    db 81,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
-    db 1,1,1,1,0,0,0,0,0,0,0,0,0,0,0,0
    db 62,1,1,1,62,62,62,62,1,1,62,1,1,62,1,1
-    db 62,1,1,1,62,1,1,1,62,1,1,1,62,1,62,62
-    db 62,1,1,1,62,1,1,1,62,1,1,1,62,1,62,1
-    db 62,1,1,1,62,1,1,1,1,1,1,1,1,1,1,1
+    db 62,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
    db 60,1,1,1,60,1,1,1,60,1,1,1,60,1,1,1
-    db 60,1,1,1,60,1,1,1,1,1,1,1,1,1,1,1
+    db 60,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1

 ;-------------------------------------------------------------------------------
 ;    Tracks
 ;-------------------------------------------------------------------------------
 section .su_tracks data align=1
 su_tracks:
-    db 16,1,1,2,3,4,5,6,1,7,7,7,7,7,7,7,7,7,7,8,8,9,10,11,12,7,7,8,8,13,14,15,1,13,14,15,1,0,1,1,1
-    db 17,1,1,1,1,1,18,1,1,19,19,19,19,19,19,19,19,19,19,20,20,21,22,23,24,19,19,20,20,25,26,27,1,25,26,27,1,0,1,1,1
-    db 0,28,1,1,1,1,28,1,1,20,20,20,20,20,20,20,20,20,20,24,24,19,19,24,29,20,20,24,24,30,31,32,1,30,31,32,1,0,1,1,1
-    db 0,1,33,1,1,1,33,1,1,34,34,34,34,34,34,34,34,34,34,29,29,35,35,29,36,34,34,29,29,37,38,39,1,37,38,39,1,0,1,1,1
-    db 0,1,1,40,41,31,42,43,1,44,44,44,44,44,44,44,44,44,44,36,36,45,45,36,1,44,44,36,36,46,47,48,1,46,47,48,1,0,1,1,1
-    db 0,1,1,1,1,1,1,1,1,49,49,49,49,49,49,49,49,49,49,50,50,51,51,50,50,49,49,50,50,52,52,53,53,52,52,53,54,1,1,1,1
-    db 0,1,1,1,1,1,1,1,1,55,55,55,55,55,55,55,55,55,55,56,56,57,57,56,56,55,55,56,56,58,58,59,59,58,58,59,60,1,1,1,1
-    db 0,1,1,1,1,1,1,1,1,1,1,1,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,78,82,83,84,85,86,1,1
-    db 0,1,1,1,1,1,1,1,1,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,87,88,89,88,89,88,89,88,90,1,1,1,1
-    db 0,1,1,1,1,1,1,1,1,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,91,92,1,1,1,1
+    db 23,1,1,2,3,4,5,6,1,7,7,7,7,7,7,7,7,7,7,8,8,9,10,11,12,7,7,8,8,7,7,13,1
+    db 14,1,1,1,1,1,15,1,1,16,16,16,16,16,16,16,16,16,16,17,17,18,19,20,21,16,16,17,17,16,16,22,1
+    db 0,24,1,1,1,1,24,1,1,17,17,17,17,17,17,17,17,17,17,21,21,16,16,21,25,17,17,21,21,17,17,26,1
+    db 0,1,27,1,1,1,27,1,1,28,28,28,28,28,28,28,28,28,28,25,25,29,29,25,30,28,28,25,25,28,28,31,1
+    db 0,1,1,32,33,34,35,36,1,37,37,37,37,37,37,37,37,37,37,30,30,38,38,30,1,37,37,30,30,37,37,39,1
+    db 0,1,1,1,1,1,1,1,1,40,40,40,40,40,40,40,40,40,40,41,41,42,42,41,41,40,40,41,41,40,40,14,1
+    db 0,1,1,1,1,1,1,1,1,43,43,43,43,43,43,43,43,43,43,44,44,45,45,44,44,43,43,44,44,43,43,15,1
+    db 0,1,1,1,1,1,1,1,1,1,1,1,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,0,1,1
+    db 0,1,1,1,1,1,1,1,1,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,64,65,1
+    db 0,1,1,1,1,1,1,1,1,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,66,67,1
 ;-------------------------------------------------------------------------------
 ;    Sample offsets
 ;-------------------------------------------------------------------------------