Immediate notes now show up correctly. #24

ltgcgo · Oct 20, 2023 · 9dd03bb · 9dd03bb
1 parent da79b44
commit 9dd03bb
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 17 deletions.
diff --git a/data/map/gs.10.tsv b/data/map/gs.10.tsv
@@ -327,6 +327,7 @@ CarCrash	Car Crash
 JetPlane	Jet Plane
 Calclate	Calculate
 PercBang	Perc. Bang
+Glas&Glm	Glass&Glam
 AudioSwi	AudioSwtch
 TrainHrn	Train Horn
 TrainPas	Train Pass

diff --git a/data/map/gs.12.tsv b/data/map/gs.12.tsv
@@ -54,7 +54,7 @@ Xylofn.w	Xylophone w
 ChrchBel	Church Bell
 ChchBel2	Church Bell2
 TubBel w	TubularBel w
-FullOrgn	Full Organ
+FullOrgn	Full Organ 1
 FullOrg2	Full Organ 2
 FullOrg3	Full Organ 3
 FullOrg4	Full Organ 4
@@ -245,6 +245,7 @@ MC500 Bp	MC-500 Beep
 CarTyreS	Car Tyre Scr
 Car Pass	Car Passing
 Calclate	Calculating
+Glas&Glm	Glass & Glam
 AudioSwi	Audio Switch
 CarStar2	Car Start 2
 LaughVox	Laugh Voice

diff --git a/data/map/gs.24.tsv b/data/map/gs.24.tsv
@@ -117,7 +117,7 @@ Syn.Str3	Synth Strings 3
 FemChoLa	Female Chorus Lah
 FemChoLu	Female Chorus Luh
 FemChLan	Female Chorus Lan
-F.La&Lan	Female La & Lan
+F.La&Lan	Female Lah & Lan
 MalChoWa	Male Chorus Wah
 SyVoice2	Synth Voice 2
 Trp&Noiz	Trumpet & Noise

diff --git a/data/map/xg.10.tsv b/data/map/xg.10.tsv
@@ -119,6 +119,7 @@ PowerGtr	Power Gtr.
 Dst.5ths	Dist. 5ths
 FeedbkGt	FeedbackGt
 FeedbkG2	FeedbackG2
+TwinDist	TwinDistGt
 RckRthm2	RockRthm 2
 RockRthm	RockRhythm
 Dist.Gt#	Dist. Gt.#
@@ -363,6 +364,7 @@ PulseSaw	Pulse Saw
 Dr. Lead	DoctorLead
 VeloLead	Velo. Lead
 SimplSaw	Simple Saw
+SeqAnal.	Seq.Analog
 NoviceLd	NoviceLead
 VentSyn.	Vent Synth
 PureLead	Pure Lead
@@ -546,6 +548,8 @@ Std&Perc	LvStd&Perc
 FunkPerc	LvFunkPerc
 Brush&P.	LvBrush&P.
 RockKit3	Rock Kit 3
+LiveRm A	LiveRoom A
+LiveRm B	LiveRoom B
 BobPiano	Bob Piano
 PnoStPad	PianoStPad
 StRichSt	StRichSt
@@ -567,6 +571,4 @@ MM-Vibe2	MM-Vibra.2
 MM-Vce 4	MM-Voice 4
 DX-SLd 9	DX-SqrLd 9
 DirtySaw	Dirty Saw
-ANCowbel	AN Cowbell
-LiveRm A	LiveRoom A
-LiveRm B	LiveRoom B
+ANCowbel	AN Cowbell
diff --git a/data/map/xg.12.tsv b/data/map/xg.12.tsv
@@ -107,6 +107,7 @@ PowerGtr	Power Gtr.
 Dst.5ths	Dist. Fifths
 FeedbkGt	Feedback Gt.
 FeedbkG2	Feedback Gt2
+TwinDist	Twin Dist.Gt
 RckRthm2	RockRhythm 2
 RockRthm	Rock Rhythm
 Dist.Gt#	Dist. Gtt. #
@@ -310,6 +311,7 @@ PulseSaw	Pulse Saw Ld
 Dr. Lead	Doctor Lead
 VeloLead	VelocityLead
 SimplSaw	Simple Saw.
+SeqAnal.	Seq. Analog
 NoviceLd	Novice Lead
 ElecPrim	ElecPrimtive
 DistLead	Distort.Lead
@@ -412,6 +414,8 @@ Lv Brush	LiveBrushKit
 Std&Perc	LiveStd&Perc
 FunkPerc	LvFunkPercKt
 Brush&P.	LvBrush&Perc
+LiveRm A	Live! Room A
+LiveRm B	Live! Room B
 PnoStPad	Piano St.Pad
 StRichSt	StageRichSt.
 Hnkytnk1	Honkytonk 1
