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/BGS/ch/tanktup.c
+++ b/src/BGS/ch/tanktup.c
@@ -114,9 +114,9 @@ void func_8038F6A4(Actor *this)
    this->is_first_encounter = FALSE;
    this->initialized = TRUE;
  }
-  if (!this->unk16C_4)
+  if (!this->volatile_initialized)
  {
-    this->unk16C_4 = 1;
+    this->volatile_initialized = TRUE;
    this->marker->propPtr->unk8_3 = 1;
    actor_collisionOff(this);
    this->scale = 1.0f;