From 791899f114c2ff6f912dcc95ce9c2c9a618b9caa Mon Sep 17 00:00:00 2001
From: Oliver Bell <freshollie@gmail.com>
Date: Tue, 3 May 2022 13:59:57 +0100
Subject: [PATCH] add notes about non matching songs

---
 scripts/match_next_midi.py                 |  29 ++++++++++++---------
 sound/songs/midi/non_matching/NOTES.md     |   6 ++++-
 sound/songs/midi/non_matching/song0044.mid | Bin 33705 -> 33705 bytes
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/scripts/match_next_midi.py b/scripts/match_next_midi.py
index f2106ee72..c6376a671 100644
--- a/scripts/match_next_midi.py
+++ b/scripts/match_next_midi.py
@@ -22,6 +22,9 @@
             all_time_signatures.append(ts)
 
 for next_song in to_match:
+    if next_song != "song0044":
+        continue
+
     if next_song in skipped:
         print(f"skipping {next_song}")
         continue
@@ -47,19 +50,21 @@
     print('Cleaning build')
     os.system('make tidy >/dev/null 2>&1')
 
-    # for absolute_ticks in range(0, 25):
-    #     print(f'Trying absolute ticks {absolute_ticks}')
-    #     os.system(f'python3 scripts/edit_time_signature.py {next_song} 4 4 {absolute_ticks}')
-    #     # if absolute_ticks:
-    #     #     print(f'applying time signature {ts[0]}/{ts[1]}')
-    #     #     os.system(f'python3 scripts/edit_time_signature.py {next_song} {ts[0]} {ts[1]}')
+    success = False
+    for ts in all_time_signatures:
+        if ts:
+            print(f'applying time signature {ts[0]}/{ts[1]}')
+            os.system(f'python3 scripts/edit_time_signature.py {next_song} {ts[0]} {ts[1]}')
         
-    print('Verifying build')
-    error = os.system("make >/dev/null 2>&1")
-    if not error:
-        print('success!')
-        os.system('git add -A')
-    else:      
+        print('Verifying build')
+        error = os.system("make >/dev/null 2>&1")
+        if not error:
+            print('success!')
+            os.system('git add -A')
+            success = True
+            break
+
+    if not success:      
         print('fail, reverting')
         os.system('git checkout -- sound ldscript.txt')
         os.system('git clean -f >/dev/null 2>&1')
diff --git a/sound/songs/midi/non_matching/NOTES.md b/sound/songs/midi/non_matching/NOTES.md
index a708ea443..87f1a2bdc 100644
--- a/sound/songs/midi/non_matching/NOTES.md
+++ b/sound/songs/midi/non_matching/NOTES.md
@@ -1 +1,5 @@
-* GOTO in middle of track doesn't handle the ending for some reason
+* 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
+* 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
diff --git a/sound/songs/midi/non_matching/song0044.mid b/sound/songs/midi/non_matching/song0044.mid
index 31f05500706acb0ab5f642da23a2516a53e128e8..ab6a29564bab8ff22dfbda0ffbad472cbf4287a0 100755
GIT binary patch
delta 28
jcmZ44&a|?fX@UfQATwL^Eav|aEG$eC9PI)d)tj0Dehvs@

delta 28
jcmZ44&a|?fX@UfQ1Pcq31P8<aKxVe+S?$6b)tj0Db_xh%