Merge branch 'mr-origin-70'

2024-09-13 20:37:54 -05:00
parent 50e1368ae1 062344a1fb
commit 351f4e9fea
192 changed files with 430 additions and 430 deletions
--- a/src/lair/ch/brentilda.c
+++ b/src/lair/ch/brentilda.c
@@ -112,9 +112,9 @@ void chBrentilda_update(Actor *this) {
        this->initialized = TRUE;
    }

-    if (!this->unk16C_4) {
+    if (!this->volatile_initialized) {
        local->unk0 = this->unkF4_8*3 + 0x1080;
-        this->unk16C_4 = TRUE;
+        this->volatile_initialized = TRUE;
    }

    func_8028E668(this->position, 280.0f, -40.0f, 160.0f);