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

2
src/MM/ch/chimpystump.c
View File

@@ -35,7 +35,7 @@ void _chchimpystump_80386CA0(Actor *this){
void chchimpystump_update(Actor *this){
if(!this->initialized){
actor_collisionOff(this);
this->initialized = 1;
this->initialized = TRUE;
this->unk28 = this->position_y;
this->position_y -= 134.0f;
this->marker->propPtr->unk8_3 = 1;

8
src/MM/ch/conga.c
View File

@@ -222,12 +222,12 @@ void func_803876D0(Actor *this){
if(!this->initialized){
((ActorLocal_Conga *)&this->local)->unkC = 1;
this->unk16C_0 = 1;
this->initialized = 1;
this->initialized = TRUE;
this->velocity_x = 0.0f;
this->unk28 = 0.0f;
node_prop = func_80304C38(0x150, this);
((ActorLocal_Conga *)&this->local)->unk1C = nodeprop_getRadius(node_prop);
func_80304D4C(node_prop, &((ActorLocal_Conga *)&this->local)->unk10);
nodeprop_getPosition_s32(node_prop, &((ActorLocal_Conga *)&this->local)->unk10);
}
if(0.0f == this->unk28){
this->unk28 = (actorArray_findActorFromMarkerId(MARKER_36_ORANGE_COLLECTIBLE) != NULL)? 2.0f: 1.0f;
@@ -259,9 +259,9 @@ void func_803876D0(Actor *this){
mapSpecificFlags_set(0xA, 1);
}//L803878F8
if( sp3C && !this->unk138_24){
if( sp3C && !this->is_first_encounter){
if(func_80311480((player_getTransformation()== TRANSFORM_2_TERMITE) ? ASSET_B3E_TEXT_CONGA_MEET_AS_TERMITE : ASSET_B3C_TEXT_CONGA_MEET, 0, this->position, 0,0,0)){
this->unk138_24 = 1;
this->is_first_encounter = TRUE;
}
} //L80387968

6
src/MM/ch/hut.c
View File

@@ -58,8 +58,8 @@ void func_803869EC(ActorMarker *this){
f32 *pos;
actorPtr = marker_getActor(this);
actorPtr = func_8032813C(0x4B, actorPtr->position, 0);
func_8032813C(ACTOR_4D_STEAM_2, actorPtr->position, 0);
actorPtr = spawn_actor_f32(0x4B, actorPtr->position, 0);
spawn_actor_f32(ACTOR_4D_STEAM_2, actorPtr->position, 0);
if(this);
}
@@ -74,7 +74,7 @@ void chhut_update(Actor *this){
if(!this->initialized){
this->marker->collidable = 0;
this->initialized = 1;
this->initialized = TRUE;
}
switch(this->state){
case HUT_STATE_INTACT:

2
src/MM/ch/juju.c
View File

@@ -70,7 +70,7 @@ void func_803890A0(ActorMarker *marker, s32 arg1){
position[1] = actorPtr->position_y;
position[2] = actorPtr->position_z;
for(i = 0; i < 4; i++){
jujuPtr = func_8032813C(ACTOR_59_JUJU, actorPtr->position, actorPtr->yaw);
jujuPtr = spawn_actor_f32(ACTOR_59_JUJU, actorPtr->position, actorPtr->yaw);
jujuPtr->marker->collidable = 0;
actorPtr = marker_getActor(marker);
func_80388DE8(actorPtr, i, jujuPtr);

8
src/MM/ch/jujuhitbox.c
View File

@@ -120,8 +120,8 @@ void func_80388E20(Actor *this){
jujuCtlPtr = (ActorLocal_JujuHitbox *)&this->local;
if(!this->initialized){
this->initialized = 1;
this->unk138_24 = 0;
this->initialized = TRUE;
this->is_first_encounter = FALSE;
jujuCtlPtr->unk18 = 0.5f;
}
if(!this->unk16C_4){
@@ -133,9 +133,9 @@ void func_80388E20(Actor *this){
&& !func_80329530(this, 0x50)
&& !func_8028ECAC()
){
if( !this->unk138_24 ){
if( !this->is_first_encounter ){
if(func_80311480(ASSET_B44_TEXT_JUJU_MEET, 0, 0, 0, NULL, NULL)){
this->unk138_24 = 1;
this->is_first_encounter = TRUE;
}
}
}

6
src/MM/ch/lmonkey.c
View File

@@ -37,7 +37,7 @@ void func_80388300(Actor **arg0){
&& func_8028FC34()
){
func_8028FA34(0xc6, *arg0);
(*arg0)->unk138_24 = 1;
(*arg0)->is_first_encounter = TRUE;
timed_setStaticCameraToNode(1.2f, 0xF);
func_80324E38(1.2f, 3);
}
@@ -101,10 +101,10 @@ void chLMonkey_update(Actor *this){
if( func_80329530(this, 345)
&& !func_80329530(this, 150)
&& !item_getCount(ITEM_19_ORANGE)
&& !this->unk138_24
&& !this->is_first_encounter
){
func_80311480(ASSET_B3F_DIALOG_CHIMPY_MEET, 0xe, this->position, NULL, NULL, NULL);
this->unk138_24 = 1;
this->is_first_encounter = TRUE;
}//L80388774
actor_loopAnimation(this);
subaddie_maybe_set_state_position_direction(this, 2, 0.0f, -1, 0.02f);

14
src/MM/ch/orange.c
View File

@@ -16,7 +16,7 @@
#endif
/* extern functions */
f32 func_80309724(f32*);
f32 mapModel_getFloorY(f32*);
/* public functions */
void MM_func_80387FF4(Actor *this);
@@ -59,7 +59,7 @@ void MM_func_80387FF4(Actor * this){
this->position_y += velocity_y;
this->position_z += this->velocity_z;
ground_position_y = func_80309724(this->position);
ground_position_y = mapModel_getFloorY(this->position);
if(this->position_y < ground_position_y){
this->position_y = ground_position_y;
@@ -67,16 +67,16 @@ void MM_func_80387FF4(Actor * this){
func_8030E6D4(SFX_2F_ORANGE_SPLAT);
this->unk28 = 1.0f;
this->unk60 = 340.0f;
this->lifetime_value = 340.0f;
this->state = 2;
}
break;
case ORANGE_LANDED_STATE:
if(this->unk60 < 324.0){
if(this->lifetime_value < 324.0){
this->marker->collidable = 0;
}
this->unk60 -= 4.0;
if(this->unk60 < 4.0){
this->lifetime_value -= 4.0;
if(this->lifetime_value < 4.0){
marker_despawn(this->marker);
}
break;
@@ -93,7 +93,7 @@ Actor *func_80388188(ActorMarker *this, Gfx **dl, Mtx **mptr, Vtx **vtx){
position[0] = actorPtr->position_x;
position[1] = actorPtr->unk1C_y + 3.0f;
position[2] = actorPtr->position_z;
modelRender_setAlpha( (s32) MIN(255.0f, actorPtr->unk60) );
modelRender_setAlpha( (s32) MIN(255.0f, actorPtr->lifetime_value) );
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
modelRender_draw(dl, mptr, position, rotation, actorPtr->unk28, sp60, func_8030A428(0x18));
actorPtr->position_y -= 1.9;

14
src/MM/ch/orangepad.c
View File

@@ -65,8 +65,8 @@ void func_80386444(ActorMarker *marker){
p_ctrl = partEmitMgr_newEmitter(30);
particleEmitter_setPosition(p_ctrl, closest_orange_pad->position);
particleEmitter_setModel(p_ctrl, 0x89f);
func_802EFB70(p_ctrl, 0.09f, 0.19f);
func_802EFB84(p_ctrl, 0.0f, 0.0f);
particleEmitter_setStartingScaleRange(p_ctrl, 0.09f, 0.19f);
particleEmitter_setFinalScaleRange(p_ctrl, 0.0f, 0.0f);
particleEmitter_setParticleVelocityRange(p_ctrl,
-200.0f, 500.0f, -200.0f,
@@ -104,7 +104,7 @@ void func_80386768(Actor * this){
if(!this->initialized){
this->marker->propPtr->unk8_3 = 1;
actor_collisionOff(this);
this->initialized = 1;
this->initialized = TRUE;
}//L803867B0
if(!this->unk16C_4){
@@ -127,17 +127,17 @@ void func_80386768(Actor * this){
}
if(this->state == 1){
if(this->unk60 < 72.0f){
if(this->lifetime_value < 72.0f){
func_8033E73C(this->marker, 5, func_80329904);
func_8033E3F0(9, this->marker->unk14_21);
}
this->unk60 = MIN(255.0, this->unk60 + 7.0);
this->lifetime_value = MIN(255.0, this->lifetime_value + 7.0);
if(255.0 == this->unk60){
if(255.0 == this->lifetime_value){
marker_despawn(this->marker);
}
}else{
}//L80386928
actor_setOpacity(this, 0xFF - (s32)this->unk60);
actor_setOpacity(this, 0xFF - (s32)this->lifetime_value);
}//*/