diff --git a/FamiStudio/Nsf/nsf_famistudio_dual.bin b/FamiStudio/Nsf/nsf_famistudio_dual.bin
index 3e5dd37e7..1e29b780a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_dual.tbl
index 3c8a1a2c7..57922c81d 100644
--- a/FamiStudio/Nsf/nsf_famistudio_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_dual.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2899
-famistudio_note_table_lsb=2705
+famistudio_note_table_msb=2931
+famistudio_note_table_lsb=2737
diff --git a/FamiStudio/Nsf/nsf_famistudio_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_epsm_dual.bin
index bdd13314f..34f474996 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_epsm_dual.tbl
index ad857cf9e..33f434895 100644
--- a/FamiStudio/Nsf/nsf_famistudio_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_epsm_dual.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4928
-famistudio_epsm_note_table_lsb=4831
-famistudio_epsm_s_note_table_msb=5122
-famistudio_epsm_s_note_table_lsb=5025
-famistudio_note_table_msb=4637
-famistudio_note_table_lsb=4443
+famistudio_epsm_note_table_msb=4960
+famistudio_epsm_note_table_lsb=4863
+famistudio_epsm_s_note_table_msb=5154
+famistudio_epsm_s_note_table_lsb=5057
+famistudio_note_table_msb=4669
+famistudio_note_table_lsb=4475
diff --git a/FamiStudio/Nsf/nsf_famistudio_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_epsm_ntsc.bin
index 45ea0878d..d106b02ed 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_epsm_ntsc.tbl
index 121c55d82..2a21cb5d3 100644
--- a/FamiStudio/Nsf/nsf_famistudio_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_epsm_ntsc.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4705
-famistudio_epsm_note_table_lsb=4608
-famistudio_epsm_s_note_table_msb=4899
-famistudio_epsm_s_note_table_lsb=4802
-famistudio_note_table_msb=4511
-famistudio_note_table_lsb=4414
+famistudio_epsm_note_table_msb=4737
+famistudio_epsm_note_table_lsb=4640
+famistudio_epsm_s_note_table_msb=4931
+famistudio_epsm_s_note_table_lsb=4834
+famistudio_note_table_msb=4543
+famistudio_note_table_lsb=4446
diff --git a/FamiStudio/Nsf/nsf_famistudio_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_epsm_pal.bin
index b4df60562..2a34d838b 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_epsm_pal.tbl
index a4d3c81ff..e5a83b2e3 100644
--- a/FamiStudio/Nsf/nsf_famistudio_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_epsm_pal.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4707
-famistudio_epsm_note_table_lsb=4610
-famistudio_epsm_s_note_table_msb=4901
-famistudio_epsm_s_note_table_lsb=4804
-famistudio_note_table_msb=4513
-famistudio_note_table_lsb=4416
+famistudio_epsm_note_table_msb=4739
+famistudio_epsm_note_table_lsb=4642
+famistudio_epsm_s_note_table_msb=4933
+famistudio_epsm_s_note_table_lsb=4836
+famistudio_note_table_msb=4545
+famistudio_note_table_lsb=4448
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_dual.bin
index 45b56af78..fc8d4f7cb 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_dual.tbl
index 97ade6041..1fd3c1dc2 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_dual.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2939
-famistudio_note_table_lsb=2745
+famistudio_note_table_msb=2971
+famistudio_note_table_lsb=2777
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_dual.bin
index f66df1a83..4a433c189 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_dual.tbl
index 9726a0233..1f1219bb2 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_dual.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4968
-famistudio_epsm_note_table_lsb=4871
-famistudio_epsm_s_note_table_msb=5162
-famistudio_epsm_s_note_table_lsb=5065
-famistudio_note_table_msb=4677
-famistudio_note_table_lsb=4483
+famistudio_epsm_note_table_msb=5000
+famistudio_epsm_note_table_lsb=4903
+famistudio_epsm_s_note_table_msb=5194
+famistudio_epsm_s_note_table_lsb=5097
+famistudio_note_table_msb=4709
+famistudio_note_table_lsb=4515
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_ntsc.bin
index ae2020875..4c681cb20 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_ntsc.tbl
index 1b5310cdc..b9e869c71 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_ntsc.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4752
-famistudio_epsm_note_table_lsb=4655
-famistudio_epsm_s_note_table_msb=4946
-famistudio_epsm_s_note_table_lsb=4849
-famistudio_note_table_msb=4558
-famistudio_note_table_lsb=4461
+famistudio_epsm_note_table_msb=4784
+famistudio_epsm_note_table_lsb=4687
+famistudio_epsm_s_note_table_msb=4978
+famistudio_epsm_s_note_table_lsb=4881
+famistudio_note_table_msb=4590
+famistudio_note_table_lsb=4493
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_pal.bin
index c89737660..fae40c285 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_pal.tbl
index 1b5310cdc..b9e869c71 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_epsm_pal.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4752
-famistudio_epsm_note_table_lsb=4655
-famistudio_epsm_s_note_table_msb=4946
-famistudio_epsm_s_note_table_lsb=4849
-famistudio_note_table_msb=4558
-famistudio_note_table_lsb=4461
+famistudio_epsm_note_table_msb=4784
+famistudio_epsm_note_table_lsb=4687
+famistudio_epsm_s_note_table_msb=4978
+famistudio_epsm_s_note_table_lsb=4881
+famistudio_note_table_msb=4590
+famistudio_note_table_lsb=4493
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_dual.bin
index a03a1ba4a..11f18a223 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_dual.tbl
index 3bdf5dfc9..ea84ab2d9 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=4112
-famistudio_fds_note_table_lsb=3918
-famistudio_note_table_msb=3724
-famistudio_note_table_lsb=3530
+famistudio_fds_note_table_msb=4144
+famistudio_fds_note_table_lsb=3950
+famistudio_note_table_msb=3756
+famistudio_note_table_lsb=3562
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_ntsc.bin
index e2b591d3d..f4260bc25 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_ntsc.tbl
index 366308a93..a694dee13 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=3795
-famistudio_fds_note_table_lsb=3698
-famistudio_note_table_msb=3601
-famistudio_note_table_lsb=3504
+famistudio_fds_note_table_msb=3827
+famistudio_fds_note_table_lsb=3730
+famistudio_note_table_msb=3633
+famistudio_note_table_lsb=3536
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_pal.bin
index 764cc8cce..edb63ef74 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_pal.tbl
index 366308a93..a694dee13 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_fds_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=3795
-famistudio_fds_note_table_lsb=3698
-famistudio_note_table_msb=3601
-famistudio_note_table_lsb=3504
+famistudio_fds_note_table_msb=3827
+famistudio_fds_note_table_lsb=3730
+famistudio_note_table_msb=3633
+famistudio_note_table_lsb=3536
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_dual.bin
index d0f33111f..f413d9015 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_dual.tbl
index 6c1085b4c..9f747d488 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_dual.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=3131
-famistudio_note_table_lsb=2937
+famistudio_note_table_msb=3161
+famistudio_note_table_lsb=2967
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_ntsc.bin
index 3cff5a705..596877961 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_ntsc.tbl
index f07a5f7a7..43e021f42 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_ntsc.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=3004
-famistudio_note_table_lsb=2907
+famistudio_note_table_msb=3034
+famistudio_note_table_lsb=2937
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_pal.bin
index bdaabedb9..bf5802dae 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_pal.tbl
index f07a5f7a7..43e021f42 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_mmc5_pal.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=3004
-famistudio_note_table_lsb=2907
+famistudio_note_table_msb=3034
+famistudio_note_table_lsb=2937
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_dual.bin
index ae0165e10..948c598cf 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_dual.tbl
index 0f13d8856..0c8d9195d 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5950
-famistudio_s5b_note_table_lsb=5756
-famistudio_n163_note_table_msb=7308
-famistudio_n163_note_table_lsb=7114
-famistudio_vrc7_note_table_msb=6629
-famistudio_vrc7_note_table_lsb=6532
-famistudio_fds_note_table_msb=6920
-famistudio_fds_note_table_lsb=6726
-famistudio_saw_note_table_msb=6338
-famistudio_saw_note_table_lsb=6144
-famistudio_note_table_msb=5950
-famistudio_note_table_lsb=5756
+famistudio_s5b_note_table_msb=5977
+famistudio_s5b_note_table_lsb=5783
+famistudio_n163_note_table_msb=7335
+famistudio_n163_note_table_lsb=7141
+famistudio_vrc7_note_table_msb=6656
+famistudio_vrc7_note_table_lsb=6559
+famistudio_fds_note_table_msb=6947
+famistudio_fds_note_table_lsb=6753
+famistudio_saw_note_table_msb=6365
+famistudio_saw_note_table_lsb=6171
+famistudio_note_table_msb=5977
+famistudio_note_table_lsb=5783
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_dual.bin
index 175aaa880..8a1d1fcd4 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_dual.tbl
index 7028cb08d..64edec4c6 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7540
-famistudio_s5b_note_table_lsb=7346
-famistudio_n163_note_table_msb=9286
-famistudio_n163_note_table_lsb=9092
-famistudio_epsm_note_table_msb=8413
-famistudio_epsm_note_table_lsb=8316
-famistudio_epsm_s_note_table_msb=8607
-famistudio_epsm_s_note_table_lsb=8510
-famistudio_vrc7_note_table_msb=8219
-famistudio_vrc7_note_table_lsb=8122
-famistudio_fds_note_table_msb=8898
-famistudio_fds_note_table_lsb=8704
-famistudio_saw_note_table_msb=7928
-famistudio_saw_note_table_lsb=7734
-famistudio_note_table_msb=7540
-famistudio_note_table_lsb=7346
+famistudio_s5b_note_table_msb=7567
+famistudio_s5b_note_table_lsb=7373
+famistudio_n163_note_table_msb=9313
+famistudio_n163_note_table_lsb=9119
+famistudio_epsm_note_table_msb=8440
+famistudio_epsm_note_table_lsb=8343
+famistudio_epsm_s_note_table_msb=8634
+famistudio_epsm_s_note_table_lsb=8537
+famistudio_vrc7_note_table_msb=8246
+famistudio_vrc7_note_table_lsb=8149
+famistudio_fds_note_table_msb=8925
+famistudio_fds_note_table_lsb=8731
+famistudio_saw_note_table_msb=7955
+famistudio_saw_note_table_lsb=7761
+famistudio_note_table_msb=7567
+famistudio_note_table_lsb=7373
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_ntsc.bin
index c036178b1..fac2b7ea6 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_ntsc.tbl
index b6a131461..099838b36 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7389
-famistudio_s5b_note_table_lsb=7292
-famistudio_n163_note_table_msb=8553
-famistudio_n163_note_table_lsb=8456
-famistudio_epsm_note_table_msb=7971
-famistudio_epsm_note_table_lsb=7874
-famistudio_epsm_s_note_table_msb=8165
-famistudio_epsm_s_note_table_lsb=8068
-famistudio_vrc7_note_table_msb=7777
-famistudio_vrc7_note_table_lsb=7680
-famistudio_fds_note_table_msb=8359
-famistudio_fds_note_table_lsb=8262
-famistudio_saw_note_table_msb=7583
-famistudio_saw_note_table_lsb=7486
-famistudio_note_table_msb=7389
-famistudio_note_table_lsb=7292
+famistudio_s5b_note_table_msb=7416
+famistudio_s5b_note_table_lsb=7319
+famistudio_n163_note_table_msb=8580
+famistudio_n163_note_table_lsb=8483
+famistudio_epsm_note_table_msb=7998
+famistudio_epsm_note_table_lsb=7901
+famistudio_epsm_s_note_table_msb=8192
+famistudio_epsm_s_note_table_lsb=8095
+famistudio_vrc7_note_table_msb=7804
+famistudio_vrc7_note_table_lsb=7707
+famistudio_fds_note_table_msb=8386
+famistudio_fds_note_table_lsb=8289
+famistudio_saw_note_table_msb=7610
+famistudio_saw_note_table_lsb=7513
+famistudio_note_table_msb=7416
+famistudio_note_table_lsb=7319
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_pal.bin
index 72790dfec..c1755b2ff 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_pal.tbl
index b6a131461..099838b36 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7389
-famistudio_s5b_note_table_lsb=7292
-famistudio_n163_note_table_msb=8553
-famistudio_n163_note_table_lsb=8456
-famistudio_epsm_note_table_msb=7971
-famistudio_epsm_note_table_lsb=7874
-famistudio_epsm_s_note_table_msb=8165
-famistudio_epsm_s_note_table_lsb=8068
-famistudio_vrc7_note_table_msb=7777
-famistudio_vrc7_note_table_lsb=7680
-famistudio_fds_note_table_msb=8359
-famistudio_fds_note_table_lsb=8262
-famistudio_saw_note_table_msb=7583
-famistudio_saw_note_table_lsb=7486
-famistudio_note_table_msb=7389
-famistudio_note_table_lsb=7292
+famistudio_s5b_note_table_msb=7416
+famistudio_s5b_note_table_lsb=7319
+famistudio_n163_note_table_msb=8580
+famistudio_n163_note_table_lsb=8483
+famistudio_epsm_note_table_msb=7998
+famistudio_epsm_note_table_lsb=7901
+famistudio_epsm_s_note_table_msb=8192
+famistudio_epsm_s_note_table_lsb=8095
+famistudio_vrc7_note_table_msb=7804
+famistudio_vrc7_note_table_lsb=7707
+famistudio_fds_note_table_msb=8386
+famistudio_fds_note_table_lsb=8289
+famistudio_saw_note_table_msb=7610
+famistudio_saw_note_table_lsb=7513
+famistudio_note_table_msb=7416
+famistudio_note_table_lsb=7319
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_ntsc.bin
index ac868f486..ef2d9f1c8 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_ntsc.tbl
index 5ce841f4d..cc421665d 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5799
-famistudio_s5b_note_table_lsb=5702
-famistudio_n163_note_table_msb=6575
-famistudio_n163_note_table_lsb=6478
-famistudio_vrc7_note_table_msb=6187
-famistudio_vrc7_note_table_lsb=6090
-famistudio_fds_note_table_msb=6381
-famistudio_fds_note_table_lsb=6284
-famistudio_saw_note_table_msb=5993
-famistudio_saw_note_table_lsb=5896
-famistudio_note_table_msb=5799
-famistudio_note_table_lsb=5702
+famistudio_s5b_note_table_msb=5826
+famistudio_s5b_note_table_lsb=5729
+famistudio_n163_note_table_msb=6602
+famistudio_n163_note_table_lsb=6505
+famistudio_vrc7_note_table_msb=6214
+famistudio_vrc7_note_table_lsb=6117
+famistudio_fds_note_table_msb=6408
+famistudio_fds_note_table_lsb=6311
+famistudio_saw_note_table_msb=6020
+famistudio_saw_note_table_lsb=5923
+famistudio_note_table_msb=5826
+famistudio_note_table_lsb=5729
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_pal.bin
index 7b4a611a2..cff932d41 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_pal.tbl
index 5ce841f4d..cc421665d 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_1ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5799
-famistudio_s5b_note_table_lsb=5702
-famistudio_n163_note_table_msb=6575
-famistudio_n163_note_table_lsb=6478
-famistudio_vrc7_note_table_msb=6187
-famistudio_vrc7_note_table_lsb=6090
-famistudio_fds_note_table_msb=6381
-famistudio_fds_note_table_lsb=6284
-famistudio_saw_note_table_msb=5993
-famistudio_saw_note_table_lsb=5896
-famistudio_note_table_msb=5799
-famistudio_note_table_lsb=5702
+famistudio_s5b_note_table_msb=5826
+famistudio_s5b_note_table_lsb=5729
+famistudio_n163_note_table_msb=6602
+famistudio_n163_note_table_lsb=6505
+famistudio_vrc7_note_table_msb=6214
+famistudio_vrc7_note_table_lsb=6117
+famistudio_fds_note_table_msb=6408
+famistudio_fds_note_table_lsb=6311
+famistudio_saw_note_table_msb=6020
+famistudio_saw_note_table_lsb=5923
+famistudio_note_table_msb=5826
+famistudio_note_table_lsb=5729
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_dual.bin
index 53f8d13ef..5de835b9d 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_dual.tbl
index 9eca7c90a..7b4759900 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5954
-famistudio_s5b_note_table_lsb=5760
-famistudio_n163_note_table_msb=7312
-famistudio_n163_note_table_lsb=7118
-famistudio_vrc7_note_table_msb=6633
-famistudio_vrc7_note_table_lsb=6536
-famistudio_fds_note_table_msb=6924
-famistudio_fds_note_table_lsb=6730
-famistudio_saw_note_table_msb=6342
-famistudio_saw_note_table_lsb=6148
-famistudio_note_table_msb=5954
-famistudio_note_table_lsb=5760
+famistudio_s5b_note_table_msb=5981
+famistudio_s5b_note_table_lsb=5787
+famistudio_n163_note_table_msb=7339
+famistudio_n163_note_table_lsb=7145
+famistudio_vrc7_note_table_msb=6660
+famistudio_vrc7_note_table_lsb=6563
+famistudio_fds_note_table_msb=6951
+famistudio_fds_note_table_lsb=6757
+famistudio_saw_note_table_msb=6369
+famistudio_saw_note_table_lsb=6175
+famistudio_note_table_msb=5981
+famistudio_note_table_lsb=5787
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_dual.bin
index a941b4510..8eb37c893 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_dual.tbl
index 86da81f67..98b8f9873 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7544
-famistudio_s5b_note_table_lsb=7350
-famistudio_n163_note_table_msb=9290
-famistudio_n163_note_table_lsb=9096
-famistudio_epsm_note_table_msb=8417
-famistudio_epsm_note_table_lsb=8320
-famistudio_epsm_s_note_table_msb=8611
-famistudio_epsm_s_note_table_lsb=8514
-famistudio_vrc7_note_table_msb=8223
-famistudio_vrc7_note_table_lsb=8126
-famistudio_fds_note_table_msb=8902
-famistudio_fds_note_table_lsb=8708
-famistudio_saw_note_table_msb=7932
-famistudio_saw_note_table_lsb=7738
-famistudio_note_table_msb=7544
-famistudio_note_table_lsb=7350
+famistudio_s5b_note_table_msb=7571
+famistudio_s5b_note_table_lsb=7377
+famistudio_n163_note_table_msb=9317
+famistudio_n163_note_table_lsb=9123
+famistudio_epsm_note_table_msb=8444
+famistudio_epsm_note_table_lsb=8347
+famistudio_epsm_s_note_table_msb=8638
+famistudio_epsm_s_note_table_lsb=8541
+famistudio_vrc7_note_table_msb=8250
+famistudio_vrc7_note_table_lsb=8153
+famistudio_fds_note_table_msb=8929
+famistudio_fds_note_table_lsb=8735
+famistudio_saw_note_table_msb=7959
+famistudio_saw_note_table_lsb=7765
+famistudio_note_table_msb=7571
+famistudio_note_table_lsb=7377
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_ntsc.bin
index 6c19cd222..bf27f15da 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_ntsc.tbl
index 8bfa0d32a..cfc43b426 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7393
-famistudio_s5b_note_table_lsb=7296
-famistudio_n163_note_table_msb=8557
-famistudio_n163_note_table_lsb=8460
-famistudio_epsm_note_table_msb=7975
-famistudio_epsm_note_table_lsb=7878
-famistudio_epsm_s_note_table_msb=8169
-famistudio_epsm_s_note_table_lsb=8072
-famistudio_vrc7_note_table_msb=7781
-famistudio_vrc7_note_table_lsb=7684
-famistudio_fds_note_table_msb=8363
-famistudio_fds_note_table_lsb=8266
-famistudio_saw_note_table_msb=7587
-famistudio_saw_note_table_lsb=7490
-famistudio_note_table_msb=7393
-famistudio_note_table_lsb=7296
+famistudio_s5b_note_table_msb=7420
+famistudio_s5b_note_table_lsb=7323
+famistudio_n163_note_table_msb=8584
+famistudio_n163_note_table_lsb=8487
+famistudio_epsm_note_table_msb=8002
+famistudio_epsm_note_table_lsb=7905
+famistudio_epsm_s_note_table_msb=8196
+famistudio_epsm_s_note_table_lsb=8099
+famistudio_vrc7_note_table_msb=7808
+famistudio_vrc7_note_table_lsb=7711
+famistudio_fds_note_table_msb=8390
+famistudio_fds_note_table_lsb=8293
+famistudio_saw_note_table_msb=7614
+famistudio_saw_note_table_lsb=7517
+famistudio_note_table_msb=7420
+famistudio_note_table_lsb=7323
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_pal.bin
index 7d7a76fbe..340046bf3 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_pal.tbl
index 8bfa0d32a..cfc43b426 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7393
-famistudio_s5b_note_table_lsb=7296
-famistudio_n163_note_table_msb=8557
-famistudio_n163_note_table_lsb=8460
-famistudio_epsm_note_table_msb=7975
-famistudio_epsm_note_table_lsb=7878
-famistudio_epsm_s_note_table_msb=8169
-famistudio_epsm_s_note_table_lsb=8072
-famistudio_vrc7_note_table_msb=7781
-famistudio_vrc7_note_table_lsb=7684
-famistudio_fds_note_table_msb=8363
-famistudio_fds_note_table_lsb=8266
-famistudio_saw_note_table_msb=7587
-famistudio_saw_note_table_lsb=7490
-famistudio_note_table_msb=7393
-famistudio_note_table_lsb=7296
+famistudio_s5b_note_table_msb=7420
+famistudio_s5b_note_table_lsb=7323
+famistudio_n163_note_table_msb=8584
+famistudio_n163_note_table_lsb=8487
+famistudio_epsm_note_table_msb=8002
+famistudio_epsm_note_table_lsb=7905
+famistudio_epsm_s_note_table_msb=8196
+famistudio_epsm_s_note_table_lsb=8099
+famistudio_vrc7_note_table_msb=7808
+famistudio_vrc7_note_table_lsb=7711
+famistudio_fds_note_table_msb=8390
+famistudio_fds_note_table_lsb=8293
+famistudio_saw_note_table_msb=7614
+famistudio_saw_note_table_lsb=7517
+famistudio_note_table_msb=7420
+famistudio_note_table_lsb=7323
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_ntsc.bin
index 1778cce6c..743bfe79b 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_ntsc.tbl
index 30acdd4f4..af7aceaf2 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5803
-famistudio_s5b_note_table_lsb=5706
-famistudio_n163_note_table_msb=6579
-famistudio_n163_note_table_lsb=6482
-famistudio_vrc7_note_table_msb=6191
-famistudio_vrc7_note_table_lsb=6094
-famistudio_fds_note_table_msb=6385
-famistudio_fds_note_table_lsb=6288
-famistudio_saw_note_table_msb=5997
-famistudio_saw_note_table_lsb=5900
-famistudio_note_table_msb=5803
-famistudio_note_table_lsb=5706
+famistudio_s5b_note_table_msb=5830
+famistudio_s5b_note_table_lsb=5733
+famistudio_n163_note_table_msb=6606
+famistudio_n163_note_table_lsb=6509
+famistudio_vrc7_note_table_msb=6218
+famistudio_vrc7_note_table_lsb=6121
+famistudio_fds_note_table_msb=6412
+famistudio_fds_note_table_lsb=6315
+famistudio_saw_note_table_msb=6024
+famistudio_saw_note_table_lsb=5927
+famistudio_note_table_msb=5830
+famistudio_note_table_lsb=5733
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_pal.bin
index 813d454e5..5a6b0b6c1 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_pal.tbl
index 30acdd4f4..af7aceaf2 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_2ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5803
-famistudio_s5b_note_table_lsb=5706
-famistudio_n163_note_table_msb=6579
-famistudio_n163_note_table_lsb=6482
-famistudio_vrc7_note_table_msb=6191
-famistudio_vrc7_note_table_lsb=6094
-famistudio_fds_note_table_msb=6385
-famistudio_fds_note_table_lsb=6288
-famistudio_saw_note_table_msb=5997
-famistudio_saw_note_table_lsb=5900
-famistudio_note_table_msb=5803
-famistudio_note_table_lsb=5706
+famistudio_s5b_note_table_msb=5830
+famistudio_s5b_note_table_lsb=5733
+famistudio_n163_note_table_msb=6606
+famistudio_n163_note_table_lsb=6509
+famistudio_vrc7_note_table_msb=6218
+famistudio_vrc7_note_table_lsb=6121
+famistudio_fds_note_table_msb=6412
+famistudio_fds_note_table_lsb=6315
+famistudio_saw_note_table_msb=6024
+famistudio_saw_note_table_lsb=5927
+famistudio_note_table_msb=5830
+famistudio_note_table_lsb=5733
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_dual.bin
index 8c9ced927..c871f4e79 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_dual.tbl
index 075898a91..3360dca03 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5958
-famistudio_s5b_note_table_lsb=5764
-famistudio_n163_note_table_msb=7316
-famistudio_n163_note_table_lsb=7122
-famistudio_vrc7_note_table_msb=6637
-famistudio_vrc7_note_table_lsb=6540
-famistudio_fds_note_table_msb=6928
-famistudio_fds_note_table_lsb=6734
-famistudio_saw_note_table_msb=6346
-famistudio_saw_note_table_lsb=6152
-famistudio_note_table_msb=5958
-famistudio_note_table_lsb=5764
+famistudio_s5b_note_table_msb=5985
+famistudio_s5b_note_table_lsb=5791
+famistudio_n163_note_table_msb=7343
+famistudio_n163_note_table_lsb=7149
+famistudio_vrc7_note_table_msb=6664
+famistudio_vrc7_note_table_lsb=6567
+famistudio_fds_note_table_msb=6955
+famistudio_fds_note_table_lsb=6761
+famistudio_saw_note_table_msb=6373
+famistudio_saw_note_table_lsb=6179
+famistudio_note_table_msb=5985
+famistudio_note_table_lsb=5791
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_dual.bin
index f76c8036c..320a84b44 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_dual.tbl
index 0a0dc6b1a..e431be8b5 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7548
-famistudio_s5b_note_table_lsb=7354
-famistudio_n163_note_table_msb=9294
-famistudio_n163_note_table_lsb=9100
-famistudio_epsm_note_table_msb=8421
-famistudio_epsm_note_table_lsb=8324
-famistudio_epsm_s_note_table_msb=8615
-famistudio_epsm_s_note_table_lsb=8518
-famistudio_vrc7_note_table_msb=8227
-famistudio_vrc7_note_table_lsb=8130
-famistudio_fds_note_table_msb=8906
-famistudio_fds_note_table_lsb=8712
-famistudio_saw_note_table_msb=7936
-famistudio_saw_note_table_lsb=7742
-famistudio_note_table_msb=7548
-famistudio_note_table_lsb=7354
+famistudio_s5b_note_table_msb=7575
+famistudio_s5b_note_table_lsb=7381
+famistudio_n163_note_table_msb=9321
+famistudio_n163_note_table_lsb=9127
+famistudio_epsm_note_table_msb=8448
+famistudio_epsm_note_table_lsb=8351
+famistudio_epsm_s_note_table_msb=8642
+famistudio_epsm_s_note_table_lsb=8545
+famistudio_vrc7_note_table_msb=8254
+famistudio_vrc7_note_table_lsb=8157
+famistudio_fds_note_table_msb=8933
+famistudio_fds_note_table_lsb=8739
+famistudio_saw_note_table_msb=7963
+famistudio_saw_note_table_lsb=7769
+famistudio_note_table_msb=7575
+famistudio_note_table_lsb=7381
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_ntsc.bin
index 2f03015d6..1c659810a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_ntsc.tbl
index 4509ee429..b124e6c21 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7397
-famistudio_s5b_note_table_lsb=7300
-famistudio_n163_note_table_msb=8561
-famistudio_n163_note_table_lsb=8464
-famistudio_epsm_note_table_msb=7979
-famistudio_epsm_note_table_lsb=7882
-famistudio_epsm_s_note_table_msb=8173
-famistudio_epsm_s_note_table_lsb=8076
-famistudio_vrc7_note_table_msb=7785
-famistudio_vrc7_note_table_lsb=7688
-famistudio_fds_note_table_msb=8367
-famistudio_fds_note_table_lsb=8270
-famistudio_saw_note_table_msb=7591
-famistudio_saw_note_table_lsb=7494
-famistudio_note_table_msb=7397
-famistudio_note_table_lsb=7300
+famistudio_s5b_note_table_msb=7424
+famistudio_s5b_note_table_lsb=7327
+famistudio_n163_note_table_msb=8588
+famistudio_n163_note_table_lsb=8491
+famistudio_epsm_note_table_msb=8006
+famistudio_epsm_note_table_lsb=7909
+famistudio_epsm_s_note_table_msb=8200
+famistudio_epsm_s_note_table_lsb=8103
+famistudio_vrc7_note_table_msb=7812
+famistudio_vrc7_note_table_lsb=7715
+famistudio_fds_note_table_msb=8394
+famistudio_fds_note_table_lsb=8297
+famistudio_saw_note_table_msb=7618
+famistudio_saw_note_table_lsb=7521
+famistudio_note_table_msb=7424
+famistudio_note_table_lsb=7327
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_pal.bin
index 82f1aa2b8..9da5c7037 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_pal.tbl
index 4509ee429..b124e6c21 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7397
-famistudio_s5b_note_table_lsb=7300
-famistudio_n163_note_table_msb=8561
-famistudio_n163_note_table_lsb=8464
-famistudio_epsm_note_table_msb=7979
-famistudio_epsm_note_table_lsb=7882
-famistudio_epsm_s_note_table_msb=8173
-famistudio_epsm_s_note_table_lsb=8076
-famistudio_vrc7_note_table_msb=7785
-famistudio_vrc7_note_table_lsb=7688
-famistudio_fds_note_table_msb=8367
-famistudio_fds_note_table_lsb=8270
-famistudio_saw_note_table_msb=7591
-famistudio_saw_note_table_lsb=7494
-famistudio_note_table_msb=7397
-famistudio_note_table_lsb=7300
+famistudio_s5b_note_table_msb=7424
+famistudio_s5b_note_table_lsb=7327
+famistudio_n163_note_table_msb=8588
+famistudio_n163_note_table_lsb=8491
+famistudio_epsm_note_table_msb=8006
+famistudio_epsm_note_table_lsb=7909
+famistudio_epsm_s_note_table_msb=8200
+famistudio_epsm_s_note_table_lsb=8103
+famistudio_vrc7_note_table_msb=7812
+famistudio_vrc7_note_table_lsb=7715
+famistudio_fds_note_table_msb=8394
+famistudio_fds_note_table_lsb=8297
+famistudio_saw_note_table_msb=7618
+famistudio_saw_note_table_lsb=7521
+famistudio_note_table_msb=7424
+famistudio_note_table_lsb=7327
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_ntsc.bin
index 0549831d0..71d034fb3 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_ntsc.tbl
index 8f0b07971..27d8b204d 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5807
-famistudio_s5b_note_table_lsb=5710
-famistudio_n163_note_table_msb=6583
-famistudio_n163_note_table_lsb=6486
-famistudio_vrc7_note_table_msb=6195
-famistudio_vrc7_note_table_lsb=6098
-famistudio_fds_note_table_msb=6389
-famistudio_fds_note_table_lsb=6292
-famistudio_saw_note_table_msb=6001
-famistudio_saw_note_table_lsb=5904
-famistudio_note_table_msb=5807
-famistudio_note_table_lsb=5710
+famistudio_s5b_note_table_msb=5834
+famistudio_s5b_note_table_lsb=5737
+famistudio_n163_note_table_msb=6610
+famistudio_n163_note_table_lsb=6513
+famistudio_vrc7_note_table_msb=6222
+famistudio_vrc7_note_table_lsb=6125
+famistudio_fds_note_table_msb=6416
+famistudio_fds_note_table_lsb=6319
+famistudio_saw_note_table_msb=6028
+famistudio_saw_note_table_lsb=5931
+famistudio_note_table_msb=5834
+famistudio_note_table_lsb=5737
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_pal.bin
index 12a4ce9b4..73fc1c190 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_pal.tbl
index 8f0b07971..27d8b204d 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_3ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5807
-famistudio_s5b_note_table_lsb=5710
-famistudio_n163_note_table_msb=6583
-famistudio_n163_note_table_lsb=6486
-famistudio_vrc7_note_table_msb=6195
-famistudio_vrc7_note_table_lsb=6098
-famistudio_fds_note_table_msb=6389
-famistudio_fds_note_table_lsb=6292
-famistudio_saw_note_table_msb=6001
-famistudio_saw_note_table_lsb=5904
-famistudio_note_table_msb=5807
-famistudio_note_table_lsb=5710
+famistudio_s5b_note_table_msb=5834
+famistudio_s5b_note_table_lsb=5737
+famistudio_n163_note_table_msb=6610
+famistudio_n163_note_table_lsb=6513
+famistudio_vrc7_note_table_msb=6222
+famistudio_vrc7_note_table_lsb=6125
+famistudio_fds_note_table_msb=6416
+famistudio_fds_note_table_lsb=6319
+famistudio_saw_note_table_msb=6028
+famistudio_saw_note_table_lsb=5931
+famistudio_note_table_msb=5834
+famistudio_note_table_lsb=5737
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_dual.bin
index bbd374d80..dc1897d16 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_dual.tbl
index 075898a91..3360dca03 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5958
-famistudio_s5b_note_table_lsb=5764
-famistudio_n163_note_table_msb=7316
-famistudio_n163_note_table_lsb=7122
-famistudio_vrc7_note_table_msb=6637
-famistudio_vrc7_note_table_lsb=6540
-famistudio_fds_note_table_msb=6928
-famistudio_fds_note_table_lsb=6734
-famistudio_saw_note_table_msb=6346
-famistudio_saw_note_table_lsb=6152
-famistudio_note_table_msb=5958
-famistudio_note_table_lsb=5764
+famistudio_s5b_note_table_msb=5985
+famistudio_s5b_note_table_lsb=5791
+famistudio_n163_note_table_msb=7343
+famistudio_n163_note_table_lsb=7149
+famistudio_vrc7_note_table_msb=6664
+famistudio_vrc7_note_table_lsb=6567
+famistudio_fds_note_table_msb=6955
+famistudio_fds_note_table_lsb=6761
+famistudio_saw_note_table_msb=6373
+famistudio_saw_note_table_lsb=6179
+famistudio_note_table_msb=5985
+famistudio_note_table_lsb=5791
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_dual.bin
index 4999e4f7a..78f22d2b1 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_dual.tbl
index 0a0dc6b1a..e431be8b5 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7548
-famistudio_s5b_note_table_lsb=7354
-famistudio_n163_note_table_msb=9294
-famistudio_n163_note_table_lsb=9100
-famistudio_epsm_note_table_msb=8421
-famistudio_epsm_note_table_lsb=8324
-famistudio_epsm_s_note_table_msb=8615
-famistudio_epsm_s_note_table_lsb=8518
-famistudio_vrc7_note_table_msb=8227
-famistudio_vrc7_note_table_lsb=8130
-famistudio_fds_note_table_msb=8906
-famistudio_fds_note_table_lsb=8712
-famistudio_saw_note_table_msb=7936
-famistudio_saw_note_table_lsb=7742
-famistudio_note_table_msb=7548
-famistudio_note_table_lsb=7354
+famistudio_s5b_note_table_msb=7575
+famistudio_s5b_note_table_lsb=7381
+famistudio_n163_note_table_msb=9321
+famistudio_n163_note_table_lsb=9127
+famistudio_epsm_note_table_msb=8448
+famistudio_epsm_note_table_lsb=8351
+famistudio_epsm_s_note_table_msb=8642
+famistudio_epsm_s_note_table_lsb=8545
+famistudio_vrc7_note_table_msb=8254
+famistudio_vrc7_note_table_lsb=8157
+famistudio_fds_note_table_msb=8933
+famistudio_fds_note_table_lsb=8739
+famistudio_saw_note_table_msb=7963
+famistudio_saw_note_table_lsb=7769
+famistudio_note_table_msb=7575
+famistudio_note_table_lsb=7381
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_ntsc.bin
index 6b5b4b76a..649ece4e2 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_ntsc.tbl
index 4509ee429..b124e6c21 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7397
-famistudio_s5b_note_table_lsb=7300
-famistudio_n163_note_table_msb=8561
-famistudio_n163_note_table_lsb=8464
-famistudio_epsm_note_table_msb=7979
-famistudio_epsm_note_table_lsb=7882
-famistudio_epsm_s_note_table_msb=8173
-famistudio_epsm_s_note_table_lsb=8076
-famistudio_vrc7_note_table_msb=7785
-famistudio_vrc7_note_table_lsb=7688
-famistudio_fds_note_table_msb=8367
-famistudio_fds_note_table_lsb=8270
-famistudio_saw_note_table_msb=7591
-famistudio_saw_note_table_lsb=7494
-famistudio_note_table_msb=7397
-famistudio_note_table_lsb=7300
+famistudio_s5b_note_table_msb=7424
+famistudio_s5b_note_table_lsb=7327
+famistudio_n163_note_table_msb=8588
+famistudio_n163_note_table_lsb=8491
+famistudio_epsm_note_table_msb=8006
+famistudio_epsm_note_table_lsb=7909
+famistudio_epsm_s_note_table_msb=8200
+famistudio_epsm_s_note_table_lsb=8103
+famistudio_vrc7_note_table_msb=7812
+famistudio_vrc7_note_table_lsb=7715
+famistudio_fds_note_table_msb=8394
+famistudio_fds_note_table_lsb=8297
+famistudio_saw_note_table_msb=7618
+famistudio_saw_note_table_lsb=7521
+famistudio_note_table_msb=7424
+famistudio_note_table_lsb=7327
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_pal.bin
index 6f9967fe7..8f1e01413 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_pal.tbl
index 4509ee429..b124e6c21 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7397
-famistudio_s5b_note_table_lsb=7300
-famistudio_n163_note_table_msb=8561
-famistudio_n163_note_table_lsb=8464
-famistudio_epsm_note_table_msb=7979
-famistudio_epsm_note_table_lsb=7882
-famistudio_epsm_s_note_table_msb=8173
-famistudio_epsm_s_note_table_lsb=8076
-famistudio_vrc7_note_table_msb=7785
-famistudio_vrc7_note_table_lsb=7688
-famistudio_fds_note_table_msb=8367
-famistudio_fds_note_table_lsb=8270
-famistudio_saw_note_table_msb=7591
-famistudio_saw_note_table_lsb=7494
-famistudio_note_table_msb=7397
-famistudio_note_table_lsb=7300
+famistudio_s5b_note_table_msb=7424
+famistudio_s5b_note_table_lsb=7327
+famistudio_n163_note_table_msb=8588
+famistudio_n163_note_table_lsb=8491
+famistudio_epsm_note_table_msb=8006
+famistudio_epsm_note_table_lsb=7909
+famistudio_epsm_s_note_table_msb=8200
+famistudio_epsm_s_note_table_lsb=8103
+famistudio_vrc7_note_table_msb=7812
+famistudio_vrc7_note_table_lsb=7715
+famistudio_fds_note_table_msb=8394
+famistudio_fds_note_table_lsb=8297
+famistudio_saw_note_table_msb=7618
+famistudio_saw_note_table_lsb=7521
+famistudio_note_table_msb=7424
+famistudio_note_table_lsb=7327
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_ntsc.bin
index 78aa70c55..d4ed21488 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_ntsc.tbl
index 8f0b07971..27d8b204d 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5807
-famistudio_s5b_note_table_lsb=5710
-famistudio_n163_note_table_msb=6583
-famistudio_n163_note_table_lsb=6486
-famistudio_vrc7_note_table_msb=6195
-famistudio_vrc7_note_table_lsb=6098
-famistudio_fds_note_table_msb=6389
-famistudio_fds_note_table_lsb=6292
-famistudio_saw_note_table_msb=6001
-famistudio_saw_note_table_lsb=5904
-famistudio_note_table_msb=5807
-famistudio_note_table_lsb=5710
+famistudio_s5b_note_table_msb=5834
+famistudio_s5b_note_table_lsb=5737
+famistudio_n163_note_table_msb=6610
+famistudio_n163_note_table_lsb=6513
+famistudio_vrc7_note_table_msb=6222
+famistudio_vrc7_note_table_lsb=6125
+famistudio_fds_note_table_msb=6416
+famistudio_fds_note_table_lsb=6319
+famistudio_saw_note_table_msb=6028
+famistudio_saw_note_table_lsb=5931
+famistudio_note_table_msb=5834
+famistudio_note_table_lsb=5737
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_pal.bin
index f3686cfdf..45de7c504 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_pal.tbl
index 8f0b07971..27d8b204d 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_4ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5807
-famistudio_s5b_note_table_lsb=5710
-famistudio_n163_note_table_msb=6583
-famistudio_n163_note_table_lsb=6486
-famistudio_vrc7_note_table_msb=6195
-famistudio_vrc7_note_table_lsb=6098
-famistudio_fds_note_table_msb=6389
-famistudio_fds_note_table_lsb=6292
-famistudio_saw_note_table_msb=6001
-famistudio_saw_note_table_lsb=5904
-famistudio_note_table_msb=5807
-famistudio_note_table_lsb=5710
+famistudio_s5b_note_table_msb=5834
+famistudio_s5b_note_table_lsb=5737
+famistudio_n163_note_table_msb=6610
+famistudio_n163_note_table_lsb=6513
+famistudio_vrc7_note_table_msb=6222
+famistudio_vrc7_note_table_lsb=6125
+famistudio_fds_note_table_msb=6416
+famistudio_fds_note_table_lsb=6319
+famistudio_saw_note_table_msb=6028
+famistudio_saw_note_table_lsb=5931
+famistudio_note_table_msb=5834
+famistudio_note_table_lsb=5737
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_dual.bin
index 018e72f81..872d4821a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_dual.tbl
index 88cc42e73..6381b46b6 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5962
-famistudio_s5b_note_table_lsb=5768
-famistudio_n163_note_table_msb=7320
-famistudio_n163_note_table_lsb=7126
-famistudio_vrc7_note_table_msb=6641
-famistudio_vrc7_note_table_lsb=6544
-famistudio_fds_note_table_msb=6932
-famistudio_fds_note_table_lsb=6738
-famistudio_saw_note_table_msb=6350
-famistudio_saw_note_table_lsb=6156
-famistudio_note_table_msb=5962
-famistudio_note_table_lsb=5768
+famistudio_s5b_note_table_msb=5989
+famistudio_s5b_note_table_lsb=5795
+famistudio_n163_note_table_msb=7347
+famistudio_n163_note_table_lsb=7153
+famistudio_vrc7_note_table_msb=6668
+famistudio_vrc7_note_table_lsb=6571
+famistudio_fds_note_table_msb=6959
+famistudio_fds_note_table_lsb=6765
+famistudio_saw_note_table_msb=6377
+famistudio_saw_note_table_lsb=6183
+famistudio_note_table_msb=5989
+famistudio_note_table_lsb=5795
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_dual.bin
index 5138c2c1f..c1175f013 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_dual.tbl
index b94d30b38..20d166f74 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7552
-famistudio_s5b_note_table_lsb=7358
-famistudio_n163_note_table_msb=9298
-famistudio_n163_note_table_lsb=9104
-famistudio_epsm_note_table_msb=8425
-famistudio_epsm_note_table_lsb=8328
-famistudio_epsm_s_note_table_msb=8619
-famistudio_epsm_s_note_table_lsb=8522
-famistudio_vrc7_note_table_msb=8231
-famistudio_vrc7_note_table_lsb=8134
-famistudio_fds_note_table_msb=8910
-famistudio_fds_note_table_lsb=8716
-famistudio_saw_note_table_msb=7940
-famistudio_saw_note_table_lsb=7746
-famistudio_note_table_msb=7552
-famistudio_note_table_lsb=7358
+famistudio_s5b_note_table_msb=7579
+famistudio_s5b_note_table_lsb=7385
+famistudio_n163_note_table_msb=9325
+famistudio_n163_note_table_lsb=9131
+famistudio_epsm_note_table_msb=8452
+famistudio_epsm_note_table_lsb=8355
+famistudio_epsm_s_note_table_msb=8646
+famistudio_epsm_s_note_table_lsb=8549
+famistudio_vrc7_note_table_msb=8258
+famistudio_vrc7_note_table_lsb=8161
+famistudio_fds_note_table_msb=8937
+famistudio_fds_note_table_lsb=8743
+famistudio_saw_note_table_msb=7967
+famistudio_saw_note_table_lsb=7773
+famistudio_note_table_msb=7579
+famistudio_note_table_lsb=7385
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_ntsc.bin
index 119636622..11a6359a7 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_ntsc.tbl
index 2a9a3646f..f55dbb12b 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7401
-famistudio_s5b_note_table_lsb=7304
-famistudio_n163_note_table_msb=8565
-famistudio_n163_note_table_lsb=8468
-famistudio_epsm_note_table_msb=7983
-famistudio_epsm_note_table_lsb=7886
-famistudio_epsm_s_note_table_msb=8177
-famistudio_epsm_s_note_table_lsb=8080
-famistudio_vrc7_note_table_msb=7789
-famistudio_vrc7_note_table_lsb=7692
-famistudio_fds_note_table_msb=8371
-famistudio_fds_note_table_lsb=8274
-famistudio_saw_note_table_msb=7595
-famistudio_saw_note_table_lsb=7498
-famistudio_note_table_msb=7401
-famistudio_note_table_lsb=7304
+famistudio_s5b_note_table_msb=7428
+famistudio_s5b_note_table_lsb=7331
+famistudio_n163_note_table_msb=8592
+famistudio_n163_note_table_lsb=8495
+famistudio_epsm_note_table_msb=8010
+famistudio_epsm_note_table_lsb=7913
+famistudio_epsm_s_note_table_msb=8204
+famistudio_epsm_s_note_table_lsb=8107
+famistudio_vrc7_note_table_msb=7816
+famistudio_vrc7_note_table_lsb=7719
+famistudio_fds_note_table_msb=8398
+famistudio_fds_note_table_lsb=8301
+famistudio_saw_note_table_msb=7622
+famistudio_saw_note_table_lsb=7525
+famistudio_note_table_msb=7428
+famistudio_note_table_lsb=7331
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_pal.bin
index 2ea51c081..b0829d50f 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_pal.tbl
index 2a9a3646f..f55dbb12b 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7401
-famistudio_s5b_note_table_lsb=7304
-famistudio_n163_note_table_msb=8565
-famistudio_n163_note_table_lsb=8468
-famistudio_epsm_note_table_msb=7983
-famistudio_epsm_note_table_lsb=7886
-famistudio_epsm_s_note_table_msb=8177
-famistudio_epsm_s_note_table_lsb=8080
-famistudio_vrc7_note_table_msb=7789
-famistudio_vrc7_note_table_lsb=7692
-famistudio_fds_note_table_msb=8371
-famistudio_fds_note_table_lsb=8274
-famistudio_saw_note_table_msb=7595
-famistudio_saw_note_table_lsb=7498
-famistudio_note_table_msb=7401
-famistudio_note_table_lsb=7304
+famistudio_s5b_note_table_msb=7428
+famistudio_s5b_note_table_lsb=7331
+famistudio_n163_note_table_msb=8592
+famistudio_n163_note_table_lsb=8495
+famistudio_epsm_note_table_msb=8010
+famistudio_epsm_note_table_lsb=7913
+famistudio_epsm_s_note_table_msb=8204
+famistudio_epsm_s_note_table_lsb=8107
+famistudio_vrc7_note_table_msb=7816
+famistudio_vrc7_note_table_lsb=7719
+famistudio_fds_note_table_msb=8398
+famistudio_fds_note_table_lsb=8301
+famistudio_saw_note_table_msb=7622
+famistudio_saw_note_table_lsb=7525
+famistudio_note_table_msb=7428
+famistudio_note_table_lsb=7331
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_ntsc.bin
index 2fa0dc0df..aee16c95a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_ntsc.tbl
index ee9009e7e..d1be680ad 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5811
-famistudio_s5b_note_table_lsb=5714
-famistudio_n163_note_table_msb=6587
-famistudio_n163_note_table_lsb=6490
-famistudio_vrc7_note_table_msb=6199
-famistudio_vrc7_note_table_lsb=6102
-famistudio_fds_note_table_msb=6393
-famistudio_fds_note_table_lsb=6296
-famistudio_saw_note_table_msb=6005
-famistudio_saw_note_table_lsb=5908
-famistudio_note_table_msb=5811
-famistudio_note_table_lsb=5714
+famistudio_s5b_note_table_msb=5838
+famistudio_s5b_note_table_lsb=5741
+famistudio_n163_note_table_msb=6614
+famistudio_n163_note_table_lsb=6517
+famistudio_vrc7_note_table_msb=6226
+famistudio_vrc7_note_table_lsb=6129
+famistudio_fds_note_table_msb=6420
+famistudio_fds_note_table_lsb=6323
+famistudio_saw_note_table_msb=6032
+famistudio_saw_note_table_lsb=5935
+famistudio_note_table_msb=5838
+famistudio_note_table_lsb=5741
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_pal.bin
index 810e5c3a6..78e507ce3 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_pal.tbl
index ee9009e7e..d1be680ad 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_5ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5811
-famistudio_s5b_note_table_lsb=5714
-famistudio_n163_note_table_msb=6587
-famistudio_n163_note_table_lsb=6490
-famistudio_vrc7_note_table_msb=6199
-famistudio_vrc7_note_table_lsb=6102
-famistudio_fds_note_table_msb=6393
-famistudio_fds_note_table_lsb=6296
-famistudio_saw_note_table_msb=6005
-famistudio_saw_note_table_lsb=5908
-famistudio_note_table_msb=5811
-famistudio_note_table_lsb=5714
+famistudio_s5b_note_table_msb=5838
+famistudio_s5b_note_table_lsb=5741
+famistudio_n163_note_table_msb=6614
+famistudio_n163_note_table_lsb=6517
+famistudio_vrc7_note_table_msb=6226
+famistudio_vrc7_note_table_lsb=6129
+famistudio_fds_note_table_msb=6420
+famistudio_fds_note_table_lsb=6323
+famistudio_saw_note_table_msb=6032
+famistudio_saw_note_table_lsb=5935
+famistudio_note_table_msb=5838
+famistudio_note_table_lsb=5741
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_dual.bin
index 68801a0ee..2f931b83e 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_dual.tbl
index 88cc42e73..6381b46b6 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5962
-famistudio_s5b_note_table_lsb=5768
-famistudio_n163_note_table_msb=7320
-famistudio_n163_note_table_lsb=7126
-famistudio_vrc7_note_table_msb=6641
-famistudio_vrc7_note_table_lsb=6544
-famistudio_fds_note_table_msb=6932
-famistudio_fds_note_table_lsb=6738
-famistudio_saw_note_table_msb=6350
-famistudio_saw_note_table_lsb=6156
-famistudio_note_table_msb=5962
-famistudio_note_table_lsb=5768
+famistudio_s5b_note_table_msb=5989
+famistudio_s5b_note_table_lsb=5795
+famistudio_n163_note_table_msb=7347
+famistudio_n163_note_table_lsb=7153
+famistudio_vrc7_note_table_msb=6668
+famistudio_vrc7_note_table_lsb=6571
+famistudio_fds_note_table_msb=6959
+famistudio_fds_note_table_lsb=6765
+famistudio_saw_note_table_msb=6377
+famistudio_saw_note_table_lsb=6183
+famistudio_note_table_msb=5989
+famistudio_note_table_lsb=5795
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_dual.bin
index fe4c93540..3650be73a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_dual.tbl
index b94d30b38..20d166f74 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7552
-famistudio_s5b_note_table_lsb=7358
-famistudio_n163_note_table_msb=9298
-famistudio_n163_note_table_lsb=9104
-famistudio_epsm_note_table_msb=8425
-famistudio_epsm_note_table_lsb=8328
-famistudio_epsm_s_note_table_msb=8619
-famistudio_epsm_s_note_table_lsb=8522
-famistudio_vrc7_note_table_msb=8231
-famistudio_vrc7_note_table_lsb=8134
-famistudio_fds_note_table_msb=8910
-famistudio_fds_note_table_lsb=8716
-famistudio_saw_note_table_msb=7940
-famistudio_saw_note_table_lsb=7746
-famistudio_note_table_msb=7552
-famistudio_note_table_lsb=7358
+famistudio_s5b_note_table_msb=7579
+famistudio_s5b_note_table_lsb=7385
+famistudio_n163_note_table_msb=9325
+famistudio_n163_note_table_lsb=9131
+famistudio_epsm_note_table_msb=8452
+famistudio_epsm_note_table_lsb=8355
+famistudio_epsm_s_note_table_msb=8646
+famistudio_epsm_s_note_table_lsb=8549
+famistudio_vrc7_note_table_msb=8258
+famistudio_vrc7_note_table_lsb=8161
+famistudio_fds_note_table_msb=8937
+famistudio_fds_note_table_lsb=8743
+famistudio_saw_note_table_msb=7967
+famistudio_saw_note_table_lsb=7773
+famistudio_note_table_msb=7579
+famistudio_note_table_lsb=7385
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_ntsc.bin
index a7716acda..59e9bc313 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_ntsc.tbl
index 2a9a3646f..f55dbb12b 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7401
-famistudio_s5b_note_table_lsb=7304
-famistudio_n163_note_table_msb=8565
-famistudio_n163_note_table_lsb=8468
-famistudio_epsm_note_table_msb=7983
-famistudio_epsm_note_table_lsb=7886
-famistudio_epsm_s_note_table_msb=8177
-famistudio_epsm_s_note_table_lsb=8080
-famistudio_vrc7_note_table_msb=7789
-famistudio_vrc7_note_table_lsb=7692
-famistudio_fds_note_table_msb=8371
-famistudio_fds_note_table_lsb=8274
-famistudio_saw_note_table_msb=7595
-famistudio_saw_note_table_lsb=7498
-famistudio_note_table_msb=7401
-famistudio_note_table_lsb=7304
+famistudio_s5b_note_table_msb=7428
+famistudio_s5b_note_table_lsb=7331
+famistudio_n163_note_table_msb=8592
+famistudio_n163_note_table_lsb=8495
+famistudio_epsm_note_table_msb=8010
+famistudio_epsm_note_table_lsb=7913
+famistudio_epsm_s_note_table_msb=8204
+famistudio_epsm_s_note_table_lsb=8107
+famistudio_vrc7_note_table_msb=7816
+famistudio_vrc7_note_table_lsb=7719
+famistudio_fds_note_table_msb=8398
+famistudio_fds_note_table_lsb=8301
+famistudio_saw_note_table_msb=7622
+famistudio_saw_note_table_lsb=7525
+famistudio_note_table_msb=7428
+famistudio_note_table_lsb=7331
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_pal.bin
index 23b34f80a..daf222c0d 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_pal.tbl
index 2a9a3646f..f55dbb12b 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7401
-famistudio_s5b_note_table_lsb=7304
-famistudio_n163_note_table_msb=8565
-famistudio_n163_note_table_lsb=8468
-famistudio_epsm_note_table_msb=7983
-famistudio_epsm_note_table_lsb=7886
-famistudio_epsm_s_note_table_msb=8177
-famistudio_epsm_s_note_table_lsb=8080
-famistudio_vrc7_note_table_msb=7789
-famistudio_vrc7_note_table_lsb=7692
-famistudio_fds_note_table_msb=8371
-famistudio_fds_note_table_lsb=8274
-famistudio_saw_note_table_msb=7595
-famistudio_saw_note_table_lsb=7498
-famistudio_note_table_msb=7401
-famistudio_note_table_lsb=7304
+famistudio_s5b_note_table_msb=7428
+famistudio_s5b_note_table_lsb=7331
+famistudio_n163_note_table_msb=8592
+famistudio_n163_note_table_lsb=8495
+famistudio_epsm_note_table_msb=8010
+famistudio_epsm_note_table_lsb=7913
+famistudio_epsm_s_note_table_msb=8204
+famistudio_epsm_s_note_table_lsb=8107
+famistudio_vrc7_note_table_msb=7816
+famistudio_vrc7_note_table_lsb=7719
+famistudio_fds_note_table_msb=8398
+famistudio_fds_note_table_lsb=8301
+famistudio_saw_note_table_msb=7622
+famistudio_saw_note_table_lsb=7525
+famistudio_note_table_msb=7428
+famistudio_note_table_lsb=7331
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_ntsc.bin
index 7a556ade9..d3e0a29ce 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_ntsc.tbl
index ee9009e7e..d1be680ad 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5811
-famistudio_s5b_note_table_lsb=5714
-famistudio_n163_note_table_msb=6587
-famistudio_n163_note_table_lsb=6490
-famistudio_vrc7_note_table_msb=6199
-famistudio_vrc7_note_table_lsb=6102
-famistudio_fds_note_table_msb=6393
-famistudio_fds_note_table_lsb=6296
-famistudio_saw_note_table_msb=6005
-famistudio_saw_note_table_lsb=5908
-famistudio_note_table_msb=5811
-famistudio_note_table_lsb=5714
+famistudio_s5b_note_table_msb=5838
+famistudio_s5b_note_table_lsb=5741
+famistudio_n163_note_table_msb=6614
+famistudio_n163_note_table_lsb=6517
+famistudio_vrc7_note_table_msb=6226
+famistudio_vrc7_note_table_lsb=6129
+famistudio_fds_note_table_msb=6420
+famistudio_fds_note_table_lsb=6323
+famistudio_saw_note_table_msb=6032
+famistudio_saw_note_table_lsb=5935
+famistudio_note_table_msb=5838
+famistudio_note_table_lsb=5741
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_pal.bin
index 3a7d2252b..ba23d481d 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_pal.tbl
index ee9009e7e..d1be680ad 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_6ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5811
-famistudio_s5b_note_table_lsb=5714
-famistudio_n163_note_table_msb=6587
-famistudio_n163_note_table_lsb=6490
-famistudio_vrc7_note_table_msb=6199
-famistudio_vrc7_note_table_lsb=6102
-famistudio_fds_note_table_msb=6393
-famistudio_fds_note_table_lsb=6296
-famistudio_saw_note_table_msb=6005
-famistudio_saw_note_table_lsb=5908
-famistudio_note_table_msb=5811
-famistudio_note_table_lsb=5714
+famistudio_s5b_note_table_msb=5838
+famistudio_s5b_note_table_lsb=5741
+famistudio_n163_note_table_msb=6614
+famistudio_n163_note_table_lsb=6517
+famistudio_vrc7_note_table_msb=6226
+famistudio_vrc7_note_table_lsb=6129
+famistudio_fds_note_table_msb=6420
+famistudio_fds_note_table_lsb=6323
+famistudio_saw_note_table_msb=6032
+famistudio_saw_note_table_lsb=5935
+famistudio_note_table_msb=5838
+famistudio_note_table_lsb=5741
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_dual.bin
index c42fc019e..c0eae0767 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_dual.tbl
index 88cc42e73..6381b46b6 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5962
-famistudio_s5b_note_table_lsb=5768
-famistudio_n163_note_table_msb=7320
-famistudio_n163_note_table_lsb=7126
-famistudio_vrc7_note_table_msb=6641
-famistudio_vrc7_note_table_lsb=6544
-famistudio_fds_note_table_msb=6932
-famistudio_fds_note_table_lsb=6738
-famistudio_saw_note_table_msb=6350
-famistudio_saw_note_table_lsb=6156
-famistudio_note_table_msb=5962
-famistudio_note_table_lsb=5768
+famistudio_s5b_note_table_msb=5989
+famistudio_s5b_note_table_lsb=5795
+famistudio_n163_note_table_msb=7347
+famistudio_n163_note_table_lsb=7153
+famistudio_vrc7_note_table_msb=6668
+famistudio_vrc7_note_table_lsb=6571
+famistudio_fds_note_table_msb=6959
+famistudio_fds_note_table_lsb=6765
+famistudio_saw_note_table_msb=6377
+famistudio_saw_note_table_lsb=6183
+famistudio_note_table_msb=5989
+famistudio_note_table_lsb=5795
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_dual.bin
index 8d4ff9e2b..59534f231 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_dual.tbl
index b94d30b38..20d166f74 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7552
-famistudio_s5b_note_table_lsb=7358
-famistudio_n163_note_table_msb=9298
-famistudio_n163_note_table_lsb=9104
-famistudio_epsm_note_table_msb=8425
-famistudio_epsm_note_table_lsb=8328
-famistudio_epsm_s_note_table_msb=8619
-famistudio_epsm_s_note_table_lsb=8522
-famistudio_vrc7_note_table_msb=8231
-famistudio_vrc7_note_table_lsb=8134
-famistudio_fds_note_table_msb=8910
-famistudio_fds_note_table_lsb=8716
-famistudio_saw_note_table_msb=7940
-famistudio_saw_note_table_lsb=7746
-famistudio_note_table_msb=7552
-famistudio_note_table_lsb=7358
+famistudio_s5b_note_table_msb=7579
+famistudio_s5b_note_table_lsb=7385
+famistudio_n163_note_table_msb=9325
+famistudio_n163_note_table_lsb=9131
+famistudio_epsm_note_table_msb=8452
+famistudio_epsm_note_table_lsb=8355
+famistudio_epsm_s_note_table_msb=8646
+famistudio_epsm_s_note_table_lsb=8549
+famistudio_vrc7_note_table_msb=8258
+famistudio_vrc7_note_table_lsb=8161
+famistudio_fds_note_table_msb=8937
+famistudio_fds_note_table_lsb=8743
+famistudio_saw_note_table_msb=7967
+famistudio_saw_note_table_lsb=7773
+famistudio_note_table_msb=7579
+famistudio_note_table_lsb=7385
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_ntsc.bin
index e528c8332..ff198761f 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_ntsc.tbl
index 2a9a3646f..f55dbb12b 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7401
-famistudio_s5b_note_table_lsb=7304
-famistudio_n163_note_table_msb=8565
-famistudio_n163_note_table_lsb=8468
-famistudio_epsm_note_table_msb=7983
-famistudio_epsm_note_table_lsb=7886
-famistudio_epsm_s_note_table_msb=8177
-famistudio_epsm_s_note_table_lsb=8080
-famistudio_vrc7_note_table_msb=7789
-famistudio_vrc7_note_table_lsb=7692
-famistudio_fds_note_table_msb=8371
-famistudio_fds_note_table_lsb=8274
-famistudio_saw_note_table_msb=7595
-famistudio_saw_note_table_lsb=7498
-famistudio_note_table_msb=7401
-famistudio_note_table_lsb=7304
+famistudio_s5b_note_table_msb=7428
+famistudio_s5b_note_table_lsb=7331
+famistudio_n163_note_table_msb=8592
+famistudio_n163_note_table_lsb=8495
+famistudio_epsm_note_table_msb=8010
+famistudio_epsm_note_table_lsb=7913
+famistudio_epsm_s_note_table_msb=8204
+famistudio_epsm_s_note_table_lsb=8107
+famistudio_vrc7_note_table_msb=7816
+famistudio_vrc7_note_table_lsb=7719
+famistudio_fds_note_table_msb=8398
+famistudio_fds_note_table_lsb=8301
+famistudio_saw_note_table_msb=7622
+famistudio_saw_note_table_lsb=7525
+famistudio_note_table_msb=7428
+famistudio_note_table_lsb=7331
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_pal.bin
index 7062887d3..5d183bb7d 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_pal.tbl
index 2a9a3646f..f55dbb12b 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7401
-famistudio_s5b_note_table_lsb=7304
-famistudio_n163_note_table_msb=8565
-famistudio_n163_note_table_lsb=8468
-famistudio_epsm_note_table_msb=7983
-famistudio_epsm_note_table_lsb=7886
-famistudio_epsm_s_note_table_msb=8177
-famistudio_epsm_s_note_table_lsb=8080
-famistudio_vrc7_note_table_msb=7789
-famistudio_vrc7_note_table_lsb=7692
-famistudio_fds_note_table_msb=8371
-famistudio_fds_note_table_lsb=8274
-famistudio_saw_note_table_msb=7595
-famistudio_saw_note_table_lsb=7498
-famistudio_note_table_msb=7401
-famistudio_note_table_lsb=7304
+famistudio_s5b_note_table_msb=7428
+famistudio_s5b_note_table_lsb=7331
+famistudio_n163_note_table_msb=8592
+famistudio_n163_note_table_lsb=8495
+famistudio_epsm_note_table_msb=8010
+famistudio_epsm_note_table_lsb=7913
+famistudio_epsm_s_note_table_msb=8204
+famistudio_epsm_s_note_table_lsb=8107
+famistudio_vrc7_note_table_msb=7816
+famistudio_vrc7_note_table_lsb=7719
+famistudio_fds_note_table_msb=8398
+famistudio_fds_note_table_lsb=8301
+famistudio_saw_note_table_msb=7622
+famistudio_saw_note_table_lsb=7525
+famistudio_note_table_msb=7428
+famistudio_note_table_lsb=7331
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_ntsc.bin
index 3d2e93570..3e77c5c30 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_ntsc.tbl
index ee9009e7e..d1be680ad 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5811
-famistudio_s5b_note_table_lsb=5714
-famistudio_n163_note_table_msb=6587
-famistudio_n163_note_table_lsb=6490
-famistudio_vrc7_note_table_msb=6199
-famistudio_vrc7_note_table_lsb=6102
-famistudio_fds_note_table_msb=6393
-famistudio_fds_note_table_lsb=6296
-famistudio_saw_note_table_msb=6005
-famistudio_saw_note_table_lsb=5908
-famistudio_note_table_msb=5811
-famistudio_note_table_lsb=5714
+famistudio_s5b_note_table_msb=5838
+famistudio_s5b_note_table_lsb=5741
+famistudio_n163_note_table_msb=6614
+famistudio_n163_note_table_lsb=6517
+famistudio_vrc7_note_table_msb=6226
+famistudio_vrc7_note_table_lsb=6129
+famistudio_fds_note_table_msb=6420
+famistudio_fds_note_table_lsb=6323
+famistudio_saw_note_table_msb=6032
+famistudio_saw_note_table_lsb=5935
+famistudio_note_table_msb=5838
+famistudio_note_table_lsb=5741
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_pal.bin
index e043af145..2a28db9d9 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_pal.tbl
index ee9009e7e..d1be680ad 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_7ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5811
-famistudio_s5b_note_table_lsb=5714
-famistudio_n163_note_table_msb=6587
-famistudio_n163_note_table_lsb=6490
-famistudio_vrc7_note_table_msb=6199
-famistudio_vrc7_note_table_lsb=6102
-famistudio_fds_note_table_msb=6393
-famistudio_fds_note_table_lsb=6296
-famistudio_saw_note_table_msb=6005
-famistudio_saw_note_table_lsb=5908
-famistudio_note_table_msb=5811
-famistudio_note_table_lsb=5714
+famistudio_s5b_note_table_msb=5838
+famistudio_s5b_note_table_lsb=5741
+famistudio_n163_note_table_msb=6614
+famistudio_n163_note_table_lsb=6517
+famistudio_vrc7_note_table_msb=6226
+famistudio_vrc7_note_table_lsb=6129
+famistudio_fds_note_table_msb=6420
+famistudio_fds_note_table_lsb=6323
+famistudio_saw_note_table_msb=6032
+famistudio_saw_note_table_lsb=5935
+famistudio_note_table_msb=5838
+famistudio_note_table_lsb=5741
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_dual.bin
index e3652045c..178f01e9e 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_dual.tbl
index 88cc42e73..6381b46b6 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5962
-famistudio_s5b_note_table_lsb=5768
-famistudio_n163_note_table_msb=7320
-famistudio_n163_note_table_lsb=7126
-famistudio_vrc7_note_table_msb=6641
-famistudio_vrc7_note_table_lsb=6544
-famistudio_fds_note_table_msb=6932
-famistudio_fds_note_table_lsb=6738
-famistudio_saw_note_table_msb=6350
-famistudio_saw_note_table_lsb=6156
-famistudio_note_table_msb=5962
-famistudio_note_table_lsb=5768
+famistudio_s5b_note_table_msb=5989
+famistudio_s5b_note_table_lsb=5795
+famistudio_n163_note_table_msb=7347
+famistudio_n163_note_table_lsb=7153
+famistudio_vrc7_note_table_msb=6668
+famistudio_vrc7_note_table_lsb=6571
+famistudio_fds_note_table_msb=6959
+famistudio_fds_note_table_lsb=6765
+famistudio_saw_note_table_msb=6377
+famistudio_saw_note_table_lsb=6183
+famistudio_note_table_msb=5989
+famistudio_note_table_lsb=5795
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_dual.bin
index 7e87ec7bc..72a07ab68 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_dual.tbl
index b94d30b38..20d166f74 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7552
-famistudio_s5b_note_table_lsb=7358
-famistudio_n163_note_table_msb=9298
-famistudio_n163_note_table_lsb=9104
-famistudio_epsm_note_table_msb=8425
-famistudio_epsm_note_table_lsb=8328
-famistudio_epsm_s_note_table_msb=8619
-famistudio_epsm_s_note_table_lsb=8522
-famistudio_vrc7_note_table_msb=8231
-famistudio_vrc7_note_table_lsb=8134
-famistudio_fds_note_table_msb=8910
-famistudio_fds_note_table_lsb=8716
-famistudio_saw_note_table_msb=7940
-famistudio_saw_note_table_lsb=7746
-famistudio_note_table_msb=7552
-famistudio_note_table_lsb=7358
+famistudio_s5b_note_table_msb=7579
+famistudio_s5b_note_table_lsb=7385
+famistudio_n163_note_table_msb=9325
+famistudio_n163_note_table_lsb=9131
+famistudio_epsm_note_table_msb=8452
+famistudio_epsm_note_table_lsb=8355
+famistudio_epsm_s_note_table_msb=8646
+famistudio_epsm_s_note_table_lsb=8549
+famistudio_vrc7_note_table_msb=8258
+famistudio_vrc7_note_table_lsb=8161
+famistudio_fds_note_table_msb=8937
+famistudio_fds_note_table_lsb=8743
+famistudio_saw_note_table_msb=7967
+famistudio_saw_note_table_lsb=7773
+famistudio_note_table_msb=7579
+famistudio_note_table_lsb=7385
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_ntsc.bin
index 18c9b2d23..621ddeddf 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_ntsc.tbl
index 2a9a3646f..f55dbb12b 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7401
-famistudio_s5b_note_table_lsb=7304
-famistudio_n163_note_table_msb=8565
-famistudio_n163_note_table_lsb=8468
-famistudio_epsm_note_table_msb=7983
-famistudio_epsm_note_table_lsb=7886
-famistudio_epsm_s_note_table_msb=8177
-famistudio_epsm_s_note_table_lsb=8080
-famistudio_vrc7_note_table_msb=7789
-famistudio_vrc7_note_table_lsb=7692
-famistudio_fds_note_table_msb=8371
-famistudio_fds_note_table_lsb=8274
-famistudio_saw_note_table_msb=7595
-famistudio_saw_note_table_lsb=7498
-famistudio_note_table_msb=7401
-famistudio_note_table_lsb=7304
+famistudio_s5b_note_table_msb=7428
+famistudio_s5b_note_table_lsb=7331
+famistudio_n163_note_table_msb=8592
+famistudio_n163_note_table_lsb=8495
+famistudio_epsm_note_table_msb=8010
+famistudio_epsm_note_table_lsb=7913
+famistudio_epsm_s_note_table_msb=8204
+famistudio_epsm_s_note_table_lsb=8107
+famistudio_vrc7_note_table_msb=7816
+famistudio_vrc7_note_table_lsb=7719
+famistudio_fds_note_table_msb=8398
+famistudio_fds_note_table_lsb=8301
+famistudio_saw_note_table_msb=7622
+famistudio_saw_note_table_lsb=7525
+famistudio_note_table_msb=7428
+famistudio_note_table_lsb=7331
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_pal.bin
index 6fb1f7f1a..35c500a42 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_pal.tbl
index 2a9a3646f..f55dbb12b 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7401
-famistudio_s5b_note_table_lsb=7304
-famistudio_n163_note_table_msb=8565
-famistudio_n163_note_table_lsb=8468
-famistudio_epsm_note_table_msb=7983
-famistudio_epsm_note_table_lsb=7886
-famistudio_epsm_s_note_table_msb=8177
-famistudio_epsm_s_note_table_lsb=8080
-famistudio_vrc7_note_table_msb=7789
-famistudio_vrc7_note_table_lsb=7692
-famistudio_fds_note_table_msb=8371
-famistudio_fds_note_table_lsb=8274
-famistudio_saw_note_table_msb=7595
-famistudio_saw_note_table_lsb=7498
-famistudio_note_table_msb=7401
-famistudio_note_table_lsb=7304
+famistudio_s5b_note_table_msb=7428
+famistudio_s5b_note_table_lsb=7331
+famistudio_n163_note_table_msb=8592
+famistudio_n163_note_table_lsb=8495
+famistudio_epsm_note_table_msb=8010
+famistudio_epsm_note_table_lsb=7913
+famistudio_epsm_s_note_table_msb=8204
+famistudio_epsm_s_note_table_lsb=8107
+famistudio_vrc7_note_table_msb=7816
+famistudio_vrc7_note_table_lsb=7719
+famistudio_fds_note_table_msb=8398
+famistudio_fds_note_table_lsb=8301
+famistudio_saw_note_table_msb=7622
+famistudio_saw_note_table_lsb=7525
+famistudio_note_table_msb=7428
+famistudio_note_table_lsb=7331
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_ntsc.bin
index f432121ce..67f137cb6 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_ntsc.tbl
index ee9009e7e..d1be680ad 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5811
-famistudio_s5b_note_table_lsb=5714
-famistudio_n163_note_table_msb=6587
-famistudio_n163_note_table_lsb=6490
-famistudio_vrc7_note_table_msb=6199
-famistudio_vrc7_note_table_lsb=6102
-famistudio_fds_note_table_msb=6393
-famistudio_fds_note_table_lsb=6296
-famistudio_saw_note_table_msb=6005
-famistudio_saw_note_table_lsb=5908
-famistudio_note_table_msb=5811
-famistudio_note_table_lsb=5714
+famistudio_s5b_note_table_msb=5838
+famistudio_s5b_note_table_lsb=5741
+famistudio_n163_note_table_msb=6614
+famistudio_n163_note_table_lsb=6517
+famistudio_vrc7_note_table_msb=6226
+famistudio_vrc7_note_table_lsb=6129
+famistudio_fds_note_table_msb=6420
+famistudio_fds_note_table_lsb=6323
+famistudio_saw_note_table_msb=6032
+famistudio_saw_note_table_lsb=5935
+famistudio_note_table_msb=5838
+famistudio_note_table_lsb=5741
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_pal.bin
index 4394c5a6a..3fe33411b 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_pal.tbl
index ee9009e7e..d1be680ad 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_multi_n163_8ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5811
-famistudio_s5b_note_table_lsb=5714
-famistudio_n163_note_table_msb=6587
-famistudio_n163_note_table_lsb=6490
-famistudio_vrc7_note_table_msb=6199
-famistudio_vrc7_note_table_lsb=6102
-famistudio_fds_note_table_msb=6393
-famistudio_fds_note_table_lsb=6296
-famistudio_saw_note_table_msb=6005
-famistudio_saw_note_table_lsb=5908
-famistudio_note_table_msb=5811
-famistudio_note_table_lsb=5714
+famistudio_s5b_note_table_msb=5838
+famistudio_s5b_note_table_lsb=5741
+famistudio_n163_note_table_msb=6614
+famistudio_n163_note_table_lsb=6517
+famistudio_vrc7_note_table_msb=6226
+famistudio_vrc7_note_table_lsb=6129
+famistudio_fds_note_table_msb=6420
+famistudio_fds_note_table_lsb=6323
+famistudio_saw_note_table_msb=6032
+famistudio_saw_note_table_lsb=5935
+famistudio_note_table_msb=5838
+famistudio_note_table_lsb=5741
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_dual.bin
index b9d09afbc..8b795ce2c 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_dual.tbl
index 6e84abbf8..a5cbc1fe7 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3989
-famistudio_n163_note_table_lsb=3795
-famistudio_note_table_msb=3601
-famistudio_note_table_lsb=3407
+famistudio_n163_note_table_msb=4021
+famistudio_n163_note_table_lsb=3827
+famistudio_note_table_msb=3633
+famistudio_note_table_lsb=3439
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_ntsc.bin
index 0c5830647..c04509121 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_ntsc.tbl
index ae3d67f78..536b8a5cb 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3672
-famistudio_n163_note_table_lsb=3575
-famistudio_note_table_msb=3478
-famistudio_note_table_lsb=3381
+famistudio_n163_note_table_msb=3704
+famistudio_n163_note_table_lsb=3607
+famistudio_note_table_msb=3510
+famistudio_note_table_lsb=3413
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_pal.bin
index 1f4d5e759..427f3423b 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_pal.tbl
index ae3d67f78..536b8a5cb 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_1ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3672
-famistudio_n163_note_table_lsb=3575
-famistudio_note_table_msb=3478
-famistudio_note_table_lsb=3381
+famistudio_n163_note_table_msb=3704
+famistudio_n163_note_table_lsb=3607
+famistudio_note_table_msb=3510
+famistudio_note_table_lsb=3413
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_dual.bin
index 078211947..2f444762c 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_dual.tbl
index 98644b17f..12e472297 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3993
-famistudio_n163_note_table_lsb=3799
-famistudio_note_table_msb=3605
-famistudio_note_table_lsb=3411
+famistudio_n163_note_table_msb=4025
+famistudio_n163_note_table_lsb=3831
+famistudio_note_table_msb=3637
+famistudio_note_table_lsb=3443
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_ntsc.bin
index df3991196..701bf6515 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_ntsc.tbl
index 3ed450f7b..eee3e4175 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3676
-famistudio_n163_note_table_lsb=3579
-famistudio_note_table_msb=3482
-famistudio_note_table_lsb=3385
+famistudio_n163_note_table_msb=3708
+famistudio_n163_note_table_lsb=3611
+famistudio_note_table_msb=3514
+famistudio_note_table_lsb=3417
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_pal.bin
index 6963f055c..80a5a413a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_pal.tbl
index 3ed450f7b..eee3e4175 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_2ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3676
-famistudio_n163_note_table_lsb=3579
-famistudio_note_table_msb=3482
-famistudio_note_table_lsb=3385
+famistudio_n163_note_table_msb=3708
+famistudio_n163_note_table_lsb=3611
+famistudio_note_table_msb=3514
+famistudio_note_table_lsb=3417
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_dual.bin
index 8aa6f4223..5b266ec41 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_dual.tbl
index efc4583e8..eb06de987 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3997
-famistudio_n163_note_table_lsb=3803
-famistudio_note_table_msb=3609
-famistudio_note_table_lsb=3415
+famistudio_n163_note_table_msb=4029
+famistudio_n163_note_table_lsb=3835
+famistudio_note_table_msb=3641
+famistudio_note_table_lsb=3447
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_ntsc.bin
index 082644f99..ad0a005a8 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_ntsc.tbl
index 2f021f03a..daba54689 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3680
-famistudio_n163_note_table_lsb=3583
-famistudio_note_table_msb=3486
-famistudio_note_table_lsb=3389
+famistudio_n163_note_table_msb=3712
+famistudio_n163_note_table_lsb=3615
+famistudio_note_table_msb=3518
+famistudio_note_table_lsb=3421
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_pal.bin
index 93d9fd3fa..623789dc3 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_pal.tbl
index 2f021f03a..daba54689 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_3ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3680
-famistudio_n163_note_table_lsb=3583
-famistudio_note_table_msb=3486
-famistudio_note_table_lsb=3389
+famistudio_n163_note_table_msb=3712
+famistudio_n163_note_table_lsb=3615
+famistudio_note_table_msb=3518
+famistudio_note_table_lsb=3421
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_dual.bin
index 9fb5f2628..c5ead5da8 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_dual.tbl
index efc4583e8..eb06de987 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3997
-famistudio_n163_note_table_lsb=3803
-famistudio_note_table_msb=3609
-famistudio_note_table_lsb=3415
+famistudio_n163_note_table_msb=4029
+famistudio_n163_note_table_lsb=3835
+famistudio_note_table_msb=3641
+famistudio_note_table_lsb=3447
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_ntsc.bin
index 6bb8f458c..06edc9333 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_ntsc.tbl
index 2f021f03a..daba54689 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3680
-famistudio_n163_note_table_lsb=3583
-famistudio_note_table_msb=3486
-famistudio_note_table_lsb=3389
+famistudio_n163_note_table_msb=3712
+famistudio_n163_note_table_lsb=3615
+famistudio_note_table_msb=3518
+famistudio_note_table_lsb=3421
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_pal.bin
index 2b239ce22..7ccee1a93 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_pal.tbl
index 2f021f03a..daba54689 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_4ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3680
-famistudio_n163_note_table_lsb=3583
-famistudio_note_table_msb=3486
-famistudio_note_table_lsb=3389
+famistudio_n163_note_table_msb=3712
+famistudio_n163_note_table_lsb=3615
+famistudio_note_table_msb=3518
+famistudio_note_table_lsb=3421
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_dual.bin
index 8ddcf9371..8b9a4f99d 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_dual.tbl
index e356b46fc..e5b7dfb01 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=4001
-famistudio_n163_note_table_lsb=3807
-famistudio_note_table_msb=3613
-famistudio_note_table_lsb=3419
+famistudio_n163_note_table_msb=4033
+famistudio_n163_note_table_lsb=3839
+famistudio_note_table_msb=3645
+famistudio_note_table_lsb=3451
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_ntsc.bin
index 82d8f84c8..2ee5c81ac 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_ntsc.tbl
index 7b2ca004b..2c85f238f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3684
-famistudio_n163_note_table_lsb=3587
-famistudio_note_table_msb=3490
-famistudio_note_table_lsb=3393
+famistudio_n163_note_table_msb=3716
+famistudio_n163_note_table_lsb=3619
+famistudio_note_table_msb=3522
+famistudio_note_table_lsb=3425
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_pal.bin
index 9c5a9a7e6..7297cb1a2 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_pal.tbl
index 7b2ca004b..2c85f238f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_5ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3684
-famistudio_n163_note_table_lsb=3587
-famistudio_note_table_msb=3490
-famistudio_note_table_lsb=3393
+famistudio_n163_note_table_msb=3716
+famistudio_n163_note_table_lsb=3619
+famistudio_note_table_msb=3522
+famistudio_note_table_lsb=3425
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_dual.bin
index a3e5244db..de60ba7f4 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_dual.tbl
index e356b46fc..e5b7dfb01 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=4001
-famistudio_n163_note_table_lsb=3807
-famistudio_note_table_msb=3613
-famistudio_note_table_lsb=3419
+famistudio_n163_note_table_msb=4033
+famistudio_n163_note_table_lsb=3839
+famistudio_note_table_msb=3645
+famistudio_note_table_lsb=3451
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_ntsc.bin
index bf4ad2323..ee030fbe4 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_ntsc.tbl
index 7b2ca004b..2c85f238f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3684
-famistudio_n163_note_table_lsb=3587
-famistudio_note_table_msb=3490
-famistudio_note_table_lsb=3393
+famistudio_n163_note_table_msb=3716
+famistudio_n163_note_table_lsb=3619
+famistudio_note_table_msb=3522
+famistudio_note_table_lsb=3425
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_pal.bin
index 0fb6fe14a..4cbfddaa7 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_pal.tbl
index 7b2ca004b..2c85f238f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_6ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3684
-famistudio_n163_note_table_lsb=3587
-famistudio_note_table_msb=3490
-famistudio_note_table_lsb=3393
+famistudio_n163_note_table_msb=3716
+famistudio_n163_note_table_lsb=3619
+famistudio_note_table_msb=3522
+famistudio_note_table_lsb=3425
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_dual.bin
index 58ee7f87c..45b17cd50 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_dual.tbl
index e356b46fc..e5b7dfb01 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=4001
-famistudio_n163_note_table_lsb=3807
-famistudio_note_table_msb=3613
-famistudio_note_table_lsb=3419
+famistudio_n163_note_table_msb=4033
+famistudio_n163_note_table_lsb=3839
+famistudio_note_table_msb=3645
+famistudio_note_table_lsb=3451
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_ntsc.bin
index 839319c33..4f0ab7ad1 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_ntsc.tbl
index 7b2ca004b..2c85f238f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3684
-famistudio_n163_note_table_lsb=3587
-famistudio_note_table_msb=3490
-famistudio_note_table_lsb=3393
+famistudio_n163_note_table_msb=3716
+famistudio_n163_note_table_lsb=3619
+famistudio_note_table_msb=3522
+famistudio_note_table_lsb=3425
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_pal.bin
index 55787808e..9b9f679f5 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_pal.tbl
index 7b2ca004b..2c85f238f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_7ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3684
-famistudio_n163_note_table_lsb=3587
-famistudio_note_table_msb=3490
-famistudio_note_table_lsb=3393
+famistudio_n163_note_table_msb=3716
+famistudio_n163_note_table_lsb=3619
+famistudio_note_table_msb=3522
+famistudio_note_table_lsb=3425
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_dual.bin
index accaa60c1..97ae620ea 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_dual.tbl
index e356b46fc..e5b7dfb01 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=4001
-famistudio_n163_note_table_lsb=3807
-famistudio_note_table_msb=3613
-famistudio_note_table_lsb=3419
+famistudio_n163_note_table_msb=4033
+famistudio_n163_note_table_lsb=3839
+famistudio_note_table_msb=3645
+famistudio_note_table_lsb=3451
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_ntsc.bin
index f51722dcd..00c096976 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_ntsc.tbl
index 7b2ca004b..2c85f238f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3684
-famistudio_n163_note_table_lsb=3587
-famistudio_note_table_msb=3490
-famistudio_note_table_lsb=3393
+famistudio_n163_note_table_msb=3716
+famistudio_n163_note_table_lsb=3619
+famistudio_note_table_msb=3522
+famistudio_note_table_lsb=3425
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_pal.bin
index f8fe42a51..4c582c0f5 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_pal.tbl
index 7b2ca004b..2c85f238f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_n163_8ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3684
-famistudio_n163_note_table_lsb=3587
-famistudio_note_table_msb=3490
-famistudio_note_table_lsb=3393
+famistudio_n163_note_table_msb=3716
+famistudio_n163_note_table_lsb=3619
+famistudio_note_table_msb=3522
+famistudio_note_table_lsb=3425
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_ntsc.bin
index c9bb59649..420e51529 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_ntsc.tbl
index ca57857d7..9a0f281f7 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_ntsc.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2820
-famistudio_note_table_lsb=2723
+famistudio_note_table_msb=2852
+famistudio_note_table_lsb=2755
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_pal.bin
index 199139971..d419a103f 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_pal.tbl
index ca57857d7..9a0f281f7 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_pal.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2820
-famistudio_note_table_lsb=2723
+famistudio_note_table_msb=2852
+famistudio_note_table_lsb=2755
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_dual.bin
index 49b07ae4c..72b427a7a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_dual.tbl
index 1ccbc96d6..5d955ed46 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3616
-famistudio_s5b_note_table_lsb=3422
-famistudio_note_table_msb=3616
-famistudio_note_table_lsb=3422
+famistudio_s5b_note_table_msb=3648
+famistudio_s5b_note_table_lsb=3454
+famistudio_note_table_msb=3648
+famistudio_note_table_lsb=3454
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_ntsc.bin
index eb4abdb24..6877d9efe 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_ntsc.tbl
index a4319b3dc..4572c07c8 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3493
-famistudio_s5b_note_table_lsb=3396
-famistudio_note_table_msb=3493
-famistudio_note_table_lsb=3396
+famistudio_s5b_note_table_msb=3525
+famistudio_s5b_note_table_lsb=3428
+famistudio_note_table_msb=3525
+famistudio_note_table_lsb=3428
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_pal.bin
index ac8acf218..f4807e8c1 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_pal.tbl
index a4319b3dc..4572c07c8 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_s5b_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3493
-famistudio_s5b_note_table_lsb=3396
-famistudio_note_table_msb=3493
-famistudio_note_table_lsb=3396
+famistudio_s5b_note_table_msb=3525
+famistudio_s5b_note_table_lsb=3428
+famistudio_note_table_msb=3525
+famistudio_note_table_lsb=3428
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_dual.bin
index 3c6ff14f9..9a2a08af9 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_dual.tbl
index 65ad1167e..3ff867725 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=3709
-famistudio_saw_note_table_lsb=3515
-famistudio_note_table_msb=3321
-famistudio_note_table_lsb=3127
+famistudio_saw_note_table_msb=3738
+famistudio_saw_note_table_lsb=3544
+famistudio_note_table_msb=3350
+famistudio_note_table_lsb=3156
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_ntsc.bin
index 8c1f265dd..8bc56def4 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_ntsc.tbl
index fdbaa97a3..a7c107d77 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=3384
-famistudio_saw_note_table_lsb=3287
-famistudio_note_table_msb=3190
-famistudio_note_table_lsb=3093
+famistudio_saw_note_table_msb=3413
+famistudio_saw_note_table_lsb=3316
+famistudio_note_table_msb=3219
+famistudio_note_table_lsb=3122
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_pal.bin
index 65f5dc604..920f4fd51 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_pal.tbl
index fdbaa97a3..a7c107d77 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc6_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=3384
-famistudio_saw_note_table_lsb=3287
-famistudio_note_table_msb=3190
-famistudio_note_table_lsb=3093
+famistudio_saw_note_table_msb=3413
+famistudio_saw_note_table_lsb=3316
+famistudio_note_table_msb=3219
+famistudio_note_table_lsb=3122
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_dual.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_dual.bin
index 604140298..0fa572ca2 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_dual.tbl
index 264cac2a4..986274377 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3839
-famistudio_vrc7_note_table_lsb=3742
-famistudio_note_table_msb=3548
-famistudio_note_table_lsb=3354
+famistudio_vrc7_note_table_msb=3871
+famistudio_vrc7_note_table_lsb=3774
+famistudio_note_table_msb=3580
+famistudio_note_table_lsb=3386
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_ntsc.bin
index db39b2d9a..a4292fce9 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_ntsc.tbl
index 7387253b4..92bed40f5 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3623
-famistudio_vrc7_note_table_lsb=3526
-famistudio_note_table_msb=3429
-famistudio_note_table_lsb=3332
+famistudio_vrc7_note_table_msb=3655
+famistudio_vrc7_note_table_lsb=3558
+famistudio_note_table_msb=3461
+famistudio_note_table_lsb=3364
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_pal.bin b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_pal.bin
index 40e83e5c6..77e02d192 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_pal.tbl
index 7387253b4..92bed40f5 100644
--- a/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_famitracker_vrc7_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3623
-famistudio_vrc7_note_table_lsb=3526
-famistudio_note_table_msb=3429
-famistudio_note_table_lsb=3332
+famistudio_vrc7_note_table_msb=3655
+famistudio_vrc7_note_table_lsb=3558
+famistudio_note_table_msb=3461
+famistudio_note_table_lsb=3364
diff --git a/FamiStudio/Nsf/nsf_famistudio_fds_dual.bin b/FamiStudio/Nsf/nsf_famistudio_fds_dual.bin
index 076678a51..3887af127 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_fds_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_fds_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_fds_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_fds_dual.tbl
index 009836ca3..859ee7b4c 100644
--- a/FamiStudio/Nsf/nsf_famistudio_fds_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_fds_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=4072
-famistudio_fds_note_table_lsb=3878
-famistudio_note_table_msb=3684
-famistudio_note_table_lsb=3490
+famistudio_fds_note_table_msb=4104
+famistudio_fds_note_table_lsb=3910
+famistudio_note_table_msb=3716
+famistudio_note_table_lsb=3522
diff --git a/FamiStudio/Nsf/nsf_famistudio_fds_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_fds_ntsc.bin
index f28572631..d2c80ea97 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_fds_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_fds_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_fds_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_fds_ntsc.tbl
index 0e9f83dd4..a8ea6cc84 100644
--- a/FamiStudio/Nsf/nsf_famistudio_fds_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_fds_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=3748
-famistudio_fds_note_table_lsb=3651
-famistudio_note_table_msb=3554
-famistudio_note_table_lsb=3457
+famistudio_fds_note_table_msb=3780
+famistudio_fds_note_table_lsb=3683
+famistudio_note_table_msb=3586
+famistudio_note_table_lsb=3489
diff --git a/FamiStudio/Nsf/nsf_famistudio_fds_pal.bin b/FamiStudio/Nsf/nsf_famistudio_fds_pal.bin
index abd08fbd0..75a1f3d01 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_fds_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_fds_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_fds_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_fds_pal.tbl
index 80ba4ac99..6b622fa12 100644
--- a/FamiStudio/Nsf/nsf_famistudio_fds_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_fds_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=3750
-famistudio_fds_note_table_lsb=3653
-famistudio_note_table_msb=3556
-famistudio_note_table_lsb=3459
+famistudio_fds_note_table_msb=3782
+famistudio_fds_note_table_lsb=3685
+famistudio_note_table_msb=3588
+famistudio_note_table_lsb=3491
diff --git a/FamiStudio/Nsf/nsf_famistudio_mmc5_dual.bin b/FamiStudio/Nsf/nsf_famistudio_mmc5_dual.bin
index 9e264b143..3cc1ce359 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_mmc5_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_mmc5_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_mmc5_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_mmc5_dual.tbl
index 1b505b31a..0dae7e7c3 100644
--- a/FamiStudio/Nsf/nsf_famistudio_mmc5_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_mmc5_dual.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=3091
-famistudio_note_table_lsb=2897
+famistudio_note_table_msb=3121
+famistudio_note_table_lsb=2927
diff --git a/FamiStudio/Nsf/nsf_famistudio_mmc5_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_mmc5_ntsc.bin
index 9f38052b2..4cb35c4cd 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_mmc5_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_mmc5_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_mmc5_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_mmc5_ntsc.tbl
index 22b37c9a7..605ee1790 100644
--- a/FamiStudio/Nsf/nsf_famistudio_mmc5_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_mmc5_ntsc.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2957
-famistudio_note_table_lsb=2860
+famistudio_note_table_msb=2987
+famistudio_note_table_lsb=2890
diff --git a/FamiStudio/Nsf/nsf_famistudio_mmc5_pal.bin b/FamiStudio/Nsf/nsf_famistudio_mmc5_pal.bin
index 24ef8093b..c487c570e 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_mmc5_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_mmc5_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_mmc5_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_mmc5_pal.tbl
index 10a98c184..f41862012 100644
--- a/FamiStudio/Nsf/nsf_famistudio_mmc5_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_mmc5_pal.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2959
-famistudio_note_table_lsb=2862
+famistudio_note_table_msb=2989
+famistudio_note_table_lsb=2892
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_dual.bin
index 81dd6d052..54053ea7c 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_dual.tbl
index f0eb1d127..543ee6a75 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5910
-famistudio_s5b_note_table_lsb=5716
-famistudio_n163_note_table_msb=7268
-famistudio_n163_note_table_lsb=7074
-famistudio_vrc7_note_table_msb=6589
-famistudio_vrc7_note_table_lsb=6492
-famistudio_fds_note_table_msb=6880
-famistudio_fds_note_table_lsb=6686
-famistudio_saw_note_table_msb=6298
-famistudio_saw_note_table_lsb=6104
-famistudio_note_table_msb=5910
-famistudio_note_table_lsb=5716
+famistudio_s5b_note_table_msb=5937
+famistudio_s5b_note_table_lsb=5743
+famistudio_n163_note_table_msb=7295
+famistudio_n163_note_table_lsb=7101
+famistudio_vrc7_note_table_msb=6616
+famistudio_vrc7_note_table_lsb=6519
+famistudio_fds_note_table_msb=6907
+famistudio_fds_note_table_lsb=6713
+famistudio_saw_note_table_msb=6325
+famistudio_saw_note_table_lsb=6131
+famistudio_note_table_msb=5937
+famistudio_note_table_lsb=5743
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_dual.bin
index d7ec681b3..5de9078f3 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_dual.tbl
index 461d6fa24..d6652101c 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7500
-famistudio_s5b_note_table_lsb=7306
-famistudio_n163_note_table_msb=9246
-famistudio_n163_note_table_lsb=9052
-famistudio_epsm_note_table_msb=8373
-famistudio_epsm_note_table_lsb=8276
-famistudio_epsm_s_note_table_msb=8567
-famistudio_epsm_s_note_table_lsb=8470
-famistudio_vrc7_note_table_msb=8179
-famistudio_vrc7_note_table_lsb=8082
-famistudio_fds_note_table_msb=8858
-famistudio_fds_note_table_lsb=8664
-famistudio_saw_note_table_msb=7888
-famistudio_saw_note_table_lsb=7694
-famistudio_note_table_msb=7500
-famistudio_note_table_lsb=7306
+famistudio_s5b_note_table_msb=7527
+famistudio_s5b_note_table_lsb=7333
+famistudio_n163_note_table_msb=9273
+famistudio_n163_note_table_lsb=9079
+famistudio_epsm_note_table_msb=8400
+famistudio_epsm_note_table_lsb=8303
+famistudio_epsm_s_note_table_msb=8594
+famistudio_epsm_s_note_table_lsb=8497
+famistudio_vrc7_note_table_msb=8206
+famistudio_vrc7_note_table_lsb=8109
+famistudio_fds_note_table_msb=8885
+famistudio_fds_note_table_lsb=8691
+famistudio_saw_note_table_msb=7915
+famistudio_saw_note_table_lsb=7721
+famistudio_note_table_msb=7527
+famistudio_note_table_lsb=7333
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_ntsc.bin
index 4393ffd4a..34864a9db 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_ntsc.tbl
index a7e206bba..05a738e22 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7342
-famistudio_s5b_note_table_lsb=7245
-famistudio_n163_note_table_msb=8506
-famistudio_n163_note_table_lsb=8409
-famistudio_epsm_note_table_msb=7924
-famistudio_epsm_note_table_lsb=7827
-famistudio_epsm_s_note_table_msb=8118
-famistudio_epsm_s_note_table_lsb=8021
-famistudio_vrc7_note_table_msb=7730
-famistudio_vrc7_note_table_lsb=7633
-famistudio_fds_note_table_msb=8312
-famistudio_fds_note_table_lsb=8215
-famistudio_saw_note_table_msb=7536
-famistudio_saw_note_table_lsb=7439
-famistudio_note_table_msb=7342
-famistudio_note_table_lsb=7245
+famistudio_s5b_note_table_msb=7369
+famistudio_s5b_note_table_lsb=7272
+famistudio_n163_note_table_msb=8533
+famistudio_n163_note_table_lsb=8436
+famistudio_epsm_note_table_msb=7951
+famistudio_epsm_note_table_lsb=7854
+famistudio_epsm_s_note_table_msb=8145
+famistudio_epsm_s_note_table_lsb=8048
+famistudio_vrc7_note_table_msb=7757
+famistudio_vrc7_note_table_lsb=7660
+famistudio_fds_note_table_msb=8339
+famistudio_fds_note_table_lsb=8242
+famistudio_saw_note_table_msb=7563
+famistudio_saw_note_table_lsb=7466
+famistudio_note_table_msb=7369
+famistudio_note_table_lsb=7272
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_pal.bin
index 7d3754147..d8be26768 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_pal.tbl
index de278eb02..7c69e06ed 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7344
-famistudio_s5b_note_table_lsb=7247
-famistudio_n163_note_table_msb=8508
-famistudio_n163_note_table_lsb=8411
-famistudio_epsm_note_table_msb=7926
-famistudio_epsm_note_table_lsb=7829
-famistudio_epsm_s_note_table_msb=8120
-famistudio_epsm_s_note_table_lsb=8023
-famistudio_vrc7_note_table_msb=7732
-famistudio_vrc7_note_table_lsb=7635
-famistudio_fds_note_table_msb=8314
-famistudio_fds_note_table_lsb=8217
-famistudio_saw_note_table_msb=7538
-famistudio_saw_note_table_lsb=7441
-famistudio_note_table_msb=7344
-famistudio_note_table_lsb=7247
+famistudio_s5b_note_table_msb=7371
+famistudio_s5b_note_table_lsb=7274
+famistudio_n163_note_table_msb=8535
+famistudio_n163_note_table_lsb=8438
+famistudio_epsm_note_table_msb=7953
+famistudio_epsm_note_table_lsb=7856
+famistudio_epsm_s_note_table_msb=8147
+famistudio_epsm_s_note_table_lsb=8050
+famistudio_vrc7_note_table_msb=7759
+famistudio_vrc7_note_table_lsb=7662
+famistudio_fds_note_table_msb=8341
+famistudio_fds_note_table_lsb=8244
+famistudio_saw_note_table_msb=7565
+famistudio_saw_note_table_lsb=7468
+famistudio_note_table_msb=7371
+famistudio_note_table_lsb=7274
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_ntsc.bin
index db0ff6bc3..4df632149 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_ntsc.tbl
index d304d2bc3..c837d8495 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5752
-famistudio_s5b_note_table_lsb=5655
-famistudio_n163_note_table_msb=6528
-famistudio_n163_note_table_lsb=6431
-famistudio_vrc7_note_table_msb=6140
-famistudio_vrc7_note_table_lsb=6043
-famistudio_fds_note_table_msb=6334
-famistudio_fds_note_table_lsb=6237
-famistudio_saw_note_table_msb=5946
-famistudio_saw_note_table_lsb=5849
-famistudio_note_table_msb=5752
-famistudio_note_table_lsb=5655
+famistudio_s5b_note_table_msb=5779
+famistudio_s5b_note_table_lsb=5682
+famistudio_n163_note_table_msb=6555
+famistudio_n163_note_table_lsb=6458
+famistudio_vrc7_note_table_msb=6167
+famistudio_vrc7_note_table_lsb=6070
+famistudio_fds_note_table_msb=6361
+famistudio_fds_note_table_lsb=6264
+famistudio_saw_note_table_msb=5973
+famistudio_saw_note_table_lsb=5876
+famistudio_note_table_msb=5779
+famistudio_note_table_lsb=5682
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_pal.bin
index f1deb6aae..7902bfcab 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_pal.tbl
index 8108d5f8c..21594cf34 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_1ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5754
-famistudio_s5b_note_table_lsb=5657
-famistudio_n163_note_table_msb=6530
-famistudio_n163_note_table_lsb=6433
-famistudio_vrc7_note_table_msb=6142
-famistudio_vrc7_note_table_lsb=6045
-famistudio_fds_note_table_msb=6336
-famistudio_fds_note_table_lsb=6239
-famistudio_saw_note_table_msb=5948
-famistudio_saw_note_table_lsb=5851
-famistudio_note_table_msb=5754
-famistudio_note_table_lsb=5657
+famistudio_s5b_note_table_msb=5781
+famistudio_s5b_note_table_lsb=5684
+famistudio_n163_note_table_msb=6557
+famistudio_n163_note_table_lsb=6460
+famistudio_vrc7_note_table_msb=6169
+famistudio_vrc7_note_table_lsb=6072
+famistudio_fds_note_table_msb=6363
+famistudio_fds_note_table_lsb=6266
+famistudio_saw_note_table_msb=5975
+famistudio_saw_note_table_lsb=5878
+famistudio_note_table_msb=5781
+famistudio_note_table_lsb=5684
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_dual.bin
index 5560e09f2..cf48e1567 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_dual.tbl
index c8b0e3525..bf3d54328 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5914
-famistudio_s5b_note_table_lsb=5720
-famistudio_n163_note_table_msb=7272
-famistudio_n163_note_table_lsb=7078
-famistudio_vrc7_note_table_msb=6593
-famistudio_vrc7_note_table_lsb=6496
-famistudio_fds_note_table_msb=6884
-famistudio_fds_note_table_lsb=6690
-famistudio_saw_note_table_msb=6302
-famistudio_saw_note_table_lsb=6108
-famistudio_note_table_msb=5914
-famistudio_note_table_lsb=5720
+famistudio_s5b_note_table_msb=5941
+famistudio_s5b_note_table_lsb=5747
+famistudio_n163_note_table_msb=7299
+famistudio_n163_note_table_lsb=7105
+famistudio_vrc7_note_table_msb=6620
+famistudio_vrc7_note_table_lsb=6523
+famistudio_fds_note_table_msb=6911
+famistudio_fds_note_table_lsb=6717
+famistudio_saw_note_table_msb=6329
+famistudio_saw_note_table_lsb=6135
+famistudio_note_table_msb=5941
+famistudio_note_table_lsb=5747
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_dual.bin
index 9277ce67c..ba0ef8d27 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_dual.tbl
index a2978b555..0b763e5c0 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7504
-famistudio_s5b_note_table_lsb=7310
-famistudio_n163_note_table_msb=9250
-famistudio_n163_note_table_lsb=9056
-famistudio_epsm_note_table_msb=8377
-famistudio_epsm_note_table_lsb=8280
-famistudio_epsm_s_note_table_msb=8571
-famistudio_epsm_s_note_table_lsb=8474
-famistudio_vrc7_note_table_msb=8183
-famistudio_vrc7_note_table_lsb=8086
-famistudio_fds_note_table_msb=8862
-famistudio_fds_note_table_lsb=8668
-famistudio_saw_note_table_msb=7892
-famistudio_saw_note_table_lsb=7698
-famistudio_note_table_msb=7504
-famistudio_note_table_lsb=7310
+famistudio_s5b_note_table_msb=7531
+famistudio_s5b_note_table_lsb=7337
+famistudio_n163_note_table_msb=9277
+famistudio_n163_note_table_lsb=9083
+famistudio_epsm_note_table_msb=8404
+famistudio_epsm_note_table_lsb=8307
+famistudio_epsm_s_note_table_msb=8598
+famistudio_epsm_s_note_table_lsb=8501
+famistudio_vrc7_note_table_msb=8210
+famistudio_vrc7_note_table_lsb=8113
+famistudio_fds_note_table_msb=8889
+famistudio_fds_note_table_lsb=8695
+famistudio_saw_note_table_msb=7919
+famistudio_saw_note_table_lsb=7725
+famistudio_note_table_msb=7531
+famistudio_note_table_lsb=7337
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_ntsc.bin
index 54250c1d0..86ed50382 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_ntsc.tbl
index a43125b42..b80a6e1ef 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7346
-famistudio_s5b_note_table_lsb=7249
-famistudio_n163_note_table_msb=8510
-famistudio_n163_note_table_lsb=8413
-famistudio_epsm_note_table_msb=7928
-famistudio_epsm_note_table_lsb=7831
-famistudio_epsm_s_note_table_msb=8122
-famistudio_epsm_s_note_table_lsb=8025
-famistudio_vrc7_note_table_msb=7734
-famistudio_vrc7_note_table_lsb=7637
-famistudio_fds_note_table_msb=8316
-famistudio_fds_note_table_lsb=8219
-famistudio_saw_note_table_msb=7540
-famistudio_saw_note_table_lsb=7443
-famistudio_note_table_msb=7346
-famistudio_note_table_lsb=7249
+famistudio_s5b_note_table_msb=7373
+famistudio_s5b_note_table_lsb=7276
+famistudio_n163_note_table_msb=8537
+famistudio_n163_note_table_lsb=8440
+famistudio_epsm_note_table_msb=7955
+famistudio_epsm_note_table_lsb=7858
+famistudio_epsm_s_note_table_msb=8149
+famistudio_epsm_s_note_table_lsb=8052
+famistudio_vrc7_note_table_msb=7761
+famistudio_vrc7_note_table_lsb=7664
+famistudio_fds_note_table_msb=8343
+famistudio_fds_note_table_lsb=8246
+famistudio_saw_note_table_msb=7567
+famistudio_saw_note_table_lsb=7470
+famistudio_note_table_msb=7373
+famistudio_note_table_lsb=7276
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_pal.bin
index c3c96e52a..0954516b6 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_pal.tbl
index e6cfdd25c..c65c7b78e 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7348
-famistudio_s5b_note_table_lsb=7251
-famistudio_n163_note_table_msb=8512
-famistudio_n163_note_table_lsb=8415
-famistudio_epsm_note_table_msb=7930
-famistudio_epsm_note_table_lsb=7833
-famistudio_epsm_s_note_table_msb=8124
-famistudio_epsm_s_note_table_lsb=8027
-famistudio_vrc7_note_table_msb=7736
-famistudio_vrc7_note_table_lsb=7639
-famistudio_fds_note_table_msb=8318
-famistudio_fds_note_table_lsb=8221
-famistudio_saw_note_table_msb=7542
-famistudio_saw_note_table_lsb=7445
-famistudio_note_table_msb=7348
-famistudio_note_table_lsb=7251
+famistudio_s5b_note_table_msb=7375
+famistudio_s5b_note_table_lsb=7278
+famistudio_n163_note_table_msb=8539
+famistudio_n163_note_table_lsb=8442
+famistudio_epsm_note_table_msb=7957
+famistudio_epsm_note_table_lsb=7860
+famistudio_epsm_s_note_table_msb=8151
+famistudio_epsm_s_note_table_lsb=8054
+famistudio_vrc7_note_table_msb=7763
+famistudio_vrc7_note_table_lsb=7666
+famistudio_fds_note_table_msb=8345
+famistudio_fds_note_table_lsb=8248
+famistudio_saw_note_table_msb=7569
+famistudio_saw_note_table_lsb=7472
+famistudio_note_table_msb=7375
+famistudio_note_table_lsb=7278
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_ntsc.bin
index 4f1f94029..f89eee0ae 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_ntsc.tbl
index 5f0303531..f07f3bc00 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5756
-famistudio_s5b_note_table_lsb=5659
-famistudio_n163_note_table_msb=6532
-famistudio_n163_note_table_lsb=6435
-famistudio_vrc7_note_table_msb=6144
-famistudio_vrc7_note_table_lsb=6047
-famistudio_fds_note_table_msb=6338
-famistudio_fds_note_table_lsb=6241
-famistudio_saw_note_table_msb=5950
-famistudio_saw_note_table_lsb=5853
-famistudio_note_table_msb=5756
-famistudio_note_table_lsb=5659
+famistudio_s5b_note_table_msb=5783
+famistudio_s5b_note_table_lsb=5686
+famistudio_n163_note_table_msb=6559
+famistudio_n163_note_table_lsb=6462
+famistudio_vrc7_note_table_msb=6171
+famistudio_vrc7_note_table_lsb=6074
+famistudio_fds_note_table_msb=6365
+famistudio_fds_note_table_lsb=6268
+famistudio_saw_note_table_msb=5977
+famistudio_saw_note_table_lsb=5880
+famistudio_note_table_msb=5783
+famistudio_note_table_lsb=5686
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_pal.bin
index 01f1eaf26..a40ad1f21 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_pal.tbl
index 8475165ab..beccdcaeb 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_2ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5758
-famistudio_s5b_note_table_lsb=5661
-famistudio_n163_note_table_msb=6534
-famistudio_n163_note_table_lsb=6437
-famistudio_vrc7_note_table_msb=6146
-famistudio_vrc7_note_table_lsb=6049
-famistudio_fds_note_table_msb=6340
-famistudio_fds_note_table_lsb=6243
-famistudio_saw_note_table_msb=5952
-famistudio_saw_note_table_lsb=5855
-famistudio_note_table_msb=5758
-famistudio_note_table_lsb=5661
+famistudio_s5b_note_table_msb=5785
+famistudio_s5b_note_table_lsb=5688
+famistudio_n163_note_table_msb=6561
+famistudio_n163_note_table_lsb=6464
+famistudio_vrc7_note_table_msb=6173
+famistudio_vrc7_note_table_lsb=6076
+famistudio_fds_note_table_msb=6367
+famistudio_fds_note_table_lsb=6270
+famistudio_saw_note_table_msb=5979
+famistudio_saw_note_table_lsb=5882
+famistudio_note_table_msb=5785
+famistudio_note_table_lsb=5688
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_dual.bin
index a2a5bf9a4..42f2f1e96 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_dual.tbl
index b83bf2796..6fe5005c1 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5918
-famistudio_s5b_note_table_lsb=5724
-famistudio_n163_note_table_msb=7276
-famistudio_n163_note_table_lsb=7082
-famistudio_vrc7_note_table_msb=6597
-famistudio_vrc7_note_table_lsb=6500
-famistudio_fds_note_table_msb=6888
-famistudio_fds_note_table_lsb=6694
-famistudio_saw_note_table_msb=6306
-famistudio_saw_note_table_lsb=6112
-famistudio_note_table_msb=5918
-famistudio_note_table_lsb=5724
+famistudio_s5b_note_table_msb=5945
+famistudio_s5b_note_table_lsb=5751
+famistudio_n163_note_table_msb=7303
+famistudio_n163_note_table_lsb=7109
+famistudio_vrc7_note_table_msb=6624
+famistudio_vrc7_note_table_lsb=6527
+famistudio_fds_note_table_msb=6915
+famistudio_fds_note_table_lsb=6721
+famistudio_saw_note_table_msb=6333
+famistudio_saw_note_table_lsb=6139
+famistudio_note_table_msb=5945
+famistudio_note_table_lsb=5751
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_dual.bin
index 8483662da..d839d55f4 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_dual.tbl
index 4d94e3c51..a3db3ab77 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7508
-famistudio_s5b_note_table_lsb=7314
-famistudio_n163_note_table_msb=9254
-famistudio_n163_note_table_lsb=9060
-famistudio_epsm_note_table_msb=8381
-famistudio_epsm_note_table_lsb=8284
-famistudio_epsm_s_note_table_msb=8575
-famistudio_epsm_s_note_table_lsb=8478
-famistudio_vrc7_note_table_msb=8187
-famistudio_vrc7_note_table_lsb=8090
-famistudio_fds_note_table_msb=8866
-famistudio_fds_note_table_lsb=8672
-famistudio_saw_note_table_msb=7896
-famistudio_saw_note_table_lsb=7702
-famistudio_note_table_msb=7508
-famistudio_note_table_lsb=7314
+famistudio_s5b_note_table_msb=7535
+famistudio_s5b_note_table_lsb=7341
+famistudio_n163_note_table_msb=9281
+famistudio_n163_note_table_lsb=9087
+famistudio_epsm_note_table_msb=8408
+famistudio_epsm_note_table_lsb=8311
+famistudio_epsm_s_note_table_msb=8602
+famistudio_epsm_s_note_table_lsb=8505
+famistudio_vrc7_note_table_msb=8214
+famistudio_vrc7_note_table_lsb=8117
+famistudio_fds_note_table_msb=8893
+famistudio_fds_note_table_lsb=8699
+famistudio_saw_note_table_msb=7923
+famistudio_saw_note_table_lsb=7729
+famistudio_note_table_msb=7535
+famistudio_note_table_lsb=7341
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_ntsc.bin
index 38bf03977..931247f0a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_ntsc.tbl
index aa640e157..2ea421950 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7350
-famistudio_s5b_note_table_lsb=7253
-famistudio_n163_note_table_msb=8514
-famistudio_n163_note_table_lsb=8417
-famistudio_epsm_note_table_msb=7932
-famistudio_epsm_note_table_lsb=7835
-famistudio_epsm_s_note_table_msb=8126
-famistudio_epsm_s_note_table_lsb=8029
-famistudio_vrc7_note_table_msb=7738
-famistudio_vrc7_note_table_lsb=7641
-famistudio_fds_note_table_msb=8320
-famistudio_fds_note_table_lsb=8223
-famistudio_saw_note_table_msb=7544
-famistudio_saw_note_table_lsb=7447
-famistudio_note_table_msb=7350
-famistudio_note_table_lsb=7253
+famistudio_s5b_note_table_msb=7377
+famistudio_s5b_note_table_lsb=7280
+famistudio_n163_note_table_msb=8541
+famistudio_n163_note_table_lsb=8444
+famistudio_epsm_note_table_msb=7959
+famistudio_epsm_note_table_lsb=7862
+famistudio_epsm_s_note_table_msb=8153
+famistudio_epsm_s_note_table_lsb=8056
+famistudio_vrc7_note_table_msb=7765
+famistudio_vrc7_note_table_lsb=7668
+famistudio_fds_note_table_msb=8347
+famistudio_fds_note_table_lsb=8250
+famistudio_saw_note_table_msb=7571
+famistudio_saw_note_table_lsb=7474
+famistudio_note_table_msb=7377
+famistudio_note_table_lsb=7280
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_pal.bin
index 2e2832d91..e59bb0f28 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_pal.tbl
index c10b17d54..e7133da07 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7352
-famistudio_s5b_note_table_lsb=7255
-famistudio_n163_note_table_msb=8516
-famistudio_n163_note_table_lsb=8419
-famistudio_epsm_note_table_msb=7934
-famistudio_epsm_note_table_lsb=7837
-famistudio_epsm_s_note_table_msb=8128
-famistudio_epsm_s_note_table_lsb=8031
-famistudio_vrc7_note_table_msb=7740
-famistudio_vrc7_note_table_lsb=7643
-famistudio_fds_note_table_msb=8322
-famistudio_fds_note_table_lsb=8225
-famistudio_saw_note_table_msb=7546
-famistudio_saw_note_table_lsb=7449
-famistudio_note_table_msb=7352
-famistudio_note_table_lsb=7255
+famistudio_s5b_note_table_msb=7379
+famistudio_s5b_note_table_lsb=7282
+famistudio_n163_note_table_msb=8543
+famistudio_n163_note_table_lsb=8446
+famistudio_epsm_note_table_msb=7961
+famistudio_epsm_note_table_lsb=7864
+famistudio_epsm_s_note_table_msb=8155
+famistudio_epsm_s_note_table_lsb=8058
+famistudio_vrc7_note_table_msb=7767
+famistudio_vrc7_note_table_lsb=7670
+famistudio_fds_note_table_msb=8349
+famistudio_fds_note_table_lsb=8252
+famistudio_saw_note_table_msb=7573
+famistudio_saw_note_table_lsb=7476
+famistudio_note_table_msb=7379
+famistudio_note_table_lsb=7282
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_ntsc.bin
index 256232306..790116c59 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_ntsc.tbl
index 653ac1ba6..3884d03ec 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5760
-famistudio_s5b_note_table_lsb=5663
-famistudio_n163_note_table_msb=6536
-famistudio_n163_note_table_lsb=6439
-famistudio_vrc7_note_table_msb=6148
-famistudio_vrc7_note_table_lsb=6051
-famistudio_fds_note_table_msb=6342
-famistudio_fds_note_table_lsb=6245
-famistudio_saw_note_table_msb=5954
-famistudio_saw_note_table_lsb=5857
-famistudio_note_table_msb=5760
-famistudio_note_table_lsb=5663
+famistudio_s5b_note_table_msb=5787
+famistudio_s5b_note_table_lsb=5690
+famistudio_n163_note_table_msb=6563
+famistudio_n163_note_table_lsb=6466
+famistudio_vrc7_note_table_msb=6175
+famistudio_vrc7_note_table_lsb=6078
+famistudio_fds_note_table_msb=6369
+famistudio_fds_note_table_lsb=6272
+famistudio_saw_note_table_msb=5981
+famistudio_saw_note_table_lsb=5884
+famistudio_note_table_msb=5787
+famistudio_note_table_lsb=5690
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_pal.bin
index 99c164c70..c59285368 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_pal.tbl
index 7fc31140f..abb5b2343 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_3ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5762
-famistudio_s5b_note_table_lsb=5665
-famistudio_n163_note_table_msb=6538
-famistudio_n163_note_table_lsb=6441
-famistudio_vrc7_note_table_msb=6150
-famistudio_vrc7_note_table_lsb=6053
-famistudio_fds_note_table_msb=6344
-famistudio_fds_note_table_lsb=6247
-famistudio_saw_note_table_msb=5956
-famistudio_saw_note_table_lsb=5859
-famistudio_note_table_msb=5762
-famistudio_note_table_lsb=5665
+famistudio_s5b_note_table_msb=5789
+famistudio_s5b_note_table_lsb=5692
+famistudio_n163_note_table_msb=6565
+famistudio_n163_note_table_lsb=6468
+famistudio_vrc7_note_table_msb=6177
+famistudio_vrc7_note_table_lsb=6080
+famistudio_fds_note_table_msb=6371
+famistudio_fds_note_table_lsb=6274
+famistudio_saw_note_table_msb=5983
+famistudio_saw_note_table_lsb=5886
+famistudio_note_table_msb=5789
+famistudio_note_table_lsb=5692
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_dual.bin
index 438b66ea5..5df543208 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_dual.tbl
index b83bf2796..6fe5005c1 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5918
-famistudio_s5b_note_table_lsb=5724
-famistudio_n163_note_table_msb=7276
-famistudio_n163_note_table_lsb=7082
-famistudio_vrc7_note_table_msb=6597
-famistudio_vrc7_note_table_lsb=6500
-famistudio_fds_note_table_msb=6888
-famistudio_fds_note_table_lsb=6694
-famistudio_saw_note_table_msb=6306
-famistudio_saw_note_table_lsb=6112
-famistudio_note_table_msb=5918
-famistudio_note_table_lsb=5724
+famistudio_s5b_note_table_msb=5945
+famistudio_s5b_note_table_lsb=5751
+famistudio_n163_note_table_msb=7303
+famistudio_n163_note_table_lsb=7109
+famistudio_vrc7_note_table_msb=6624
+famistudio_vrc7_note_table_lsb=6527
+famistudio_fds_note_table_msb=6915
+famistudio_fds_note_table_lsb=6721
+famistudio_saw_note_table_msb=6333
+famistudio_saw_note_table_lsb=6139
+famistudio_note_table_msb=5945
+famistudio_note_table_lsb=5751
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_dual.bin
index 185690372..fb343671b 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_dual.tbl
index 4d94e3c51..a3db3ab77 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7508
-famistudio_s5b_note_table_lsb=7314
-famistudio_n163_note_table_msb=9254
-famistudio_n163_note_table_lsb=9060
-famistudio_epsm_note_table_msb=8381
-famistudio_epsm_note_table_lsb=8284
-famistudio_epsm_s_note_table_msb=8575
-famistudio_epsm_s_note_table_lsb=8478
-famistudio_vrc7_note_table_msb=8187
-famistudio_vrc7_note_table_lsb=8090
-famistudio_fds_note_table_msb=8866
-famistudio_fds_note_table_lsb=8672
-famistudio_saw_note_table_msb=7896
-famistudio_saw_note_table_lsb=7702
-famistudio_note_table_msb=7508
-famistudio_note_table_lsb=7314
+famistudio_s5b_note_table_msb=7535
+famistudio_s5b_note_table_lsb=7341
+famistudio_n163_note_table_msb=9281
+famistudio_n163_note_table_lsb=9087
+famistudio_epsm_note_table_msb=8408
+famistudio_epsm_note_table_lsb=8311
+famistudio_epsm_s_note_table_msb=8602
+famistudio_epsm_s_note_table_lsb=8505
+famistudio_vrc7_note_table_msb=8214
+famistudio_vrc7_note_table_lsb=8117
+famistudio_fds_note_table_msb=8893
+famistudio_fds_note_table_lsb=8699
+famistudio_saw_note_table_msb=7923
+famistudio_saw_note_table_lsb=7729
+famistudio_note_table_msb=7535
+famistudio_note_table_lsb=7341
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_ntsc.bin
index 0e4931884..d882c6ef8 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_ntsc.tbl
index aa640e157..2ea421950 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7350
-famistudio_s5b_note_table_lsb=7253
-famistudio_n163_note_table_msb=8514
-famistudio_n163_note_table_lsb=8417
-famistudio_epsm_note_table_msb=7932
-famistudio_epsm_note_table_lsb=7835
-famistudio_epsm_s_note_table_msb=8126
-famistudio_epsm_s_note_table_lsb=8029
-famistudio_vrc7_note_table_msb=7738
-famistudio_vrc7_note_table_lsb=7641
-famistudio_fds_note_table_msb=8320
-famistudio_fds_note_table_lsb=8223
-famistudio_saw_note_table_msb=7544
-famistudio_saw_note_table_lsb=7447
-famistudio_note_table_msb=7350
-famistudio_note_table_lsb=7253
+famistudio_s5b_note_table_msb=7377
+famistudio_s5b_note_table_lsb=7280
+famistudio_n163_note_table_msb=8541
+famistudio_n163_note_table_lsb=8444
+famistudio_epsm_note_table_msb=7959
+famistudio_epsm_note_table_lsb=7862
+famistudio_epsm_s_note_table_msb=8153
+famistudio_epsm_s_note_table_lsb=8056
+famistudio_vrc7_note_table_msb=7765
+famistudio_vrc7_note_table_lsb=7668
+famistudio_fds_note_table_msb=8347
+famistudio_fds_note_table_lsb=8250
+famistudio_saw_note_table_msb=7571
+famistudio_saw_note_table_lsb=7474
+famistudio_note_table_msb=7377
+famistudio_note_table_lsb=7280
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_pal.bin
index baeace714..4acb0cc56 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_pal.tbl
index c10b17d54..e7133da07 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7352
-famistudio_s5b_note_table_lsb=7255
-famistudio_n163_note_table_msb=8516
-famistudio_n163_note_table_lsb=8419
-famistudio_epsm_note_table_msb=7934
-famistudio_epsm_note_table_lsb=7837
-famistudio_epsm_s_note_table_msb=8128
-famistudio_epsm_s_note_table_lsb=8031
-famistudio_vrc7_note_table_msb=7740
-famistudio_vrc7_note_table_lsb=7643
-famistudio_fds_note_table_msb=8322
-famistudio_fds_note_table_lsb=8225
-famistudio_saw_note_table_msb=7546
-famistudio_saw_note_table_lsb=7449
-famistudio_note_table_msb=7352
-famistudio_note_table_lsb=7255
+famistudio_s5b_note_table_msb=7379
+famistudio_s5b_note_table_lsb=7282
+famistudio_n163_note_table_msb=8543
+famistudio_n163_note_table_lsb=8446
+famistudio_epsm_note_table_msb=7961
+famistudio_epsm_note_table_lsb=7864
+famistudio_epsm_s_note_table_msb=8155
+famistudio_epsm_s_note_table_lsb=8058
+famistudio_vrc7_note_table_msb=7767
+famistudio_vrc7_note_table_lsb=7670
+famistudio_fds_note_table_msb=8349
+famistudio_fds_note_table_lsb=8252
+famistudio_saw_note_table_msb=7573
+famistudio_saw_note_table_lsb=7476
+famistudio_note_table_msb=7379
+famistudio_note_table_lsb=7282
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_ntsc.bin
index 92224b23b..321b91f27 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_ntsc.tbl
index 653ac1ba6..3884d03ec 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5760
-famistudio_s5b_note_table_lsb=5663
-famistudio_n163_note_table_msb=6536
-famistudio_n163_note_table_lsb=6439
-famistudio_vrc7_note_table_msb=6148
-famistudio_vrc7_note_table_lsb=6051
-famistudio_fds_note_table_msb=6342
-famistudio_fds_note_table_lsb=6245
-famistudio_saw_note_table_msb=5954
-famistudio_saw_note_table_lsb=5857
-famistudio_note_table_msb=5760
-famistudio_note_table_lsb=5663
+famistudio_s5b_note_table_msb=5787
+famistudio_s5b_note_table_lsb=5690
+famistudio_n163_note_table_msb=6563
+famistudio_n163_note_table_lsb=6466
+famistudio_vrc7_note_table_msb=6175
+famistudio_vrc7_note_table_lsb=6078
+famistudio_fds_note_table_msb=6369
+famistudio_fds_note_table_lsb=6272
+famistudio_saw_note_table_msb=5981
+famistudio_saw_note_table_lsb=5884
+famistudio_note_table_msb=5787
+famistudio_note_table_lsb=5690
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_pal.bin
index 51150eed9..76690cc1f 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_pal.tbl
index 7fc31140f..abb5b2343 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_4ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5762
-famistudio_s5b_note_table_lsb=5665
-famistudio_n163_note_table_msb=6538
-famistudio_n163_note_table_lsb=6441
-famistudio_vrc7_note_table_msb=6150
-famistudio_vrc7_note_table_lsb=6053
-famistudio_fds_note_table_msb=6344
-famistudio_fds_note_table_lsb=6247
-famistudio_saw_note_table_msb=5956
-famistudio_saw_note_table_lsb=5859
-famistudio_note_table_msb=5762
-famistudio_note_table_lsb=5665
+famistudio_s5b_note_table_msb=5789
+famistudio_s5b_note_table_lsb=5692
+famistudio_n163_note_table_msb=6565
+famistudio_n163_note_table_lsb=6468
+famistudio_vrc7_note_table_msb=6177
+famistudio_vrc7_note_table_lsb=6080
+famistudio_fds_note_table_msb=6371
+famistudio_fds_note_table_lsb=6274
+famistudio_saw_note_table_msb=5983
+famistudio_saw_note_table_lsb=5886
+famistudio_note_table_msb=5789
+famistudio_note_table_lsb=5692
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_dual.bin
index 71968320f..d206d1409 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_dual.tbl
index 79d3fc677..17b609348 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5922
-famistudio_s5b_note_table_lsb=5728
-famistudio_n163_note_table_msb=7280
-famistudio_n163_note_table_lsb=7086
-famistudio_vrc7_note_table_msb=6601
-famistudio_vrc7_note_table_lsb=6504
-famistudio_fds_note_table_msb=6892
-famistudio_fds_note_table_lsb=6698
-famistudio_saw_note_table_msb=6310
-famistudio_saw_note_table_lsb=6116
-famistudio_note_table_msb=5922
-famistudio_note_table_lsb=5728
+famistudio_s5b_note_table_msb=5949
+famistudio_s5b_note_table_lsb=5755
+famistudio_n163_note_table_msb=7307
+famistudio_n163_note_table_lsb=7113
+famistudio_vrc7_note_table_msb=6628
+famistudio_vrc7_note_table_lsb=6531
+famistudio_fds_note_table_msb=6919
+famistudio_fds_note_table_lsb=6725
+famistudio_saw_note_table_msb=6337
+famistudio_saw_note_table_lsb=6143
+famistudio_note_table_msb=5949
+famistudio_note_table_lsb=5755
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_dual.bin
index 18a8dcad5..d508e171f 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_dual.tbl
index 86358b75b..965c22d90 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7512
-famistudio_s5b_note_table_lsb=7318
-famistudio_n163_note_table_msb=9258
-famistudio_n163_note_table_lsb=9064
-famistudio_epsm_note_table_msb=8385
-famistudio_epsm_note_table_lsb=8288
-famistudio_epsm_s_note_table_msb=8579
-famistudio_epsm_s_note_table_lsb=8482
-famistudio_vrc7_note_table_msb=8191
-famistudio_vrc7_note_table_lsb=8094
-famistudio_fds_note_table_msb=8870
-famistudio_fds_note_table_lsb=8676
-famistudio_saw_note_table_msb=7900
-famistudio_saw_note_table_lsb=7706
-famistudio_note_table_msb=7512
-famistudio_note_table_lsb=7318
+famistudio_s5b_note_table_msb=7539
+famistudio_s5b_note_table_lsb=7345
+famistudio_n163_note_table_msb=9285
+famistudio_n163_note_table_lsb=9091
+famistudio_epsm_note_table_msb=8412
+famistudio_epsm_note_table_lsb=8315
+famistudio_epsm_s_note_table_msb=8606
+famistudio_epsm_s_note_table_lsb=8509
+famistudio_vrc7_note_table_msb=8218
+famistudio_vrc7_note_table_lsb=8121
+famistudio_fds_note_table_msb=8897
+famistudio_fds_note_table_lsb=8703
+famistudio_saw_note_table_msb=7927
+famistudio_saw_note_table_lsb=7733
+famistudio_note_table_msb=7539
+famistudio_note_table_lsb=7345
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_ntsc.bin
index ffe6b59aa..3a5e143cc 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_ntsc.tbl
index 0986dd70b..5c4dfa0c4 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7354
-famistudio_s5b_note_table_lsb=7257
-famistudio_n163_note_table_msb=8518
-famistudio_n163_note_table_lsb=8421
-famistudio_epsm_note_table_msb=7936
-famistudio_epsm_note_table_lsb=7839
-famistudio_epsm_s_note_table_msb=8130
-famistudio_epsm_s_note_table_lsb=8033
-famistudio_vrc7_note_table_msb=7742
-famistudio_vrc7_note_table_lsb=7645
-famistudio_fds_note_table_msb=8324
-famistudio_fds_note_table_lsb=8227
-famistudio_saw_note_table_msb=7548
-famistudio_saw_note_table_lsb=7451
-famistudio_note_table_msb=7354
-famistudio_note_table_lsb=7257
+famistudio_s5b_note_table_msb=7381
+famistudio_s5b_note_table_lsb=7284
+famistudio_n163_note_table_msb=8545
+famistudio_n163_note_table_lsb=8448
+famistudio_epsm_note_table_msb=7963
+famistudio_epsm_note_table_lsb=7866
+famistudio_epsm_s_note_table_msb=8157
+famistudio_epsm_s_note_table_lsb=8060
+famistudio_vrc7_note_table_msb=7769
+famistudio_vrc7_note_table_lsb=7672
+famistudio_fds_note_table_msb=8351
+famistudio_fds_note_table_lsb=8254
+famistudio_saw_note_table_msb=7575
+famistudio_saw_note_table_lsb=7478
+famistudio_note_table_msb=7381
+famistudio_note_table_lsb=7284
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_pal.bin
index 3f1df26ae..1677b8553 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_pal.tbl
index 6e1d48449..1226acafa 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7356
-famistudio_s5b_note_table_lsb=7259
-famistudio_n163_note_table_msb=8520
-famistudio_n163_note_table_lsb=8423
-famistudio_epsm_note_table_msb=7938
-famistudio_epsm_note_table_lsb=7841
-famistudio_epsm_s_note_table_msb=8132
-famistudio_epsm_s_note_table_lsb=8035
-famistudio_vrc7_note_table_msb=7744
-famistudio_vrc7_note_table_lsb=7647
-famistudio_fds_note_table_msb=8326
-famistudio_fds_note_table_lsb=8229
-famistudio_saw_note_table_msb=7550
-famistudio_saw_note_table_lsb=7453
-famistudio_note_table_msb=7356
-famistudio_note_table_lsb=7259
+famistudio_s5b_note_table_msb=7383
+famistudio_s5b_note_table_lsb=7286
+famistudio_n163_note_table_msb=8547
+famistudio_n163_note_table_lsb=8450
+famistudio_epsm_note_table_msb=7965
+famistudio_epsm_note_table_lsb=7868
+famistudio_epsm_s_note_table_msb=8159
+famistudio_epsm_s_note_table_lsb=8062
+famistudio_vrc7_note_table_msb=7771
+famistudio_vrc7_note_table_lsb=7674
+famistudio_fds_note_table_msb=8353
+famistudio_fds_note_table_lsb=8256
+famistudio_saw_note_table_msb=7577
+famistudio_saw_note_table_lsb=7480
+famistudio_note_table_msb=7383
+famistudio_note_table_lsb=7286
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_ntsc.bin
index d80635156..cdb6ad10e 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_ntsc.tbl
index 5a4c62fae..fbcf18067 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5764
-famistudio_s5b_note_table_lsb=5667
-famistudio_n163_note_table_msb=6540
-famistudio_n163_note_table_lsb=6443
-famistudio_vrc7_note_table_msb=6152
-famistudio_vrc7_note_table_lsb=6055
-famistudio_fds_note_table_msb=6346
-famistudio_fds_note_table_lsb=6249
-famistudio_saw_note_table_msb=5958
-famistudio_saw_note_table_lsb=5861
-famistudio_note_table_msb=5764
-famistudio_note_table_lsb=5667
+famistudio_s5b_note_table_msb=5791
+famistudio_s5b_note_table_lsb=5694
+famistudio_n163_note_table_msb=6567
+famistudio_n163_note_table_lsb=6470
+famistudio_vrc7_note_table_msb=6179
+famistudio_vrc7_note_table_lsb=6082
+famistudio_fds_note_table_msb=6373
+famistudio_fds_note_table_lsb=6276
+famistudio_saw_note_table_msb=5985
+famistudio_saw_note_table_lsb=5888
+famistudio_note_table_msb=5791
+famistudio_note_table_lsb=5694
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_pal.bin
index 0d8d9398c..64d571d19 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_pal.tbl
index b14163039..4e9480f0c 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_5ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5766
-famistudio_s5b_note_table_lsb=5669
-famistudio_n163_note_table_msb=6542
-famistudio_n163_note_table_lsb=6445
-famistudio_vrc7_note_table_msb=6154
-famistudio_vrc7_note_table_lsb=6057
-famistudio_fds_note_table_msb=6348
-famistudio_fds_note_table_lsb=6251
-famistudio_saw_note_table_msb=5960
-famistudio_saw_note_table_lsb=5863
-famistudio_note_table_msb=5766
-famistudio_note_table_lsb=5669
+famistudio_s5b_note_table_msb=5793
+famistudio_s5b_note_table_lsb=5696
+famistudio_n163_note_table_msb=6569
+famistudio_n163_note_table_lsb=6472
+famistudio_vrc7_note_table_msb=6181
+famistudio_vrc7_note_table_lsb=6084
+famistudio_fds_note_table_msb=6375
+famistudio_fds_note_table_lsb=6278
+famistudio_saw_note_table_msb=5987
+famistudio_saw_note_table_lsb=5890
+famistudio_note_table_msb=5793
+famistudio_note_table_lsb=5696
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_dual.bin
index e95b01b68..1e76d3b9c 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_dual.tbl
index 79d3fc677..17b609348 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5922
-famistudio_s5b_note_table_lsb=5728
-famistudio_n163_note_table_msb=7280
-famistudio_n163_note_table_lsb=7086
-famistudio_vrc7_note_table_msb=6601
-famistudio_vrc7_note_table_lsb=6504
-famistudio_fds_note_table_msb=6892
-famistudio_fds_note_table_lsb=6698
-famistudio_saw_note_table_msb=6310
-famistudio_saw_note_table_lsb=6116
-famistudio_note_table_msb=5922
-famistudio_note_table_lsb=5728
+famistudio_s5b_note_table_msb=5949
+famistudio_s5b_note_table_lsb=5755
+famistudio_n163_note_table_msb=7307
+famistudio_n163_note_table_lsb=7113
+famistudio_vrc7_note_table_msb=6628
+famistudio_vrc7_note_table_lsb=6531
+famistudio_fds_note_table_msb=6919
+famistudio_fds_note_table_lsb=6725
+famistudio_saw_note_table_msb=6337
+famistudio_saw_note_table_lsb=6143
+famistudio_note_table_msb=5949
+famistudio_note_table_lsb=5755
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_dual.bin
index 3dfa327d7..bd17b3623 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_dual.tbl
index 86358b75b..965c22d90 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7512
-famistudio_s5b_note_table_lsb=7318
-famistudio_n163_note_table_msb=9258
-famistudio_n163_note_table_lsb=9064
-famistudio_epsm_note_table_msb=8385
-famistudio_epsm_note_table_lsb=8288
-famistudio_epsm_s_note_table_msb=8579
-famistudio_epsm_s_note_table_lsb=8482
-famistudio_vrc7_note_table_msb=8191
-famistudio_vrc7_note_table_lsb=8094
-famistudio_fds_note_table_msb=8870
-famistudio_fds_note_table_lsb=8676
-famistudio_saw_note_table_msb=7900
-famistudio_saw_note_table_lsb=7706
-famistudio_note_table_msb=7512
-famistudio_note_table_lsb=7318
+famistudio_s5b_note_table_msb=7539
+famistudio_s5b_note_table_lsb=7345
+famistudio_n163_note_table_msb=9285
+famistudio_n163_note_table_lsb=9091
+famistudio_epsm_note_table_msb=8412
+famistudio_epsm_note_table_lsb=8315
+famistudio_epsm_s_note_table_msb=8606
+famistudio_epsm_s_note_table_lsb=8509
+famistudio_vrc7_note_table_msb=8218
+famistudio_vrc7_note_table_lsb=8121
+famistudio_fds_note_table_msb=8897
+famistudio_fds_note_table_lsb=8703
+famistudio_saw_note_table_msb=7927
+famistudio_saw_note_table_lsb=7733
+famistudio_note_table_msb=7539
+famistudio_note_table_lsb=7345
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_ntsc.bin
index 2399de095..84cd57dc6 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_ntsc.tbl
index 0986dd70b..5c4dfa0c4 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7354
-famistudio_s5b_note_table_lsb=7257
-famistudio_n163_note_table_msb=8518
-famistudio_n163_note_table_lsb=8421
-famistudio_epsm_note_table_msb=7936
-famistudio_epsm_note_table_lsb=7839
-famistudio_epsm_s_note_table_msb=8130
-famistudio_epsm_s_note_table_lsb=8033
-famistudio_vrc7_note_table_msb=7742
-famistudio_vrc7_note_table_lsb=7645
-famistudio_fds_note_table_msb=8324
-famistudio_fds_note_table_lsb=8227
-famistudio_saw_note_table_msb=7548
-famistudio_saw_note_table_lsb=7451
-famistudio_note_table_msb=7354
-famistudio_note_table_lsb=7257
+famistudio_s5b_note_table_msb=7381
+famistudio_s5b_note_table_lsb=7284
+famistudio_n163_note_table_msb=8545
+famistudio_n163_note_table_lsb=8448
+famistudio_epsm_note_table_msb=7963
+famistudio_epsm_note_table_lsb=7866
+famistudio_epsm_s_note_table_msb=8157
+famistudio_epsm_s_note_table_lsb=8060
+famistudio_vrc7_note_table_msb=7769
+famistudio_vrc7_note_table_lsb=7672
+famistudio_fds_note_table_msb=8351
+famistudio_fds_note_table_lsb=8254
+famistudio_saw_note_table_msb=7575
+famistudio_saw_note_table_lsb=7478
+famistudio_note_table_msb=7381
+famistudio_note_table_lsb=7284
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_pal.bin
index 4d6fa271b..2fc4fd417 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_pal.tbl
index 6e1d48449..1226acafa 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7356
-famistudio_s5b_note_table_lsb=7259
-famistudio_n163_note_table_msb=8520
-famistudio_n163_note_table_lsb=8423
-famistudio_epsm_note_table_msb=7938
-famistudio_epsm_note_table_lsb=7841
-famistudio_epsm_s_note_table_msb=8132
-famistudio_epsm_s_note_table_lsb=8035
-famistudio_vrc7_note_table_msb=7744
-famistudio_vrc7_note_table_lsb=7647
-famistudio_fds_note_table_msb=8326
-famistudio_fds_note_table_lsb=8229
-famistudio_saw_note_table_msb=7550
-famistudio_saw_note_table_lsb=7453
-famistudio_note_table_msb=7356
-famistudio_note_table_lsb=7259
+famistudio_s5b_note_table_msb=7383
+famistudio_s5b_note_table_lsb=7286
+famistudio_n163_note_table_msb=8547
+famistudio_n163_note_table_lsb=8450
+famistudio_epsm_note_table_msb=7965
+famistudio_epsm_note_table_lsb=7868
+famistudio_epsm_s_note_table_msb=8159
+famistudio_epsm_s_note_table_lsb=8062
+famistudio_vrc7_note_table_msb=7771
+famistudio_vrc7_note_table_lsb=7674
+famistudio_fds_note_table_msb=8353
+famistudio_fds_note_table_lsb=8256
+famistudio_saw_note_table_msb=7577
+famistudio_saw_note_table_lsb=7480
+famistudio_note_table_msb=7383
+famistudio_note_table_lsb=7286
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_ntsc.bin
index 85b0722cf..c9b6a4b6e 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_ntsc.tbl
index 5a4c62fae..fbcf18067 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5764
-famistudio_s5b_note_table_lsb=5667
-famistudio_n163_note_table_msb=6540
-famistudio_n163_note_table_lsb=6443
-famistudio_vrc7_note_table_msb=6152
-famistudio_vrc7_note_table_lsb=6055
-famistudio_fds_note_table_msb=6346
-famistudio_fds_note_table_lsb=6249
-famistudio_saw_note_table_msb=5958
-famistudio_saw_note_table_lsb=5861
-famistudio_note_table_msb=5764
-famistudio_note_table_lsb=5667
+famistudio_s5b_note_table_msb=5791
+famistudio_s5b_note_table_lsb=5694
+famistudio_n163_note_table_msb=6567
+famistudio_n163_note_table_lsb=6470
+famistudio_vrc7_note_table_msb=6179
+famistudio_vrc7_note_table_lsb=6082
+famistudio_fds_note_table_msb=6373
+famistudio_fds_note_table_lsb=6276
+famistudio_saw_note_table_msb=5985
+famistudio_saw_note_table_lsb=5888
+famistudio_note_table_msb=5791
+famistudio_note_table_lsb=5694
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_pal.bin
index 38b1d5481..31b07fb38 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_pal.tbl
index b14163039..4e9480f0c 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_6ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5766
-famistudio_s5b_note_table_lsb=5669
-famistudio_n163_note_table_msb=6542
-famistudio_n163_note_table_lsb=6445
-famistudio_vrc7_note_table_msb=6154
-famistudio_vrc7_note_table_lsb=6057
-famistudio_fds_note_table_msb=6348
-famistudio_fds_note_table_lsb=6251
-famistudio_saw_note_table_msb=5960
-famistudio_saw_note_table_lsb=5863
-famistudio_note_table_msb=5766
-famistudio_note_table_lsb=5669
+famistudio_s5b_note_table_msb=5793
+famistudio_s5b_note_table_lsb=5696
+famistudio_n163_note_table_msb=6569
+famistudio_n163_note_table_lsb=6472
+famistudio_vrc7_note_table_msb=6181
+famistudio_vrc7_note_table_lsb=6084
+famistudio_fds_note_table_msb=6375
+famistudio_fds_note_table_lsb=6278
+famistudio_saw_note_table_msb=5987
+famistudio_saw_note_table_lsb=5890
+famistudio_note_table_msb=5793
+famistudio_note_table_lsb=5696
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_dual.bin
index 0fe733cce..4030c67fc 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_dual.tbl
index 79d3fc677..17b609348 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5922
-famistudio_s5b_note_table_lsb=5728
-famistudio_n163_note_table_msb=7280
-famistudio_n163_note_table_lsb=7086
-famistudio_vrc7_note_table_msb=6601
-famistudio_vrc7_note_table_lsb=6504
-famistudio_fds_note_table_msb=6892
-famistudio_fds_note_table_lsb=6698
-famistudio_saw_note_table_msb=6310
-famistudio_saw_note_table_lsb=6116
-famistudio_note_table_msb=5922
-famistudio_note_table_lsb=5728
+famistudio_s5b_note_table_msb=5949
+famistudio_s5b_note_table_lsb=5755
+famistudio_n163_note_table_msb=7307
+famistudio_n163_note_table_lsb=7113
+famistudio_vrc7_note_table_msb=6628
+famistudio_vrc7_note_table_lsb=6531
+famistudio_fds_note_table_msb=6919
+famistudio_fds_note_table_lsb=6725
+famistudio_saw_note_table_msb=6337
+famistudio_saw_note_table_lsb=6143
+famistudio_note_table_msb=5949
+famistudio_note_table_lsb=5755
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_dual.bin
index 37b222bb9..72a160055 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_dual.tbl
index 86358b75b..965c22d90 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7512
-famistudio_s5b_note_table_lsb=7318
-famistudio_n163_note_table_msb=9258
-famistudio_n163_note_table_lsb=9064
-famistudio_epsm_note_table_msb=8385
-famistudio_epsm_note_table_lsb=8288
-famistudio_epsm_s_note_table_msb=8579
-famistudio_epsm_s_note_table_lsb=8482
-famistudio_vrc7_note_table_msb=8191
-famistudio_vrc7_note_table_lsb=8094
-famistudio_fds_note_table_msb=8870
-famistudio_fds_note_table_lsb=8676
-famistudio_saw_note_table_msb=7900
-famistudio_saw_note_table_lsb=7706
-famistudio_note_table_msb=7512
-famistudio_note_table_lsb=7318
+famistudio_s5b_note_table_msb=7539
+famistudio_s5b_note_table_lsb=7345
+famistudio_n163_note_table_msb=9285
+famistudio_n163_note_table_lsb=9091
+famistudio_epsm_note_table_msb=8412
+famistudio_epsm_note_table_lsb=8315
+famistudio_epsm_s_note_table_msb=8606
+famistudio_epsm_s_note_table_lsb=8509
+famistudio_vrc7_note_table_msb=8218
+famistudio_vrc7_note_table_lsb=8121
+famistudio_fds_note_table_msb=8897
+famistudio_fds_note_table_lsb=8703
+famistudio_saw_note_table_msb=7927
+famistudio_saw_note_table_lsb=7733
+famistudio_note_table_msb=7539
+famistudio_note_table_lsb=7345
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_ntsc.bin
index 9504bfad6..905801936 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_ntsc.tbl
index 0986dd70b..5c4dfa0c4 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7354
-famistudio_s5b_note_table_lsb=7257
-famistudio_n163_note_table_msb=8518
-famistudio_n163_note_table_lsb=8421
-famistudio_epsm_note_table_msb=7936
-famistudio_epsm_note_table_lsb=7839
-famistudio_epsm_s_note_table_msb=8130
-famistudio_epsm_s_note_table_lsb=8033
-famistudio_vrc7_note_table_msb=7742
-famistudio_vrc7_note_table_lsb=7645
-famistudio_fds_note_table_msb=8324
-famistudio_fds_note_table_lsb=8227
-famistudio_saw_note_table_msb=7548
-famistudio_saw_note_table_lsb=7451
-famistudio_note_table_msb=7354
-famistudio_note_table_lsb=7257
+famistudio_s5b_note_table_msb=7381
+famistudio_s5b_note_table_lsb=7284
+famistudio_n163_note_table_msb=8545
+famistudio_n163_note_table_lsb=8448
+famistudio_epsm_note_table_msb=7963
+famistudio_epsm_note_table_lsb=7866
+famistudio_epsm_s_note_table_msb=8157
+famistudio_epsm_s_note_table_lsb=8060
+famistudio_vrc7_note_table_msb=7769
+famistudio_vrc7_note_table_lsb=7672
+famistudio_fds_note_table_msb=8351
+famistudio_fds_note_table_lsb=8254
+famistudio_saw_note_table_msb=7575
+famistudio_saw_note_table_lsb=7478
+famistudio_note_table_msb=7381
+famistudio_note_table_lsb=7284
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_pal.bin
index 99d8dc13a..f4b5b035f 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_pal.tbl
index 6e1d48449..1226acafa 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7356
-famistudio_s5b_note_table_lsb=7259
-famistudio_n163_note_table_msb=8520
-famistudio_n163_note_table_lsb=8423
-famistudio_epsm_note_table_msb=7938
-famistudio_epsm_note_table_lsb=7841
-famistudio_epsm_s_note_table_msb=8132
-famistudio_epsm_s_note_table_lsb=8035
-famistudio_vrc7_note_table_msb=7744
-famistudio_vrc7_note_table_lsb=7647
-famistudio_fds_note_table_msb=8326
-famistudio_fds_note_table_lsb=8229
-famistudio_saw_note_table_msb=7550
-famistudio_saw_note_table_lsb=7453
-famistudio_note_table_msb=7356
-famistudio_note_table_lsb=7259
+famistudio_s5b_note_table_msb=7383
+famistudio_s5b_note_table_lsb=7286
+famistudio_n163_note_table_msb=8547
+famistudio_n163_note_table_lsb=8450
+famistudio_epsm_note_table_msb=7965
+famistudio_epsm_note_table_lsb=7868
+famistudio_epsm_s_note_table_msb=8159
+famistudio_epsm_s_note_table_lsb=8062
+famistudio_vrc7_note_table_msb=7771
+famistudio_vrc7_note_table_lsb=7674
+famistudio_fds_note_table_msb=8353
+famistudio_fds_note_table_lsb=8256
+famistudio_saw_note_table_msb=7577
+famistudio_saw_note_table_lsb=7480
+famistudio_note_table_msb=7383
+famistudio_note_table_lsb=7286
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_ntsc.bin
index 7cd7c2c73..1afee92d3 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_ntsc.tbl
index 5a4c62fae..fbcf18067 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5764
-famistudio_s5b_note_table_lsb=5667
-famistudio_n163_note_table_msb=6540
-famistudio_n163_note_table_lsb=6443
-famistudio_vrc7_note_table_msb=6152
-famistudio_vrc7_note_table_lsb=6055
-famistudio_fds_note_table_msb=6346
-famistudio_fds_note_table_lsb=6249
-famistudio_saw_note_table_msb=5958
-famistudio_saw_note_table_lsb=5861
-famistudio_note_table_msb=5764
-famistudio_note_table_lsb=5667
+famistudio_s5b_note_table_msb=5791
+famistudio_s5b_note_table_lsb=5694
+famistudio_n163_note_table_msb=6567
+famistudio_n163_note_table_lsb=6470
+famistudio_vrc7_note_table_msb=6179
+famistudio_vrc7_note_table_lsb=6082
+famistudio_fds_note_table_msb=6373
+famistudio_fds_note_table_lsb=6276
+famistudio_saw_note_table_msb=5985
+famistudio_saw_note_table_lsb=5888
+famistudio_note_table_msb=5791
+famistudio_note_table_lsb=5694
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_pal.bin
index 45695ceb0..cb97423f5 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_pal.tbl
index b14163039..4e9480f0c 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_7ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5766
-famistudio_s5b_note_table_lsb=5669
-famistudio_n163_note_table_msb=6542
-famistudio_n163_note_table_lsb=6445
-famistudio_vrc7_note_table_msb=6154
-famistudio_vrc7_note_table_lsb=6057
-famistudio_fds_note_table_msb=6348
-famistudio_fds_note_table_lsb=6251
-famistudio_saw_note_table_msb=5960
-famistudio_saw_note_table_lsb=5863
-famistudio_note_table_msb=5766
-famistudio_note_table_lsb=5669
+famistudio_s5b_note_table_msb=5793
+famistudio_s5b_note_table_lsb=5696
+famistudio_n163_note_table_msb=6569
+famistudio_n163_note_table_lsb=6472
+famistudio_vrc7_note_table_msb=6181
+famistudio_vrc7_note_table_lsb=6084
+famistudio_fds_note_table_msb=6375
+famistudio_fds_note_table_lsb=6278
+famistudio_saw_note_table_msb=5987
+famistudio_saw_note_table_lsb=5890
+famistudio_note_table_msb=5793
+famistudio_note_table_lsb=5696
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_dual.bin
index e25fddf07..8fac83d03 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_dual.tbl
index 79d3fc677..17b609348 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_dual.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5922
-famistudio_s5b_note_table_lsb=5728
-famistudio_n163_note_table_msb=7280
-famistudio_n163_note_table_lsb=7086
-famistudio_vrc7_note_table_msb=6601
-famistudio_vrc7_note_table_lsb=6504
-famistudio_fds_note_table_msb=6892
-famistudio_fds_note_table_lsb=6698
-famistudio_saw_note_table_msb=6310
-famistudio_saw_note_table_lsb=6116
-famistudio_note_table_msb=5922
-famistudio_note_table_lsb=5728
+famistudio_s5b_note_table_msb=5949
+famistudio_s5b_note_table_lsb=5755
+famistudio_n163_note_table_msb=7307
+famistudio_n163_note_table_lsb=7113
+famistudio_vrc7_note_table_msb=6628
+famistudio_vrc7_note_table_lsb=6531
+famistudio_fds_note_table_msb=6919
+famistudio_fds_note_table_lsb=6725
+famistudio_saw_note_table_msb=6337
+famistudio_saw_note_table_lsb=6143
+famistudio_note_table_msb=5949
+famistudio_note_table_lsb=5755
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_dual.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_dual.bin
index e8b145359..21ba6c376 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_dual.tbl
index 86358b75b..965c22d90 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_dual.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7512
-famistudio_s5b_note_table_lsb=7318
-famistudio_n163_note_table_msb=9258
-famistudio_n163_note_table_lsb=9064
-famistudio_epsm_note_table_msb=8385
-famistudio_epsm_note_table_lsb=8288
-famistudio_epsm_s_note_table_msb=8579
-famistudio_epsm_s_note_table_lsb=8482
-famistudio_vrc7_note_table_msb=8191
-famistudio_vrc7_note_table_lsb=8094
-famistudio_fds_note_table_msb=8870
-famistudio_fds_note_table_lsb=8676
-famistudio_saw_note_table_msb=7900
-famistudio_saw_note_table_lsb=7706
-famistudio_note_table_msb=7512
-famistudio_note_table_lsb=7318
+famistudio_s5b_note_table_msb=7539
+famistudio_s5b_note_table_lsb=7345
+famistudio_n163_note_table_msb=9285
+famistudio_n163_note_table_lsb=9091
+famistudio_epsm_note_table_msb=8412
+famistudio_epsm_note_table_lsb=8315
+famistudio_epsm_s_note_table_msb=8606
+famistudio_epsm_s_note_table_lsb=8509
+famistudio_vrc7_note_table_msb=8218
+famistudio_vrc7_note_table_lsb=8121
+famistudio_fds_note_table_msb=8897
+famistudio_fds_note_table_lsb=8703
+famistudio_saw_note_table_msb=7927
+famistudio_saw_note_table_lsb=7733
+famistudio_note_table_msb=7539
+famistudio_note_table_lsb=7345
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_ntsc.bin
index b017c545a..62de2d946 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_ntsc.tbl
index 0986dd70b..5c4dfa0c4 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_ntsc.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7354
-famistudio_s5b_note_table_lsb=7257
-famistudio_n163_note_table_msb=8518
-famistudio_n163_note_table_lsb=8421
-famistudio_epsm_note_table_msb=7936
-famistudio_epsm_note_table_lsb=7839
-famistudio_epsm_s_note_table_msb=8130
-famistudio_epsm_s_note_table_lsb=8033
-famistudio_vrc7_note_table_msb=7742
-famistudio_vrc7_note_table_lsb=7645
-famistudio_fds_note_table_msb=8324
-famistudio_fds_note_table_lsb=8227
-famistudio_saw_note_table_msb=7548
-famistudio_saw_note_table_lsb=7451
-famistudio_note_table_msb=7354
-famistudio_note_table_lsb=7257
+famistudio_s5b_note_table_msb=7381
+famistudio_s5b_note_table_lsb=7284
+famistudio_n163_note_table_msb=8545
+famistudio_n163_note_table_lsb=8448
+famistudio_epsm_note_table_msb=7963
+famistudio_epsm_note_table_lsb=7866
+famistudio_epsm_s_note_table_msb=8157
+famistudio_epsm_s_note_table_lsb=8060
+famistudio_vrc7_note_table_msb=7769
+famistudio_vrc7_note_table_lsb=7672
+famistudio_fds_note_table_msb=8351
+famistudio_fds_note_table_lsb=8254
+famistudio_saw_note_table_msb=7575
+famistudio_saw_note_table_lsb=7478
+famistudio_note_table_msb=7381
+famistudio_note_table_lsb=7284
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_pal.bin
index 98c52044b..9605be6c8 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_pal.tbl
index 6e1d48449..1226acafa 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_epsm_pal.tbl
@@ -1,16 +1,16 @@
-famistudio_s5b_note_table_msb=7356
-famistudio_s5b_note_table_lsb=7259
-famistudio_n163_note_table_msb=8520
-famistudio_n163_note_table_lsb=8423
-famistudio_epsm_note_table_msb=7938
-famistudio_epsm_note_table_lsb=7841
-famistudio_epsm_s_note_table_msb=8132
-famistudio_epsm_s_note_table_lsb=8035
-famistudio_vrc7_note_table_msb=7744
-famistudio_vrc7_note_table_lsb=7647
-famistudio_fds_note_table_msb=8326
-famistudio_fds_note_table_lsb=8229
-famistudio_saw_note_table_msb=7550
-famistudio_saw_note_table_lsb=7453
-famistudio_note_table_msb=7356
-famistudio_note_table_lsb=7259
+famistudio_s5b_note_table_msb=7383
+famistudio_s5b_note_table_lsb=7286
+famistudio_n163_note_table_msb=8547
+famistudio_n163_note_table_lsb=8450
+famistudio_epsm_note_table_msb=7965
+famistudio_epsm_note_table_lsb=7868
+famistudio_epsm_s_note_table_msb=8159
+famistudio_epsm_s_note_table_lsb=8062
+famistudio_vrc7_note_table_msb=7771
+famistudio_vrc7_note_table_lsb=7674
+famistudio_fds_note_table_msb=8353
+famistudio_fds_note_table_lsb=8256
+famistudio_saw_note_table_msb=7577
+famistudio_saw_note_table_lsb=7480
+famistudio_note_table_msb=7383
+famistudio_note_table_lsb=7286
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_ntsc.bin
index 59a986bb3..dfd926779 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_ntsc.tbl
index 5a4c62fae..fbcf18067 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_ntsc.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5764
-famistudio_s5b_note_table_lsb=5667
-famistudio_n163_note_table_msb=6540
-famistudio_n163_note_table_lsb=6443
-famistudio_vrc7_note_table_msb=6152
-famistudio_vrc7_note_table_lsb=6055
-famistudio_fds_note_table_msb=6346
-famistudio_fds_note_table_lsb=6249
-famistudio_saw_note_table_msb=5958
-famistudio_saw_note_table_lsb=5861
-famistudio_note_table_msb=5764
-famistudio_note_table_lsb=5667
+famistudio_s5b_note_table_msb=5791
+famistudio_s5b_note_table_lsb=5694
+famistudio_n163_note_table_msb=6567
+famistudio_n163_note_table_lsb=6470
+famistudio_vrc7_note_table_msb=6179
+famistudio_vrc7_note_table_lsb=6082
+famistudio_fds_note_table_msb=6373
+famistudio_fds_note_table_lsb=6276
+famistudio_saw_note_table_msb=5985
+famistudio_saw_note_table_lsb=5888
+famistudio_note_table_msb=5791
+famistudio_note_table_lsb=5694
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_pal.bin
index a83b9f941..2fede5501 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_pal.tbl
index b14163039..4e9480f0c 100644
--- a/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_multi_n163_8ch_pal.tbl
@@ -1,12 +1,12 @@
-famistudio_s5b_note_table_msb=5766
-famistudio_s5b_note_table_lsb=5669
-famistudio_n163_note_table_msb=6542
-famistudio_n163_note_table_lsb=6445
-famistudio_vrc7_note_table_msb=6154
-famistudio_vrc7_note_table_lsb=6057
-famistudio_fds_note_table_msb=6348
-famistudio_fds_note_table_lsb=6251
-famistudio_saw_note_table_msb=5960
-famistudio_saw_note_table_lsb=5863
-famistudio_note_table_msb=5766
-famistudio_note_table_lsb=5669
+famistudio_s5b_note_table_msb=5793
+famistudio_s5b_note_table_lsb=5696
+famistudio_n163_note_table_msb=6569
+famistudio_n163_note_table_lsb=6472
+famistudio_vrc7_note_table_msb=6181
+famistudio_vrc7_note_table_lsb=6084
+famistudio_fds_note_table_msb=6375
+famistudio_fds_note_table_lsb=6278
+famistudio_saw_note_table_msb=5987
+famistudio_saw_note_table_lsb=5890
+famistudio_note_table_msb=5793
+famistudio_note_table_lsb=5696
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_dual.bin
index b9335a8b6..796153976 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_dual.tbl
index 97bc04634..119206733 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3949
-famistudio_n163_note_table_lsb=3755
-famistudio_note_table_msb=3561
-famistudio_note_table_lsb=3367
+famistudio_n163_note_table_msb=3981
+famistudio_n163_note_table_lsb=3787
+famistudio_note_table_msb=3593
+famistudio_note_table_lsb=3399
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_ntsc.bin
index 366c13ef7..7a8e14aa2 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_ntsc.tbl
index af130a80e..393447ee4 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3625
-famistudio_n163_note_table_lsb=3528
-famistudio_note_table_msb=3431
-famistudio_note_table_lsb=3334
+famistudio_n163_note_table_msb=3657
+famistudio_n163_note_table_lsb=3560
+famistudio_note_table_msb=3463
+famistudio_note_table_lsb=3366
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_pal.bin
index 03863eece..42269299a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_pal.tbl
index 366a67a9d..0a4d3a817 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_1ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_1ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3627
-famistudio_n163_note_table_lsb=3530
-famistudio_note_table_msb=3433
-famistudio_note_table_lsb=3336
+famistudio_n163_note_table_msb=3659
+famistudio_n163_note_table_lsb=3562
+famistudio_note_table_msb=3465
+famistudio_note_table_lsb=3368
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_dual.bin
index 442f5fb43..a6b795da9 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_dual.tbl
index 0605f920f..afedcf7de 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3953
-famistudio_n163_note_table_lsb=3759
-famistudio_note_table_msb=3565
-famistudio_note_table_lsb=3371
+famistudio_n163_note_table_msb=3985
+famistudio_n163_note_table_lsb=3791
+famistudio_note_table_msb=3597
+famistudio_note_table_lsb=3403
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_ntsc.bin
index 88e065324..51856d8d5 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_ntsc.tbl
index f12438bba..ed7d29feb 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3629
-famistudio_n163_note_table_lsb=3532
-famistudio_note_table_msb=3435
-famistudio_note_table_lsb=3338
+famistudio_n163_note_table_msb=3661
+famistudio_n163_note_table_lsb=3564
+famistudio_note_table_msb=3467
+famistudio_note_table_lsb=3370
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_pal.bin
index 1a10d5feb..5d6d2e9af 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_pal.tbl
index 643aeb978..1aac65c2c 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_2ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_2ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3631
-famistudio_n163_note_table_lsb=3534
-famistudio_note_table_msb=3437
-famistudio_note_table_lsb=3340
+famistudio_n163_note_table_msb=3663
+famistudio_n163_note_table_lsb=3566
+famistudio_note_table_msb=3469
+famistudio_note_table_lsb=3372
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_dual.bin
index 23a1d882d..f8e797097 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_dual.tbl
index 4b36ebdcc..6e84abbf8 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3957
-famistudio_n163_note_table_lsb=3763
-famistudio_note_table_msb=3569
-famistudio_note_table_lsb=3375
+famistudio_n163_note_table_msb=3989
+famistudio_n163_note_table_lsb=3795
+famistudio_note_table_msb=3601
+famistudio_note_table_lsb=3407
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_ntsc.bin
index 129f11dc6..ede49cf55 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_ntsc.tbl
index a928964b8..690403826 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3633
-famistudio_n163_note_table_lsb=3536
-famistudio_note_table_msb=3439
-famistudio_note_table_lsb=3342
+famistudio_n163_note_table_msb=3665
+famistudio_n163_note_table_lsb=3568
+famistudio_note_table_msb=3471
+famistudio_note_table_lsb=3374
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_pal.bin
index 44983a2fd..ceabf5ba4 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_pal.tbl
index 28f9d9a6f..458aa30ea 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_3ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_3ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3635
-famistudio_n163_note_table_lsb=3538
-famistudio_note_table_msb=3441
-famistudio_note_table_lsb=3344
+famistudio_n163_note_table_msb=3667
+famistudio_n163_note_table_lsb=3570
+famistudio_note_table_msb=3473
+famistudio_note_table_lsb=3376
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_dual.bin
index 1c7d4eee6..3fd0aac49 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_dual.tbl
index 4b36ebdcc..6e84abbf8 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3957
-famistudio_n163_note_table_lsb=3763
-famistudio_note_table_msb=3569
-famistudio_note_table_lsb=3375
+famistudio_n163_note_table_msb=3989
+famistudio_n163_note_table_lsb=3795
+famistudio_note_table_msb=3601
+famistudio_note_table_lsb=3407
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_ntsc.bin
index 059a48773..9f5d0dfb6 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_ntsc.tbl
index a928964b8..690403826 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3633
-famistudio_n163_note_table_lsb=3536
-famistudio_note_table_msb=3439
-famistudio_note_table_lsb=3342
+famistudio_n163_note_table_msb=3665
+famistudio_n163_note_table_lsb=3568
+famistudio_note_table_msb=3471
+famistudio_note_table_lsb=3374
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_pal.bin
index 5359f8cd8..67d5a3e0f 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_pal.tbl
index 28f9d9a6f..458aa30ea 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_4ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_4ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3635
-famistudio_n163_note_table_lsb=3538
-famistudio_note_table_msb=3441
-famistudio_note_table_lsb=3344
+famistudio_n163_note_table_msb=3667
+famistudio_n163_note_table_lsb=3570
+famistudio_note_table_msb=3473
+famistudio_note_table_lsb=3376
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_dual.bin
index 7b5bc4149..00b23a02c 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_dual.tbl
index 7ca56f814..98644b17f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3961
-famistudio_n163_note_table_lsb=3767
-famistudio_note_table_msb=3573
-famistudio_note_table_lsb=3379
+famistudio_n163_note_table_msb=3993
+famistudio_n163_note_table_lsb=3799
+famistudio_note_table_msb=3605
+famistudio_note_table_lsb=3411
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_ntsc.bin
index 6e58e2bee..baeadab4a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_ntsc.tbl
index 7b1d7c039..8f87f97fe 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3637
-famistudio_n163_note_table_lsb=3540
-famistudio_note_table_msb=3443
-famistudio_note_table_lsb=3346
+famistudio_n163_note_table_msb=3669
+famistudio_n163_note_table_lsb=3572
+famistudio_note_table_msb=3475
+famistudio_note_table_lsb=3378
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_pal.bin
index 8f61b6fc0..b630b1bf3 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_pal.tbl
index b04d64750..5c6ea017f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_5ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_5ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3639
-famistudio_n163_note_table_lsb=3542
-famistudio_note_table_msb=3445
-famistudio_note_table_lsb=3348
+famistudio_n163_note_table_msb=3671
+famistudio_n163_note_table_lsb=3574
+famistudio_note_table_msb=3477
+famistudio_note_table_lsb=3380
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_dual.bin
index 5e0770b2b..909b04a8e 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_dual.tbl
index 7ca56f814..98644b17f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3961
-famistudio_n163_note_table_lsb=3767
-famistudio_note_table_msb=3573
-famistudio_note_table_lsb=3379
+famistudio_n163_note_table_msb=3993
+famistudio_n163_note_table_lsb=3799
+famistudio_note_table_msb=3605
+famistudio_note_table_lsb=3411
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_ntsc.bin
index 7ab428790..20abb50ad 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_ntsc.tbl
index 7b1d7c039..8f87f97fe 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3637
-famistudio_n163_note_table_lsb=3540
-famistudio_note_table_msb=3443
-famistudio_note_table_lsb=3346
+famistudio_n163_note_table_msb=3669
+famistudio_n163_note_table_lsb=3572
+famistudio_note_table_msb=3475
+famistudio_note_table_lsb=3378
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_pal.bin
index e897164fa..d8aecbefd 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_pal.tbl
index b04d64750..5c6ea017f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_6ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_6ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3639
-famistudio_n163_note_table_lsb=3542
-famistudio_note_table_msb=3445
-famistudio_note_table_lsb=3348
+famistudio_n163_note_table_msb=3671
+famistudio_n163_note_table_lsb=3574
+famistudio_note_table_msb=3477
+famistudio_note_table_lsb=3380
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_dual.bin
index 17f75bfaf..9d3992aac 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_dual.tbl
index 7ca56f814..98644b17f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3961
-famistudio_n163_note_table_lsb=3767
-famistudio_note_table_msb=3573
-famistudio_note_table_lsb=3379
+famistudio_n163_note_table_msb=3993
+famistudio_n163_note_table_lsb=3799
+famistudio_note_table_msb=3605
+famistudio_note_table_lsb=3411
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_ntsc.bin
index 469f3cfec..521ac0013 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_ntsc.tbl
index 7b1d7c039..8f87f97fe 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3637
-famistudio_n163_note_table_lsb=3540
-famistudio_note_table_msb=3443
-famistudio_note_table_lsb=3346
+famistudio_n163_note_table_msb=3669
+famistudio_n163_note_table_lsb=3572
+famistudio_note_table_msb=3475
+famistudio_note_table_lsb=3378
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_pal.bin
index 28496a32b..3c6918505 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_pal.tbl
index b04d64750..5c6ea017f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_7ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_7ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3639
-famistudio_n163_note_table_lsb=3542
-famistudio_note_table_msb=3445
-famistudio_note_table_lsb=3348
+famistudio_n163_note_table_msb=3671
+famistudio_n163_note_table_lsb=3574
+famistudio_note_table_msb=3477
+famistudio_note_table_lsb=3380
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_dual.bin b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_dual.bin
index f105b9122..d24f03c62 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_dual.tbl
index 7ca56f814..98644b17f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3961
-famistudio_n163_note_table_lsb=3767
-famistudio_note_table_msb=3573
-famistudio_note_table_lsb=3379
+famistudio_n163_note_table_msb=3993
+famistudio_n163_note_table_lsb=3799
+famistudio_note_table_msb=3605
+famistudio_note_table_lsb=3411
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_ntsc.bin
index ebcf5691a..0a9e1d63d 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_ntsc.tbl
index 7b1d7c039..8f87f97fe 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3637
-famistudio_n163_note_table_lsb=3540
-famistudio_note_table_msb=3443
-famistudio_note_table_lsb=3346
+famistudio_n163_note_table_msb=3669
+famistudio_n163_note_table_lsb=3572
+famistudio_note_table_msb=3475
+famistudio_note_table_lsb=3378
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_pal.bin b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_pal.bin
index 41eb6a985..8f3ed5736 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_pal.tbl
index b04d64750..5c6ea017f 100644
--- a/FamiStudio/Nsf/nsf_famistudio_n163_8ch_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_n163_8ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3639
-famistudio_n163_note_table_lsb=3542
-famistudio_note_table_msb=3445
-famistudio_note_table_lsb=3348
+famistudio_n163_note_table_msb=3671
+famistudio_n163_note_table_lsb=3574
+famistudio_note_table_msb=3477
+famistudio_note_table_lsb=3380
diff --git a/FamiStudio/Nsf/nsf_famistudio_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_ntsc.bin
index 2f7ceacb3..b6aa35c9b 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_ntsc.tbl
index f641b6013..d450a2651 100644
--- a/FamiStudio/Nsf/nsf_famistudio_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_ntsc.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2773
-famistudio_note_table_lsb=2676
+famistudio_note_table_msb=2805
+famistudio_note_table_lsb=2708
diff --git a/FamiStudio/Nsf/nsf_famistudio_pal.bin b/FamiStudio/Nsf/nsf_famistudio_pal.bin
index 47ba14c2e..665e03f26 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_pal.tbl
index 5d2a6d8d6..71000dff8 100644
--- a/FamiStudio/Nsf/nsf_famistudio_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_pal.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2775
-famistudio_note_table_lsb=2678
+famistudio_note_table_msb=2807
+famistudio_note_table_lsb=2710
diff --git a/FamiStudio/Nsf/nsf_famistudio_s5b_dual.bin b/FamiStudio/Nsf/nsf_famistudio_s5b_dual.bin
index 4a07f655f..d02ae786a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_s5b_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_s5b_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_s5b_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_s5b_dual.tbl
index 96972ffe2..0bd1b5b6a 100644
--- a/FamiStudio/Nsf/nsf_famistudio_s5b_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_s5b_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3576
-famistudio_s5b_note_table_lsb=3382
-famistudio_note_table_msb=3576
-famistudio_note_table_lsb=3382
+famistudio_s5b_note_table_msb=3608
+famistudio_s5b_note_table_lsb=3414
+famistudio_note_table_msb=3608
+famistudio_note_table_lsb=3414
diff --git a/FamiStudio/Nsf/nsf_famistudio_s5b_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_s5b_ntsc.bin
index cecd5fa84..f26e88c0a 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_s5b_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_s5b_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_s5b_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_s5b_ntsc.tbl
index 744ede5f7..43e20e569 100644
--- a/FamiStudio/Nsf/nsf_famistudio_s5b_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_s5b_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3446
-famistudio_s5b_note_table_lsb=3349
-famistudio_note_table_msb=3446
-famistudio_note_table_lsb=3349
+famistudio_s5b_note_table_msb=3478
+famistudio_s5b_note_table_lsb=3381
+famistudio_note_table_msb=3478
+famistudio_note_table_lsb=3381
diff --git a/FamiStudio/Nsf/nsf_famistudio_s5b_pal.bin b/FamiStudio/Nsf/nsf_famistudio_s5b_pal.bin
index 3dfb34989..87df78606 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_s5b_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_s5b_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_s5b_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_s5b_pal.tbl
index fe0c81773..3885e8ef0 100644
--- a/FamiStudio/Nsf/nsf_famistudio_s5b_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_s5b_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3448
-famistudio_s5b_note_table_lsb=3351
-famistudio_note_table_msb=3448
-famistudio_note_table_lsb=3351
+famistudio_s5b_note_table_msb=3480
+famistudio_s5b_note_table_lsb=3383
+famistudio_note_table_msb=3480
+famistudio_note_table_lsb=3383
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc6_dual.bin b/FamiStudio/Nsf/nsf_famistudio_vrc6_dual.bin
index 4d74ec8a0..7e87d85d4 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_vrc6_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_vrc6_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc6_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_vrc6_dual.tbl
index c69ab9c81..446030be6 100644
--- a/FamiStudio/Nsf/nsf_famistudio_vrc6_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_vrc6_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=3669
-famistudio_saw_note_table_lsb=3475
-famistudio_note_table_msb=3281
-famistudio_note_table_lsb=3087
+famistudio_saw_note_table_msb=3698
+famistudio_saw_note_table_lsb=3504
+famistudio_note_table_msb=3310
+famistudio_note_table_lsb=3116
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc6_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_vrc6_ntsc.bin
index 488c6acbf..91cc953a9 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_vrc6_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_vrc6_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc6_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_vrc6_ntsc.tbl
index 6a93968ea..6596f717e 100644
--- a/FamiStudio/Nsf/nsf_famistudio_vrc6_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_vrc6_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=3337
-famistudio_saw_note_table_lsb=3240
-famistudio_note_table_msb=3143
-famistudio_note_table_lsb=3046
+famistudio_saw_note_table_msb=3366
+famistudio_saw_note_table_lsb=3269
+famistudio_note_table_msb=3172
+famistudio_note_table_lsb=3075
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc6_pal.bin b/FamiStudio/Nsf/nsf_famistudio_vrc6_pal.bin
index 24a898e4c..688a3ccc3 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_vrc6_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_vrc6_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc6_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_vrc6_pal.tbl
index 069adc66d..612b080f5 100644
--- a/FamiStudio/Nsf/nsf_famistudio_vrc6_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_vrc6_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=3339
-famistudio_saw_note_table_lsb=3242
-famistudio_note_table_msb=3145
-famistudio_note_table_lsb=3048
+famistudio_saw_note_table_msb=3368
+famistudio_saw_note_table_lsb=3271
+famistudio_note_table_msb=3174
+famistudio_note_table_lsb=3077
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc7_dual.bin b/FamiStudio/Nsf/nsf_famistudio_vrc7_dual.bin
index bbff7789f..bd9422518 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_vrc7_dual.bin and b/FamiStudio/Nsf/nsf_famistudio_vrc7_dual.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc7_dual.tbl b/FamiStudio/Nsf/nsf_famistudio_vrc7_dual.tbl
index 3fd8cdb2f..da1a534dd 100644
--- a/FamiStudio/Nsf/nsf_famistudio_vrc7_dual.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_vrc7_dual.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3799
-famistudio_vrc7_note_table_lsb=3702
-famistudio_note_table_msb=3508
-famistudio_note_table_lsb=3314
+famistudio_vrc7_note_table_msb=3831
+famistudio_vrc7_note_table_lsb=3734
+famistudio_note_table_msb=3540
+famistudio_note_table_lsb=3346
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc7_ntsc.bin b/FamiStudio/Nsf/nsf_famistudio_vrc7_ntsc.bin
index 382c2e232..7b6401173 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_vrc7_ntsc.bin and b/FamiStudio/Nsf/nsf_famistudio_vrc7_ntsc.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc7_ntsc.tbl b/FamiStudio/Nsf/nsf_famistudio_vrc7_ntsc.tbl
index 481b1b6f3..b1e4f48c8 100644
--- a/FamiStudio/Nsf/nsf_famistudio_vrc7_ntsc.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_vrc7_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3576
-famistudio_vrc7_note_table_lsb=3479
-famistudio_note_table_msb=3382
-famistudio_note_table_lsb=3285
+famistudio_vrc7_note_table_msb=3608
+famistudio_vrc7_note_table_lsb=3511
+famistudio_note_table_msb=3414
+famistudio_note_table_lsb=3317
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc7_pal.bin b/FamiStudio/Nsf/nsf_famistudio_vrc7_pal.bin
index d5845ec28..9640787ba 100644
Binary files a/FamiStudio/Nsf/nsf_famistudio_vrc7_pal.bin and b/FamiStudio/Nsf/nsf_famistudio_vrc7_pal.bin differ
diff --git a/FamiStudio/Nsf/nsf_famistudio_vrc7_pal.tbl b/FamiStudio/Nsf/nsf_famistudio_vrc7_pal.tbl
index f3c44d853..f7732e1b9 100644
--- a/FamiStudio/Nsf/nsf_famistudio_vrc7_pal.tbl
+++ b/FamiStudio/Nsf/nsf_famistudio_vrc7_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3578
-famistudio_vrc7_note_table_lsb=3481
-famistudio_note_table_msb=3384
-famistudio_note_table_lsb=3287
+famistudio_vrc7_note_table_msb=3610
+famistudio_vrc7_note_table_lsb=3513
+famistudio_note_table_msb=3416
+famistudio_note_table_lsb=3319
diff --git a/FamiStudio/Rom/fds.fds b/FamiStudio/Rom/fds.fds
index 8934c4f17..1dc53c6f7 100644
Binary files a/FamiStudio/Rom/fds.fds and b/FamiStudio/Rom/fds.fds differ
diff --git a/FamiStudio/Rom/fds.tbl b/FamiStudio/Rom/fds.tbl
index e0679d36b..8b7ef5658 100644
--- a/FamiStudio/Rom/fds.tbl
+++ b/FamiStudio/Rom/fds.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=3460
-famistudio_fds_note_table_lsb=3363
-famistudio_note_table_msb=3266
-famistudio_note_table_lsb=3169
+famistudio_fds_note_table_msb=3494
+famistudio_fds_note_table_lsb=3397
+famistudio_note_table_msb=3300
+famistudio_note_table_lsb=3203
diff --git a/FamiStudio/Rom/fds_famitracker.fds b/FamiStudio/Rom/fds_famitracker.fds
index 6db356578..63db7625d 100644
Binary files a/FamiStudio/Rom/fds_famitracker.fds and b/FamiStudio/Rom/fds_famitracker.fds differ
diff --git a/FamiStudio/Rom/fds_famitracker.tbl b/FamiStudio/Rom/fds_famitracker.tbl
index e9bcaa292..fe78feabe 100644
--- a/FamiStudio/Rom/fds_famitracker.tbl
+++ b/FamiStudio/Rom/fds_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=3507
-famistudio_fds_note_table_lsb=3410
-famistudio_note_table_msb=3313
-famistudio_note_table_lsb=3216
+famistudio_fds_note_table_msb=3541
+famistudio_fds_note_table_lsb=3444
+famistudio_note_table_msb=3347
+famistudio_note_table_lsb=3250
diff --git a/FamiStudio/Rom/fds_pal.fds b/FamiStudio/Rom/fds_pal.fds
index 5866a3a2d..dad2ce541 100644
Binary files a/FamiStudio/Rom/fds_pal.fds and b/FamiStudio/Rom/fds_pal.fds differ
diff --git a/FamiStudio/Rom/fds_pal.tbl b/FamiStudio/Rom/fds_pal.tbl
index d4720b565..e39619b08 100644
--- a/FamiStudio/Rom/fds_pal.tbl
+++ b/FamiStudio/Rom/fds_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=3462
-famistudio_fds_note_table_lsb=3365
-famistudio_note_table_msb=3268
-famistudio_note_table_lsb=3171
+famistudio_fds_note_table_msb=3496
+famistudio_fds_note_table_lsb=3399
+famistudio_note_table_msb=3302
+famistudio_note_table_lsb=3205
diff --git a/FamiStudio/Rom/fds_pal_famitracker.fds b/FamiStudio/Rom/fds_pal_famitracker.fds
index 1cb2d9350..5b51d8923 100644
Binary files a/FamiStudio/Rom/fds_pal_famitracker.fds and b/FamiStudio/Rom/fds_pal_famitracker.fds differ
diff --git a/FamiStudio/Rom/fds_pal_famitracker.tbl b/FamiStudio/Rom/fds_pal_famitracker.tbl
index e9bcaa292..fe78feabe 100644
--- a/FamiStudio/Rom/fds_pal_famitracker.tbl
+++ b/FamiStudio/Rom/fds_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_fds_note_table_msb=3507
-famistudio_fds_note_table_lsb=3410
-famistudio_note_table_msb=3313
-famistudio_note_table_lsb=3216
+famistudio_fds_note_table_msb=3541
+famistudio_fds_note_table_lsb=3444
+famistudio_note_table_msb=3347
+famistudio_note_table_lsb=3250
diff --git a/FamiStudio/Rom/rom_epsm_ntsc.nes b/FamiStudio/Rom/rom_epsm_ntsc.nes
index a9b7553ed..6bf80c678 100644
Binary files a/FamiStudio/Rom/rom_epsm_ntsc.nes and b/FamiStudio/Rom/rom_epsm_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_epsm_ntsc.tbl b/FamiStudio/Rom/rom_epsm_ntsc.tbl
index 46f1b02a1..9ec7bdc46 100644
--- a/FamiStudio/Rom/rom_epsm_ntsc.tbl
+++ b/FamiStudio/Rom/rom_epsm_ntsc.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4349
-famistudio_epsm_note_table_lsb=4252
-famistudio_epsm_s_note_table_msb=4543
-famistudio_epsm_s_note_table_lsb=4446
-famistudio_note_table_msb=4155
-famistudio_note_table_lsb=4058
+famistudio_epsm_note_table_msb=4381
+famistudio_epsm_note_table_lsb=4284
+famistudio_epsm_s_note_table_msb=4575
+famistudio_epsm_s_note_table_lsb=4478
+famistudio_note_table_msb=4187
+famistudio_note_table_lsb=4090
diff --git a/FamiStudio/Rom/rom_epsm_ntsc_famitracker.nes b/FamiStudio/Rom/rom_epsm_ntsc_famitracker.nes
index c2a1a1b16..18c74e4cf 100644
Binary files a/FamiStudio/Rom/rom_epsm_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_epsm_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_epsm_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_epsm_ntsc_famitracker.tbl
index 38b2dcbf3..8b5339f71 100644
--- a/FamiStudio/Rom/rom_epsm_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_epsm_ntsc_famitracker.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4396
-famistudio_epsm_note_table_lsb=4299
-famistudio_epsm_s_note_table_msb=4590
-famistudio_epsm_s_note_table_lsb=4493
-famistudio_note_table_msb=4202
-famistudio_note_table_lsb=4105
+famistudio_epsm_note_table_msb=4428
+famistudio_epsm_note_table_lsb=4331
+famistudio_epsm_s_note_table_msb=4622
+famistudio_epsm_s_note_table_lsb=4525
+famistudio_note_table_msb=4234
+famistudio_note_table_lsb=4137
diff --git a/FamiStudio/Rom/rom_epsm_pal.nes b/FamiStudio/Rom/rom_epsm_pal.nes
index 408b70cc6..23e56c27f 100644
Binary files a/FamiStudio/Rom/rom_epsm_pal.nes and b/FamiStudio/Rom/rom_epsm_pal.nes differ
diff --git a/FamiStudio/Rom/rom_epsm_pal.tbl b/FamiStudio/Rom/rom_epsm_pal.tbl
index e860815f8..847e77242 100644
--- a/FamiStudio/Rom/rom_epsm_pal.tbl
+++ b/FamiStudio/Rom/rom_epsm_pal.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4351
-famistudio_epsm_note_table_lsb=4254
-famistudio_epsm_s_note_table_msb=4545
-famistudio_epsm_s_note_table_lsb=4448
-famistudio_note_table_msb=4157
-famistudio_note_table_lsb=4060
+famistudio_epsm_note_table_msb=4383
+famistudio_epsm_note_table_lsb=4286
+famistudio_epsm_s_note_table_msb=4577
+famistudio_epsm_s_note_table_lsb=4480
+famistudio_note_table_msb=4189
+famistudio_note_table_lsb=4092
diff --git a/FamiStudio/Rom/rom_epsm_pal_famitracker.nes b/FamiStudio/Rom/rom_epsm_pal_famitracker.nes
index 3aaf6e871..01de9b491 100644
Binary files a/FamiStudio/Rom/rom_epsm_pal_famitracker.nes and b/FamiStudio/Rom/rom_epsm_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_epsm_pal_famitracker.tbl b/FamiStudio/Rom/rom_epsm_pal_famitracker.tbl
index 38b2dcbf3..8b5339f71 100644
--- a/FamiStudio/Rom/rom_epsm_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_epsm_pal_famitracker.tbl
@@ -1,6 +1,6 @@
-famistudio_epsm_note_table_msb=4396
-famistudio_epsm_note_table_lsb=4299
-famistudio_epsm_s_note_table_msb=4590
-famistudio_epsm_s_note_table_lsb=4493
-famistudio_note_table_msb=4202
-famistudio_note_table_lsb=4105
+famistudio_epsm_note_table_msb=4428
+famistudio_epsm_note_table_lsb=4331
+famistudio_epsm_s_note_table_msb=4622
+famistudio_epsm_s_note_table_lsb=4525
+famistudio_note_table_msb=4234
+famistudio_note_table_lsb=4137
diff --git a/FamiStudio/Rom/rom_mmc5_ntsc.nes b/FamiStudio/Rom/rom_mmc5_ntsc.nes
index 52327b3b5..f8d67b632 100644
Binary files a/FamiStudio/Rom/rom_mmc5_ntsc.nes and b/FamiStudio/Rom/rom_mmc5_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_mmc5_ntsc.tbl b/FamiStudio/Rom/rom_mmc5_ntsc.tbl
index e94e93e33..02d6c763e 100644
--- a/FamiStudio/Rom/rom_mmc5_ntsc.tbl
+++ b/FamiStudio/Rom/rom_mmc5_ntsc.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2601
-famistudio_note_table_lsb=2504
+famistudio_note_table_msb=2631
+famistudio_note_table_lsb=2534
diff --git a/FamiStudio/Rom/rom_mmc5_ntsc_famitracker.nes b/FamiStudio/Rom/rom_mmc5_ntsc_famitracker.nes
index c8e230719..16497febd 100644
Binary files a/FamiStudio/Rom/rom_mmc5_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_mmc5_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_mmc5_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_mmc5_ntsc_famitracker.tbl
index 1399524cf..233cd583d 100644
--- a/FamiStudio/Rom/rom_mmc5_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_mmc5_ntsc_famitracker.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2648
-famistudio_note_table_lsb=2551
+famistudio_note_table_msb=2678
+famistudio_note_table_lsb=2581
diff --git a/FamiStudio/Rom/rom_mmc5_pal.nes b/FamiStudio/Rom/rom_mmc5_pal.nes
index 870aadeaa..876f86316 100644
Binary files a/FamiStudio/Rom/rom_mmc5_pal.nes and b/FamiStudio/Rom/rom_mmc5_pal.nes differ
diff --git a/FamiStudio/Rom/rom_mmc5_pal.tbl b/FamiStudio/Rom/rom_mmc5_pal.tbl
index 58184a203..e2f5af5d5 100644
--- a/FamiStudio/Rom/rom_mmc5_pal.tbl
+++ b/FamiStudio/Rom/rom_mmc5_pal.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2603
-famistudio_note_table_lsb=2506
+famistudio_note_table_msb=2633
+famistudio_note_table_lsb=2536
diff --git a/FamiStudio/Rom/rom_mmc5_pal_famitracker.nes b/FamiStudio/Rom/rom_mmc5_pal_famitracker.nes
index a741c77d4..43affcc55 100644
Binary files a/FamiStudio/Rom/rom_mmc5_pal_famitracker.nes and b/FamiStudio/Rom/rom_mmc5_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_mmc5_pal_famitracker.tbl b/FamiStudio/Rom/rom_mmc5_pal_famitracker.tbl
index 1399524cf..233cd583d 100644
--- a/FamiStudio/Rom/rom_mmc5_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_mmc5_pal_famitracker.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2648
-famistudio_note_table_lsb=2551
+famistudio_note_table_msb=2678
+famistudio_note_table_lsb=2581
diff --git a/FamiStudio/Rom/rom_n163_1ch_ntsc.nes b/FamiStudio/Rom/rom_n163_1ch_ntsc.nes
index 982df91c4..92c20a791 100644
Binary files a/FamiStudio/Rom/rom_n163_1ch_ntsc.nes and b/FamiStudio/Rom/rom_n163_1ch_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_n163_1ch_ntsc.tbl b/FamiStudio/Rom/rom_n163_1ch_ntsc.tbl
index 5b37f4d0d..915334367 100644
--- a/FamiStudio/Rom/rom_n163_1ch_ntsc.tbl
+++ b/FamiStudio/Rom/rom_n163_1ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3269
-famistudio_n163_note_table_lsb=3172
-famistudio_note_table_msb=3075
-famistudio_note_table_lsb=2978
+famistudio_n163_note_table_msb=3301
+famistudio_n163_note_table_lsb=3204
+famistudio_note_table_msb=3107
+famistudio_note_table_lsb=3010
diff --git a/FamiStudio/Rom/rom_n163_1ch_ntsc_famitracker.nes b/FamiStudio/Rom/rom_n163_1ch_ntsc_famitracker.nes
index 14e376079..3b2d03ecf 100644
Binary files a/FamiStudio/Rom/rom_n163_1ch_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_n163_1ch_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_1ch_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_n163_1ch_ntsc_famitracker.tbl
index 975f96d37..45d9cfc7d 100644
--- a/FamiStudio/Rom/rom_n163_1ch_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_1ch_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3316
-famistudio_n163_note_table_lsb=3219
-famistudio_note_table_msb=3122
-famistudio_note_table_lsb=3025
+famistudio_n163_note_table_msb=3348
+famistudio_n163_note_table_lsb=3251
+famistudio_note_table_msb=3154
+famistudio_note_table_lsb=3057
diff --git a/FamiStudio/Rom/rom_n163_1ch_pal.nes b/FamiStudio/Rom/rom_n163_1ch_pal.nes
index 66fa7b00a..d2e4d48ca 100644
Binary files a/FamiStudio/Rom/rom_n163_1ch_pal.nes and b/FamiStudio/Rom/rom_n163_1ch_pal.nes differ
diff --git a/FamiStudio/Rom/rom_n163_1ch_pal.tbl b/FamiStudio/Rom/rom_n163_1ch_pal.tbl
index e14287588..55b820751 100644
--- a/FamiStudio/Rom/rom_n163_1ch_pal.tbl
+++ b/FamiStudio/Rom/rom_n163_1ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3271
-famistudio_n163_note_table_lsb=3174
-famistudio_note_table_msb=3077
-famistudio_note_table_lsb=2980
+famistudio_n163_note_table_msb=3303
+famistudio_n163_note_table_lsb=3206
+famistudio_note_table_msb=3109
+famistudio_note_table_lsb=3012
diff --git a/FamiStudio/Rom/rom_n163_1ch_pal_famitracker.nes b/FamiStudio/Rom/rom_n163_1ch_pal_famitracker.nes
index 65a55154f..a530c21c2 100644
Binary files a/FamiStudio/Rom/rom_n163_1ch_pal_famitracker.nes and b/FamiStudio/Rom/rom_n163_1ch_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_1ch_pal_famitracker.tbl b/FamiStudio/Rom/rom_n163_1ch_pal_famitracker.tbl
index 975f96d37..45d9cfc7d 100644
--- a/FamiStudio/Rom/rom_n163_1ch_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_1ch_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3316
-famistudio_n163_note_table_lsb=3219
-famistudio_note_table_msb=3122
-famistudio_note_table_lsb=3025
+famistudio_n163_note_table_msb=3348
+famistudio_n163_note_table_lsb=3251
+famistudio_note_table_msb=3154
+famistudio_note_table_lsb=3057
diff --git a/FamiStudio/Rom/rom_n163_2ch_ntsc.nes b/FamiStudio/Rom/rom_n163_2ch_ntsc.nes
index b3c3afaea..84286748d 100644
Binary files a/FamiStudio/Rom/rom_n163_2ch_ntsc.nes and b/FamiStudio/Rom/rom_n163_2ch_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_n163_2ch_ntsc.tbl b/FamiStudio/Rom/rom_n163_2ch_ntsc.tbl
index fa593324a..6d50e8c8d 100644
--- a/FamiStudio/Rom/rom_n163_2ch_ntsc.tbl
+++ b/FamiStudio/Rom/rom_n163_2ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3273
-famistudio_n163_note_table_lsb=3176
-famistudio_note_table_msb=3079
-famistudio_note_table_lsb=2982
+famistudio_n163_note_table_msb=3305
+famistudio_n163_note_table_lsb=3208
+famistudio_note_table_msb=3111
+famistudio_note_table_lsb=3014
diff --git a/FamiStudio/Rom/rom_n163_2ch_ntsc_famitracker.nes b/FamiStudio/Rom/rom_n163_2ch_ntsc_famitracker.nes
index e20b4884d..925e21a6b 100644
Binary files a/FamiStudio/Rom/rom_n163_2ch_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_n163_2ch_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_2ch_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_n163_2ch_ntsc_famitracker.tbl
index 34a1cd1b9..d780c9283 100644
--- a/FamiStudio/Rom/rom_n163_2ch_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_2ch_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3320
-famistudio_n163_note_table_lsb=3223
-famistudio_note_table_msb=3126
-famistudio_note_table_lsb=3029
+famistudio_n163_note_table_msb=3352
+famistudio_n163_note_table_lsb=3255
+famistudio_note_table_msb=3158
+famistudio_note_table_lsb=3061
diff --git a/FamiStudio/Rom/rom_n163_2ch_pal.nes b/FamiStudio/Rom/rom_n163_2ch_pal.nes
index 8602ff6f8..da9cd6089 100644
Binary files a/FamiStudio/Rom/rom_n163_2ch_pal.nes and b/FamiStudio/Rom/rom_n163_2ch_pal.nes differ
diff --git a/FamiStudio/Rom/rom_n163_2ch_pal.tbl b/FamiStudio/Rom/rom_n163_2ch_pal.tbl
index 29bdb39ca..c50a7a084 100644
--- a/FamiStudio/Rom/rom_n163_2ch_pal.tbl
+++ b/FamiStudio/Rom/rom_n163_2ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3275
-famistudio_n163_note_table_lsb=3178
-famistudio_note_table_msb=3081
-famistudio_note_table_lsb=2984
+famistudio_n163_note_table_msb=3307
+famistudio_n163_note_table_lsb=3210
+famistudio_note_table_msb=3113
+famistudio_note_table_lsb=3016
diff --git a/FamiStudio/Rom/rom_n163_2ch_pal_famitracker.nes b/FamiStudio/Rom/rom_n163_2ch_pal_famitracker.nes
index 0057c85a0..863e61dfd 100644
Binary files a/FamiStudio/Rom/rom_n163_2ch_pal_famitracker.nes and b/FamiStudio/Rom/rom_n163_2ch_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_2ch_pal_famitracker.tbl b/FamiStudio/Rom/rom_n163_2ch_pal_famitracker.tbl
index 34a1cd1b9..d780c9283 100644
--- a/FamiStudio/Rom/rom_n163_2ch_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_2ch_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3320
-famistudio_n163_note_table_lsb=3223
-famistudio_note_table_msb=3126
-famistudio_note_table_lsb=3029
+famistudio_n163_note_table_msb=3352
+famistudio_n163_note_table_lsb=3255
+famistudio_note_table_msb=3158
+famistudio_note_table_lsb=3061
diff --git a/FamiStudio/Rom/rom_n163_3ch_ntsc.nes b/FamiStudio/Rom/rom_n163_3ch_ntsc.nes
index be216d0f1..abb10ca24 100644
Binary files a/FamiStudio/Rom/rom_n163_3ch_ntsc.nes and b/FamiStudio/Rom/rom_n163_3ch_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_n163_3ch_ntsc.tbl b/FamiStudio/Rom/rom_n163_3ch_ntsc.tbl
index d82216115..79c82ef10 100644
--- a/FamiStudio/Rom/rom_n163_3ch_ntsc.tbl
+++ b/FamiStudio/Rom/rom_n163_3ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3277
-famistudio_n163_note_table_lsb=3180
-famistudio_note_table_msb=3083
-famistudio_note_table_lsb=2986
+famistudio_n163_note_table_msb=3309
+famistudio_n163_note_table_lsb=3212
+famistudio_note_table_msb=3115
+famistudio_note_table_lsb=3018
diff --git a/FamiStudio/Rom/rom_n163_3ch_ntsc_famitracker.nes b/FamiStudio/Rom/rom_n163_3ch_ntsc_famitracker.nes
index df3376c8f..546b12276 100644
Binary files a/FamiStudio/Rom/rom_n163_3ch_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_n163_3ch_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_3ch_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_n163_3ch_ntsc_famitracker.tbl
index 2c72fa4c4..b80930db3 100644
--- a/FamiStudio/Rom/rom_n163_3ch_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_3ch_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3324
-famistudio_n163_note_table_lsb=3227
-famistudio_note_table_msb=3130
-famistudio_note_table_lsb=3033
+famistudio_n163_note_table_msb=3356
+famistudio_n163_note_table_lsb=3259
+famistudio_note_table_msb=3162
+famistudio_note_table_lsb=3065
diff --git a/FamiStudio/Rom/rom_n163_3ch_pal.nes b/FamiStudio/Rom/rom_n163_3ch_pal.nes
index 130c6b6ed..00cd6f6cd 100644
Binary files a/FamiStudio/Rom/rom_n163_3ch_pal.nes and b/FamiStudio/Rom/rom_n163_3ch_pal.nes differ
diff --git a/FamiStudio/Rom/rom_n163_3ch_pal.tbl b/FamiStudio/Rom/rom_n163_3ch_pal.tbl
index 4f344b13b..311debeee 100644
--- a/FamiStudio/Rom/rom_n163_3ch_pal.tbl
+++ b/FamiStudio/Rom/rom_n163_3ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3279
-famistudio_n163_note_table_lsb=3182
-famistudio_note_table_msb=3085
-famistudio_note_table_lsb=2988
+famistudio_n163_note_table_msb=3311
+famistudio_n163_note_table_lsb=3214
+famistudio_note_table_msb=3117
+famistudio_note_table_lsb=3020
diff --git a/FamiStudio/Rom/rom_n163_3ch_pal_famitracker.nes b/FamiStudio/Rom/rom_n163_3ch_pal_famitracker.nes
index 1c3792991..73006231e 100644
Binary files a/FamiStudio/Rom/rom_n163_3ch_pal_famitracker.nes and b/FamiStudio/Rom/rom_n163_3ch_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_3ch_pal_famitracker.tbl b/FamiStudio/Rom/rom_n163_3ch_pal_famitracker.tbl
index 2c72fa4c4..b80930db3 100644
--- a/FamiStudio/Rom/rom_n163_3ch_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_3ch_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3324
-famistudio_n163_note_table_lsb=3227
-famistudio_note_table_msb=3130
-famistudio_note_table_lsb=3033
+famistudio_n163_note_table_msb=3356
+famistudio_n163_note_table_lsb=3259
+famistudio_note_table_msb=3162
+famistudio_note_table_lsb=3065
diff --git a/FamiStudio/Rom/rom_n163_4ch_ntsc.nes b/FamiStudio/Rom/rom_n163_4ch_ntsc.nes
index 1f507f7dc..557b52fcd 100644
Binary files a/FamiStudio/Rom/rom_n163_4ch_ntsc.nes and b/FamiStudio/Rom/rom_n163_4ch_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_n163_4ch_ntsc.tbl b/FamiStudio/Rom/rom_n163_4ch_ntsc.tbl
index d82216115..79c82ef10 100644
--- a/FamiStudio/Rom/rom_n163_4ch_ntsc.tbl
+++ b/FamiStudio/Rom/rom_n163_4ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3277
-famistudio_n163_note_table_lsb=3180
-famistudio_note_table_msb=3083
-famistudio_note_table_lsb=2986
+famistudio_n163_note_table_msb=3309
+famistudio_n163_note_table_lsb=3212
+famistudio_note_table_msb=3115
+famistudio_note_table_lsb=3018
diff --git a/FamiStudio/Rom/rom_n163_4ch_ntsc_famitracker.nes b/FamiStudio/Rom/rom_n163_4ch_ntsc_famitracker.nes
index 8607487a6..ae5629592 100644
Binary files a/FamiStudio/Rom/rom_n163_4ch_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_n163_4ch_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_4ch_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_n163_4ch_ntsc_famitracker.tbl
index 2c72fa4c4..b80930db3 100644
--- a/FamiStudio/Rom/rom_n163_4ch_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_4ch_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3324
-famistudio_n163_note_table_lsb=3227
-famistudio_note_table_msb=3130
-famistudio_note_table_lsb=3033
+famistudio_n163_note_table_msb=3356
+famistudio_n163_note_table_lsb=3259
+famistudio_note_table_msb=3162
+famistudio_note_table_lsb=3065
diff --git a/FamiStudio/Rom/rom_n163_4ch_pal.nes b/FamiStudio/Rom/rom_n163_4ch_pal.nes
index c81b564e7..c956e6c16 100644
Binary files a/FamiStudio/Rom/rom_n163_4ch_pal.nes and b/FamiStudio/Rom/rom_n163_4ch_pal.nes differ
diff --git a/FamiStudio/Rom/rom_n163_4ch_pal.tbl b/FamiStudio/Rom/rom_n163_4ch_pal.tbl
index 4f344b13b..311debeee 100644
--- a/FamiStudio/Rom/rom_n163_4ch_pal.tbl
+++ b/FamiStudio/Rom/rom_n163_4ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3279
-famistudio_n163_note_table_lsb=3182
-famistudio_note_table_msb=3085
-famistudio_note_table_lsb=2988
+famistudio_n163_note_table_msb=3311
+famistudio_n163_note_table_lsb=3214
+famistudio_note_table_msb=3117
+famistudio_note_table_lsb=3020
diff --git a/FamiStudio/Rom/rom_n163_4ch_pal_famitracker.nes b/FamiStudio/Rom/rom_n163_4ch_pal_famitracker.nes
index c853dd9d5..15daea9da 100644
Binary files a/FamiStudio/Rom/rom_n163_4ch_pal_famitracker.nes and b/FamiStudio/Rom/rom_n163_4ch_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_4ch_pal_famitracker.tbl b/FamiStudio/Rom/rom_n163_4ch_pal_famitracker.tbl
index 2c72fa4c4..b80930db3 100644
--- a/FamiStudio/Rom/rom_n163_4ch_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_4ch_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3324
-famistudio_n163_note_table_lsb=3227
-famistudio_note_table_msb=3130
-famistudio_note_table_lsb=3033
+famistudio_n163_note_table_msb=3356
+famistudio_n163_note_table_lsb=3259
+famistudio_note_table_msb=3162
+famistudio_note_table_lsb=3065
diff --git a/FamiStudio/Rom/rom_n163_5ch_ntsc.nes b/FamiStudio/Rom/rom_n163_5ch_ntsc.nes
index 2d839f47b..93fc81b3c 100644
Binary files a/FamiStudio/Rom/rom_n163_5ch_ntsc.nes and b/FamiStudio/Rom/rom_n163_5ch_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_n163_5ch_ntsc.tbl b/FamiStudio/Rom/rom_n163_5ch_ntsc.tbl
index 15eee8073..59a9bd66a 100644
--- a/FamiStudio/Rom/rom_n163_5ch_ntsc.tbl
+++ b/FamiStudio/Rom/rom_n163_5ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3281
-famistudio_n163_note_table_lsb=3184
-famistudio_note_table_msb=3087
-famistudio_note_table_lsb=2990
+famistudio_n163_note_table_msb=3313
+famistudio_n163_note_table_lsb=3216
+famistudio_note_table_msb=3119
+famistudio_note_table_lsb=3022
diff --git a/FamiStudio/Rom/rom_n163_5ch_ntsc_famitracker.nes b/FamiStudio/Rom/rom_n163_5ch_ntsc_famitracker.nes
index bc1d9697d..d0168159f 100644
Binary files a/FamiStudio/Rom/rom_n163_5ch_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_n163_5ch_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_5ch_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_n163_5ch_ntsc_famitracker.tbl
index 91bd86500..b51ea07c5 100644
--- a/FamiStudio/Rom/rom_n163_5ch_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_5ch_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3328
-famistudio_n163_note_table_lsb=3231
-famistudio_note_table_msb=3134
-famistudio_note_table_lsb=3037
+famistudio_n163_note_table_msb=3360
+famistudio_n163_note_table_lsb=3263
+famistudio_note_table_msb=3166
+famistudio_note_table_lsb=3069
diff --git a/FamiStudio/Rom/rom_n163_5ch_pal.nes b/FamiStudio/Rom/rom_n163_5ch_pal.nes
index 6dd09fb8b..77331d51f 100644
Binary files a/FamiStudio/Rom/rom_n163_5ch_pal.nes and b/FamiStudio/Rom/rom_n163_5ch_pal.nes differ
diff --git a/FamiStudio/Rom/rom_n163_5ch_pal.tbl b/FamiStudio/Rom/rom_n163_5ch_pal.tbl
index 54f6c04e3..a1c1414cf 100644
--- a/FamiStudio/Rom/rom_n163_5ch_pal.tbl
+++ b/FamiStudio/Rom/rom_n163_5ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3283
-famistudio_n163_note_table_lsb=3186
-famistudio_note_table_msb=3089
-famistudio_note_table_lsb=2992
+famistudio_n163_note_table_msb=3315
+famistudio_n163_note_table_lsb=3218
+famistudio_note_table_msb=3121
+famistudio_note_table_lsb=3024
diff --git a/FamiStudio/Rom/rom_n163_5ch_pal_famitracker.nes b/FamiStudio/Rom/rom_n163_5ch_pal_famitracker.nes
index bdaad83b2..dff45c6a6 100644
Binary files a/FamiStudio/Rom/rom_n163_5ch_pal_famitracker.nes and b/FamiStudio/Rom/rom_n163_5ch_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_5ch_pal_famitracker.tbl b/FamiStudio/Rom/rom_n163_5ch_pal_famitracker.tbl
index 91bd86500..b51ea07c5 100644
--- a/FamiStudio/Rom/rom_n163_5ch_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_5ch_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3328
-famistudio_n163_note_table_lsb=3231
-famistudio_note_table_msb=3134
-famistudio_note_table_lsb=3037
+famistudio_n163_note_table_msb=3360
+famistudio_n163_note_table_lsb=3263
+famistudio_note_table_msb=3166
+famistudio_note_table_lsb=3069
diff --git a/FamiStudio/Rom/rom_n163_6ch_ntsc.nes b/FamiStudio/Rom/rom_n163_6ch_ntsc.nes
index b59aa8887..c8a57df4e 100644
Binary files a/FamiStudio/Rom/rom_n163_6ch_ntsc.nes and b/FamiStudio/Rom/rom_n163_6ch_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_n163_6ch_ntsc.tbl b/FamiStudio/Rom/rom_n163_6ch_ntsc.tbl
index 15eee8073..59a9bd66a 100644
--- a/FamiStudio/Rom/rom_n163_6ch_ntsc.tbl
+++ b/FamiStudio/Rom/rom_n163_6ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3281
-famistudio_n163_note_table_lsb=3184
-famistudio_note_table_msb=3087
-famistudio_note_table_lsb=2990
+famistudio_n163_note_table_msb=3313
+famistudio_n163_note_table_lsb=3216
+famistudio_note_table_msb=3119
+famistudio_note_table_lsb=3022
diff --git a/FamiStudio/Rom/rom_n163_6ch_ntsc_famitracker.nes b/FamiStudio/Rom/rom_n163_6ch_ntsc_famitracker.nes
index 3e57503a2..625f78cf3 100644
Binary files a/FamiStudio/Rom/rom_n163_6ch_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_n163_6ch_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_6ch_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_n163_6ch_ntsc_famitracker.tbl
index 91bd86500..b51ea07c5 100644
--- a/FamiStudio/Rom/rom_n163_6ch_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_6ch_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3328
-famistudio_n163_note_table_lsb=3231
-famistudio_note_table_msb=3134
-famistudio_note_table_lsb=3037
+famistudio_n163_note_table_msb=3360
+famistudio_n163_note_table_lsb=3263
+famistudio_note_table_msb=3166
+famistudio_note_table_lsb=3069
diff --git a/FamiStudio/Rom/rom_n163_6ch_pal.nes b/FamiStudio/Rom/rom_n163_6ch_pal.nes
index b2f1088c3..90a3a911c 100644
Binary files a/FamiStudio/Rom/rom_n163_6ch_pal.nes and b/FamiStudio/Rom/rom_n163_6ch_pal.nes differ
diff --git a/FamiStudio/Rom/rom_n163_6ch_pal.tbl b/FamiStudio/Rom/rom_n163_6ch_pal.tbl
index 54f6c04e3..a1c1414cf 100644
--- a/FamiStudio/Rom/rom_n163_6ch_pal.tbl
+++ b/FamiStudio/Rom/rom_n163_6ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3283
-famistudio_n163_note_table_lsb=3186
-famistudio_note_table_msb=3089
-famistudio_note_table_lsb=2992
+famistudio_n163_note_table_msb=3315
+famistudio_n163_note_table_lsb=3218
+famistudio_note_table_msb=3121
+famistudio_note_table_lsb=3024
diff --git a/FamiStudio/Rom/rom_n163_6ch_pal_famitracker.nes b/FamiStudio/Rom/rom_n163_6ch_pal_famitracker.nes
index 2e8574280..e605d797f 100644
Binary files a/FamiStudio/Rom/rom_n163_6ch_pal_famitracker.nes and b/FamiStudio/Rom/rom_n163_6ch_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_6ch_pal_famitracker.tbl b/FamiStudio/Rom/rom_n163_6ch_pal_famitracker.tbl
index 91bd86500..b51ea07c5 100644
--- a/FamiStudio/Rom/rom_n163_6ch_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_6ch_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3328
-famistudio_n163_note_table_lsb=3231
-famistudio_note_table_msb=3134
-famistudio_note_table_lsb=3037
+famistudio_n163_note_table_msb=3360
+famistudio_n163_note_table_lsb=3263
+famistudio_note_table_msb=3166
+famistudio_note_table_lsb=3069
diff --git a/FamiStudio/Rom/rom_n163_7ch_ntsc.nes b/FamiStudio/Rom/rom_n163_7ch_ntsc.nes
index 74f993b2b..19a413e5c 100644
Binary files a/FamiStudio/Rom/rom_n163_7ch_ntsc.nes and b/FamiStudio/Rom/rom_n163_7ch_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_n163_7ch_ntsc.tbl b/FamiStudio/Rom/rom_n163_7ch_ntsc.tbl
index 15eee8073..59a9bd66a 100644
--- a/FamiStudio/Rom/rom_n163_7ch_ntsc.tbl
+++ b/FamiStudio/Rom/rom_n163_7ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3281
-famistudio_n163_note_table_lsb=3184
-famistudio_note_table_msb=3087
-famistudio_note_table_lsb=2990
+famistudio_n163_note_table_msb=3313
+famistudio_n163_note_table_lsb=3216
+famistudio_note_table_msb=3119
+famistudio_note_table_lsb=3022
diff --git a/FamiStudio/Rom/rom_n163_7ch_ntsc_famitracker.nes b/FamiStudio/Rom/rom_n163_7ch_ntsc_famitracker.nes
index 9f185a6d6..b1b8915a5 100644
Binary files a/FamiStudio/Rom/rom_n163_7ch_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_n163_7ch_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_7ch_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_n163_7ch_ntsc_famitracker.tbl
index 91bd86500..b51ea07c5 100644
--- a/FamiStudio/Rom/rom_n163_7ch_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_7ch_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3328
-famistudio_n163_note_table_lsb=3231
-famistudio_note_table_msb=3134
-famistudio_note_table_lsb=3037
+famistudio_n163_note_table_msb=3360
+famistudio_n163_note_table_lsb=3263
+famistudio_note_table_msb=3166
+famistudio_note_table_lsb=3069
diff --git a/FamiStudio/Rom/rom_n163_7ch_pal.nes b/FamiStudio/Rom/rom_n163_7ch_pal.nes
index ccaa0e9d1..7549b121b 100644
Binary files a/FamiStudio/Rom/rom_n163_7ch_pal.nes and b/FamiStudio/Rom/rom_n163_7ch_pal.nes differ
diff --git a/FamiStudio/Rom/rom_n163_7ch_pal.tbl b/FamiStudio/Rom/rom_n163_7ch_pal.tbl
index 54f6c04e3..a1c1414cf 100644
--- a/FamiStudio/Rom/rom_n163_7ch_pal.tbl
+++ b/FamiStudio/Rom/rom_n163_7ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3283
-famistudio_n163_note_table_lsb=3186
-famistudio_note_table_msb=3089
-famistudio_note_table_lsb=2992
+famistudio_n163_note_table_msb=3315
+famistudio_n163_note_table_lsb=3218
+famistudio_note_table_msb=3121
+famistudio_note_table_lsb=3024
diff --git a/FamiStudio/Rom/rom_n163_7ch_pal_famitracker.nes b/FamiStudio/Rom/rom_n163_7ch_pal_famitracker.nes
index 7df84d3fd..4bf4efc81 100644
Binary files a/FamiStudio/Rom/rom_n163_7ch_pal_famitracker.nes and b/FamiStudio/Rom/rom_n163_7ch_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_7ch_pal_famitracker.tbl b/FamiStudio/Rom/rom_n163_7ch_pal_famitracker.tbl
index 91bd86500..b51ea07c5 100644
--- a/FamiStudio/Rom/rom_n163_7ch_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_7ch_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3328
-famistudio_n163_note_table_lsb=3231
-famistudio_note_table_msb=3134
-famistudio_note_table_lsb=3037
+famistudio_n163_note_table_msb=3360
+famistudio_n163_note_table_lsb=3263
+famistudio_note_table_msb=3166
+famistudio_note_table_lsb=3069
diff --git a/FamiStudio/Rom/rom_n163_8ch_ntsc.nes b/FamiStudio/Rom/rom_n163_8ch_ntsc.nes
index 8c58dc03d..8957f32dc 100644
Binary files a/FamiStudio/Rom/rom_n163_8ch_ntsc.nes and b/FamiStudio/Rom/rom_n163_8ch_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_n163_8ch_ntsc.tbl b/FamiStudio/Rom/rom_n163_8ch_ntsc.tbl
index 15eee8073..59a9bd66a 100644
--- a/FamiStudio/Rom/rom_n163_8ch_ntsc.tbl
+++ b/FamiStudio/Rom/rom_n163_8ch_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3281
-famistudio_n163_note_table_lsb=3184
-famistudio_note_table_msb=3087
-famistudio_note_table_lsb=2990
+famistudio_n163_note_table_msb=3313
+famistudio_n163_note_table_lsb=3216
+famistudio_note_table_msb=3119
+famistudio_note_table_lsb=3022
diff --git a/FamiStudio/Rom/rom_n163_8ch_ntsc_famitracker.nes b/FamiStudio/Rom/rom_n163_8ch_ntsc_famitracker.nes
index 4d8e7859d..37574f276 100644
Binary files a/FamiStudio/Rom/rom_n163_8ch_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_n163_8ch_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_8ch_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_n163_8ch_ntsc_famitracker.tbl
index 91bd86500..b51ea07c5 100644
--- a/FamiStudio/Rom/rom_n163_8ch_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_8ch_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3328
-famistudio_n163_note_table_lsb=3231
-famistudio_note_table_msb=3134
-famistudio_note_table_lsb=3037
+famistudio_n163_note_table_msb=3360
+famistudio_n163_note_table_lsb=3263
+famistudio_note_table_msb=3166
+famistudio_note_table_lsb=3069
diff --git a/FamiStudio/Rom/rom_n163_8ch_pal.nes b/FamiStudio/Rom/rom_n163_8ch_pal.nes
index 94faae27f..c999453aa 100644
Binary files a/FamiStudio/Rom/rom_n163_8ch_pal.nes and b/FamiStudio/Rom/rom_n163_8ch_pal.nes differ
diff --git a/FamiStudio/Rom/rom_n163_8ch_pal.tbl b/FamiStudio/Rom/rom_n163_8ch_pal.tbl
index 54f6c04e3..a1c1414cf 100644
--- a/FamiStudio/Rom/rom_n163_8ch_pal.tbl
+++ b/FamiStudio/Rom/rom_n163_8ch_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3283
-famistudio_n163_note_table_lsb=3186
-famistudio_note_table_msb=3089
-famistudio_note_table_lsb=2992
+famistudio_n163_note_table_msb=3315
+famistudio_n163_note_table_lsb=3218
+famistudio_note_table_msb=3121
+famistudio_note_table_lsb=3024
diff --git a/FamiStudio/Rom/rom_n163_8ch_pal_famitracker.nes b/FamiStudio/Rom/rom_n163_8ch_pal_famitracker.nes
index 28cc70f89..7ff2cc7e8 100644
Binary files a/FamiStudio/Rom/rom_n163_8ch_pal_famitracker.nes and b/FamiStudio/Rom/rom_n163_8ch_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_n163_8ch_pal_famitracker.tbl b/FamiStudio/Rom/rom_n163_8ch_pal_famitracker.tbl
index 91bd86500..b51ea07c5 100644
--- a/FamiStudio/Rom/rom_n163_8ch_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_n163_8ch_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_n163_note_table_msb=3328
-famistudio_n163_note_table_lsb=3231
-famistudio_note_table_msb=3134
-famistudio_note_table_lsb=3037
+famistudio_n163_note_table_msb=3360
+famistudio_n163_note_table_lsb=3263
+famistudio_note_table_msb=3166
+famistudio_note_table_lsb=3069
diff --git a/FamiStudio/Rom/rom_ntsc.nes b/FamiStudio/Rom/rom_ntsc.nes
index a89fb2b73..14bf3d6cb 100644
Binary files a/FamiStudio/Rom/rom_ntsc.nes and b/FamiStudio/Rom/rom_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_ntsc.tbl b/FamiStudio/Rom/rom_ntsc.tbl
index 9332ffac5..bc8062ea9 100644
--- a/FamiStudio/Rom/rom_ntsc.tbl
+++ b/FamiStudio/Rom/rom_ntsc.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2417
-famistudio_note_table_lsb=2320
+famistudio_note_table_msb=2449
+famistudio_note_table_lsb=2352
diff --git a/FamiStudio/Rom/rom_ntsc_famitracker.nes b/FamiStudio/Rom/rom_ntsc_famitracker.nes
index 25c6f9364..cdec4de92 100644
Binary files a/FamiStudio/Rom/rom_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_ntsc_famitracker.tbl
index 0c2b3cf8c..2f1e7070c 100644
--- a/FamiStudio/Rom/rom_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_ntsc_famitracker.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2464
-famistudio_note_table_lsb=2367
+famistudio_note_table_msb=2496
+famistudio_note_table_lsb=2399
diff --git a/FamiStudio/Rom/rom_pal.nes b/FamiStudio/Rom/rom_pal.nes
index 12d5a6069..9dbead481 100644
Binary files a/FamiStudio/Rom/rom_pal.nes and b/FamiStudio/Rom/rom_pal.nes differ
diff --git a/FamiStudio/Rom/rom_pal.tbl b/FamiStudio/Rom/rom_pal.tbl
index 1079cd156..647c3ec4e 100644
--- a/FamiStudio/Rom/rom_pal.tbl
+++ b/FamiStudio/Rom/rom_pal.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2419
-famistudio_note_table_lsb=2322
+famistudio_note_table_msb=2451
+famistudio_note_table_lsb=2354
diff --git a/FamiStudio/Rom/rom_pal_famitracker.nes b/FamiStudio/Rom/rom_pal_famitracker.nes
index 21ee91b06..085a1cd53 100644
Binary files a/FamiStudio/Rom/rom_pal_famitracker.nes and b/FamiStudio/Rom/rom_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_pal_famitracker.tbl b/FamiStudio/Rom/rom_pal_famitracker.tbl
index 0c2b3cf8c..2f1e7070c 100644
--- a/FamiStudio/Rom/rom_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_pal_famitracker.tbl
@@ -1,2 +1,2 @@
-famistudio_note_table_msb=2464
-famistudio_note_table_lsb=2367
+famistudio_note_table_msb=2496
+famistudio_note_table_lsb=2399
diff --git a/FamiStudio/Rom/rom_s5b_ntsc.nes b/FamiStudio/Rom/rom_s5b_ntsc.nes
index 807256de2..540ea0d26 100644
Binary files a/FamiStudio/Rom/rom_s5b_ntsc.nes and b/FamiStudio/Rom/rom_s5b_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_s5b_ntsc.tbl b/FamiStudio/Rom/rom_s5b_ntsc.tbl
index 8a92c01f5..bf502d46c 100644
--- a/FamiStudio/Rom/rom_s5b_ntsc.tbl
+++ b/FamiStudio/Rom/rom_s5b_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3090
-famistudio_s5b_note_table_lsb=2993
-famistudio_note_table_msb=3090
-famistudio_note_table_lsb=2993
+famistudio_s5b_note_table_msb=3122
+famistudio_s5b_note_table_lsb=3025
+famistudio_note_table_msb=3122
+famistudio_note_table_lsb=3025
diff --git a/FamiStudio/Rom/rom_s5b_ntsc_famitracker.nes b/FamiStudio/Rom/rom_s5b_ntsc_famitracker.nes
index 49fb8d84c..930899fd5 100644
Binary files a/FamiStudio/Rom/rom_s5b_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_s5b_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_s5b_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_s5b_ntsc_famitracker.tbl
index 863f1f935..baf1746d8 100644
--- a/FamiStudio/Rom/rom_s5b_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_s5b_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3137
-famistudio_s5b_note_table_lsb=3040
-famistudio_note_table_msb=3137
-famistudio_note_table_lsb=3040
+famistudio_s5b_note_table_msb=3169
+famistudio_s5b_note_table_lsb=3072
+famistudio_note_table_msb=3169
+famistudio_note_table_lsb=3072
diff --git a/FamiStudio/Rom/rom_s5b_pal.nes b/FamiStudio/Rom/rom_s5b_pal.nes
index 5a57c8a12..08e83fa28 100644
Binary files a/FamiStudio/Rom/rom_s5b_pal.nes and b/FamiStudio/Rom/rom_s5b_pal.nes differ
diff --git a/FamiStudio/Rom/rom_s5b_pal.tbl b/FamiStudio/Rom/rom_s5b_pal.tbl
index 7ac38b6a0..4770a5d92 100644
--- a/FamiStudio/Rom/rom_s5b_pal.tbl
+++ b/FamiStudio/Rom/rom_s5b_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3092
-famistudio_s5b_note_table_lsb=2995
-famistudio_note_table_msb=3092
-famistudio_note_table_lsb=2995
+famistudio_s5b_note_table_msb=3124
+famistudio_s5b_note_table_lsb=3027
+famistudio_note_table_msb=3124
+famistudio_note_table_lsb=3027
diff --git a/FamiStudio/Rom/rom_s5b_pal_famitracker.nes b/FamiStudio/Rom/rom_s5b_pal_famitracker.nes
index a945e9dcc..96ae30d7f 100644
Binary files a/FamiStudio/Rom/rom_s5b_pal_famitracker.nes and b/FamiStudio/Rom/rom_s5b_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_s5b_pal_famitracker.tbl b/FamiStudio/Rom/rom_s5b_pal_famitracker.tbl
index 863f1f935..baf1746d8 100644
--- a/FamiStudio/Rom/rom_s5b_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_s5b_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_s5b_note_table_msb=3137
-famistudio_s5b_note_table_lsb=3040
-famistudio_note_table_msb=3137
-famistudio_note_table_lsb=3040
+famistudio_s5b_note_table_msb=3169
+famistudio_s5b_note_table_lsb=3072
+famistudio_note_table_msb=3169
+famistudio_note_table_lsb=3072
diff --git a/FamiStudio/Rom/rom_vrc6_ntsc.nes b/FamiStudio/Rom/rom_vrc6_ntsc.nes
index cd13aca34..7cce5f8f2 100644
Binary files a/FamiStudio/Rom/rom_vrc6_ntsc.nes and b/FamiStudio/Rom/rom_vrc6_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_vrc6_ntsc.tbl b/FamiStudio/Rom/rom_vrc6_ntsc.tbl
index 6c22687c3..0d8ee7d66 100644
--- a/FamiStudio/Rom/rom_vrc6_ntsc.tbl
+++ b/FamiStudio/Rom/rom_vrc6_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=2981
-famistudio_saw_note_table_lsb=2884
-famistudio_note_table_msb=2787
-famistudio_note_table_lsb=2690
+famistudio_saw_note_table_msb=3010
+famistudio_saw_note_table_lsb=2913
+famistudio_note_table_msb=2816
+famistudio_note_table_lsb=2719
diff --git a/FamiStudio/Rom/rom_vrc6_ntsc_famitracker.nes b/FamiStudio/Rom/rom_vrc6_ntsc_famitracker.nes
index f1a343d74..44d72e49c 100644
Binary files a/FamiStudio/Rom/rom_vrc6_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_vrc6_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_vrc6_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_vrc6_ntsc_famitracker.tbl
index 88853b927..fa0315781 100644
--- a/FamiStudio/Rom/rom_vrc6_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_vrc6_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=3028
-famistudio_saw_note_table_lsb=2931
-famistudio_note_table_msb=2834
-famistudio_note_table_lsb=2737
+famistudio_saw_note_table_msb=3057
+famistudio_saw_note_table_lsb=2960
+famistudio_note_table_msb=2863
+famistudio_note_table_lsb=2766
diff --git a/FamiStudio/Rom/rom_vrc6_pal.nes b/FamiStudio/Rom/rom_vrc6_pal.nes
index 005b432ce..21dd317f0 100644
Binary files a/FamiStudio/Rom/rom_vrc6_pal.nes and b/FamiStudio/Rom/rom_vrc6_pal.nes differ
diff --git a/FamiStudio/Rom/rom_vrc6_pal.tbl b/FamiStudio/Rom/rom_vrc6_pal.tbl
index 8aad7a403..a126260f7 100644
--- a/FamiStudio/Rom/rom_vrc6_pal.tbl
+++ b/FamiStudio/Rom/rom_vrc6_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=2983
-famistudio_saw_note_table_lsb=2886
-famistudio_note_table_msb=2789
-famistudio_note_table_lsb=2692
+famistudio_saw_note_table_msb=3012
+famistudio_saw_note_table_lsb=2915
+famistudio_note_table_msb=2818
+famistudio_note_table_lsb=2721
diff --git a/FamiStudio/Rom/rom_vrc6_pal_famitracker.nes b/FamiStudio/Rom/rom_vrc6_pal_famitracker.nes
index b2bef88fd..650647fc5 100644
Binary files a/FamiStudio/Rom/rom_vrc6_pal_famitracker.nes and b/FamiStudio/Rom/rom_vrc6_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_vrc6_pal_famitracker.tbl b/FamiStudio/Rom/rom_vrc6_pal_famitracker.tbl
index 88853b927..fa0315781 100644
--- a/FamiStudio/Rom/rom_vrc6_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_vrc6_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_saw_note_table_msb=3028
-famistudio_saw_note_table_lsb=2931
-famistudio_note_table_msb=2834
-famistudio_note_table_lsb=2737
+famistudio_saw_note_table_msb=3057
+famistudio_saw_note_table_lsb=2960
+famistudio_note_table_msb=2863
+famistudio_note_table_lsb=2766
diff --git a/FamiStudio/Rom/rom_vrc7_ntsc.nes b/FamiStudio/Rom/rom_vrc7_ntsc.nes
index 0916e1453..51fb95866 100644
Binary files a/FamiStudio/Rom/rom_vrc7_ntsc.nes and b/FamiStudio/Rom/rom_vrc7_ntsc.nes differ
diff --git a/FamiStudio/Rom/rom_vrc7_ntsc.tbl b/FamiStudio/Rom/rom_vrc7_ntsc.tbl
index 94c96dc7f..37a3281cc 100644
--- a/FamiStudio/Rom/rom_vrc7_ntsc.tbl
+++ b/FamiStudio/Rom/rom_vrc7_ntsc.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3220
-famistudio_vrc7_note_table_lsb=3123
-famistudio_note_table_msb=3026
-famistudio_note_table_lsb=2929
+famistudio_vrc7_note_table_msb=3252
+famistudio_vrc7_note_table_lsb=3155
+famistudio_note_table_msb=3058
+famistudio_note_table_lsb=2961
diff --git a/FamiStudio/Rom/rom_vrc7_ntsc_famitracker.nes b/FamiStudio/Rom/rom_vrc7_ntsc_famitracker.nes
index 32a32a483..1af893ef1 100644
Binary files a/FamiStudio/Rom/rom_vrc7_ntsc_famitracker.nes and b/FamiStudio/Rom/rom_vrc7_ntsc_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_vrc7_ntsc_famitracker.tbl b/FamiStudio/Rom/rom_vrc7_ntsc_famitracker.tbl
index 528cfe22a..bb01eaf57 100644
--- a/FamiStudio/Rom/rom_vrc7_ntsc_famitracker.tbl
+++ b/FamiStudio/Rom/rom_vrc7_ntsc_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3267
-famistudio_vrc7_note_table_lsb=3170
-famistudio_note_table_msb=3073
-famistudio_note_table_lsb=2976
+famistudio_vrc7_note_table_msb=3299
+famistudio_vrc7_note_table_lsb=3202
+famistudio_note_table_msb=3105
+famistudio_note_table_lsb=3008
diff --git a/FamiStudio/Rom/rom_vrc7_pal.nes b/FamiStudio/Rom/rom_vrc7_pal.nes
index 30585a9db..394ca0e0c 100644
Binary files a/FamiStudio/Rom/rom_vrc7_pal.nes and b/FamiStudio/Rom/rom_vrc7_pal.nes differ
diff --git a/FamiStudio/Rom/rom_vrc7_pal.tbl b/FamiStudio/Rom/rom_vrc7_pal.tbl
index b13e571fd..b8d6c7250 100644
--- a/FamiStudio/Rom/rom_vrc7_pal.tbl
+++ b/FamiStudio/Rom/rom_vrc7_pal.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3222
-famistudio_vrc7_note_table_lsb=3125
-famistudio_note_table_msb=3028
-famistudio_note_table_lsb=2931
+famistudio_vrc7_note_table_msb=3254
+famistudio_vrc7_note_table_lsb=3157
+famistudio_note_table_msb=3060
+famistudio_note_table_lsb=2963
diff --git a/FamiStudio/Rom/rom_vrc7_pal_famitracker.nes b/FamiStudio/Rom/rom_vrc7_pal_famitracker.nes
index fd51b59e6..ac8d43b81 100644
Binary files a/FamiStudio/Rom/rom_vrc7_pal_famitracker.nes and b/FamiStudio/Rom/rom_vrc7_pal_famitracker.nes differ
diff --git a/FamiStudio/Rom/rom_vrc7_pal_famitracker.tbl b/FamiStudio/Rom/rom_vrc7_pal_famitracker.tbl
index 528cfe22a..bb01eaf57 100644
--- a/FamiStudio/Rom/rom_vrc7_pal_famitracker.tbl
+++ b/FamiStudio/Rom/rom_vrc7_pal_famitracker.tbl
@@ -1,4 +1,4 @@
-famistudio_vrc7_note_table_msb=3267
-famistudio_vrc7_note_table_lsb=3170
-famistudio_note_table_msb=3073
-famistudio_note_table_lsb=2976
+famistudio_vrc7_note_table_msb=3299
+famistudio_vrc7_note_table_lsb=3202
+famistudio_note_table_msb=3105
+famistudio_note_table_lsb=3008
diff --git a/SoundEngine/demo_asm6.nes b/SoundEngine/demo_asm6.nes
index ad59001e2..324d6bca8 100644
Binary files a/SoundEngine/demo_asm6.nes and b/SoundEngine/demo_asm6.nes differ
diff --git a/SoundEngine/demo_ca65.nes b/SoundEngine/demo_ca65.nes
index ad59001e2..324d6bca8 100644
Binary files a/SoundEngine/demo_ca65.nes and b/SoundEngine/demo_ca65.nes differ
diff --git a/SoundEngine/demo_cc65.nes b/SoundEngine/demo_cc65.nes
index d3db59767..0656bc375 100644
Binary files a/SoundEngine/demo_cc65.nes and b/SoundEngine/demo_cc65.nes differ
diff --git a/SoundEngine/demo_nesasm.nes b/SoundEngine/demo_nesasm.nes
index ad59001e2..324d6bca8 100644
Binary files a/SoundEngine/demo_nesasm.nes and b/SoundEngine/demo_nesasm.nes differ
diff --git a/SoundEngine/demo_sdas.nes b/SoundEngine/demo_sdas.nes
index ad59001e2..324d6bca8 100644
Binary files a/SoundEngine/demo_sdas.nes and b/SoundEngine/demo_sdas.nes differ
diff --git a/SoundEngine/famistudio_asm6.asm b/SoundEngine/famistudio_asm6.asm
index 5cfe4f463..ed5b52b1c 100644
--- a/SoundEngine/famistudio_asm6.asm
+++ b/SoundEngine/famistudio_asm6.asm
@@ -954,6 +954,9 @@ famistudio_instrument_hi:         .dsb 1
 famistudio_dpcm_list_lo:          .dsb 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_list_hi:          .dsb 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_effect:           .dsb 1 ; TODO: Not needed if DPCM support is disabled.
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+famistudio_dpcm_music_loop:       .dsb 1
+.endif
 famistudio_pulse1_prev:           .dsb 1
 famistudio_pulse2_prev:           .dsb 1
 famistudio_song_speed:            .dsb 1
