From 2576bd7be37317e6c8cc571067138a1a48996780 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lumi=C3=A8re=20=C3=89lev=C3=A9?= <88174309+PoneyClairDeLune@users.noreply.github.com> Date: Tue, 9 Jul 2024 15:35:21 +0000 Subject: [PATCH] Data sync. --- data/bank/s90es.tsv | 2 +- data/map/s90es.10.tsv | 2 +- data/map/s90es.12.tsv | 212 +++++++++++++++++++++++++++++++++++++++++- data/map/s90es.24.tsv | 165 +++++++++++++++++++++++++++++++- data/map/xg.24.tsv | 2 +- src/state/index.mjs | 3 +- 6 files changed, 380 insertions(+), 6 deletions(-) diff --git a/data/bank/s90es.tsv b/data/bank/s90es.tsv index 6db2ccc..d996cfd 100644 --- a/data/bank/s90es.tsv +++ b/data/bank/s90es.tsv @@ -883,7 +883,7 @@ MSB LSB PRG NME 063 029 079 Beater 063 029 093 GnarlyBa 063 029 116 MegaFrtl -063 030 016 PizzSect +063 030 016 Hophead 063 030 027 BeautyHp 063 030 052 SlwSuckr 063 030 063 Trombone diff --git a/data/map/s90es.10.tsv b/data/map/s90es.10.tsv index 9803958..7be8e53 100644 --- a/data/map/s90es.10.tsv +++ b/data/map/s90es.10.tsv @@ -215,7 +215,7 @@ Pizz.Ens Pizz. Ens. PizzSect Pizz. Sect Oct.Pizz OctavePizz Orch.Pl OrchstrlPl -VeloFall Velo Fall +VeloFall Velo Falls SoprnoSx SopranoSax SprnoSft SopranoSft Alto Vib Alto Vib. diff --git a/data/map/s90es.12.tsv b/data/map/s90es.12.tsv index 1ba2ded..cde4fe5 100644 --- a/data/map/s90es.12.tsv +++ b/data/map/s90es.12.tsv @@ -1,12 +1,211 @@ ID Name NaturalS Natural S700 +Dave's B Dave's B Org +YamaEP's Yamaha EPnos +Vintg'74 Vintage'74EP +Greasy Greasy Organ ElegantS Elegant S700 Bright S Bright S700 +Intimate IntimateS700 FulGrand FullGrandPno +Ragtime RagtimeHonky HousePno House Piano +78rpmPno 78rpm Piano BaladKey Ballad Keys +80sLayer 80's Layered +BladStak Ballad Stack +Pno&Str Piano & Strs +Pno&Ooh Piano & Oohs +Digi.Grd Digi. Grand +CP80&EP CP80 & E. Pno +DynoStrt DynoStraight +ChrsDyno ChorusedDyno +ChrsHard ChorusedHard +80th Bst 80th BoostEP +R&B Soft Soft R&B Pno +HrdVintg Hard Vintage +PhaseVin Phaser Vintg +SoftCase Soft Case EP +Early70s Early 70'sEP Sweetnes Sweetness EP +VintgFas Phased Vintg +EarlyFsn Early Fusion +VintgCas CasedVintage +Contempo Contempo EP +E.PnoPad E. Piano Pad +BelChors Bell Chorus +FM E.Pno FM E. Piano +BalladEP Ballad E. Pf +SparkTne Sparkle Tine +Anal.Pno Analog Piano +Anal.EP Analog E. Pf +WurlTrem Trem. Wurli +WurliAmp Amped Wurli +VintgClv Vintage Clav +SuperClv Super Clavi. +St.Clavi StereoClavi. +HollwClv HollowClavi. +NuPhasin NewPhasinClv +PulseClv Pulse Clavi. +TouchClv Touch Clavi. +Marimbl1 Marimbell 1 +Marimbl2 Marimbell 2 +Tibetan Tibetan Bell +VbrBowMW BowedVibr.MW +BazrBels Bazaar Bells +MstcBowl Mystic Bowl +Twinkle Twinkle Bell +StickBel Stick Bells +ChorsBel Chorus Bells +StackBel Stack Bells +BelChiff Bell Chiffon +NoisyBel Noisy Bells +J-Pop J-Pop Bells +SynStlDr SynSteelDrum +WoodBell Wooden Bells +IslndBel Island Bells +Log&Drum Log & Drums +TmpBlGlk Tmp/Bl/Glock +VelOrPrc VeloPercOrgn +PetitOrg Petit Organ +Imprompt ImpromptuOrg +MixtureO Mixture Org. +St. Paul St. Paul Org +FlutyPpe Flutey Pipes +St.Peter St. Peter Or +TradiOrg Tradi. Organ +SundayOr Sunday Organ +BrthPipe Breathy Pipe +Medieval Medieval Org +PreludeO Prelude Orgn +AmpedOrg Amped Organ +VintageC Vintage C.Or +2nd Perc 2ndPercOrgan +1685&13 16+8+5 & 1/3 +JazzyOr1 Jazzy Organ1 +JazzyOr2 Jazzy Organ2 +SwishieO Swishie Org. +MellowPp Mellow Pipes +Nu Shade NewShadeOrgn +Cool Cat Cool Cat Org +FluteyOr Flutey Organ +LeftMnl. LeftManualOr +DrawCtrl DrawbarCntrl +GospSplt GosplSplitOr +SoulemnO SoulemnOrgan +FullyOrg Fully Organ +Progress ProgressyOrg +CrunchyO Crunchy Org. +RockyOrg Rocky Organ +DistFull DistFullOrgn +EarlyBrd EarlyBirdOrg +AnaDrwOr AnalgDrawbar +PaddyOrg Paddy Organ +MellowOr Mellow Organ +RezDrwOr RezDrawOrgan +PantherO Panther Org. +SawCombo SawComboOrg. +CompactO CompactOrgan +Espa.Gtr Spanish Gtr. +Nyln+Hrm Nylon+Harm. +SimpStlG SimplSteelGt +StlCmprG SteelCmprsGt +MuteSliG Mute&SlideGt +Ac&HrmGt Acou&HarmGtr +StlSwtch SteelSwtchGt +MegaStlG MegaSteelGtr +Mega12St Mega12StrGtr +JazzyPik JazzyPickGtr +JazGtMel JazzGtr.Melo +VeloJazz VeloJazzGtr. +2CoilAm1 2CoilAmpGtr1 +2CoilAm2 2CoilAmpGtr2 +DistantG Distant Gtr. +AltRockr AltRockerGt. +RotatrGt Rotater Gtr. +Baby Gtr Baby Guitar +MegaClnG MegaCleanGtr +OvrDrivn OverDrivenGt +Dyna.Amp DynamicAmpGt +DriveGtr Drive Guitar +SnekFngr Snake Finger +Feedbker FeedbackerGt +KilrWhmy KillerWhammy +Vuduman Voodooman Gt +CrunchyG Crunchy Gtr. +SmallAmp SmallAmpGtr. +LatnLuvr LatinLoverGt +StillBlu StillBlueGtr +59 Combo 59 Combo Gtr +OvrDaTop Over The Top +Beater Beater Gtr. +MegaAcBs MegaAcouBass +FngrPkBs FingrPikBass +PrecFW Prec FW Bass +RndWound RoundWoundBs +ActivePk ActivePickBs +GnarlyBa Gnarly Bass +PkBsFgDs PikBsFngrDst +MegaFgHm MegaFingrHrm +SlpSwtch SlapSwitchBs +MegaFngr MegaFingerBs +MegaSlap MegaSlapBass +PickOpen OpenPickBass +PickPull PullPickBass +PkMuteDr MutedDryPick +NewPikBs NewPickedBas +MegaPkBs MegaPickedBs +FrtlsDry Fretless Dry +FrtlSolo FretlessSolo +MegaFrtl Mega Fretles +SoloStr1 Solo Str. 1 +SoloStr2 Solo Str. 2 +SolSpict SoloSpiccato +2SoloStr 2 Solo Str. +CelloEns CelloEnsembl +ViolaEns ViolaEnsembl +ViolnEns ViolnEnsembl +CtrbSect Contra.Sect. +SmolSec1 Small Sect 1 +SmolSec2 Small Sect 2 +MediumEn MediumStrEns +SpicLine Spicca.Lines +BkGround BackGrndStr. +Hophead Hophead Str. +Hole Str Hole Strings +Velo Str Velo Strings +Big Strs Big Strings +BeautyHp Beauty Harp +Ste.Harp Stereo Harp +Pizz.Ens PizzEnsemble +PizzSect Pizz.Section +Oct.Pizz Octave Pizz. +Orch.Pl OrchstralPlk +VeloFall Velo Fall Br +SoprnoSx Soprano Sax +SprnoSft Soft Soprano +Alto Vib Vibrato Alto +VeloAlto Velo Alto Sx +TenrSoft SoftTenorSax +Hip Bari Hip Baritone +SmthOboe Smooth Oboe +DblRdQrt DblReedQuart +C Flute ConcertFlute +SwtFlute Sweet Flute +BluzDist Bluz Distort +Campfire CampfireHrmo +TootsHrp Tootsy Harmo +WoodyHrp Woody Harmo. +NomadGtr Nomad Guitar ChrchOoh Church Oohs +Paradies Paradies Pad +SmthBlue SmoothBluePd +FrozenVx Frozen Voice +Soft RnB Soft RnBLead +SimpleBa Simple Bass +Fat Sine Fat Sine Bas +OneVoice OneVoiceBass +Fundmntl Fundamental PWM Perc PWM Percuss. HyperStd HyperStandKt DryStdKt DryStndrdKit @@ -53,9 +252,20 @@ BlyDance BellyDanceKt DanceSnr Dance Snares Spec.SFX Special SFX SynthSFX SyntheticSFX +SlwSuckr SlowSuckrStr +BigBrtBr BigBrightBrs BackPdMW Back Pad MW +RezAtkLd RezAttakLead +Dark Uni DarkUni.Bass +Mini Sub Mini SubBass SinglOsc Single Osci. Wave Pan Wave Panner +TrncHook TranceHookLd +MaydayLd Mayday Lead TrncMelo Trance Melod TranceBa Trance Bass -PolyTrnc Poly Trance \ No newline at end of file +DeepPtBa DeepPointBas +AmbiBite Ambient Bite +ShneChrd Shine Chords +PolyTrnc Poly Trance +ChordzLd Chordz Lead \ No newline at end of file diff --git a/data/map/s90es.24.tsv b/data/map/s90es.24.tsv index bc424ac..ebd281f 100644 --- a/data/map/s90es.24.tsv +++ b/data/map/s90es.24.tsv @@ -1,6 +1,161 @@ ID Name +Dave's B Dave's B Organ +YamaEP's Yamaha E. Pianos +Vintg'74 Vintage '74 EP +Intimate Intimate S700 FulGrand Full Grand Piano +Ragtime Ragtime Honkytonk +80sLayer 80's Layered EP +BladStak Ballad Stack EP +Pno&Str Piano & Strings +Digi.Grd Digital Grand +CP80&EP CP80 & E. Piano +DynoStrt Straight Dyno EP +ChrsDyno Chorused Dyno EP +ChrsHard Chorused Hard EP +80th Bst 80th Boost EP +R&B Soft Soft R&B Piano +HrdVintg Hard Vintage EP +PhaseVin Phaser Vintage EP +Early70s Early 70's EP Sweetnes Sweetness E. Piano +VintgFas Phased Vintage EP +EarlyFsn Early Fusion EP +VintgCas Cased Vintage EP +Contempo Contemporary EP +BalladEP Ballad E. Piano +SparkTne Sparkling Tines +Anal.EP Analog E. Piano +WurlTrem Tremolo Wurli EP +WurliAmp Amped Wurli EP +VintgClv Vintage Clavichord +SuperClv Super Clavichord +St.Clavi Stereo Clavichord +HollwClv Hollow Clavichord +NuPhasin New Phasing Clavichord +PulseClv Pulse Clavichord +TouchClv Touch Clavichord +Tibetan Tibetan Bells +VbrBowMW Bowed Vibraphone MW +Twinkle Twinkle Bells +ChorsBel Chorused Bells +SynStlDr Synth Steel Drum +TmpBlGlk Timpani / Bell / Glocken +VelOrPrc Velo Percussion Organ +Imprompt Impromptu Organ +MixtureO Mixture Organ +St. Paul St. Paul Organ +St.Peter St. Peter Organ +TradiOrg Traditional Organ +BrthPipe Breathy Pipes +Medieval Medieval Organ +PreludeO Prelude Organ +VintageC Vintage Church Organ +2nd Perc 2nd Percussion Organ +1685&13 16+8+5 & 1/3 +JazzyOr1 Jazzy Organ 1 +JazzyOr2 Jazzy Organ 2 +SwishieO Swishie Organ +Nu Shade New Shade Organ +Cool Cat Cool Cat Organ +LeftMnl. Left Manual Organ +DrawCtrl Drawbar Control Organ +GospSplt Split Gospel Organ +SoulemnO Soulemn Organ +Progress Progressy Organ +CrunchyO Crunchy Organ +DistFull Distorted Full Organ +EarlyBrd Early Bird Organ +AnaDrwOr Analog Drawbar Organ +RezDrwOr Resonant Drawbar Organ +PantherO Panther Organ +SawCombo Sawtooth Combo Organ +CompactO Compact Organ +Espa.Gtr Spanish Guitar +Nyln+Hrm Nylon Guitar + Harmonics +SimpStlG Simple Steel Guitar +StlCmprG Steel Compression Guitar +MuteSliG Muted & Slide Guitar +Ac&HrmGt Acoustic & Harmonics Gt. +StlSwtch Steel Switch Guitar +MegaStlG Mega Steel Guitar +Mega12St Mega 12-String Guitar +JazzyPik Picked Jazzy Guitar +JazGtMel Mellow Jazzy Guitar +VeloJazz Velo Jazz Guitar +2CoilAm1 2-Coil Amped Guitar 1 +2CoilAm2 2-Coil Amped Guitar 2 +DistantG Distant Guitar +AltRockr Alt Rocker Guitar +RotatrGt Rotater Guitar +MegaClnG Mega Clean Guitar +OvrDrivn Over Driven Guitar +Dyna.Amp Dynamic Amped Guitar +SnekFngr Snake Finger Guitar +Feedbker Feedbacker Guitar +KilrWhmy Killer Whammy Guitar +Vuduman Voodooman Guitar +CrunchyG Crunchy Guitar +SmallAmp Small Amped Guitar +LatnLuvr Latin Lover Guitar +StillBlu Still Blue Guitar +59 Combo 59 Combo Guitar +OvrDaTop Over The Top Guitar +Beater Beater Guitar +MegaAcBs Mega Acoustic Bass +FngrPkBs Fingered Picked Bass +RndWound Round Wound Bass +ActivePk Active Picked Bs +PkBsFgDs Picked Bass Finger Dist. +MegaFgHm Mega Fingered Harmonics +SlpSwtch Slap Switch Bass +MegaFngr Mega Fingered Bass +MegaSlap Mega Slap Bass +PickOpen Open Picked Bass +PickPull Pull Picked Bass +PkMuteDr Muted Dry Picked Bass +NewPikBs New Picked Bass +MegaPkBs Mega Picked Bass +FrtlsDry Dry Fretless Bass +FrtlSolo Solo Fretless Bass +MegaFrtl Mega Fretless Bass +SoloStr1 Solo Strings 1 +SoloStr2 Solo Strings 2 +SolSpict Solo Spiccato Strings +2SoloStr 2 Solo Strings +CelloEns Cello Ensemble +ViolaEns Viola Ensemble +ViolnEns Violin Ensemble +CtrbSect Contrabass Section +SmolSec1 Small String Section 1 +SmolSec2 Small String Section 2 +MediumEn Medium String Ensemble +SpicLine Spiccato Lines +BkGround Back Ground Strings +Hophead Hophead Strings +Pizz.Ens Pizzicato Ensemble +PizzSect Pizzicato Section +Oct.Pizz Octave Pizzicato +Orch.Pl Orchstral Plucks +VeloFall Velo Fall Brass +SprnoSft Soft Soprano Sax +Alto Vib Vibrato Alto Sax +VeloAlto Velo Alto Sax +TenrSoft Soft Tenor Sax +Hip Bari Hip Baritone Sax +DblRdQrt Double Reed Quarter +C Flute Concert Flute +BluzDist Bluz Distortion +Campfire Campfire Harmonica +TootsHrp Tootsy Harmonica +WoodyHrp Woody Harmonica +NomadGtr Nomadic Guitar +SmthBlue Smooth Blue Pad +FrozenVx Frozen Voices +Whisperr Whisperer Pad +Soft RnB Soft RnB Lead +OneVoice One Voice Bass +Fundmntl Fundamental Bass PWM Perc PWM Percussion HyperStd Hyper Standard Kit DryStdKt Dry Standard Kit @@ -35,6 +190,14 @@ SynPopKt Synth Pop Kit ArabMxKt Arabic Mix Kit BlyDance Belly Dance Kit SynthSFX Synthetic SFX Kit +SlwSuckr Slow Sucker Strings +BigBrtBr Big Bright Brass +RezAtkLd Resonant Attack Lead +Dark Uni Dark Universe Bass +Mini Sub Mini Sub Bass SinglOsc Single Oscillator +TrncHook Trance Hook Lead TrncMelo Trance Melody -PolyTrnc Poly Trance Lead \ No newline at end of file +DeepPtBa Deep Point Bass +PolyTrnc Poly Trance Lead +ChordzLd Chordz Lead \ No newline at end of file diff --git a/data/map/xg.24.tsv b/data/map/xg.24.tsv index 2ed0448..ed2b038 100644 --- a/data/map/xg.24.tsv +++ b/data/map/xg.24.tsv @@ -60,7 +60,7 @@ VelGtHrm Velo Guitar Harmonics DecayEsG Decay Spanish Guitar NylonGt# Nylon Guitar # SteelGt2 Steel Guitar 2 -12StrGtr 12-string Guitar +12StrGtr 12-String Guitar Nyln&Stl Nylon & Steel Guitar Stl&Body Steel Guitar & Body Nashvill Nashville Guitar diff --git a/src/state/index.mjs b/src/state/index.mjs index 904391d..f4b4124 100644 --- a/src/state/index.mjs +++ b/src/state/index.mjs @@ -161,7 +161,8 @@ ccAccepted = [ 12, 13, // General-purpose effect controllers 16, 17, 18, 19, // General-purpose sound controllers 14, 15, 20, 21, 26, 28, // For some reason, used by PLG-VL - 80, 81, 83, // Used by KORG KROSS 2 + 22, // S90 ES and Motif ES + 80, 81, 82, 83, // Used by KORG KROSS 2 129, // PLG-VL part breath strength 130, 131, 132, 133, 134, 135, 136, 137, 138, 139, 140, 141, // PLG-VL part controls 142, 143, 144, 145, 146, 147, 148, 149, // PLG-DX carrier level