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

documented volatile flag functions and enums and some Actor struct members

Browse Source
This commit is contained in:
mariob92
2024-09-08 12:22:27 +02:00
parent 347c3edcdf
commit 615e2bda33
111 changed files with 584 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -109,7 +109,7 @@ void func_8038A384(Actor *this){
}//L8038A4A0
if( jiggyscore_isCollected(JIGGY_2E_FP_PRESENTS)
|| func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)
|| volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)
){
subaddie_set_state_with_direction(this, 2, randf2(0.0f, 0.9f), 1);
}

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

@@ -115,7 +115,7 @@ void func_8038794C(Actor *this){
this->unk38_31 = 1;
ml_vec3f_copy(this->velocity, this->position);
if(func_803203FC(1))
if(volatileFlag_get(VOLATILE_FLAG_1))
return;
if(!jiggyscore_isCollected(JIGGY_2A_FP_BOGGY_1) && jiggyscore_isSpawned(JIGGY_2A_FP_BOGGY_1)){

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

@@ -143,9 +143,9 @@ void func_80388B18(Actor *this, u8 arg1){
}
}
else{//L80388BB8
if(!func_803203FC(0xb3)){
if(!volatileFlag_get(0xb3)){
if(func_80311480(0xc01, 0xe, this->position, this->marker, func_80388D70, NULL)){
func_803204E4(0xb3, TRUE);
volatileFlag_set(0xb3, TRUE);
func_80388A50(this);
}
}
@@ -153,9 +153,9 @@ void func_80388B18(Actor *this, u8 arg1){
}
else{//L80388C08
if(player_getTransformation() == TRANSFORM_4_WALRUS){
if(!func_803203FC(0xb4)){
if(!volatileFlag_get(0xb4)){
if(func_80311480(0xc08, 0xe, this->position, this->marker, func_80388D70, NULL)){
func_803204E4(0xb4, TRUE);
volatileFlag_set(0xb4, TRUE);
func_80388A50(this);
}
}
@@ -476,13 +476,13 @@ void func_803896FC(Actor *this){
){
if( local->unk19 == 1
&& player_getTransformation() != TRANSFORM_4_WALRUS
&& func_803203FC(0xb3)
&& volatileFlag_get(0xb3)
){
func_80311480(0xC01, 0xf, this->position, this->marker, func_80388D70, NULL);
}
else if( local->unk19 == 2){
if( player_getTransformation() == TRANSFORM_4_WALRUS
&& func_803203FC(0xb4)
&& volatileFlag_get(0xb4)
){
func_80311480(0xC08, 0xf, this->position, this->marker, func_80388D70, NULL);
}

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

@@ -20,7 +20,7 @@ extern ActorInfo D_80392700 = { MARKER_20F_WOZZA_IN_CAVE, ACTOR_33F_WOZZA_IN_CAV
/* .code */
void func_80390630(Actor *this){
if(func_803203FC(0xC4)){
if(volatileFlag_get(VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE)){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
this->marker->propPtr->unk8_3 = FALSE;

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

@@ -242,7 +242,7 @@ void func_8038C8F0(ActorMarker *marker){
void func_8038C94C(ActorMarker *caller, enum asset_e text_id, s32 arg2){
Actor *this = marker_getActor(caller);
if(!func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
if(!volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){
subaddie_set_state(this, 6);
__spawnQueue_add_1((GenFunction_1)func_8038C8F0, reinterpret_cast(s32, this->marker));
}

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

@@ -302,14 +302,14 @@ void func_8038D6C8(Actor *this){
this->velocity[1] = 0.0f;
this->unk1C[0] = -1.0f;
func_8028F8F8(7, FALSE);
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -1){
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -1){
subaddie_set_state_with_direction(this, 3, 0.001f, 1);
actor_playAnimationOnce(this);
this->velocity[0] = 1.0f;
}
}//L8038D844
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE)){
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE)){
this->velocity[0] = 1.0f;
}

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

@@ -112,7 +112,7 @@ void func_8038E094(Actor *this){
func_8038DDC8(this);
}
if(this->unkF4_8 == 2){
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -2){
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE) && gcparade_8031B4F4() == -2){
func_8038DDC8(this);
}
else{

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

@@ -172,7 +172,7 @@ void FP_func_8038F758(ActorMarker *marker){
void FP_func_8038F7AC(Actor *this){
ActorLocal_Wozza * local = (ActorLocal_Wozza *)&this->local;
if(func_803203FC(0xC4)){
if(volatileFlag_get(VOLATILE_FLAG_C4_WOZZA_HIDE_IN_SNS_PARADE)){
if(!this->unk16C_4){
this->unk16C_4 = TRUE;
this->marker->propPtr->unk8_3 = FALSE;
@@ -228,7 +228,7 @@ void FP_func_8038F7AC(Actor *this){
break;
}
if(func_80329530(this, 1000) && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)){
if(func_80329530(this, 1000) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)){
func_8038F454(this);
break;
}

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

@@ -42,7 +42,7 @@ void __chXmasTree_80386EF4(Actor *this, int arg1){
void __chXmasTree_80386F3C(void){
levelSpecificFlags_set(0x29, TRUE);
func_803228D8();
func_803204E4(0xe, 1);
volatileFlag_set(0xe, 1);
func_802E4078(MAP_53_FP_CHRISTMAS_TREE, 1, 0);
}