@@ -425,6 +429,4 @@ Det.EP 8	Detuned EP 8
 MM-Clav3	MM-Clavi. 3
 MM-Vibe2	MM-Vibrafn.2
 MM-Vce 4	MM-Voices 4
-DX-SLd 9	DX-SquareLd9
-LiveRm A	Live! Room A
-LiveRm B	Live! Room B
+DX-SLd 9	DX-SquareLd9
diff --git a/data/map/xg.24.tsv b/data/map/xg.24.tsv
@@ -85,6 +85,7 @@ PowerGtr	Power Guitar
 Dst.5ths	Distorted Fifths
 FeedbkGt	Feedback Guitar
 FeedbkG2	Feedback Guitar 2
+TwinDist	Twin Distortion Guitar
 RckRthm2	Rock Rhythm 2
 Dist.Gt#	Distortion Guitar #
 GtFeedbk	Guitar Feedback
@@ -239,6 +240,7 @@ Dim Saw	Dim Sawtooth Lead
 PulseSaw	Pulse Sawtooth Ld
 VeloLead	Velocity Lead
 SimplSaw	Simple Sawtooth
+SeqAnal.	Sequenced Analog Lead
 ElecPrim	Electric Primtive
 DistLead	Distortion Lead
 DaSyncLd	The Sync Lead
@@ -300,6 +302,8 @@ Lv Brush	Live! Brush Kit
 Std&Perc	Live! Standard+Perc Kit
 FunkPerc	Live! Funk + Perc Kit
 Brush&P.	Live! Brush + Perc Kit
+LiveRm A	Live! Room Kit A
+LiveRm B	Live! Room Kit B
 PnoStPad	Piano Stereo Pad
 StRichSt	Stage Rich Piano Stereo
 60's EP	60s' Electric Piano
@@ -312,6 +316,4 @@ MM-Fall	MM Fall
 MM-Clav3	MM Clavichord 3
 MM-Vibe2	MM Vibraphone 2
 DX-SLd 9	DX Square Lead 9
-DirtySaw	Dirty Sawtooth Lead
-LiveRm A	Live! Room Kit A
-LiveRm B	Live! Room Kit B
+DirtySaw	Dirty Sawtooth Lead
diff --git a/data/misc/efxId.tsv b/data/misc/efxId.tsv
@@ -47,20 +47,20 @@ MSB	LSB	Name
 21	22	GS Rotary
 21	23	GS Stereo Flanger
 21	24	GS Step Flanger
-21	25	GS Tremelo
+21	25	GS Tremolo
 21	26	GS Auto Pan
 21	30	GS Compressor
 21	31	GS Limiter
 21	40	GS Hexa Chorus
-21	41	GS Tremelo Chorus
+21	41	GS Tremolo Chorus
 21	42	GS Stereo Chorus
 21	43	GS Space Delay
 21	44	GS 3D Chorus
 21	50	GS Stereo Delay
 21	51	GS Mod Delay
 21	52	GS 3-tap Delay
 21	53	GS 4-tap Delay
-21	54	GS Tremelo C Delay
+21	54	GS Tremolo C Delay
 21	55	GS Reverb
 21	56	GS Gate
 21	57	GS 3D Delay
@@ -154,7 +154,7 @@ MSB	LSB	Name
 2c	21	AI Phaser 2
 2c	22	AI Rotary
 2c	23	AI Auto Pan
-2c	24	AI Tremelo
+2c	24	AI Tremolo
 2c	25	AI 3-band EQ
 2c	26	AI Chorus+Delay
 2c	27	AI Flanger+Delay
@@ -198,7 +198,7 @@ MSB	LSB	Name
 45	01	XG Distort+Rotary
 45	02	XG Overdrive+Rotary
 45	03	XG Amp Sim+Rotary
-46	00	XG Tremelo
+46	00	XG Tremolo
 47	00	XG Auto Pan
 48	00	XG Phaser 1
 48	08	XG Phaser 2

diff --git a/src/cambiare/index.mjs b/src/cambiare/index.mjs
@@ -372,6 +372,7 @@ let Cambiare = class extends RootDisplay {
 			} = e;
 			let noteId = part << 7 | note;
 			channels[part] = true;
+			//console.debug(part);
 			if (state == 0) {
 				if (onNotes.has(noteId)) {
 					offNotes.add(noteId);
@@ -387,8 +388,9 @@ let Cambiare = class extends RootDisplay {
 		// Draw every note inside extraStates
 		offNotes.forEach((key) => {
 			let {part, note, velo, state} = extraStates[key];
-			let context = upThis.#sectPart[part >> 7][part & 15].cxt;
+			let context = upThis.#sectPart[part >> 4][part & 15].cxt;
 			upThis.#drawNote(context, note, velo, state, upThis.device.getPitchShift(part));
+			//console.debug(part, note);
 		});
 		// Write to the new pixel display buffers
 		let ccxt = upThis.#sectPix.cxt;