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/FP/ch/boggy1.c
+++ b/src/FP/ch/boggy1.c
@@ -108,8 +108,8 @@ void func_8038787C(ActorMarker *marker){
 void func_8038794C(Actor *this){
    int i;

-    if(!this->unk16C_4){
-        this->unk16C_4 = TRUE;
+    if(!this->volatile_initialized){
+        this->volatile_initialized = TRUE;
        this->marker->propPtr->unk8_3 = TRUE;
        marker_setCollisionScripts(this->marker, NULL, func_80387754, NULL);
        this->unk38_31 = 1;