Change table name to noiseFlag

bsom · Mar 3, 2014 · b4e45a1 · b4e45a1
1 parent 2ad8cd0
commit b4e45a1
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 14 deletions.
diff --git a/src/SamTabs.h b/src/SamTabs.h
@@ -345,20 +345,41 @@ unsigned char blendRank[] =
 	0x1D , 0x1B , 0x17 , 0x1D , 0x17 , 0x17 , 0x1D , 0x17 ,
 	0x17 , 0x1D , 0x17 , 0x17 , 0x1D , 0x17 , 0x17 , 0x17
 };
+
+
+
+// Looks like it's used as bit flags
+// High bits masked by 248 (11111000)
+//
+// 32: S*    241         11110001
+// 33: SH    226         11100010    
+// 34: F*    211         11010011
+// 35: TH    187         10111011
+// 36: /H    124         01111100
+// 37: /X    149         10010101
+// 38: Z*    1           00000001
+// 39: ZH    2           00000010
+// 40: V*    3           00000011
+// 41: DH    3           00000011
+// 43: **    114         01110010
+// 45: **    2           00000010
+// 67: **    27          00011011
+// 70: **    25          00011001
+// tab45936
+unsigned char noiseFlag[] =
+{
+    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
+    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
+    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
+    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
+    0xF1 , 0xE2 , 0xD3 , 0xBB , 0x7C , 0x95 , 1 , 2 ,
+    3 , 3 , 0 , 0x72 , 0 , 2 , 0 , 0 ,
+    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
+    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
+    0 , 0 , 0 , 0x1B , 0 , 0 , 0x19 , 0 ,
+    0 , 0 , 0 , 0 , 0 , 0 , 0 , 0
+};
 
-unsigned char tab45936[] = 
-{
-	0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-	0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-	0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-	0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-	0xF1 , 0xE2 , 0xD3 , 0xBB , 0x7C , 0x95 , 1 , 2 ,
-	3 , 3 , 0 , 0x72 , 0 , 2 , 0 , 0 ,
-	0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-	0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 ,
-	0 , 0 , 0 , 0x1B , 0 , 0 , 0x19 , 0 ,
-	0 , 0 , 0 , 0 , 0 , 0 , 0 , 0 
-};
 
 
 unsigned char amplitudeRescale[] = 

diff --git a/src/sam.c b/src/sam.c
@@ -1780,7 +1780,7 @@ do
 		amplitude1[X] = ampl1data[Y];     // F1 amplitude
 		amplitude2[X] = ampl2data[Y];     // F2 amplitude
 		amplitude3[X] = ampl3data[Y];     // F3 amplitude
-		tab44800[X] = tab45936[Y];        // flags
+		tab44800[X] = noiseFlag[Y];        // flags
 		pitches[X] = pitch + phase1;      // pitch
 		X++;
 		phase2--;