Merge branch 'mr-origin-70'

src/TTC/ch/blubber.c

@@ -138,11 +138,11 @@ void func_803878CC(Actor * this){
     if(!mapSpecificFlags_get(1) && !func_80329530(this, 2500))
         return;
     
-    if(!this->unk16C_4){
+    if(!this->volatile_initialized){
         if(this->state == 3){
             subaddie_set_state_with_direction(this, 2, 0.0f, 1);
         }
-        this->unk16C_4 = TRUE;
+        this->volatile_initialized = TRUE;
     }//L80387970
 
     if(func_80329530(this, 250) && !func_80329530(this, 80)

src/TTC/ch/clam.c

@@ -271,8 +271,8 @@ void chClam_update(Actor *this){
         animctrl_setDuration(this->animctrl, 2.0f);
     }
 
-    if(!this->unk16C_4){
-        this->unk16C_4 =  TRUE;
+    if(!this->volatile_initialized){
+        this->volatile_initialized = TRUE;
         marker_setCollisionScripts(this->marker, NULL, __chClam_attackOther, __chClam_takeDamage);
     }
 

src/TTC/ch/leaky.c

@@ -36,8 +36,8 @@ void chLeaky_update(Actor *this) {
     void *temp_v0_2;
 
     func_8028E668(this->position, 100.0f, -20.0f, 100.0f);
-    if (!this->unk16C_4) {
-        this->unk16C_4 = TRUE;
+    if (!this->volatile_initialized) {
+        this->volatile_initialized = TRUE;
         this->marker->propPtr->unk8_3 = FALSE;
         if (levelSpecificFlags_get(5) != 0) {
             levelSpecificFlags_set(5, FALSE);

src/TTC/ch/lockup.c

@@ -86,8 +86,8 @@ void func_80389600(Actor *this){
         this->is_first_encounter = TRUE;
     }//L803896AC
 
-    if(!this->unk16C_4){
-        this->unk16C_4 = TRUE;
+    if(!this->volatile_initialized){
+        this->volatile_initialized = TRUE;
     }
 
     switch(this->state){

src/TTC/ch/nipper.c

@@ -194,8 +194,8 @@ void func_80388434(Actor *this){
 
     player_getPosition(sp38);
     sp44 = func_80309D58(sp38, 1);
-    if(!this->unk16C_4){
-        this->unk16C_4 = TRUE;
+    if(!this->volatile_initialized){
+        this->volatile_initialized = TRUE;
         this->velocity_x = sp44;
         func_8032BC18(this);
     }

src/TTC/code_26D0.c

@@ -135,9 +135,9 @@ void func_80388D04(s32 arg0){
 
 void func_80388D34(Actor *this){
     TTC_func_80388C78(this);
-    if(!this->unk16C_4){
+    if(!this->volatile_initialized){
         __spawnQueue_add_1((GenFunction_1)func_80388D04, (s32)this->marker);
-        this->unk16C_4 = TRUE;
+        this->volatile_initialized = TRUE;
     }
 }
 
@@ -152,8 +152,8 @@ void func_80388D8C(Actor *this){
         this->yaw = 199.0f;
     }
 
-    if(!this->unk16C_4){
-        this->unk16C_4 = TRUE;
+    if(!this->volatile_initialized){
+        this->volatile_initialized = TRUE;
         if(sns_get_item_state(SNS_ITEM_EGG_PINK, TRUE)){
             this->position_y = 700.0f;
         }