Skip to content

Commit 2029ba4

Browse files
committed
[MP2K] Fix square patterns
Got mixed up when merging NDS and GBA music studios
1 parent 3e67140 commit 2029ba4

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

VG Music Studio/Core/GBA/MP2K/Channel.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,8 +615,8 @@ public void Init(Track owner, Note note, ADSR env, SquarePattern pattern)
615615
switch (pattern)
616616
{
617617
default: _pat = Utils.SquareD12; break;
618-
case SquarePattern.D12: _pat = Utils.SquareD25; break;
619-
case SquarePattern.D25: _pat = Utils.SquareD50; break;
618+
case SquarePattern.D25: _pat = Utils.SquareD25; break;
619+
case SquarePattern.D50: _pat = Utils.SquareD50; break;
620620
case SquarePattern.D75: _pat = Utils.SquareD75; break;
621621
}
622622
}

VG Music Studio/Core/GBA/MP2K/Utils.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,9 @@ internal static class Utils
3232
};
3333

3434
// Squares
35-
public static readonly float[] SquareD12 = new float[8] { 0.500f, 0.500f, 0.500f, 0.500f, -0.500f, -0.500f, -0.500f, -0.500f };
36-
public static readonly float[] SquareD25 = new float[8] { 0.875f, -0.125f, -0.125f, -0.125f, -0.125f, -0.125f, -0.125f, -0.125f };
37-
public static readonly float[] SquareD50 = new float[8] { 0.750f, 0.750f, -0.250f, -0.250f, -0.250f, -0.250f, -0.250f, -0.250f };
35+
public static readonly float[] SquareD12 = new float[8] { 0.875f, -0.125f, -0.125f, -0.125f, -0.125f, -0.125f, -0.125f, -0.125f };
36+
public static readonly float[] SquareD25 = new float[8] { 0.750f, 0.750f, -0.250f, -0.250f, -0.250f, -0.250f, -0.250f, -0.250f };
37+
public static readonly float[] SquareD50 = new float[8] { 0.500f, 0.500f, 0.500f, 0.500f, -0.500f, -0.500f, -0.500f, -0.500f };
3838
public static readonly float[] SquareD75 = new float[8] { 0.250f, 0.250f, 0.250f, 0.250f, 0.250f, 0.250f, -0.750f, -0.750f };
3939

4040
// Noises

0 commit comments

Comments
 (0)