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/core2/code_55180.c
+++ b/src/core2/code_55180.c
@@ -50,8 +50,8 @@ void func_802DC208(Actor *this) {
    f32 sp2C[3];
    enum asset_e phi_a1;

-    if (!this->unk16C_4) {
-        this->unk16C_4 = TRUE;
+    if (!this->volatile_initialized) {
+        this->volatile_initialized = TRUE;
        actor_collisionOff(this);
        this->marker->propPtr->unk8_3 = TRUE;
    }