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/gc/pauseMenu.c
+++ b/src/core2/gc/pauseMenu.c
@@ -936,7 +936,7 @@ s32 gcPauseMenu_update(void) {
        return 0;
    }

-    func_8024E55C(0, face_button);
+    controller_copyFaceButtons(0, face_button);
    controller_getJoystick(0, joystick);
    func_8024E60C(0, sp60);
    func_8024E6E0(0, sp50);