Don't allocate cc128 if value is same as default.

ltgcgo · Feb 11, 2025 · d064c78 · d064c78
1 parent 64418bd
commit d064c78
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/data/map/xg.10.tsv b/data/map/xg.10.tsv
@@ -545,7 +545,7 @@ OrgnHit+	Organ Hit+
 ChoirSpl	SplitChoir
 UnvrsSwp	UniversSwp
 VaporVox	VaporVoice
-Xe +	Xenon +
+Xe +	Xenon Plus
 VoxShoot	VoiceShoot
 SemiacOr	SemiAcouOr
 Refusal+	Refusal +
@@ -860,10 +860,15 @@ MM-Clsta	MM-Celesta
 MM-Vibe2	MM-Vibra.2
 MM-Vce 4	MM-Voice 4
 DX-SLd 9	DX-SqrLd 9
+Cream Ba	Cream Bass
+WonderBa	WonderBass
+AnalgStr	Analog Str
+PulserLd	PulserLead
 DirtySaw	Dirty Saw
 J.Hammer	JackHammer
 ANCowbel	AN Cowbell
 Radio Nz	RadioNoise
 FreeEdge	Free Edge
+BPF Step	BPF Steps
 Dist.5th	Dist.Fifth
 HardNoiz	Hard Noise
diff --git a/data/map/xg.12.tsv b/data/map/xg.12.tsv
@@ -430,6 +430,7 @@ UnvrsSwp	Universe Swp
 VaporVox	Vapour Voice
 VoxShoot	Voice Shoot
 SemiacOr	SemiAcouOrgn
+Refusal+	Refusal Plus
 DoubtDbl	Double Doubt
 Glocken+	Glocknspiel+
 CutNoiz2	Cut Noise 2
@@ -640,6 +641,9 @@ MM-Clav3	MM-Clavi. 3
 MM-Vibe2	MM-Vibrafn.2
 MM-Vce 4	MM-Voices 4
 DX-SLd 9	DX-SquareLd9
+WonderBa	Wonder Bass
+AnalgStr	AnalogString
+PulserLd	Pulser Lead
 J.Hammer	Jack Hammer
 Radio Nz	Radio Noise
 Dist.5th	Distorted5th
diff --git a/data/map/xg.24.tsv b/data/map/xg.24.tsv
@@ -186,6 +186,9 @@ ChoirStr	Choir Strings
 SynVoix2	Synth Voice 2
 OrchHit2	Orchestra Hit 2
 BrsStb80	Brass Stab 80
+BassHit+	Bass Hit Plus
+6th Hit+	6th Hit Plus
+EuroHit+	Euro Hit Plus
 BriteTrp	Bright Trumpet
 SftDkTrp	Soft Dark Trumpet
 BlownTrp	Blown Trumpet
@@ -233,14 +236,14 @@ Sax Sect	Saxophone Section
 HyprAlto	Hyper Alto Sax
 PwrAltSx	Power Alto Sax
 FakeAlto	Fake Alto Sax
-FakeAlt+	Fake Alto Sax +
+FakeAlt+	Fake Alto Plus
 DFakeAlt	Dark Fake Alto Sax
 AltoSax#	Alto Saxophone #
 BrthTnSx	Breathy Tenor Sax
 SoftTenr	Soft Tenor Sax
 TenrSax2	Tenor Saxophone 2
 SuperTnr	Super Tenor Sax
-SuprTnr+	Super Tenor Sax +
+SuprTnr+	Super Tenor Plus
 SupTnrSt	Super Tenor Stereo
 Tenr&Alt	Tenor & Alto Sax
 BrthTnr2	Breathy Tenor Sax 2
@@ -322,18 +325,21 @@ K/S Hum.	Humid Kick / Snare
 IncntClk	Incontience Click
 K/S Slap	Slap Kick / Snare
 CheapOsc	Cheap Oscillator
+SoftHit+	Soft Hit Plus
 Rvr/Crsh	Reverse / Crash
-CheapOc+	Cheap Oscillator +
+CheapOc+	Cheap Oscillator Plus
 NstyCtSt	Stereo Nasty Cut
 NstOrSpl	Split Nasty Organ
 ChoCalcO	Chorus Calc Organ
+OrgnHit+	Organ Hit Plus
 UnvrsSwp	Universe Sweep
 SemiacOr	Semi Acoustic Organ
-Glocken+	Glockenspiel +
+Glocken+	Glockenspiel Plus
 CutNoise	Cutting Noise
 CutNoiz2	Cutting Noise 2
 DstCutNz	Distorted Cutting Noise
 Fl.KClik	Flute Key Click
+Insects	Insect Chirps
 Scratch2	Scratch Split
 CarTyreS	Car Tyre Squeal
 TechnoHi	Techno Kit High
@@ -545,5 +551,7 @@ MM-Fall	MM-Fall SFX
 MM-Clav3	MM-Clavichord 3
 MM-Vibe2	MM-Vibraphone 2
 DX-SLd 9	DX Square Lead 9
+AnalgStr	Analog Strings
 DirtySaw	Dirty Sawtooth Lead
+BPF Step	Band Passed Steps
 Dist.5th	Distorted Fifth
diff --git a/data/misc/efxId.tsv b/data/misc/efxId.tsv
@@ -351,7 +351,7 @@ MSB	LSB	Name
 56	03	XG 2-way Rot+Amp
 57	00	XG Ensemble Detune
 58	00	XG Ambience
-5d	00	XG Talking Modulator
+5d	00	XG Talking Mod
 5e	00	XG Lo-Fi
 5f	00	XG Delay+Distortion
 5f	01	XG Delay+Overdrive

diff --git a/src/state/index.mjs b/src/state/index.mjs
@@ -6114,9 +6114,11 @@ let OctaviaDevice = class extends CustomEventSource {
 					e && (upThis.setChActive(part, 1));
 					upThis.#cc[chOff + ccToPos[94]] = e;
 				}, () => {
-					e != 127 && (upThis.setChActive(part, 1));
-					upThis.#cc[chOff + ccToPos[128]] = e;
-					upThis.allocateAce(part, 128);
+					upThis.setChCc(part, 128, e);
+					if (e != 127) {
+						upThis.setChActive(part, 1);
+						upThis.allocateAce(part, 128);
+					};
 				}, () => {
 					// note shift, RPN
 				}, () => {