Merge branch 'master' into 'document/code_91E10'

src/lair/ch/brentilda.c

@@ -120,7 +120,7 @@ void chBrentilda_update(Actor *this) {
     func_8028E668(this->position, 280.0f, -40.0f, 160.0f);
     this->yaw_ideal = (f32) func_80329784(this);
     func_80328FB0(this, 3.0f);
-    func_8024E55C(0, sp78);
+    controller_copyFaceButtons(0, sp78);
     player_getPosition(sp64);
     temp_f0 = sp64[1] - this->position[1];
     if ((temp_f0 > -100.0f) && (temp_f0 < 350.0f)) {

src/lair/code_5ED0.c

@@ -1158,7 +1158,7 @@ void lair_func_8038E0B0(void) {
     ){
         gcquiz_func_80319EA4();
         func_8038C9D0();
-        func_8024E55C(0, sp48);
+        controller_copyFaceButtons(0, sp48);
         func_8024E60C(0, sp3C);
         if (D_8037DCB8->currFfMode < 3) {
             player_getPosition(D_8037DCB8->playerPosition);

src/lair/code_86F0.c

@@ -468,7 +468,7 @@ void lair_func_8038F924(Actor *this) {
             particleEmitter_emitN(sp54, 6);
         }
     }
-    func_8024E55C(0, sp7C);
+    controller_copyFaceButtons(0, sp7C);
     func_8024E60C(0, sp6C);
     func_8038EDBC(this);
     switch(this->state){

src/lair/code_9C40.c

@@ -108,7 +108,7 @@ void func_803902B8(Actor *this) {
     this->unk38_0 = sp58;
     sp58 = ml_vec3f_within_distance(this->position, sp5C, 400.0f);
     if (fileProgressFlag_get(sp54 + FILEPROG_AD_CHEATO_BLUEEGGS_UNLOCKED)) {
-        func_8024E55C(0, sp3C);
+        controller_copyFaceButtons(0, sp3C);
         sp58 &= (sp3C[FACE_BUTTON(BUTTON_B)] == 1) || func_8028EC04();
     }
     if (sp58 && !*(s32 *)&this->local) {