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

4
src/GV/ch/gobi1.c
View File

@@ -176,13 +176,13 @@ void chGobi1_update(Actor *this){
}
if(this->state == 1 || this->state == 2){
if( !this->unk138_24
if( !this->is_first_encounter
&& func_80329530(this, 250)
&& !func_80329530(this, 80)
&& func_8028F2A0()
&& func_80311480(0xa73, 0, NULL, NULL, NULL, NULL)
){
this->unk138_24 = 1;
this->is_first_encounter = TRUE;
}
}//L803877A4

4
src/GV/ch/gobi2.c
View File

@@ -200,11 +200,11 @@ void chGobi2_update(Actor *this){
}//L80388114
if(this->state == 2){
if(!this->unk138_24){
if(!this->is_first_encounter){
if(func_80329530(this, 0xFA) && !func_80329530(this, 0x50)){
if(func_8028F2A0()){
if(func_80311480(ASSET_A75_TEXT_GOBI2_MEET, 0, this->position, NULL, NULL, NULL))
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
}
}

6
src/GV/ch/histup.c
View File

@@ -119,15 +119,15 @@ void func_8038DBDC(Actor *this){
this->unk1C[0] = 0.0f;
}//L8038DC90
if(func_8038E178() != (s32)this->unk1C[0] || volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){
if(15.0f <= this->unk60){
if(15.0f <= this->lifetime_value){
subaddie_set_state_with_direction(this, 2, 0.01f, 1);
animctrl_setPlaybackType(this->animctrl, ANIMCTRL_ONCE);
animctrl_setDuration(this->animctrl, 2.0f);
this->unk1C[0] = (f32)func_8038E178();
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
}
else{//L8038DD2C
this->unk60 += 1.0f;
this->lifetime_value += 1.0f;
}
}
break;

4
src/GV/ch/trunker.c
View File

@@ -69,13 +69,13 @@ void chTrucker_update(Actor *this){
}
}//L803891D8
if( this->state == 1
&& !this->unk138_24
&& !this->is_first_encounter
&& func_80329530(this, 250)
&& !func_80329530(this, 80)
&& func_8028F2A0()
){
func_80311480(ASSET_A71_TEXT_TRUNKER_MEET, 0xe, this->position, NULL, NULL, NULL);
this->unk138_24 = 1;
this->is_first_encounter = TRUE;
}//L80389254
if(this->state == 1 && mapSpecificFlags_get(0xC)){

14
src/GV/code_3630.c
View File

@@ -30,7 +30,7 @@ void func_80389A20(ActorMarker *caller, enum asset_e text_id, s32 arg2){
void func_80389A60(Actor *this){
func_80311480(ASSET_A70_TEXT_CHARMER_HELPED, 4, NULL, this->marker, func_80389A20, NULL);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
subaddie_set_state(this, 5);
}
@@ -47,8 +47,8 @@ void func_80389ABC(Actor *this){
void func_80389B1C(Actor *this){
if(!this->unk16C_4){
this->unk60 = (f32) func_8038E184();
this->unk138_24 = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(0);
this->lifetime_value = (f32) func_8038E184();
this->is_first_encounter = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(0);
this->unk138_23 = jiggyscore_isCollected(JIGGY_43_GV_HISTUP) || mapSpecificFlags_get(2);
this->unk16C_4 = TRUE;
}
@@ -62,16 +62,16 @@ void func_80389B1C(Actor *this){
animctrl_setTransitionDuration(this->animctrl, 0.15f);
if(this->state == 1 || this->state == 2){
if(! this->unk138_24 && func_80329530(this, 250) && !func_80329530(this, 0x50)){
if(! this->is_first_encounter && func_80329530(this, 250) && !func_80329530(this, 0x50)){
func_80311480(ASSET_A6F_TEXT_CHARMER_MEET, 0xe, this->position, NULL, NULL, NULL);
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
mapSpecificFlags_set(0, TRUE);
}
}
switch(this->state){
case 1://L80389CC4
if(this->unk60 <= (f32)func_8038E178()){
if(this->lifetime_value <= (f32)func_8038E178()){
func_80389ABC(this);
}
else if(actor_animationIsAt(this, 0.99f)){
@@ -92,7 +92,7 @@ void func_80389B1C(Actor *this){
break;
case 2: //L80389DB0
if(this->unk60 <= (f32)func_8038E178()){
if(this->lifetime_value <= (f32)func_8038E178()){
func_80389ABC(this);
}
else if(actor_animationIsAt(this, 0.99f)){

4
src/GV/code_3D90.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]);
void func_80329904(ActorMarker *, s32, void *);
void func_8038A314(Actor *this);
@@ -143,7 +143,7 @@ void func_8038A31C(Actor *this){
this->pitch = 0.0f;
if(this->unk100 && sp24 && this->unk100->id == MARKER_AF_MAGIC_CARPET_SHADOW){
sp24->position_x = this->position_x;
sp24->position_y = func_80309724(this->position) + 60.0f;
sp24->position_y = mapModel_getFloorY(this->position) + 60.0f;
sp24->position_z = this->position_z;
sp24->unk1C[0] = func_8038A264(sp24, this);
sp24->yaw = this->yaw;

4
src/GV/code_43B0.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]);
void func_80329904(ActorMarker *, s32, void *);
@@ -57,7 +57,7 @@ void func_8038A8CC(ActorMarker *this_marker){
s32 pad;
this->unk100 = shadow->marker;
shadow->position_y = func_80309724(this->position);
shadow->position_y = mapModel_getFloorY(this->position);
shadow->unk1C[0] = func_8038A860(shadow, this);
shadow->yaw = this->yaw;
func_8032AA58(shadow, this->scale);

16
src/GV/code_4740.c
View File

@@ -61,8 +61,8 @@ void func_8038ABD8(f32 position[3], s32 cnt){
-100.0f, 10.0f, -100.0f,
100.0f, 60.0f, 100.0f
);
func_802EFB70(pCtrl, 0.1f, 0.5f);
func_802EFB84(pCtrl, 1.2f, 2.6f);
particleEmitter_setStartingScaleRange(pCtrl, 0.1f, 0.5f);
particleEmitter_setFinalScaleRange(pCtrl, 1.2f, 2.6f);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.5f, 1.4f);
particleEmitter_emitN(pCtrl, cnt);
@@ -79,8 +79,8 @@ void func_8038ACEC(f32 pos[3], s32 cnt){
-200.0f, 20.0f, -200.0f,
300.0f, 120.0f, 200.0f
);
func_802EFB70(pCtrl, 1.0f, 2.6f);
func_802EFB84(pCtrl, 3.0f, 5.5f);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 2.6f);
particleEmitter_setFinalScaleRange(pCtrl, 3.0f, 5.5f);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 1.2f, 3.2f);
particleEmitter_emitN(pCtrl, cnt);
@@ -94,7 +94,7 @@ void func_8038ADFC(f32 pos[3], s32 cnt){
particleEmitter_setAngularVelocityRange(pCtrl, -500.0f, -500.0f, -500.0f, 500.0f, 500.0f, 500.0f);
func_802EF9F8(pCtrl, 0.6f);
func_802EFA18(pCtrl, 2);
func_802EFB70(pCtrl, 1.0f, 1.0f);
particleEmitter_setStartingScaleRange(pCtrl, 1.0f, 1.0f);
particleEmitter_setDrawMode(pCtrl, 2);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 4.0f, 6.0f);
@@ -271,19 +271,19 @@ void func_8038B124(Actor *this){
if(0.98 < animctrl_getAnimTimer(this->animctrl)){
subaddie_set_state_with_direction(this, 6, 0.99f, 0);
actor_playAnimationOnce(this);
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
this->unk1C[0] = 1.0f;
}
break;
case 6: //L8038B78C
if(75.0f <= this->unk60){
if(75.0f <= this->lifetime_value){
subaddie_set_state_with_direction(this, 7, 0.00001f, 1);
actor_playAnimationOnce(this);
this->unk1C[0] = 1.0f;
}
else{
this->unk60 += 1.0f;
this->lifetime_value += 1.0f;
}
break;

12
src/GV/code_5570.c
View File

@@ -130,8 +130,8 @@ void func_8038BC7C(f32 position[3], s32 cnt){
-250.0f, 10.0f, -250.0f,
250.0f, 110.0f, 250.0f
);
func_802EFB70(pCtrl, 0.1f, 0.5f);
func_802EFB84(pCtrl, 2.0f, 2.6f);
particleEmitter_setStartingScaleRange(pCtrl, 0.1f, 0.5f);
particleEmitter_setFinalScaleRange(pCtrl, 2.0f, 2.6f);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.5f, 1.4f);
particleEmitter_emitN(pCtrl, cnt);
@@ -148,8 +148,8 @@ void func_8038BD8C(f32 position[3], s32 cnt){
-100.0f, 20.0f, -100.0f,
100.0f, 60.0f, 100.0f
);
func_802EFB70(pCtrl, 0.1f, 0.5f);
func_802EFB84(pCtrl, 1.2, 1.6f);
particleEmitter_setStartingScaleRange(pCtrl, 0.1f, 0.5f);
particleEmitter_setFinalScaleRange(pCtrl, 1.2, 1.6f);
particleEmitter_setSpawnIntervalRange(pCtrl, 0.0f, 0.01f);
particleEmitter_setParticleLifeTimeRange(pCtrl, 0.5f, 1.4f);
particleEmitter_emitN(pCtrl, cnt);
@@ -244,9 +244,9 @@ void GV_func_8038BEA0(Actor *this){
}
}
else{
if(!this->unk138_24){
if(!this->is_first_encounter){
if(func_80311480(ASSET_A78_TEXT_GRABBA_MEET, 0, NULL, NULL, NULL, NULL)){
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
}
}