Merge branch 'mr-origin-80'

2024-09-26 19:10:37 -05:00
parent e8eed5ecb9 249f5a7329
commit 8a312a3e64
170 changed files with 1495 additions and 1305 deletions
--- a/src/core2/code_85800.c
+++ b/src/core2/code_85800.c
@@ -838,7 +838,7 @@ int func_8030E3FC(u8 indx){
    }
 }

-void func_8030E484(enum sfx_e uid){
+void sfxsource_playHighPriority(enum sfx_e uid){
    func_8030D6C4(uid, 1.0f, 22000, 0, 2);
 }