Merge branch 'develop' into z64-devmerge

2022-06-17 00:39:07 -04:00
parent bb90be6748 3e6307bf96
commit dd42cca2cf
24 changed files with 355 additions and 299 deletions
--- a/soh/src/code/audio_playback.c
+++ b/soh/src/code/audio_playback.c
@@ -355,8 +355,6 @@ Instrument* Audio_GetInstrumentInner(s32 fontId, s32 instId) {
        return inst;
    }

-
-
    return inst;
 }