Merge remote-tracking branch 'origin/master' into pal

2024-09-07 21:13:37 -05:00
parent 3f210f38b8 347c3edcdf
commit 3460bb81e5
156 changed files with 1857 additions and 1784 deletions
--- a/src/core1/memory.c
+++ b/src/core1/memory.c
@@ -807,7 +807,7 @@ void func_80255A3C(void){

    if(!func_802559A0()){
        ml_defrag();
-        func_80254464();
+        dummy_func_80254464();
    }

 }