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_DA760.c
+++ b/src/core2/code_DA760.c
@@ -41,9 +41,9 @@ void func_80361828(Actor *this){
 void func_80361870(Actor *this){
    s32 text_id;
    s32 sp28;
-    if(!this->unk16C_4){
+    if(!this->volatile_initialized){
        marker_setFreeMethod(this->marker, func_80361828);
-        this->unk16C_4 = 1;
+        this->volatile_initialized = TRUE;
    }

    if(!this->is_first_encounter && func_80329530(this, 400) && !func_80329530(this, 50)){