Renaming Juju

This commit is contained in:
Nabnut
2024-09-22 11:30:51 +02:00
parent 0224f95863
commit 249f5a7329
75 changed files with 426 additions and 390 deletions

View File

@@ -143,8 +143,8 @@ void BGS_func_803888E4(Actor *this, s32 arg1){
skeletalAnim_set(this->unk148, ASSET_12B_ANIM_TIPTUP_IDLE, 1.0f, 9.0f);
unqPtr->unkC = randf2(5.0f, 15.0f);
if (!this->is_first_encounter) {
this->is_first_encounter = TRUE;
if (!this->has_met_before) {
this->has_met_before = TRUE;
if (unqPtr->unkA == 0) {
gcdialog_showText(ASSET_C72_TEXT_UNKNOWN, 0xe, this->position, this->marker, func_80388784, 0);

View File

@@ -111,7 +111,7 @@ void func_8038F6A4(Actor *this)
{
nodeprop_getPosition(temp_v0, local->unk18);
}
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
this->initialized = TRUE;
}
if (!this->volatile_initialized)
@@ -138,12 +138,12 @@ void func_8038F6A4(Actor *this)
case 1:
func_8038F610(this);
player_getPosition(sp48);
if (!this->is_first_encounter)
if (!this->has_met_before)
{
if ((((ml_distance_vec3f(local->unk18, sp48) < 250.0f) && (ml_distance_vec3f(local->unk18, sp48) > 80.0f)) && (!func_8028ECAC())) && (player_getTransformation() == TRANSFORM_1_BANJO))
{
gcdialog_showText(0xC7E, 0, 0, 0, 0, 0);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
if (local->unk10)