diff --git a/mml2vgm/CHANGE.txt b/mml2vgm/CHANGE.txt index 295277e..3260924 100644 --- a/mml2vgm/CHANGE.txt +++ b/mml2vgm/CHANGE.txt @@ -1,4 +1,10 @@ 更新履歴 +TAG754 2024/12/8 2nd + Core:PartCounter:.gwi:PPコマンド修正。 + Core:OPN系(OPNA2除く):yXXコマンドCh3Ex向け修正。 + 参照パラメータがEXパート同士で共有されません。 + 音色部分適応機能の考慮はしません。(これはCh3Ex以外でも同じ) + TAG753 2024/12/8 Core:PartCounter:.gwi:PPコマンド追加。パートの表示順を指定できます。 diff --git a/mml2vgm/Corex64/chips/clsOPN.cs b/mml2vgm/Corex64/chips/clsOPN.cs index 6fc4e3b..9b85a6b 100644 --- a/mml2vgm/Corex64/chips/clsOPN.cs +++ b/mml2vgm/Corex64/chips/clsOPN.cs @@ -1190,7 +1190,44 @@ public void OutFmSetInstrument(partPage page, MML mml, int n, int vol, char type break; } + + //迴セ蝨ィ縺ョ髻ウ濶イ縺ョ繝代Λ繝。繝シ繧ソ繧定ィ俶カ縺吶k(y繧ウ繝槭Φ繝峨〒蜿らァ縺輔l繧) page.currentInstrument = CopyInstrument(parent.instFM[n]); + if (!(page.chip is YM2609)) + { + if (isDef && (page.ch == 2 || page.ch == m + 3 || page.ch == m + 4 || page.ch == m + 5)) + { + page.chip.lstPartWork[2].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[m + 3].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[m + 4].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[m + 5].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + } + } + else + { + if (page.chip.lstPartWork[2].cpg.Ch3SpecialMode && page.ch >= 12 && page.ch < 15) + { + if (isDef) + { + page.chip.lstPartWork[2].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[12].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[13].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[14].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + } + } + if (page.chip.lstPartWork[8].cpg.Ch3SpecialMode && page.ch >= 15 && page.ch < 18) + { + if (isDef) + { + page.chip.lstPartWork[8].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[15].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[16].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + page.chip.lstPartWork[17].cpg.currentInstrument = CopyInstrument(parent.instFM[n]); + } + } + } + + if (!(page.chip is YM2612X2)) { diff --git a/mml2vgm/mml2vgmIDEx64/MMLParameter/Instrument.cs b/mml2vgm/mml2vgmIDEx64/MMLParameter/Instrument.cs index 773f1ae..22a75ee 100644 --- a/mml2vgm/mml2vgmIDEx64/MMLParameter/Instrument.cs +++ b/mml2vgm/mml2vgmIDEx64/MMLParameter/Instrument.cs @@ -83,7 +83,7 @@ public Instrument(int n, SoundManager.Chip chip, Setting setting,MIDIKbd midiKbd volMode[i] = 0; beforeTie[i] = false; partColor[i] = 1; - partPriority[i] = 100; + partPriority[i] = i; } TraceInfoOld = new outDatum[n]; this.chip = chip; diff --git a/mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs b/mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs index 7f87b78..c745cad 100644 --- a/mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs +++ b/mml2vgm/mml2vgmIDEx64/form/FrmPartCounter.cs @@ -67,7 +67,7 @@ public FrmPartCounter(Setting setting) { InitializeComponent(); this.setting = setting; - comparer=new PartRowComparer(SortOrder.Descending); + comparer=new PartRowComparer(SortOrder.Ascending); dgvPartCounter.BackgroundColor = Color.FromArgb(setting.ColorScheme.PartCounter_BackColor); dgvPartCounter.DefaultCellStyle.BackColor = Color.FromArgb(setting.ColorScheme.PartCounter_BackColor); diff --git a/mml2vgm_MMLCommandMemo.txt b/mml2vgm_MMLCommandMemo.txt index 234a93e..6fda149 100644 --- a/mml2vgm_MMLCommandMemo.txt +++ b/mml2vgm_MMLCommandMemo.txt @@ -1072,8 +1072,8 @@ ___ -oooooooooooooooooooooooooooooooooooooooooooooooooooooo 螻謇 PCn ooooooooooooooooooooooooooooooooooooooooooooooooooooooo 繝代シ繝医き繝ゥ繝シ(0 - 63 def:1)IDE縺ョ繝代シ繝郁牡繧呈欠螳壹☆繧九 0:鮟 1:髱 2:襍、 3:邏ォ 4:邱 5:豌エ 6:鮟 7:逋ス 8:muap鬚ィ蜻ウ濶イ 9-15:譛螟ァ髻ウ驥乗凾縲∬オ、縺ォ縺ェ繧九 16莉・髯63縺セ縺ァ縺ッ郢ー繧願ソ斐@ -PPn ooooooooooooooooooooooooooooooooooooooooooooooooooooooo 繝代シ繝郁。ィ遉コ蜆ェ蜈亥コヲ(0 - 65535 def:100) - partcounter逕サ髱「縺ァ縺ョ陦ィ遉コ鬆繧貞、画峩縺吶k縲ょ、縺悟、ァ縺阪>縺サ縺ゥ荳翫↓陦ィ遉コ縺輔l縺セ縺(驥阪>縺ァ縺) +PPn ooooooooooooooooooooooooooooooooooooooooooooooooooooooo 繝代シ繝郁。ィ遉コ蜆ェ蜈亥コヲ(0 - 65535 def:陦檎分蜿キ(0蟋九∪繧)) + partcounter逕サ髱「縺ァ縺ョ陦ィ遉コ鬆繧貞、画峩縺吶k縲ょ、縺悟ー上&縺縺サ縺ゥ荳翫↓陦ィ遉コ縺輔l縺セ縺(蜃ヲ逅驥阪>縺ァ縺) c -oooooooooooooooooooooooooooooooooooooooooooooooooooooo 髻ウ隨ヲ繝 d -oooooooooooooooooooooooooooooooooooooooooooooooooooooo 髻ウ隨ヲ繝ャ