Renaming functions
This commit is contained in:
@@ -176,13 +176,13 @@ void chGobi1_update(Actor *this){
|
||||
}
|
||||
|
||||
if(this->state == 1 || this->state == 2){
|
||||
if( !this->unk138_24
|
||||
if( !this->is_first_encounter
|
||||
&& func_80329530(this, 250)
|
||||
&& !func_80329530(this, 80)
|
||||
&& func_8028F2A0()
|
||||
&& func_80311480(0xa73, 0, NULL, NULL, NULL, NULL)
|
||||
){
|
||||
this->unk138_24 = 1;
|
||||
this->is_first_encounter = TRUE;
|
||||
}
|
||||
}//L803877A4
|
||||
|
||||
|
@@ -200,11 +200,11 @@ void chGobi2_update(Actor *this){
|
||||
}//L80388114
|
||||
|
||||
if(this->state == 2){
|
||||
if(!this->unk138_24){
|
||||
if(!this->is_first_encounter){
|
||||
if(func_80329530(this, 0xFA) && !func_80329530(this, 0x50)){
|
||||
if(func_8028F2A0()){
|
||||
if(func_80311480(ASSET_A75_TEXT_GOBI2_MEET, 0, this->position, NULL, NULL, NULL))
|
||||
this->unk138_24 = TRUE;
|
||||
this->is_first_encounter = TRUE;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -119,15 +119,15 @@ void func_8038DBDC(Actor *this){
|
||||
this->unk1C[0] = 0.0f;
|
||||
}//L8038DC90
|
||||
if(func_8038E178() != (s32)this->unk1C[0] || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){
|
||||
if(15.0f <= this->unk60){
|
||||
if(15.0f <= this->lifetime_value){
|
||||
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
|
||||
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
|
||||
animctrl_setDuration(this->animctrl, 2.0f);
|
||||
this->unk1C[0] = (f32)func_8038E178();
|
||||
this->unk60 = 0.0f;
|
||||
this->lifetime_value = 0.0f;
|
||||
}
|
||||
else{//L8038DD2C
|
||||
this->unk60 += 1.0f;
|
||||
this->lifetime_value += 1.0f;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
@@ -69,13 +69,13 @@ void chTrucker_update(Actor *this){
|
||||
}
|
||||
}//L803891D8
|
||||
if( this->state == 1
|
||||
&& !this->unk138_24
|
||||
&& !this->is_first_encounter
|
||||
&& func_80329530(this, 250)
|
||||
&& !func_80329530(this, 80)
|
||||
&& func_8028F2A0()
|
||||
){
|
||||
func_80311480(ASSET_A71_TEXT_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL);
|
||||
this->unk138_24 = 1;
|
||||
this->is_first_encounter = TRUE;
|
||||
}//L80389254
|
||||
|
||||
if(this->state == 1 && mapSpecificFlags_get(0xC)){
|
||||
|
Reference in New Issue
Block a user