Patch dev#217

hourai-branch wants to merge 2 commits intosonicnext-dev:mainsonicnext-dev/MarathonRecomp:mainfrom

hourai-branch:patch-devhourai-branch/MarathonRecomp:patch-devCopy head branch name to clipboard