Fixed LSB bank selection bank 0 override.

ltgcgo · May 15, 2024 · 8ef6620 · 8ef6620
1 parent 622f45e
commit 8ef6620
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/data/bitmaps/sc/voices.tsv b/data/bitmaps/sc/voices.tsv
@@ -81,12 +81,12 @@ Whistle	002800200000000000000000000000000000000000000000000000000000000000000000
 Ocarina	002800200000003f80000000c040000007004000000800800000300080000040010000008042000003000400000c20080000100c100000200c20000040002000008c002000030c0040000400c080000800c100001030010000103001000020001200004000040000418008000081801000008000200000800020000084001000008000100000800008000040fe0800003f011000000000e0000000000000000000000000
 SquareLd	002800200000000000000000000000fc3f0fc0008421084000842108400084210840008421084000842108401f87e1f87c0000000000ffffffffff9ffffffd57afffffffff9fc98bf76fafffdb236fffffdbf62fffaadbf747ffffd1f76ffffffffffffffffe03ffffac920355ffffffffffb6fc9223ffe97fffffffb6d4a94a95ffd4a94a95dfd4a94a958ad4a94a95dfd4a94a95ffc0000001c0c00000017ffffffffe
 Saw Lead	0028002000000000000000000000001800c006006803401a01880c406206083041821808c04602600b005802000c0060020000000000ffffffffff9ffffffd57afffffffff9fc98bf76fafffdb236fffffdbf62fffaadbf747ffffd1f76ffffffffffffffffe03ffffac920355ffffffffffb6fc9223ffe97fffffffb6d4a94a95ffd4a94a95dfd4a94a958ad4a94a95dfd4a94a95ffc0000001c0c00000017ffffffffe
-CaliopLd	002800200000000000000000000000000000000000000000000000000000000000000000000000ffffffffff9ffffffd57afffffffff9fc98bf76fafffdb236fffffdbf62fffaadbf747ffffd1f76ffffffffffffffffe03ffffac920355ffffffffffb6fc9223ffe97fffffffb6d4a94a95ffd4a94a95dfd4a94a958ad4a94a95dfd4a94a95ffc0000001c0c00000017ffffffffe000000000000000000000000000000
-Chiff Ld	@CaliopLd
-CharanLd	@CaliopLd
-Voice Ld	@CaliopLd
-Fifth Ld	@CaliopLd
-Bass&Ld	@CaliopLd
+CaliopLd	00280020000000000000000004100000811f7c0823e7d1443efa245144228a245144228a245144228a245144228a2451440000000000ffffffffff9ffffffd57afffffffff9fc98bf76fafffdb236fffffdbf62fffaadbf747ffffd1f76ffffffffffffffffe03ffffac920355ffffffffffb6fc9223ffe97fffffffb6d4a94a95ffd4a94a95dfd4a94a958ad4a94a95dfd4a94a95ffc0000001c0c00000017ffffffffe
+Chiff Ld	002800200000000000000000000000000000000000000000000000000000000000000000000000ffffffffff9ffffffd57afffffffff9fc98bf76fafffdb236fffffdbf62fffaadbf747ffffd1f76ffffffffffffffffe03ffffac920355ffffffffffb6fc9223ffe97fffffffb6d4a94a95ffd4a94a95dfd4a94a958ad4a94a95dfd4a94a95ffc0000001c0c00000017ffffffffe000000000000000000000000000000
+CharanLd	@Chiff Ld
+Voice Ld	@Chiff Ld
+Fifth Ld	@Chiff Ld
+Bass&Ld	@Chiff Ld
 NewAgePd	002800200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007fffffffff7fffffffff70fe003aab76ca003fd776fffffaab70ca493fd77ffffffaab76caaabfff7fffffffff7ca94a94a97ca94a94a97ca94a94a97ca94a94a96ca94a94a944000000016c000000017fffffffff000000000000000000000000000000000000000000000000000000000000
 Warm Pad	@NewAgePd
 PolySyPd	@NewAgePd

diff --git a/src/basic/index.mjs b/src/basic/index.mjs
@@ -224,7 +224,7 @@ let RootDisplay = class extends CustomEventSource {
 						case 97:
 						case 99:
 						case 100: {
-							result = upThis.voxBm.getBm(upThis.getVoice(0, voiceObject.sid[1], overrides.bank0, voiceObject.mode).name);
+							result = upThis.voxBm.getBm(upThis.getVoice(overrides.bank0, voiceObject.sid[1], overrides.bank0, voiceObject.mode).name);
 							break;
 						};
 					};
@@ -237,21 +237,23 @@ let RootDisplay = class extends CustomEventSource {
 						case 97:
 						case 98:
 						case 99: {
-							result = upThis.voxBm.getBm(upThis.getVoice(0, voiceObject.sid[1], 0, voiceObject.mode).name);
+							result = upThis.voxBm.getBm(upThis.getVoice(overrides.bank0, voiceObject.sid[1], overrides.bank0, voiceObject.mode).name);
 							break;
 						};
 						case 104:
 						case 105:
 						case 106:
 						case 107: {
-							result = upThis.voxBm.getBm(upThis.getVoice(120, voiceObject.sid[1], 0, voiceObject.mode).name);
+							result = upThis.voxBm.getBm(upThis.getVoice(120, voiceObject.sid[1], overrides.bank0, voiceObject.mode).name);
 							break;
 						};
 					};
 					break;
 				};
 				case "gs":
 				case "sc":
+				case "k11":
+				case "sg":
 				case "gm": {
 					switch (voiceObject.sid[0]) {
 						case 120: {

diff --git a/src/state/index.mjs b/src/state/index.mjs
@@ -1458,6 +1458,9 @@ let OctaviaDevice = class extends CustomEventSource {
 		if (msb == overrides.bank0) {
 			msb = 0;
 		};
+		if (lsb == overrides.bank0) {
+			lsb = 0;
+		};
 		if (mode == "ns5r") {
 			if (msb > 0 && msb < 56) {
 				lsb = 3; // Use SC-88 Pro map