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

rename animctrl to anctrl to match source debug string and tooie naming

Browse Source 
rename `rumbleManager` to `bamotor`
This commit is contained in:
banjo.decomp
2024-10-30 19:51:58 -05:00
parent aa181c3bd9
commit 4c3d4df97b
134 changed files with 1588 additions and 1587 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/FP/ch/bearcub.c
View File

@@ -100,19 +100,19 @@ void func_8038A384(Actor *this){
case MARKER_1FA_POLAR_BEAR_CUB_BLUE://L8038A404
this->unk1C[0] = 1.0f;
this->unk1C[1] = 1.2f;
animctrl_setAnimTimer(this->animctrl, 0.0f);
anctrl_setAnimTimer(this->anctrl, 0.0f);
break;
case MARKER_1FB_POLAR_BEAR_CUB_GREEN://L8038A438
this->unk1C[0] = 1.1f;
this->unk1C[1] = 1.3f;
animctrl_setAnimTimer(this->animctrl, 0.4f);
anctrl_setAnimTimer(this->anctrl, 0.4f);
break;
case MARKER_1FC_POLAR_BEAR_CUB_RED://L8038A470
this->unk1C[0] = 1.2f;
this->unk1C[1] = 1.4f;
animctrl_setAnimTimer(this->animctrl, 0.7f);
anctrl_setAnimTimer(this->anctrl, 0.7f);
break;
}//L8038A4A0

2
src/FP/ch/present.c
View File

@@ -50,7 +50,7 @@ void func_8038F144(Actor *this){
this->unk38_31 = FALSE;
this->marker->collidable = FALSE;
this->marker->propPtr->unk8_3 = TRUE;
animctrl_setAnimTimer(this->animctrl, randf());
anctrl_setAnimTimer(this->anctrl, randf());
}
}
if (this) if (this);

10
src/FP/ch/twinkly.c
View File

