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/code_C1C0.c
+++ b/src/lair/code_C1C0.c
@@ -91,13 +91,13 @@ void func_80392700(Actor *this) {


 void func_80392918(Actor *this) {
-    if (!this->unk16C_4) {
+    if (!this->volatile_initialized) {
        if (fileProgressFlag_get(FILEPROG_F4_ENTER_FF_CUTSCENE) && (func_8028E4A4() == 2)) {
            mapSpecificFlags_set(4, 1);
        }
        this->unk4C = 400.0f;
        this->marker->unk2C_2 = FALSE;
-        this->unk16C_4 = TRUE;
+        this->volatile_initialized = TRUE;
        if (fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)) {
            marker_despawn(this->marker);
        }