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/lair/ch/brentilda.c
+++ b/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)) {