@@ -182,7 +182,7 @@ void func_8038C428(Actor *arg0, f32 arg1[3], f32 arg2)
temp_f0 = sp78;
sp74 = (((arg1[1] + 40.0f) - arg0->position[1]) / temp_f0) - (((-3.2) * temp_f0) / 2.0);
}
animctrl_setAnimTimer(arg0->animctrl, 0.0f);(arg0->animctrl, 0.0f);
anctrl_setAnimTimer(arg0->anctrl, 0.0f);(arg0->anctrl, 0.0f);
temp_f0 = sp78;
arg0->unk1C[0] = (f32) (0.99999 / temp_f0);
arg0->velocity[1] = sp74;
@@ -202,8 +202,8 @@ bool func_8038C718(Actor *this, f32 arg1){
this->position[0] += this->velocity[0];
this->position_y += (this->velocity_y += -3.2);
this->position_z += this->velocity_z;
tmp = 0.9999 < animctrl_getAnimTimer(this->animctrl) + this->unk1C[0] ? 0.999999 : animctrl_getAnimTimer(this->animctrl) + this->unk1C[0];
animctrl_setAnimTimer(this->animctrl, tmp);
tmp = 0.9999 < anctrl_getAnimTimer(this->anctrl) + this->unk1C[0] ? 0.999999 : anctrl_getAnimTimer(this->anctrl) + this->unk1C[0];
anctrl_setAnimTimer(this->anctrl, tmp);
if(arg1 == 0.0f)
arg1 = mapModel_getFloorY(this->position);
@@ -271,7 +271,7 @@ void func_8038C9A0(Actor *this){
this->velocity_y = 0.0f;
this->velocity_z = 0.0f;
this->unk1C[0] = 0.0f;
animctrl_setAnimTimer(this->animctrl, 0.0f);
anctrl_setAnimTimer(this->anctrl, 0.0f);
func_8038C428(this, D_8039207C, 0);
return;
}
@@ -303,7 +303,7 @@ void func_8038C9A0(Actor *this){
func_8034DFB0(sp30, D_803920B0, D_803920A0, 0.14f);
}
if(0.8 < animctrl_getAnimTimer(this->animctrl) || animctrl_getAnimTimer(this->animctrl) < 0.2){
if(0.8 < anctrl_getAnimTimer(this->anctrl) || anctrl_getAnimTimer(this->anctrl) < 0.2){
this->unk38_31 = TRUE;
}
else{

6
src/FP/ch/twinklybox.c
View File

@@ -330,8 +330,8 @@ void func_8038D6C8(Actor *this){
break;
case 2: //L8038D91C
sp20 = animctrl_isPlayedForwards(this->animctrl);
animctrl_setDuration(this->animctrl, this->velocity[2]);
sp20 = anctrl_isPlayedForwards(this->anctrl);
anctrl_setDuration(this->anctrl, this->velocity[2]);
if( ( sp20 == TRUE && actor_animationIsAt(this, 0.999f) )
|| ( sp20 == FALSE && actor_animationIsAt(this, 0.001f) )
){
@@ -406,7 +406,7 @@ void func_8038D6C8(Actor *this){
}
if(0.96 < animctrl_getAnimTimer(this->animctrl)){
if(0.96 < anctrl_getAnimTimer(this->anctrl)){
if(this->lifetime_value <= 0.0){
__spawnQueue_add_1((GenFunction_1)func_8038D474, (s32)this->marker);
this->lifetime_value = 2.9f;

4
src/FP/ch/twinklymuncher.c
View File

@@ -106,7 +106,7 @@ void func_8038E094(Actor *this){
this->volatile_initialized = TRUE;
marker_setCollisionScripts(this->marker, NULL, func_8038DEB8, NULL);
this->marker->propPtr->unk8_3 = TRUE;
animctrl_setAnimTimer(this->animctrl, 0.99999f);
anctrl_setAnimTimer(this->anctrl, 0.99999f);
this->lifetime_value = 0.0f;
if(this->unkF4_8 == 1){
func_8038DDC8(this);
@@ -147,7 +147,7 @@ void func_8038E094(Actor *this){
switch(this->state){
case 1: //L8038E2DC
this->marker->propPtr->unk8_3 = FALSE;
animctrl_setAnimTimer(this->animctrl, 0.99f);
anctrl_setAnimTimer(this->anctrl, 0.99f);
if(this->lifetime_value < 5.0){
this->lifetime_value += sp34;
}

8
src/FP/ch/wozza.c
View File

@@ -132,7 +132,7 @@ void func_8038F598(Actor *this, f32 arg1){
bool func_8038F5D4(Actor *this, f32 arg1[3], f32 arg2, f32 arg3, s32 arg4){
f32 sp24;
sp24 = animctrl_getAnimTimer(this->animctrl);
sp24 = anctrl_getAnimTimer(this->anctrl);
this->yaw_ideal = (f32) func_803297C8(this, arg1);
func_80328FB0(this, arg3);
if(actor_animationIsAt(this, 0.9f)){
@@ -236,7 +236,7 @@ void FP_func_8038F7AC(Actor *this){
func_8038F598(this, 1.0f);
if( actor_animationIsAt(this, 0.38f) || actor_animationIsAt(this, 0.7f)){
if(randf() < 0.4)
animctrl_setDirection(this->animctrl, animctrl_isPlayedForwards(this->animctrl) ^ 1);
anctrl_setDirection(this->anctrl, anctrl_isPlayedForwards(this->anctrl) ^ 1);
}
break;
@@ -259,7 +259,7 @@ void FP_func_8038F7AC(Actor *this){
case 5: //L8038FB50
FP_func_8038F6C4(this, local->unk18, 1.0f);
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
if(0.97 < anctrl_getAnimTimer(this->anctrl)){
subaddie_set_state_with_direction(this, 6, 0.02f, 1);
actor_loopAnimation(this);
}
@@ -330,7 +330,7 @@ void FP_func_8038F7AC(Actor *this){
case 9: //L8038FE14
FP_func_8038F6C4(this, D_803925AC, 9.0f);
if(0.97 < animctrl_getAnimTimer(this->animctrl)){
if(0.97 < anctrl_getAnimTimer(this->anctrl)){
subaddie_set_state_with_direction(this, 10, 0.02f, 1);
actor_loopAnimation(this);
}

12
src/FP/ch/wozzasjig.c
View File

@@ -55,11 +55,11 @@ void func_8038FF54(Actor *this){
actor_playAnimationOnce(this);
}
else{
animctrl_setIndex(this->animctrl, animctrl_getIndex(other->animctrl));
animctrl_setStart(this->animctrl, animctrl_getAnimTimer(other->animctrl));
animctrl_setDuration(this->animctrl, animctrl_getDuration(other->animctrl));
animctrl_setSmoothTransition(this->animctrl, FALSE);
animctrl_start(this->animctrl, "chwozzasjig.c", 0x87);
anctrl_setIndex(this->anctrl, anctrl_getIndex(other->anctrl));
anctrl_setStart(this->anctrl, anctrl_getAnimTimer(other->anctrl));
anctrl_setDuration(this->anctrl, anctrl_getDuration(other->anctrl));
anctrl_setSmoothTransition(this->anctrl, FALSE);
anctrl_start(this->anctrl, "chwozzasjig.c", 0x87);
this->position[0] = other->position[0];
this->position[1] = other->position[1];
this->position[2] = other->position[2];
@@ -69,7 +69,7 @@ void func_8038FF54(Actor *this){
}//L8039008C
if(this->state == 9){
if(0.99999 <= animctrl_getAnimTimer(this->animctrl)){
if(0.99999 <= anctrl_getAnimTimer(this->anctrl)){
func_8034A174(this->marker->unk44, 5, sp40);
sp40[0] = (f32)(s32)sp40[0];
sp40[1] = (f32)(s32)sp40[1];