renamed Actor.unk16C_4 to Actor.volatile_initialized
This commit is contained in:
@@ -437,9 +437,9 @@ void chsmmole_Update(Actor * this){
|
||||
}
|
||||
}//L80389B20
|
||||
|
||||
if(!this->unk16C_4){
|
||||
if(!this->volatile_initialized){
|
||||
__spawnQueue_add_1((GenFunction_1)chsmmole_spawnMolehill, reinterpret_cast(s32, this->marker));
|
||||
this->unk16C_4 = 1;
|
||||
this->volatile_initialized = TRUE;
|
||||
}//L80389B4C
|
||||
|
||||
if(this->unk138_23){
|
||||
|
@@ -27,7 +27,7 @@ void func_8038A8F8(Actor *this){
|
||||
f32 sp2C;
|
||||
NodeProp *other;
|
||||
|
||||
if(!this->unk16C_4){
|
||||
if(!this->volatile_initialized){
|
||||
other = func_80304C38(0x3be, this);
|
||||
if(!other){
|
||||
this->unk1C_x = this->position_x;
|
||||
@@ -37,7 +37,7 @@ void func_8038A8F8(Actor *this){
|
||||
nodeprop_getPosition(other, this->unk1C);
|
||||
}
|
||||
actor_collisionOff(this);
|
||||
this->unk16C_4 = 1;
|
||||
this->volatile_initialized = TRUE;
|
||||
}//L8038A968
|
||||
player_getPosition(this->velocity);
|
||||
sp2C = ml_distance_vec3f(this->velocity, this->position);
|
||||
|
@@ -51,7 +51,7 @@ void func_803869A0(Actor *this, f32 arg1, f32 arg2) {
|
||||
}
|
||||
|
||||
void SM_func_80386A00(Actor *this) {
|
||||
if (this->unk16C_4 <= 0) {
|
||||
if (this->volatile_initialized <= 0) {
|
||||
if (fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY) == 0) {
|
||||
marker_despawn(this->marker);
|
||||
return;
|
||||
@@ -59,7 +59,7 @@ void SM_func_80386A00(Actor *this) {
|
||||
actor_collisionOff(this);
|
||||
if(0);
|
||||
this->marker->propPtr->unk8_3 = 1;
|
||||
this->unk16C_4 = 1;
|
||||
this->volatile_initialized = TRUE;
|
||||
}
|
||||
func_803869A0(this, 0.20f, 1.00f);
|
||||
func_803869A0(this, 0.27f, 1.05f);
|
||||
@@ -129,12 +129,12 @@ void func_80386EB4(ActorMarker *marker, ActorMarker *other_marker) {
|
||||
void SM_func_80386EF4(Actor *this) {
|
||||
u32 temp_t3;
|
||||
Actor *other;
|
||||
if ((this->unk16C_4) <= 0) {
|
||||
if ((this->volatile_initialized) <= 0) {
|
||||
this->marker->propPtr->unk8_3 = 1;
|
||||
marker_setCollisionScripts(this->marker, 0, 0, func_80386EB4);
|
||||
this->unk38_31 = 0;
|
||||
this->unk138_31 = 1;
|
||||
this->unk16C_4 = 1;
|
||||
this->volatile_initialized = TRUE;
|
||||
}
|
||||
if ((this->state) == 1) {
|
||||
temp_t3 = this->unk38_31++ ^ 2;
|
||||
|
@@ -14,10 +14,10 @@ ActorInfo D_8038ABF0 = {
|
||||
|
||||
/* .code */
|
||||
void SM_func_80386FE0(Actor *this){
|
||||
if(!this->unk16C_4){
|
||||
if(!this->volatile_initialized){
|
||||
this->unk10_12 = 0;
|
||||
this->unk38_31 = this->unk10_12;
|
||||
this->unk16C_4 = 1;
|
||||
this->volatile_initialized = TRUE;
|
||||
actor_collisionOff(this);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user