kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Renaming Juju

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

6
src/SM/ch/vegetables.c
View File

@@ -223,7 +223,7 @@ void func_80387DCC(ActorMarker *marker, ActorMarker *other_marker){
Actor *func_80387DF4(ActorMarker *marker, Gfx **gdl, Mtx **mptr, Vtx **arg3){
Actor *actor = marker_getActor(marker);
if(actor->is_first_encounter)
if(actor->has_met_before)
func_8033A470(3, 7);
else
func_8033A45C(3, 0);
@@ -320,7 +320,7 @@ void func_80388080(Actor *this){
this->velocity_x = temp_velX;
this->velocity_y = (local->unkC == 3) ? 90.0f : 70.0f;
this->velocity_z = temp_velZ;
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
this->unk138_23 = 0;
this->unk38_0 = 0;
this->initialized = TRUE;
@@ -483,7 +483,7 @@ void func_80388080(Actor *this){
sp54[2] = this->position_z;
if(local->unkC == 1)
sp54[1] += 150.0f;
this->is_first_encounter = FALSE;
this->has_met_before = FALSE;
func_80387A80(partEmitMgr_newEmitter(3), sp54, 3, (local->unkC == 1)? 0x4f0: 0x4f1);
}//L80388CC4

6
src/SM/code_2990.c
View File

@@ -233,7 +233,7 @@ void func_803892C8(ActorMarker *marker, enum asset_e text_id, s32 arg2){
break;
case ASSET_E1D_TEXT_BOTTLES_TUTORIAL_OFFER_WAIT: /* 2FFC 803893EC 920B0138 */
actor->is_first_encounter = FALSE;
actor->has_met_before = FALSE;
actor->lifetime_value = 0.0f;
break;
@@ -572,9 +572,9 @@ void chsmmole_Update(Actor * this){
chsmmole_skipIntroTutorial(); //give all SM moves
}
this->unk38_0 = 0;
}else if(!this->is_first_encounter && 5.0 < this->lifetime_value){
}else if(!this->has_met_before && 5.0 < this->lifetime_value){
gcdialog_showText(0xe1d, 0x86, this->position, this->marker, func_803892C8, NULL);
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
break;