Skip to content

Commit 085afe1

Browse files
author
kumatan
committed
TAG711 2023/11/26
 重要!!->Core:OPNA/OPNB/OPNA2:ADPCMの基準音程変更 mucom基準からの修正になります。 例えばo4Aであれば444Hz(mucom基準)から440Hzへ変更になります。 (gwiのみです。) PartCounter:OPNA2:ADPCMの表記の揺れを修正。 音程可変ADPCMを　"ADPCM-A"、 音程固定ADPCMを　"ADPCM-B"に。 (YM2610とは逆になります) YM2609.txtも修正
1 parent 2421c64 commit 085afe1

File tree

8 files changed

+54
-17
lines changed

8 files changed

+54
-17
lines changed

‎YM2609.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ Virtual Instrument YM2609(Register Map)
33

44
Port 0 Port 1 Port 2 Port 3
55
__________________ __________________ __________________ __________________
6-
$00 | SSG1 | $00 | ADPCM1 | $00 | SSG3 | $00 | ADPCM2 |
6+
$00 | SSG1 | $00 | ADPCM-A1 | $00 | SSG3 | $00 | ADPCM-A2 |
77
| | | | | | | |
88
$0F |__________________| $10 |__________________| $0F |__________________| $10 |__________________|
9-
$10 | Rhythm | $11 | ADPCM-A | $10 | SSG4 | $11 | ADPCM3 |
9+
$10 | Rhythm | $11 | ADPCM-B | $10 | SSG4 | $11 | ADPCM-A3 |
1010
| | | | | | | |
1111
$1F |__________________| $17 |__________________| $1F |__________________| $21 |__________________|
1212
$20 | FM | $20 | SSG2 | $20 | FM | $22 |Sys:Rev.Dep |
@@ -83,7 +83,7 @@ Virtual Instrument YM2609(Register Map)
8383
Wave Data : 0 ~ 15 (Write 64 times)
8484

8585

86-
ADPCM1:1.$00 ADPCM2:3.$00 ADPCM3:3.$11
86+
ADPCM-A1:1.$00 ADPCM-A2:3.$00 ADPCM-A3:3.$11
8787
ADDRESS REGISTER
8888
____ ____________________
8989
| |
@@ -139,8 +139,8 @@ Virtual Instrument YM2609(Register Map)
139139
____ |____________________|
140140

141141
Extend Memory Capacity
142-
ADPCM1:256Kbyte
143-
ADPCM2,3:16Mbyte
142+
ADPCM-A1 :256Kbyte
143+
ADPCM-A2,3:16Mbyte
144144

145145
Write Data (FM)
146146
ADDR. D7 D6 D5 D4 D3 D2 D1 D0 COMMENT
@@ -539,7 +539,7 @@ Virtual Instrument YM2609(Register Map)
539539
Ch.Ins.Effect Sys.Effect
540540
____________ ____________ ____________ ____________ ____________ ____________ ____________
541541
| | | | | | | Ch.Ins. | | | | 3 band EQ | | Sys. |
542-
| Distorsion | --> | Chorus | --> | LPF > HPF | --> | Compressor | -+-> | Reverb | --> | l > m > h | --> | Compressor |
542+
| Distortion | --> | Chorus | --> | LPF > HPF | --> | Compressor | -+-> | Reverb | --> | l > m > h | --> | Compressor |
543543
|____________| |____________| |____________| |____________| | |____________| |____________| |____________|
544544
.
545545
. other Ch.Ins.Effect

‎mml2vgm/CHANGE.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
�X�V����
2+
TAG711 2023/11/26
3+
�d�v!!->Core:OPNA/OPNB/OPNA2:ADPCM�̊�����ύX
4+
mucom�����̏C���ɂȂ�܂��B
5+
�Ⴆ��o4A�ł����444Hz(mucom�)����440Hz�֕ύX�ɂȂ�܂��B
6+
(gwi�݂̂ł��B)
7+
PartCounter:OPNA2:ADPCM�̕\�L�̗h����C���B
8+
�����•�ADPCM���@"ADPCM-A"�A
9+
�����Œ�ADPCM���@"ADPCM-B"�ɁB
10+
(YM2610�Ƃ͋t�ɂȂ�܂�)
11+
YM2609.txt���C��
12+
13+
214
TAG710 2023/11/25
315
Core:OPNA2:���Y�������p�[�g�ł�@ �R�}���h�𖳎�����悤�C��
416

‎mml2vgm/Core/chips/YM2608.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,8 @@ public int GetAdpcmFNum(partPage page, int octave, char noteCmd, int shift)
381381
}
382382

