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

Renaming functions

Browse Source
This commit is contained in:
Adrien Bonnin
2024-09-09 19:51:23 +02:00
parent b77274c9ea
commit 1861ce5c0e
173 changed files with 752 additions and 753 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/TTC/ch/nipper.c
View File

@@ -68,7 +68,7 @@ Actor *func_80387EB0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
void TTC_func_80387F18(Actor *this) {
subaddie_set_state_looped(this, 3);
this->unk1C[0] = 0.0f;
switch((s32)this->unk60){
switch((s32)this->lifetime_value){
case 0x78:
animctrl_setDuration(this->animctrl, 1.2f);
break;
@@ -126,7 +126,7 @@ void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) {
this = marker_getActor(this_marker);
func_8032B4DC(this, other_marker, 7);
if (this->unk60 == 40.0f) {
if (this->lifetime_value == 40.0f) {
subaddie_set_state_with_direction(this, 6, 0.01f, 1);
actor_playAnimationOnce(this);
for(i = 0; i < 3; i++){
@@ -139,14 +139,14 @@ void func_80388178(ActorMarker *this_marker, ActorMarker *other_marker) {
return;
}
if (this->unk60 == 80.0f) {
if (this->lifetime_value == 80.0f) {
TTC_func_80387FF4(this);
this->unk60 = 40.0f;
this->lifetime_value = 40.0f;
return;
}
TTC_func_80387FF4(this);
this->unk60 = 80.0f;
this->lifetime_value = 80.0f;
func_80311480(0xA10, 4, NULL, NULL, NULL, NULL);
return;
}
@@ -167,7 +167,7 @@ void func_80388344(ActorMarker * this_marker, ActorMarker *other_marker){
if(other_marker->id == 1){
this = marker_getActor(this_marker);
if( !mapSpecificFlags_get(7)
&& this->unk138_24
&& this->is_first_encounter
&& func_80311480(0xa0f, 0, NULL, NULL, NULL, NULL)
){
mapSpecificFlags_set(7, TRUE);
@@ -178,7 +178,7 @@ void func_80388344(ActorMarker * this_marker, ActorMarker *other_marker){
void func_803883C8(ActorMarker * this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if( !this->unk138_23
&& this->unk138_24
&& this->is_first_encounter
&& func_80311480(0xa11, 0, NULL, NULL, NULL, NULL)
){
this->unk138_23 = TRUE;
@@ -221,7 +221,7 @@ void func_80388434(Actor *this){
if(!this->initialized){
animctrl_setTransitionDuration(this->animctrl, 0.35f);
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
this->unk60 = 120.0f;
this->lifetime_value = 120.0f;
this->marker->propPtr->unk8_3 = TRUE;
marker_setCollisionScripts(this->marker, func_803883C8, func_80388344, func_80388178);
func_803300C0(this->marker, func_803882E4);
@@ -229,13 +229,13 @@ void func_80388434(Actor *this){
}//L8038860C
if(func_8038812C(this)){
temp_v0 = func_8028ECAC();
if( !this->unk138_24
if( !this->is_first_encounter
&& temp_v0 != 1
&& temp_v0 != 10
){
subaddie_set_state_with_direction(this, 5, 0.01f, 1);
if(func_80311480(0xa0e, 0xf, this->position, this->marker, TTC_func_80387FB0, NULL)){
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
comusic_8025AB44(COMUSIC_12_TTC_NIPPER, 5000, 300);
ncStaticCamera_setToNode(11);
@@ -262,7 +262,7 @@ void func_80388434(Actor *this){
break;
}
if(this->unk60 <= this->unk38_31){
if(this->lifetime_value <= this->unk38_31){
TTC_func_80387F18(this);
break;
}