Merge branch 'master' into wip/pal_integration

2024-09-05 20:10:25 -05:00
parent 17a0530ff8 4f122e5b8c
commit 1a240c651c
112 changed files with 429 additions and 428 deletions
--- a/src/core1/code_10A00.c
+++ b/src/core1/code_10A00.c
@@ -133,7 +133,7 @@ s32 func_8024E67C(s32 controller_index){
 }

 s32 func_8024E698(s32 controller_index){
-    if(func_8023DB5C() < 2){
+    if(globalTimer_getTime() < 2){
        return 0;
    }