Skip to content

Commit

Permalink
match song0046 with some added dummy note events
Browse files Browse the repository at this point in the history
  • Loading branch information
freshollie committed May 3, 2022
1 parent 791899f commit 9133045
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 1,016 deletions.
2 changes: 1 addition & 1 deletion ldscript.txt
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ SECTIONS
build/sa2/sound/songs/midi/song0043.o(.rodata);
build/sa2/sound/songs/song0044.o(.rodata);
build/sa2/sound/songs/midi/song0045.o(.rodata);
build/sa2/sound/songs/song0046.o(.rodata);
build/sa2/sound/songs/midi/song0046.o(.rodata);
build/sa2/sound/songs/midi/song0048.o(.rodata);
build/sa2/sound/songs/midi/song0049.o(.rodata);
build/sa2/sound/songs/midi/song0050.o(.rodata);
Expand Down
3 changes: 2 additions & 1 deletion scripts/edit_time_signature.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
line = data[i]

if 'Time_signature' in line:
print(line)
new_data = line.split(', ')

# Set the time signature
new_data[3] = sys.argv[2]
new_data[4] = str(int(sys.argv[3]) // 2)
Expand Down
2 changes: 1 addition & 1 deletion scripts/match_next_midi.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
all_time_signatures.append(ts)

for next_song in to_match:
if next_song != "song0044":
if next_song != "song0046":
continue

if next_song in skipped:
Expand Down
2 changes: 1 addition & 1 deletion sound/songs/midi/non_matching/NOTES.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
* song0020: line 5627 (of compiled) doesn't reuse the previous pattern even though it's identical. Need to understand how mid2agb detects these
* song0046: line 429 (of compiled) has a weird time signature change
* song0046: line 429 (of compiled) has a weird time signature change (28:012)
* song0291: needs something to change at tick 24?
* song0044: some time signature shift and maybe multiple time signatures
* song0042: time should start at 96, first track fits 4/6, other don't after some point
Binary file not shown.
Loading

0 comments on commit 9133045

Please sign in to comment.