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/MM/ch/orangepad.c
+++ b/src/MM/ch/orangepad.c
@@ -107,9 +107,9 @@ void func_80386768(Actor * this){
        this->initialized = TRUE;
    }//L803867B0

-    if(!this->unk16C_4){
+    if(!this->volatile_initialized){
        this->unk100 = actorArray_findClosestActorFromActorId(this->position, 8,-1, &min_distance)->marker;
-        this->unk16C_4 = 1;
+        this->volatile_initialized = TRUE;
    }//L803867E0

    if(this->unk100){