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/CCW/code_6EC0.c
+++ b/src/CCW/code_6EC0.c
@@ -50,9 +50,9 @@ void func_8038D368(Actor *this) {
    f32 plyr_pos[3];

    local = (ActorLocal_CCW_6EC0 *)&this->local;
-    if (!this->unk16C_4) {
+    if (!this->volatile_initialized) {
        this->marker->propPtr->unk8_3 = TRUE;
-        this->unk16C_4 = TRUE;
+        this->volatile_initialized = TRUE;
        this->is_first_encounter = FALSE;
        local->unk0 = D_8038F600;
        while (local->unk0->map != 0 && map_get() != local->unk0->map) {