@@ -1405,7 +1408,11 @@ famistudio_music_stop:
     sta famistudio_song_speed
     sta famistudio_dpcm_effect
 
-    ldx #0
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+    sta famistudio_dpcm_music_loop
+.endif
+
+    ldx #(FAMISTUDIO_NUM_CHANNELS - 1)
 
 @set_channels:
 
@@ -1427,39 +1434,35 @@ famistudio_music_stop:
         sta famistudio_chn_cut_delay,x
         lda #0
     .endif
-    inx
-    cpx #FAMISTUDIO_NUM_CHANNELS
-    bne @set_channels
+    dex
+    bpl @set_channels
 
 .if FAMISTUDIO_USE_DUTYCYCLE_EFFECT
-ldx #0
+ldx #(FAMISTUDIO_NUM_DUTY_CYCLES - 1)
 @set_duty_cycles:
     sta famistudio_duty_cycle,x
-    inx
-    cpx #FAMISTUDIO_NUM_DUTY_CYCLES
-    bne @set_duty_cycles
+    dex
+    bpl @set_duty_cycles
 .endif
 
 .if FAMISTUDIO_USE_SLIDE_NOTES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_SLIDES - 1)
 @set_slides:
     sta famistudio_slide_step, x
-    inx
-    cpx #FAMISTUDIO_NUM_SLIDES
-    bne @set_slides
+    dex
+    bpl @set_slides
 .endif
 
 .if FAMISTUDIO_USE_VOLUME_SLIDES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_VOLUME_SLIDES - 1)
 @set_volume_slides:
     sta famistudio_chn_volume_slide_step, x
     sta famistudio_chn_volume_slide_target, x
