Merge branch 'master' into 'document/code_91E10'

2024-10-14 21:30:27 +00:00
parent 2b85cc990a cd753fed3d
commit 370585ebd5
33 changed files with 1651 additions and 1246 deletions
--- a/src/core2/code_4C020.c
+++ b/src/core2/code_4C020.c
@@ -1013,7 +1013,7 @@ void func_802D5628(void){
                        D_8037DE08 -= time_getDelta();
                    }
                    else{//L802D5B24
-                        func_8024E55C(0, sp50); //get button inputs
+                        controller_copyFaceButtons(0, sp50); //get button inputs
                        if(sp50[FACE_BUTTON(BUTTON_B)] == 1){
                            func_80324C58();
                            func_802D6114();