File tree Expand file tree Collapse file tree 3 files changed +10
-7
lines changed
VG Music Studio/Core/GBA/AlphaDream Expand file tree Collapse file tree 3 files changed +10
-7
lines changed Original file line number Diff line number Diff line change @@ -86,10 +86,10 @@ internal class RestCommand : ICommand
86
86
87
87
public byte Rest { get ; set ; }
88
88
}
89
- internal class TempoCommand : ICommand
89
+ internal class TrackTempoCommand : ICommand
90
90
{
91
91
public Color Color => Color . DeepSkyBlue ;
92
- public string Label => "Tempo" ;
92
+ public string Label => "Track Tempo" ;
93
93
public string Arguments => Tempo . ToString ( ) ;
94
94
95
95
public byte Tempo { get ; set ; }
Original file line number Diff line number Diff line change @@ -251,7 +251,7 @@ void AddEvent(ICommand command)
251
251
byte tempoArg = _config . Reader . ReadByte ( ) ;
252
252
if ( ! EventExists ( offset ) )
253
253
{
254
- AddEvent ( new TempoCommand { Tempo = tempoArg } ) ;
254
+ AddEvent ( new TrackTempoCommand { Tempo = tempoArg } ) ;
255
255
}
256
256
break ;
257
257
}
@@ -552,7 +552,7 @@ private void ExecuteNext(Track track, ref bool update)
552
552
track . DataOffset += ofs ;
553
553
break ;
554
554
}
555
- case 0xF9 : // Tempo
555
+ case 0xF9 : // Track Tempo
556
556
{
557
557
_tempo = _config . ROM [ track . DataOffset ++ ] ;
558
558
break ;
Original file line number Diff line number Diff line change @@ -31,18 +31,21 @@ public Track(byte i, Mixer mixer)
31
31
Type = i >= 8 ? i % 2 == 0 ? "Square 1" : "Square 2" : "PCM8" ;
32
32
Channel = i >= 8 ? ( Channel ) new SquareChannel ( mixer ) : new PCMChannel ( mixer ) ;
33
33
}
34
+ // 0x819B040
34
35
public void Init ( )
35
36
{
36
37
Voice = 0 ;
37
- Rest = 0 ;
38
+ Rest = 1 ; // Unsure why Rest starts at 1
38
39
PitchBendRange = 2 ;
39
40
NoteDuration = 0 ;
40
41
PitchBend = 0 ;
41
- Panpot = 0 ;
42
+ Panpot = 0 ; // Start centered; ROM sets this to 0x7F since it's unsigned there
42
43
DataOffset = StartOffset ;
43
44
Stopped = false ;
44
- Volume = 0x7F ;
45
+ Volume = 200 ;
45
46
PrevCommand = 0xFF ;
47
+ //Tempo = 120;
48
+ //TempoStack = 0;
46
49
}
47
50
public void Tick ( )
48
51
{
You can’t perform that action at this time.
0 commit comments