-    inx
-    cpx #FAMISTUDIO_NUM_VOLUME_SLIDES
-    bne @set_volume_slides
+    dex
+    bpl @set_volume_slides
 .endif
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_ENVELOPES - 1)
 
 @set_envelopes:
 
@@ -1471,11 +1474,10 @@ ldx #0
     sta famistudio_env_repeat,x
     sta famistudio_env_value,x
     sta famistudio_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_ENVELOPES
-    bne @set_envelopes
+    dex
+    bpl @set_envelopes
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_PITCH_ENVELOPES - 1)
 @set_pitch_envelopes:
 
     lda #<famistudio_dummy_pitch_envelope
@@ -1491,9 +1493,8 @@ ldx #0
     .endif
     lda #1
     sta famistudio_pitch_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_PITCH_ENVELOPES
-    bne @set_pitch_envelopes
+    dex
+    bpl @set_pitch_envelopes
 
     jmp famistudio_sample_stop
 
@@ -2017,7 +2018,7 @@ done:
 
     lda famistudio_chn_note+idx
     bne nocut
-    jmp set_volume
+    beq set_volume
 
 nocut:
     clc
@@ -3967,6 +3968,27 @@ famistudio_update:
 
 .endif
 
+;----------------------------------------------------------------------------------------------------------------------
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+@check_dpcm_effect:
+    lda famistudio_dpcm_effect
+    beq @after_check_dpcm_effect
+
+    lda FAMISTUDIO_APU_SND_CHN
+    and #16
+    bne @after_check_dpcm_effect
+
+    lda #0
+    sta famistudio_dpcm_effect
+
+    lda famistudio_dpcm_music_loop
+    beq @after_check_dpcm_effect
+
+    jsr famistudio_music_sample_play
+
+@after_check_dpcm_effect:
+.endif
+
 ;----------------------------------------------------------------------------------------------------------------------
 @advance_song:
     ldx #0
