Patch some stuff

eulyderg · Mar 21, 2021 · 71ce679 · 71ce679
1 parent 40e10fe
commit 71ce679
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 16 deletions.
diff --git a/E-FamiTracker.rc b/E-FamiTracker.rc
@@ -498,11 +498,11 @@ BEGIN
     VK_BACK,        ID_EDIT_UNDO,           VIRTKEY, ALT, NOINVERT
     "Z",            ID_EDIT_UNDO,           VIRTKEY, CONTROL, NOINVERT
     VK_F4,          ID_FILE_CLOSE,          VIRTKEY, ALT, NOINVERT
-    "E",            ID_FILE_CREATE_NSF,     VIRTKEY, CONTROL, NOINVERT
+//    "E",            ID_FILE_CREATE_NSF,     VIRTKEY, CONTROL, NOINVERT
     "N",            ID_FILE_NEW,            VIRTKEY, CONTROL, NOINVERT
     "O",            ID_FILE_OPEN,           VIRTKEY, CONTROL, NOINVERT
     "S",            ID_FILE_SAVE,           VIRTKEY, CONTROL, NOINVERT
-    VK_F1,          ID_HELP,                VIRTKEY, NOINVERT
+//    VK_F1,          ID_HELP,                VIRTKEY, NOINVERT
     "K",            ID_KRAID1,              VIRTKEY, SHIFT, CONTROL, NOINVERT
     "R",            ID_KRAID2,              VIRTKEY, SHIFT, CONTROL, NOINVERT
     "A",            ID_KRAID3,              VIRTKEY, SHIFT, CONTROL, NOINVERT

diff --git a/Source/APU/nsfplay/xgm/devices/Sound/nes_dmc.cpp b/Source/APU/nsfplay/xgm/devices/Sound/nes_dmc.cpp
@@ -243,16 +243,16 @@ namespace xgm
         8, 9,10,11,12,13,14,15,
       },
       {
-       15,15,14,14,13,13,12,12,
-       11,11,10,10, 9, 9, 8, 8,
-        7, 7, 6, 6, 5, 5, 4, 4,
-        3, 3, 2, 2, 1, 1, 0, 0,
+       11,11,11,11,10,10,10,10,
+        9, 9, 9, 9, 8, 8, 8, 8,
+        7, 7, 7, 7, 6, 6, 6, 6,
+        5, 5, 5, 5, 4, 4, 4, 4,
       },
       {
-       15,15,15,15,15,15,15,15,
-       15,15,15,15,15,15,15,15,
-        0, 0, 0, 0, 0, 0, 0, 0,
-        0, 0, 0, 0, 0, 0, 0, 0,
+       11,11,11,11,11,11,11,11,
+       11,11,11,11,11,11,11,11,
+        4, 4, 4, 4, 4, 4, 4, 4,
+        4, 4, 4, 4, 4, 4, 4, 4,
       },
       {
         8, 9,10,12,13,14,14,15,

diff --git a/Source/ChannelsDlg.cpp b/Source/ChannelsDlg.cpp
@@ -39,7 +39,7 @@ const int CHILD_ITEMS_ID[ROOT_ITEM_COUNT][9] = {
 
 const TCHAR *CHILD_ITEMS[ROOT_ITEM_COUNT][9] = {
 	// 2A03
-	{_T("Square 1"), _T("Square 2"), _T("Triangle"), _T("Noise"), _T("DPCM")},
+	{_T("Square 1"), _T("Square 2"), _T("Waveform"), _T("Noise"), _T("DPCM")},
 	// VRC 6
 	{_T("Pulse 1"), _T("Pulse 2"), _T("Sawtooth")},
 	// VRC 7

diff --git a/Source/FindDlg.cpp b/Source/FindDlg.cpp
@@ -305,7 +305,7 @@ void CFindResultsBox::SelectItem(int Index)
 	const auto ToChannelIndex = [] (const std::string &_x) {
 		CString x {_x.c_str()};
 		static const CString HEADER_STR[] = {
-			_T("Pulse "), _T("Triangle"), _T("Noise"), _T("DPCM"),
+			_T("Pulse "), _T("Waveform"), _T("Noise"), _T("DPCM"),
 			_T("VRC6 Pulse "), _T("Sawtooth"),
 			_T("MMC5 Pulse "), _T("Namco "), _T("FDS"), _T("FM Channel "), _T("5B Square ")
 		};
@@ -513,7 +513,7 @@ int CFindResultsBox::ChannelCompareFunc(LPARAM lParam1, LPARAM lParam2, LPARAM l
 
 	const auto ToIndex = [] (const CString &x) {
 		static const CString HEADER_STR[] = {
-			_T("Pulse "), _T("Triangle"), _T("Noise"), _T("DPCM"),
+			_T("Pulse "), _T("Waveform"), _T("Noise"), _T("DPCM"),
 			_T("VRC6 Pulse "), _T("Sawtooth"),
 			_T("MMC5 Pulse "), _T("Namco "), _T("FDS"), _T("FM Channel "), _T("5B Square ")
 		};

diff --git a/Source/SeqInstHandler.cpp b/Source/SeqInstHandler.cpp
@@ -174,7 +174,7 @@ bool CSeqInstHandler::ProcessSequence(int Index, unsigned Setting, int Value)
 				switch (scheme) {
 				case 0: break;
 				case 1: lim += Param >> 4;   break;
-				case 2: lim += Param & 0x1F; break;
+				case 2: lim += Param & 0x0F; break;
 				case 3: lim -= Param & 0x0F; break;
 				}
 			}

diff --git a/Source/SoundGen.cpp b/Source/SoundGen.cpp
@@ -192,7 +192,7 @@ void CSoundGen::CreateChannels()
 	AssignChannel(new CTrackerChannel(_T("Pulse 1"), _T("PU1"), SNDCHIP_NONE, CHANID_SQUARE1));
 	AssignChannel(new CTrackerChannel(_T("Pulse 2"), _T("PU2"), SNDCHIP_NONE, CHANID_SQUARE2));
 #endif
-	AssignChannel(new CTrackerChannel(_T("Wave"), _T("WAV"), SNDCHIP_NONE, CHANID_TRIANGLE));
+	AssignChannel(new CTrackerChannel(_T("Waveform"), _T("WAV"), SNDCHIP_NONE, CHANID_TRIANGLE));
 	AssignChannel(new CTrackerChannel(_T("Noise"), _T("NOI"), SNDCHIP_NONE, CHANID_NOISE));
 	AssignChannel(new CTrackerChannel(_T("DPCM"), _T("DMC"), SNDCHIP_NONE, CHANID_DPCM));
 

diff --git a/version.h b/version.h
@@ -35,7 +35,7 @@
 #define VERSION_API  0
 #define VERSION_MAJ  0
 #define VERSION_MIN  1
-#define VERSION_REV  1
+#define VERSION_REV  3
 
 #define VERSION VERSION_API,VERSION_MAJ,VERSION_MIN,VERSION_REV