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

8
src/TTC/ch/blubber.c
View File

@@ -117,7 +117,7 @@ void func_80387774(Actor **this_ptr){
&& func_8028FC34()
){
func_8028FA34(!mapSpecificFlags_get(0)? 0x149 : 0x14a, *this_ptr);
(*this_ptr)->unk138_24 = TRUE;
(*this_ptr)->is_first_encounter = TRUE;
}
}
@@ -146,11 +146,11 @@ void func_803878CC(Actor * this){
}//L80387970
if(func_80329530(this, 250) && !func_80329530(this, 80)
&& !this->unk138_24
&& !this->is_first_encounter
&& item_getCount(ITEM_18_GOLD_BULLIONS) == 0
){
func_80311480(0xa0b, 0xe, this->position, this->marker, func_80387520, NULL);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
subaddie_set_state_forward(this, 3);
}
@@ -161,7 +161,7 @@ void func_803878CC(Actor * this){
func_80311480(0xa0c, 4, NULL, NULL, NULL, NULL);
this->unk138_23 = TRUE;
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}//L80387A54

8
src/TTC/ch/clam.c
View File

@@ -160,7 +160,7 @@ void __chClam_emitLargeShellParticles(f32 position[3], s32 count){
particleEmitter_setModel(pCtrl, ASSET_37C_MODEL_CLAM_LARGE_SHELL_PIECE);
particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_8038C3F4);
particleEmitter_setAngularVelocityRange(pCtrl, -600.0f, -600.0f, -600.0f, 600.0f, 600.0f, 600.0f);
func_802EFB70(pCtrl, 1.0f, 1.0f);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_emitN(pCtrl, count);
}
@@ -176,7 +176,7 @@ void __chClam_emitEyeParticles(f32 position[3], s32 count){
particleEmitter_setModel(pCtrl, ASSET_37D_MODEL_CLAM_EYE);
particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_8038C424);
particleEmitter_setAngularVelocityRange(pCtrl, -300.0f, -300.0f, -300.0f, 300.0f, 300.0f, 300.0f);
func_802EFB70(pCtrl, 1.0f, 1.0f);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_emitN(pCtrl, count);
}
@@ -192,7 +192,7 @@ void __chClam_emitSmallShellParticles(f32 position[3], s32 count){
particleEmitter_setModel(pCtrl, ASSET_37E_MODEL_CLAM_SMALL_SHELL_PIECE);
particleEmitter_setVelocityAndAccelerationRanges(pCtrl, &D_8038C454);
particleEmitter_setAngularVelocityRange(pCtrl, -800.0f, -800.0f, -800.0f, 800.0f, 800.0f, 800.0f);
func_802EFB70(pCtrl, 0.5f, 0.8f);
particleEmitter_setStartingScaleRange(pCtrl, 0.5f, 0.8f);
particleEmitter_emitN(pCtrl, count);
}
@@ -277,7 +277,7 @@ void chClam_update(Actor *this){
}
if(this->state != 3){
sp48 = func_80309724(this->position);
sp48 = mapModel_getFloorY(this->position);
if(sp4C != NULL){
sp44 = sp4C->marker->id;
}

4
src/TTC/ch/leaky.c
View File

@@ -54,12 +54,12 @@ void chLeaky_update(Actor *this) {
}
}
if( this->state == 1
&& !this->unk138_24
&& !this->is_first_encounter
&& func_80329530(this, 250) && !func_80329530(this, 160)
&& !func_8028ECAC()
&& func_80311480(0xA1A, 0, NULL, NULL, NULL, NULL)
){
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
if (func_803114B0() == 0) {
if (actor_animationIsAt(this, 0.83f)) {

4
src/TTC/ch/lockup.c
View File

@@ -75,7 +75,7 @@ void func_80389600(Actor *this){
s32 tmp_v1;
int i;
if( !this->unk138_24
if( !this->is_first_encounter
&& this->unkF4_8 == 0xA
&& !jiggyscore_isCollected(JIGGY_13_TTC_LOCKUP)
&& func_80329530(this, 320)
@@ -83,7 +83,7 @@ void func_80389600(Actor *this){
&& !func_8028ECAC()
&& func_80311480(0xA15, 0, NULL, NULL, NULL, NULL)
){
this->unk138_24 = 1;
this->is_first_encounter = TRUE;
}//L803896AC
if(!this->unk16C_4){

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;
}

14
src/TTC/ch/treasure.c
View File

@@ -34,12 +34,12 @@ void __chtreasure_updatePosition(Actor *this){
this->position[1] = this->unk1C[1];\
this->position[2] = this->unk1C[2];
this->position[0] += this->unk5C*cosf(this->unk60);
this->position[2] += this->unk5C*sinf(this->unk60);
this->unk60 += 2.0*time_getDelta()*this->unk5C/300.0;
if(2*M_PI <= this->unk60)
this->unk60 -= 2*M_PI;
this->yaw = this->unk60*180.0/M_PI;
this->position[0] += this->unk5C*cosf(this->lifetime_value);
this->position[2] += this->unk5C*sinf(this->lifetime_value);
this->lifetime_value += 2.0*time_getDelta()*this->unk5C/300.0;
if(2*M_PI <= this->lifetime_value)
this->lifetime_value -= 2*M_PI;
this->yaw = this->lifetime_value*180.0/M_PI;
}
void chtreasure_update(Actor *this){
@@ -54,7 +54,7 @@ void chtreasure_update(Actor *this){
}
actor_collisionOff(this);
this->scale = 0.5f;
this->unk60 = M_PI/2;
this->lifetime_value = M_PI/2;
this->unk5C = 0.0f;
this->unk1C[0] = this->position[0];
this->unk1C[1] = this->position[1];

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

@@ -2,7 +2,7 @@
#include "functions.h"
#include "variables.h"
extern f32 func_80309724(f32[3]);
extern f32 mapModel_getFloorY(f32[3]);
extern void func_8028F45C(s32, f32[3]);
typedef struct {
@@ -92,11 +92,11 @@ void func_80389A1C(void) {
Actor *actor;
ActorLocal_TreasureHunt *local;
actor = func_8032813C(0x55, D_8038C820[D_8037DCB4], 0);
actor = spawn_actor_f32(0x55, D_8038C820[D_8037DCB4], 0);
local = (ActorLocal_TreasureHunt *)&actor->local;
actor->yaw = D_8038C868[D_8037DCB4];
local->unk0 = D_8037DCB4;
actor->unk60 = 0.0f;
actor->lifetime_value = 0.0f;
actor->state = 0;
}
@@ -105,11 +105,11 @@ void func_80389A9C(void) {
ActorLocal_TreasureHunt *local;
s32 actor_id;
actor = func_8032813C((D_8038C898 - 1)[D_8037DCB4], D_8038C820[D_8037DCB4 - 1], 0);
actor = spawn_actor_f32((D_8038C898 - 1)[D_8037DCB4], D_8038C820[D_8037DCB4 - 1], 0);
local = (ActorLocal_TreasureHunt *)&actor->local;
actor->yaw = D_8038C880[D_8037DCB4 - 1];
local->unk0 = D_8037DCB4;
actor->unk60 = 0.0f;
actor->lifetime_value = 0.0f;
actor->state = 0;
}
@@ -156,7 +156,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
D_8038D708[0] = (f32)arg0[0];
D_8038D708[1] = (f32)arg0[1];
D_8038D708[2] = (f32)arg0[2];
D_8038D708[1] = func_80309724(D_8038D708);
D_8038D708[1] = mapModel_getFloorY(D_8038D708);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2]));
D_8038D700 = partEmitMgr_newEmitter(3);
particleEmitter_setRGB(D_8038D700, D_8038C91C);
@@ -192,8 +192,8 @@ void TTC_func_80389E90(Actor *this){
switch(this->state){
case 0://L80389F20
this->unk60 = MIN(255.0, this->unk60 + tick*150.0);
if(255.0 == this->unk60){
this->lifetime_value = MIN(255.0, this->lifetime_value + tick*150.0);
if(255.0 == this->lifetime_value){
this->state = 1;
}
break;
@@ -203,12 +203,12 @@ void TTC_func_80389E90(Actor *this){
}
break;
case 2://L80389FC4
this->unk60 = MAX(0.0, this->unk60 - tick*((this->marker->modelId == ASSET_3EA_MODEL_RED_X)? 200.0 : 150.0));
if(0.0 == this->unk60)
this->lifetime_value = MAX(0.0, this->lifetime_value - tick*((this->marker->modelId == ASSET_3EA_MODEL_RED_X)? 200.0 : 150.0));
if(0.0 == this->lifetime_value)
marker_despawn(this->marker);
break;
}//L8038A094
actor_setOpacity(this, (s32)this->unk60);
actor_setOpacity(this, (s32)this->lifetime_value);
this->depth_mode = 2;
}