@@ -6477,7 +6499,17 @@ famistudio_advance_channel:
 ;======================================================================================================================
 
 famistudio_sample_stop:
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+    lda #0
+    sta famistudio_dpcm_music_loop
 
+    lda famistudio_dpcm_effect
+    beq @stop_dpcm
+
+    rts
+.endif
+
+@stop_dpcm:
     lda #%00001111
     sta FAMISTUDIO_APU_SND_CHN
     rts
@@ -6505,9 +6537,10 @@ sample_play:
     sample_index = famistudio_r3
     sample_data_ptr = famistudio_ptr1
 
+    sta sample_index
+
 .if FAMISTUDIO_USE_DPCM_BANKSWITCHING || FAMISTUDIO_USE_DPCM_EXTENDED_RANGE
     ; famistudio_dpcm_list + sample number * (4 or 5)
-    sta sample_index
     ldy #0
     sty sample_data_ptr+1
     asl
@@ -6552,6 +6585,14 @@ stop_dpcm:
     sta FAMISTUDIO_APU_DMC_FREQ
     iny
 
+@check_for_loop:
+    and #%01000000
+    beq @after_check_for_loop
+
+    lda sample_index
+    sta famistudio_dpcm_music_loop
+@after_check_for_loop:
+
 .if FAMISTUDIO_USE_DELTA_COUNTER
     lda famistudio_dmc_delta_counter
     bmi read_dmc_initial_value
