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

14
src/MMM/ch/loggo.c
View File

@@ -22,11 +22,11 @@ ActorInfo chLoggo = {
/* .code */
void __chLoggo_flush(ActorMarker* marker) {
Actor* sp1C = marker_getActor(marker);
Actor* actor = marker_getActor(marker);
func_8028F918(2);
subaddie_set_state_with_direction(sp1C, 2, 0.01, 1);
actor_playAnimationOnce(sp1C);
sp1C->unk60 = 3.2f;
subaddie_set_state_with_direction(actor, 2, 0.01, 1);
actor_playAnimationOnce(actor);
actor->lifetime_value = 3.2f;
}
void __chLoggo_textCallback(ActorMarker* caller, enum asset_e text_id, s32 arg3) {
@@ -69,7 +69,7 @@ void chLoggo_update(Actor *this){
marker_setCollisionScripts(this->marker, __chLoggo_collide, NULL, NULL);
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
actor_loopAnimation(this);
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
if(!fileProgressFlag_get(FILEPROG_8A_EXITED_LOGGO) && levelSpecificFlags_get(0x33)){
if(func_80311480(ASSET_AE0_TEXT_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)){
fileProgressFlag_set(FILEPROG_8A_EXITED_LOGGO, TRUE);
@@ -112,8 +112,8 @@ void chLoggo_update(Actor *this){
func_8028F6E4(BS_INTR_2F_LOGGO, sp38);
}
if(0.0 < this->unk60){
this->unk60 -= sp44;
if(0.0 < this->lifetime_value){
this->lifetime_value -= sp44;
}
else{
warp_mmmEnterLoggo(0, 0);

4
src/MMM/ch/napper.c
View File

@@ -61,9 +61,9 @@ void __chnapper_setState(Actor *this, s32 next_state){
void func_80386ACC(ActorMarker *this_marker, ActorMarker *other_marker){
Actor *this = marker_getActor(this_marker);
if(!this->unk138_24){
if(!this->is_first_encounter){
if(func_80311480(0xad8, 0, NULL, NULL, NULL, NULL)){
this->unk138_24 = TRUE;
this->is_first_encounter = TRUE;
}
}
}

20
src/MMM/code_2040.c
View File

@@ -196,7 +196,7 @@ f32 MMM_func_80388430(Actor *this, s32 arg1, s32 arg2, f32 arg3) {
break;
}
func_8030E878(SFX_82_METAL_BREAK, randf2(0.93f, 1.07f), 0x7FF8, this->position, 100.0f, 900.0f);
this->unk60 = 1.0f;
this->lifetime_value = 1.0f;
}
}
arg3 += 4.5;
@@ -226,7 +226,7 @@ bool func_80388670(ActorMarker * this_marker, ActorMarker * other_marker){
void func_803888B8(Actor *this){
func_803300C0(this->marker, func_80388670);
func_802D3CE8(this);
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
switch(this->state){
case 4:
switch(this->marker->id){
@@ -255,7 +255,7 @@ Actor *func_80388994(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
f32 sp6C[3];
this = actor_drawFullDepth(marker, gfx, mtx, vtx);
if (marker->unk14_21 && (this->unk60 != 0.0f)) {
if (marker->unk14_21 && (this->lifetime_value != 0.0f)) {
func_8034A174((struct5Bs *) marker->unk44, 5, &sp84);
func_8034A174((struct5Bs *) marker->unk44, 6, &sp78);
for(i = 0; i < 8; i++){
@@ -290,13 +290,13 @@ void func_80388BDC(Actor *this) {
mapSpecificFlags_set(1, ((this->yaw > 260.0f) && (this->yaw < 330.0f)) ? TRUE : FALSE);
if (!this->unk16C_4) {
if (this->yaw != 0.0f) {
this->unk60 = 0.5f;
this->lifetime_value = 0.5f;
subaddie_set_state(this, 7);
this->unk38_31 = 1;
this->yaw = 270.0f;
} else {
this->unk38_31 = 0;
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
}
this->unk16C_4 = TRUE;
}
@@ -327,13 +327,13 @@ void func_80388BDC(Actor *this) {
break;
case 7:
if (this->unk38_31) {
this->unk60 -= time_getDelta();
if (this->unk60 < 0.0f) {
this->unk60 = 0.0f;
this->lifetime_value -= time_getDelta();
if (this->lifetime_value < 0.0f) {
this->lifetime_value = 0.0f;
}
}
if( (!this->unk38_31 && item_empty(ITEM_0_HOURGLASS_TIMER))
|| ((this->unk38_31) && (this->unk60 == 0.0f))
|| ((this->unk38_31) && (this->lifetime_value == 0.0f))
) {
if (!this->unk38_31) {
func_802BAFE4(0x22);
@@ -357,7 +357,7 @@ void func_80388BDC(Actor *this) {
func_8025AE0C(0x7D0, 2.5f);
}
this->unk38_31 = 0;
this->unk60 = 0.0f;
this->lifetime_value = 0.0f;
volatileFlag_setAndTriggerDialog_0(VOLATILE_FLAG_AD_MMM_CHURCH_DOOR_MISSED);
}
break;