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_54D50.c
+++ b/src/core2/code_54D50.c
@@ -89,11 +89,11 @@ void func_802DC018(Actor *this){
    ActorLocal_Core2_53C10 *local = (ActorLocal_Core2_53C10 *) &this->local;
    f32 tmp_f0;

-    if(!this->unk16C_4){
+    if(!this->volatile_initialized){
        actor_collisionOff(this);
        local->unk0 = partEmitMgr_newEmitter(16);
        func_802DBE9C(this, local->unk0);
-        this->unk16C_4 = TRUE;
+        this->volatile_initialized = TRUE;
    }
    if(func_802DBF94(this, 600) && randf() < 0.2){
        tmp_f0 = randf2(0.01f, 0.06f);