diff --git a/SoundEngine/famistudio_ca65.s b/SoundEngine/famistudio_ca65.s
index ee06b7641..2f0f531c2 100644
--- a/SoundEngine/famistudio_ca65.s
+++ b/SoundEngine/famistudio_ca65.s
@@ -956,6 +956,9 @@ famistudio_instrument_hi:         .res 1
 famistudio_dpcm_list_lo:          .res 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_list_hi:          .res 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_effect:           .res 1 ; TODO: Not needed if DPCM support is disabled.
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+famistudio_dpcm_music_loop:       .res 1
+.endif
 famistudio_pulse1_prev:           .res 1
 famistudio_pulse2_prev:           .res 1
 famistudio_song_speed:            .res 1
@@ -1423,7 +1426,11 @@ famistudio_music_stop:
     sta famistudio_song_speed
     sta famistudio_dpcm_effect
 
-    ldx #0
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+    sta famistudio_dpcm_music_loop
+.endif
+
+    ldx #(FAMISTUDIO_NUM_CHANNELS - 1)
 
 @set_channels:
 
@@ -1445,39 +1452,35 @@ famistudio_music_stop:
         sta famistudio_chn_cut_delay,x
         lda #0
     .endif
-    inx
-    cpx #FAMISTUDIO_NUM_CHANNELS
-    bne @set_channels
+    dex
+    bpl @set_channels
 
 .if FAMISTUDIO_USE_DUTYCYCLE_EFFECT