383383
return (int)(
384-
0x4a82 * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)) * (freq / 8000.0)
384+
//0x4a82 * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)) * (freq / 8000.0)
385+
0x49d8 * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)) * (freq / 8000.0)
385386
);
386387
}
387388

‎mml2vgm/Core/chips/YM2609.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,8 @@ public int GetAdpcmFNum(partPage page, int octave, char noteCmd, int shift)
498498
}
499499

500500
return (int)(
501-
0x4a82 * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)) * (freq / 8000.0)
501+
//0x4a82 * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)) * (freq / 8000.0)
502+
0x49d8 * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)) * (freq / 8000.0)
502503
);
503504
}
504505

‎mml2vgm/Core/chips/YM2610B.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,8 @@ public int GetAdpcmBFNum(int octave, char noteCmd, int shift)
407407
if (n < 0) { n += 12; }
408408
}
409409

410-
return (int)(0x4a53 * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)));
410+
//return (int)(0x4a53 * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)));
411+
return (int)(0x49ba * Const.pcmMTbl[n] * Math.Pow(2, (o - 4)));
411412
}
412413

413414
public void OutAdpcmBKeyOn(MML mml, partPage page)

‎mml2vgm/mml2vgmIDEx64/form/FrmMain.cs

Lines changed: 22 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2192,7 +2192,28 @@ private void finishedCompileGWI()
21922192
cells[5] = pw[i].clockCounter;
21932193
cells[6] = "-";
21942194
cells[7] = muteManager.UpdateTrackInfo(doc, cells);
2195-
cells[8] = pw[i].pg[0].Type.ToString();
2195+
if (pw[i].pg[0].chip.chipType != enmChipType.YM2609)
2196+
{
2197+
cells[8] = pw[i].pg[0].Type.ToString();
2198+
}
2199+
else
2200+
{
2201+
if (pw[i].pg[0].Type != enmChannelType.ADPCM
2202+
&& pw[i].pg[0].Type != enmChannelType.ADPCMA
2203+
&& pw[i].pg[0].Type != enmChannelType.ADPCMB)
2204+
{
2205+
cells[8] = pw[i].pg[0].Type.ToString();
2206+
}
2207+
else if (pw[i].pg[0].Type == enmChannelType.ADPCM)
2208+
{
2209+
cells[8] = "ADPCM-B";//音程固定ADPCM(YM2610でいうADPCM-A)
2210+
}
2211+
else
2212+
{
2213+
2214+
cells[8] = "ADPCM-A";//音程可変ADPCM(YM2610でいうADPCM-B)
2215+
}
2216+
}
21962217
frmPartCounter.AddPartCounter(cells);
21972218
}
21982219

‎mml2vgm_MMLCommandMemo.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -414,12 +414,12 @@
414414
...
415415
U35 YM2609(RHYTHM音源)(Primary) CH5
416416
U36 YM2609(RHYTHM音源)(Primary) CH6
417-
U37 YM2609(ADPCM1音源)(Primary) CH1
418-
U38 YM2609(ADPCM2音源)(Primary) CH1
419-
U39 YM2609(ADPCM3音源)(Primary) CH1
420-
U40 YM2609(ADPCMA音源)(Primary) CH1
417+
U37 YM2609(ADPCMA音源)(Primary) CH1
418+
U38 YM2609(ADPCMA音源)(Primary) CH2
419+
U39 YM2609(ADPCMA音源)(Primary) CH3
420+
U40 YM2609(ADPCMB音源)(Primary) CH1
421421
...
422-
U45 YM2609(ADPCMA音源)(Primary) CH6
422+
U45 YM2609(ADPCMB音源)(Primary) CH6
423423
N1 YM2203(FM音源)(Primary) CH1
424424
N2 YM2203(FM音源)(Primary) CH2
425425
N3 YM2203(FM音源)(Primary) CH3/CH3Ex0

‎mmlCommandTable.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,10 @@
4848
- YM2609(SSG)
4949
Support type: PSG 12Ch(sine/square/triangle/saw wave)
5050
- YM2609(RHYTHM)
51-
Support type: PRESET FIXED ADPCM 6Ch
51+
Support type: PRESET FIXED ADPCM 6Ch
52+
Support type: FIXED ADPCM-B 6Ch
5253
- YM2609(ADPCM)
53-
Support type: ADPCM 3Ch
54+
Support type: ADPCM-A 3Ch
5455
- YM2203(FM)
5556
Support type: FM 3Ch
5657
- YM2203(Ch3 Ex)

0 commit comments

Comments
 (0)