diff options
| author | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-09-26 03:09:58 -0400 | 
|---|---|---|
| committer | Kermalis <29823718+Kermalis@users.noreply.github.com> | 2018-09-26 03:09:58 -0400 | 
| commit | 5dee55787ff5b34f3deaee19596badceafa34683 (patch) | |
| tree | 1ee3ebdba14257c18296c26904b8215800b0112c | |
| parent | 042bad2d434a1bf65a9cc84261e761c21d01d9b2 (diff) | |
| parent | f143e184a87d95338b95a34bfd64a3aff7258dee (diff) | |
Merge branch 'master' of https://github.com/pret/pokeemerald
| -rw-r--r-- | tools/mid2agb/midi.cpp | 6 | 
1 files changed, 3 insertions, 3 deletions
| diff --git a/tools/mid2agb/midi.cpp b/tools/mid2agb/midi.cpp index b49970282..e506fcb09 100644 --- a/tools/mid2agb/midi.cpp +++ b/tools/mid2agb/midi.cpp @@ -785,7 +785,7 @@ int CalculateCompressionScore(std::vector<Event>& events, int index)      if (events[index].type == EventType::Note)      {          // Bug reintroduction -        lastParam1 |= events[index].note + 0x40; +        lastParam1 = events[index].note + 0x40;      }      if (events[index].time > 0) @@ -842,7 +842,7 @@ int CalculateCompressionScore(std::vector<Event>& events, int index)              }              else              { -                score++; +                score += 2;              }          } @@ -851,7 +851,7 @@ int CalculateCompressionScore(std::vector<Event>& events, int index)          if (events[i].type == EventType::Note)          {              // Bug reintroduction -            lastParam1 |= events[i].note + 0x40; +            lastParam1 = events[i].note + 0x40;          }          lastType = events[i].type; | 