-ldx #0
+ldx #(FAMISTUDIO_NUM_DUTY_CYCLES - 1)
 @set_duty_cycles:
     sta famistudio_duty_cycle,x
-    inx
-    cpx #FAMISTUDIO_NUM_DUTY_CYCLES
-    bne @set_duty_cycles
+    dex
+    bpl @set_duty_cycles
 .endif
 
 .if FAMISTUDIO_USE_SLIDE_NOTES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_SLIDES - 1)
 @set_slides:
     sta famistudio_slide_step, x
-    inx
-    cpx #FAMISTUDIO_NUM_SLIDES
-    bne @set_slides
+    dex
+    bpl @set_slides
 .endif
 
 .if FAMISTUDIO_USE_VOLUME_SLIDES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_VOLUME_SLIDES - 1)
 @set_volume_slides:
     sta famistudio_chn_volume_slide_step, x
     sta famistudio_chn_volume_slide_target, x
-    inx
-    cpx #FAMISTUDIO_NUM_VOLUME_SLIDES
-    bne @set_volume_slides
+    dex
+    bpl @set_volume_slides
 .endif
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_ENVELOPES - 1)
 
 @set_envelopes:
 
@@ -1489,11 +1492,10 @@ ldx #0
     sta famistudio_env_repeat,x
     sta famistudio_env_value,x
     sta famistudio_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_ENVELOPES
