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/cauldron.c
+++ b/src/lair/ch/cauldron.c
@@ -221,9 +221,9 @@ void chWarpCauldron_update(Actor *this) {
    f32 sp34;
    
    lair_func_8038A864(this);
-    if (!this->unk16C_4) {
+    if (!this->volatile_initialized) {
        sp50 = FALSE;
-        this->unk16C_4 = TRUE;
+        this->volatile_initialized = TRUE;
        this->marker->propPtr->unk8_3 = TRUE;
        this->unk1C[1] = 0.0f;
        this->velocity[0] = this->yaw;