-    bne @set_envelopes
+    dex
+    bpl @set_envelopes
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_PITCH_ENVELOPES - 1)
 @set_pitch_envelopes:
 
     lda #<famistudio_dummy_pitch_envelope
@@ -1509,9 +1511,8 @@ ldx #0
     .endif
     lda #1
     sta famistudio_pitch_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_PITCH_ENVELOPES
-    bne @set_pitch_envelopes
+    dex
+    bpl @set_pitch_envelopes
 
     jmp famistudio_sample_stop
 
@@ -2053,7 +2054,7 @@ famistudio_get_note_pitch_vrc6_saw:
 
     lda famistudio_chn_note+idx
     bne @nocut
-    jmp @set_volume
+    beq @set_volume
 
 @nocut:
     clc
@@ -4013,6 +4014,27 @@ famistudio_update:
 
 .endif
 
+;----------------------------------------------------------------------------------------------------------------------
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+@check_dpcm_effect:
+    lda famistudio_dpcm_effect
+    beq @after_check_dpcm_effect
+
+    lda FAMISTUDIO_APU_SND_CHN
+    and #16
+    bne @after_check_dpcm_effect
+
+    lda #0
+    sta famistudio_dpcm_effect
+
+    lda famistudio_dpcm_music_loop
+    beq @after_check_dpcm_effect
+
+    jsr famistudio_music_sample_play
+
+@after_check_dpcm_effect:
+.endif
+
 ;----------------------------------------------------------------------------------------------------------------------
 @advance_song:
     ldx #0
@@ -6523,7 +6545,17 @@ famistudio_advance_channel:
 ;======================================================================================================================
 
 famistudio_sample_stop:
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+    lda #0
+    sta famistudio_dpcm_music_loop
+
+    lda famistudio_dpcm_effect
+    beq @stop_dpcm
+
+    rts
+.endif
 
+@stop_dpcm:
     lda #%00001111
     sta FAMISTUDIO_APU_SND_CHN
     rts
@@ -6551,9 +6583,10 @@ sample_play:
     @sample_index = famistudio_r3
     @sample_data_ptr = famistudio_ptr1
 
+    sta @sample_index
+
 .if FAMISTUDIO_USE_DPCM_BANKSWITCHING || FAMISTUDIO_USE_DPCM_EXTENDED_RANGE
     ; famistudio_dpcm_list + sample number * (4 or 5)
-    sta @sample_index
     ldy #0
     sty @sample_data_ptr+1
     asl
@@ -6598,6 +6631,14 @@ sample_play:
     sta FAMISTUDIO_APU_DMC_FREQ
     iny
 
+@check_for_loop:
+    and #%01000000
+    beq @after_check_for_loop
+
+    lda @sample_index
+    sta famistudio_dpcm_music_loop
+@after_check_for_loop:
+
 .if FAMISTUDIO_USE_DELTA_COUNTER
     lda famistudio_dmc_delta_counter
     bmi @read_dmc_initial_value
diff --git a/SoundEngine/famistudio_multi_ca65.s b/SoundEngine/famistudio_multi_ca65.s
index 016068712..6fb7afddd 100644
--- a/SoundEngine/famistudio_multi_ca65.s
+++ b/SoundEngine/famistudio_multi_ca65.s
@@ -959,6 +959,9 @@ famistudio_instrument_hi:         .res 1
 famistudio_dpcm_list_lo:          .res 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_list_hi:          .res 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_effect:           .res 1 ; TODO: Not needed if DPCM support is disabled.
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+famistudio_dpcm_music_loop:       .res 1
+.endif
 famistudio_pulse1_prev:           .res 1
 famistudio_pulse2_prev:           .res 1
 famistudio_song_speed:            .res 1
@@ -1457,7 +1460,11 @@ famistudio_music_stop:
     sta famistudio_song_speed
     sta famistudio_dpcm_effect
 
-    ldx #0
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+    sta famistudio_dpcm_music_loop
+.endif
+
+    ldx #(FAMISTUDIO_NUM_CHANNELS - 1)
 
 @set_channels:
 
@@ -1479,39 +1486,35 @@ famistudio_music_stop:
         sta famistudio_chn_cut_delay,x
         lda #0
     .endif
-    inx
-    cpx #FAMISTUDIO_NUM_CHANNELS
-    bne @set_channels
+    dex
+    bpl @set_channels
 
 .if FAMISTUDIO_USE_DUTYCYCLE_EFFECT
-ldx #0
+ldx #(FAMISTUDIO_NUM_DUTY_CYCLES - 1)
 @set_duty_cycles:
     sta famistudio_duty_cycle,x
-    inx
-    cpx #FAMISTUDIO_NUM_DUTY_CYCLES
-    bne @set_duty_cycles
+    dex
+    bpl @set_duty_cycles
 .endif
 
 .if FAMISTUDIO_USE_SLIDE_NOTES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_SLIDES - 1)
 @set_slides:
     sta famistudio_slide_step, x
-    inx
-    cpx #FAMISTUDIO_NUM_SLIDES
-    bne @set_slides
+    dex
+    bpl @set_slides
 .endif
 
 .if FAMISTUDIO_USE_VOLUME_SLIDES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_VOLUME_SLIDES - 1)
 @set_volume_slides:
     sta famistudio_chn_volume_slide_step, x
     sta famistudio_chn_volume_slide_target, x
-    inx
-    cpx #FAMISTUDIO_NUM_VOLUME_SLIDES
-    bne @set_volume_slides
+    dex
+    bpl @set_volume_slides
 .endif
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_ENVELOPES - 1)
 
 @set_envelopes:
 
@@ -1523,11 +1526,10 @@ ldx #0
     sta famistudio_env_repeat,x
     sta famistudio_env_value,x
     sta famistudio_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_ENVELOPES
-    bne @set_envelopes
+    dex
+    bpl @set_envelopes
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_PITCH_ENVELOPES - 1)
 @set_pitch_envelopes:
 
     lda #<famistudio_dummy_pitch_envelope
@@ -1543,9 +1545,8 @@ ldx #0
     .endif
     lda #1
     sta famistudio_pitch_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_PITCH_ENVELOPES
-    bne @set_pitch_envelopes
+    dex
+    bpl @set_pitch_envelopes
 
     jmp famistudio_sample_stop
 
@@ -2090,7 +2091,7 @@ famistudio_get_note_pitch_vrc6_saw:
 
     lda famistudio_chn_note+idx
     bne @nocut
-    jmp @set_volume
+    beq @set_volume
 
 @nocut:
     clc
@@ -4054,6 +4055,27 @@ famistudio_update:
 
 .endif
 
+;----------------------------------------------------------------------------------------------------------------------
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+@check_dpcm_effect:
+    lda famistudio_dpcm_effect
+    beq @after_check_dpcm_effect
+
+    lda FAMISTUDIO_APU_SND_CHN
+    and #16
+    bne @after_check_dpcm_effect
+
+    lda #0
+    sta famistudio_dpcm_effect
+
+    lda famistudio_dpcm_music_loop
+    beq @after_check_dpcm_effect
+
+    jsr famistudio_music_sample_play
+
+@after_check_dpcm_effect:
+.endif
+
 ;----------------------------------------------------------------------------------------------------------------------
 @advance_song:
     ldx #0
@@ -6643,7 +6665,17 @@ famistudio_advance_channel:
 ;======================================================================================================================
 
 famistudio_sample_stop:
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+    lda #0
+    sta famistudio_dpcm_music_loop
+
+    lda famistudio_dpcm_effect
+    beq @stop_dpcm
+
+    rts
+.endif
 
+@stop_dpcm:
     lda #%00001111
     sta FAMISTUDIO_APU_SND_CHN
     rts
@@ -6671,9 +6703,10 @@ sample_play:
     @sample_index = famistudio_r3
     @sample_data_ptr = famistudio_ptr1
 
+    sta @sample_index
+
 .if FAMISTUDIO_USE_DPCM_BANKSWITCHING || FAMISTUDIO_USE_DPCM_EXTENDED_RANGE
     ; famistudio_dpcm_list + sample number * (4 or 5)
-    sta @sample_index
     ldy #0
     sty @sample_data_ptr+1
     asl
@@ -6718,6 +6751,14 @@ sample_play:
     sta FAMISTUDIO_APU_DMC_FREQ
     iny
 
+@check_for_loop:
+    and #%01000000
+    beq @after_check_for_loop
+
+    lda @sample_index
+    sta famistudio_dpcm_music_loop
+@after_check_for_loop:
+
 .if FAMISTUDIO_USE_DELTA_COUNTER
     lda famistudio_dmc_delta_counter
     bmi @read_dmc_initial_value
diff --git a/SoundEngine/famistudio_nesasm.asm b/SoundEngine/famistudio_nesasm.asm
index 70cb23794..a4c89d74e 100644
--- a/SoundEngine/famistudio_nesasm.asm
+++ b/SoundEngine/famistudio_nesasm.asm
@@ -967,6 +967,9 @@ famistudio_instrument_hi:         .rs 1
 famistudio_dpcm_list_lo:          .rs 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_list_hi:          .rs 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_effect:           .rs 1 ; TODO: Not needed if DPCM support is disabled.
+    .if FAMISTUDIO_CFG_DPCM_SUPPORT
+famistudio_dpcm_music_loop:       .rs 1
+    .endif
 famistudio_pulse1_prev:           .rs 1
 famistudio_pulse2_prev:           .rs 1
 famistudio_song_speed             .rs 1
@@ -1426,7 +1429,11 @@ famistudio_music_stop:
     sta famistudio_song_speed
     sta famistudio_dpcm_effect
 
-    ldx #0
+    .if FAMISTUDIO_CFG_DPCM_SUPPORT
+    sta famistudio_dpcm_music_loop
+    .endif
+
+    ldx #(FAMISTUDIO_NUM_CHANNELS - 1)
 
 .set_channels:
 
@@ -1448,40 +1455,36 @@ famistudio_music_stop:
         sta famistudio_chn_cut_delay,x
         lda #0
     .endif
-    inx
-    cpx #FAMISTUDIO_NUM_CHANNELS
-    bne .set_channels
+    dex
+    bpl .set_channels
 
     .if FAMISTUDIO_USE_DUTYCYCLE_EFFECT
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_DUTY_CYCLES - 1)
 .set_duty_cycles:
     sta famistudio_duty_cycle,x
-    inx
-    cpx #FAMISTUDIO_NUM_DUTY_CYCLES
-    bne .set_duty_cycles
+    dex
+    bpl .set_duty_cycles
     .endif
 
     .if FAMISTUDIO_USE_SLIDE_NOTES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_SLIDES - 1)
 .set_slides:
 
     sta famistudio_slide_step, x
-    inx
-    cpx #FAMISTUDIO_NUM_SLIDES
-    bne .set_slides
+    dex
+    bpl .set_slides
     .endif
 
     .if FAMISTUDIO_USE_VOLUME_SLIDES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_VOLUME_SLIDES - 1)
 .set_volume_slides:
     sta famistudio_chn_volume_slide_step, x
     sta famistudio_chn_volume_slide_target, x
-    inx
-    cpx #FAMISTUDIO_NUM_VOLUME_SLIDES
-    bne .set_volume_slides
+    dex
+    bpl .set_volume_slides
     .endif
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_ENVELOPES - 1)
 
 .set_envelopes:
 
@@ -1493,11 +1496,10 @@ famistudio_music_stop:
     sta famistudio_env_repeat,x
     sta famistudio_env_value,x
     sta famistudio_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_ENVELOPES
-    bne .set_envelopes
+    dex
+    bpl .set_envelopes
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_PITCH_ENVELOPES - 1)
 .set_pitch_envelopes:
 
     lda #LOW(famistudio_dummy_pitch_envelope)
@@ -1513,9 +1515,8 @@ famistudio_music_stop:
     .endif
     lda #1
     sta famistudio_pitch_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_PITCH_ENVELOPES
-    bne .set_pitch_envelopes
+    dex
+    bpl .set_pitch_envelopes
 
     jmp famistudio_sample_stop
 
@@ -2065,7 +2066,7 @@ reg_sweep\@ = \7
 
     lda famistudio_chn_note+idx\@
     bne .nocut\@
-    jmp .set_volume\@
+    beq .set_volume\@
 
 .nocut\@:
     clc
@@ -4024,6 +4025,27 @@ famistudio_update:
 
     .endif
 
+;----------------------------------------------------------------------------------------------------------------------
+    .if FAMISTUDIO_CFG_DPCM_SUPPORT
+.check_dpcm_effect:
+    lda famistudio_dpcm_effect
+    beq .after_check_dpcm_effect
+
+    lda FAMISTUDIO_APU_SND_CHN
+    and #16
+    bne .after_check_dpcm_effect
+
+    lda #0
+    sta famistudio_dpcm_effect
+
+    lda famistudio_dpcm_music_loop
+    beq .after_check_dpcm_effect
+
+    jsr famistudio_music_sample_play
+
+.after_check_dpcm_effect:
+    .endif
+
 ;----------------------------------------------------------------------------------------------------------------------
 .advance_song:
     ldx #0
@@ -6542,7 +6564,17 @@ famistudio_advance_channel:
 ;======================================================================================================================
 
 famistudio_sample_stop:
+    .if FAMISTUDIO_CFG_DPCM_SUPPORT
+    lda #0
+    sta famistudio_dpcm_music_loop
+
+    lda famistudio_dpcm_effect
+    beq .stop_dpcm
+
+    rts
+    .endif
 
+.stop_dpcm:
     lda #%00001111
     sta FAMISTUDIO_APU_SND_CHN
     rts
@@ -6570,9 +6602,10 @@ sample_play:
 .sample_index = famistudio_r3
 .sample_data_ptr = famistudio_ptr1
 
+    sta <.sample_index
+
     .if (FAMISTUDIO_USE_DPCM_BANKSWITCHING != 0) | (FAMISTUDIO_USE_DPCM_EXTENDED_RANGE != 0)
     ; famistudio_dpcm_list + sample number * (4 or 5)
-    sta <.sample_index
     ldy #0
     sty <.sample_data_ptr+1
     asl a
@@ -6617,6 +6650,14 @@ sample_play:
     sta FAMISTUDIO_APU_DMC_FREQ
     iny
 
+.check_for_loop:
+    and #%01000000
+    beq .after_check_for_loop
+
+    lda <.sample_index
+    sta famistudio_dpcm_music_loop
+.after_check_for_loop:
+
     .if FAMISTUDIO_USE_DELTA_COUNTER
     lda famistudio_dmc_delta_counter
     bmi .read_dmc_initial_value
diff --git a/SoundEngine/famistudio_sdas.s b/SoundEngine/famistudio_sdas.s
index 278e7d971..72837ed2c 100644
--- a/SoundEngine/famistudio_sdas.s
+++ b/SoundEngine/famistudio_sdas.s
@@ -964,6 +964,9 @@ famistudio_instrument_hi:         .ds 1
 famistudio_dpcm_list_lo:          .ds 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_list_hi:          .ds 1 ; TODO: Not needed if DPCM support is disabled.
 famistudio_dpcm_effect:           .ds 1 ; TODO: Not needed if DPCM support is disabled.
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+famistudio_dpcm_music_loop:       .ds 1
+.endif
 famistudio_pulse1_prev:           .ds 1
 famistudio_pulse2_prev:           .ds 1
 famistudio_song_speed:            .ds 1
@@ -1416,7 +1419,11 @@ famistudio_music_stop::
     sta famistudio_song_speed
     sta famistudio_dpcm_effect
 
-    ldx #0
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+    sta famistudio_dpcm_music_loop
+.endif
+
+    ldx #(FAMISTUDIO_NUM_CHANNELS - 1)
 
 .famistudio_music_stop_set_channels:
 
@@ -1438,39 +1445,35 @@ famistudio_music_stop::
         sta famistudio_chn_cut_delay,x
         lda #0
     .endif
-    inx
-    cpx #FAMISTUDIO_NUM_CHANNELS
-    bne .famistudio_music_stop_set_channels
+    dex
+    bpl .famistudio_music_stop_set_channels
 
 .if FAMISTUDIO_USE_DUTYCYCLE_EFFECT
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_DUTY_CYCLES - 1)
 .set_duty_cycles:
     sta famistudio_duty_cycle,x
-    inx
-    cpx #FAMISTUDIO_NUM_DUTY_CYCLES
-    bne .set_duty_cycles
+    dex
+    bpl .set_duty_cycles
 .endif
 
 .if FAMISTUDIO_USE_SLIDE_NOTES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_SLIDES - 1)
 .set_slides:
     sta famistudio_slide_step, x
-    inx
-    cpx #FAMISTUDIO_NUM_SLIDES
-    bne .set_slides
+    dex
+    bpl .set_slides
 .endif
 
 .if FAMISTUDIO_USE_VOLUME_SLIDES
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_VOLUME_SLIDES - 1)
 .set_volume_slides:
     sta famistudio_chn_volume_slide_step, x
     sta famistudio_chn_volume_slide_target, x
-    inx
-    cpx #FAMISTUDIO_NUM_VOLUME_SLIDES
-    bne .set_volume_slides
+    dex
+    bpl .set_volume_slides
 .endif
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_ENVELOPES - 1)
 
 .set_envelopes:
 
@@ -1482,11 +1485,10 @@ famistudio_music_stop::
     sta famistudio_env_repeat,x
     sta famistudio_env_value,x
     sta famistudio_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_ENVELOPES
-    bne .set_envelopes
+    dex
+    bpl .set_envelopes
 
-    ldx #0
+    ldx #(FAMISTUDIO_NUM_PITCH_ENVELOPES - 1)
 .set_pitch_envelopes:
 
     lda #<famistudio_dummy_pitch_envelope
@@ -1502,9 +1504,8 @@ famistudio_music_stop::
     .endif
     lda #1
     sta famistudio_pitch_env_ptr,x
-    inx
-    cpx #FAMISTUDIO_NUM_PITCH_ENVELOPES
-    bne .set_pitch_envelopes
+    dex
+    bpl .set_pitch_envelopes
 
     jmp famistudio_sample_stop
 
@@ -2040,7 +2041,7 @@ famistudio_get_note_pitch_vrc6_saw:
 
     lda famistudio_chn_note+idx
     bne .nocut
-    jmp .set_volume
+    beq .set_volume
 
 .nocut:
     clc
@@ -4120,6 +4121,27 @@ famistudio_update::
 
 .endif
 
+;----------------------------------------------------------------------------------------------------------------------
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+.check_dpcm_effect:
+    lda famistudio_dpcm_effect
+    beq .after_check_dpcm_effect
+
+    lda FAMISTUDIO_APU_SND_CHN
+    and #16
+    bne .after_check_dpcm_effect
+
+    lda #0
+    sta famistudio_dpcm_effect
+
+    lda famistudio_dpcm_music_loop
+    beq .after_check_dpcm_effect
+
+    jsr famistudio_music_sample_play
+
+.after_check_dpcm_effect:
+.endif
+
 ;----------------------------------------------------------------------------------------------------------------------
 .advance_song:
     ldx #0
@@ -6697,7 +6719,17 @@ famistudio_advance_channel:
 ;======================================================================================================================
 
 famistudio_sample_stop:
+.if FAMISTUDIO_CFG_DPCM_SUPPORT
+    lda #0
+    sta famistudio_dpcm_music_loop
 
+    lda famistudio_dpcm_effect
+    beq .stop_dpcm$
+
+    rts
+.endif
+
+.stop_dpcm$:
     lda #0b00001111
     sta FAMISTUDIO_APU_SND_CHN
     rts
@@ -6728,9 +6760,10 @@ sample_play:
     .sample_index = famistudio_r3
     .sample_data_ptr = famistudio_ptr1
 
+    sta *.sample_index
+
 .if FAMISTUDIO_USE_DPCM_BANKSWITCHING | FAMISTUDIO_USE_DPCM_EXTENDED_RANGE
     ; famistudio_dpcm_list + sample number * (4 or 5)
-    sta *.sample_index
     ldy #0
     sty *.sample_data_ptr+1
     asl
@@ -6775,6 +6808,14 @@ sample_play:
     sta FAMISTUDIO_APU_DMC_FREQ
     iny
 
+.check_for_loop:
+    and #0b01000000
+    beq .after_check_for_loop
+
+    lda *.sample_index
+    sta famistudio_dpcm_music_loop
+.after_check_for_loop:
+
 .if FAMISTUDIO_USE_DELTA_COUNTER
     lda famistudio_dmc_delta_counter
     bmi .read_dmc_initial_value