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

26
src/BGS/ch/code_2270.c
View File

@@ -111,10 +111,10 @@ void func_80388848(ActorMarker *this){
if(sp1C != ++unqPtr->unk0)
return;
if(func_803203FC(2)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
item_set(ITEM_6_HOURGLASS,0);
func_803204E4(3,0);
func_803204E4(5,1);
volatileFlag_set(3,0);
volatileFlag_set(5,1);
}
else{
BGS_func_80388660(thisActor->marker);
@@ -173,12 +173,12 @@ void BGS_func_803888E4(Actor *this, s32 arg1){
}//L80388B7C
timed_exitStaticCamera(tmpf += 2.5);
if(!unqPtr->unkA && !func_803203FC(2)){
if(!unqPtr->unkA && !volatileFlag_get(VOLATILE_FLAG_2)){
func_80324DBC(tmpf + 0.5, 0xc73, 0xe, this->position, this->marker, func_80388784, 0);
unqPtr->unkA = 1;
}
func_80324E38(sp54 = tmpf + 0.6, 0);
if(func_803203FC(2)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
timedFunc_set_1(sp54, (GenFunction_1)func_803886F4, reinterpret_cast(s32, this->marker));
}else{
this->state = 0x05;
@@ -243,7 +243,7 @@ void func_80388E94(ActorMarker *this, s32 arg1){
else{
func_8028F55C(1, thisActor->marker);
timedFunc_set_0(0.5f, BGS_func_80388760);
if(!mapSpecificFlags_get(1) && !func_803203FC(2) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL))
if(!mapSpecificFlags_get(1) && !volatileFlag_get(VOLATILE_FLAG_2) && func_80311480(0xc75, 0, NULL, NULL, NULL, NULL))
mapSpecificFlags_set(1,TRUE);
}
}
@@ -292,12 +292,12 @@ void func_80389080(Actor *this){
unqPtr->unkA = fileProgressFlag_getN(0,2);
unqPtr->unkB = 0;
unqPtr->unkC = 0.0f;
if(func_803203FC(2)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
unqPtr->unkA = 3;
this->position_y = this->position_y - 300.0f;
}
BGS_func_803888E4(this, 1);
if(jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !func_803203FC(2) && !func_803203FC(1))
if(jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_1))
marker_despawn(this->marker);
}
else{
@@ -312,8 +312,8 @@ void func_80389080(Actor *this){
func_80258A4C(this->position, this->yaw - 90.0f, player_position, &sp38, &sp34, &sp30);
this->yaw = this->yaw + 5.0f*sp30;
if(this->state == 1){
if(func_803203FC(2)){
if(func_803203FC(3)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
if(volatileFlag_get(VOLATILE_FLAG_3)){
func_80324E38(0.0f,0);
BGS_func_803888E4(this, 3);
}
@@ -325,11 +325,11 @@ void func_80389080(Actor *this){
}
}
if(this->state == 5){
if(func_803203FC(2)){
if(volatileFlag_get(VOLATILE_FLAG_2)){
if(item_empty(ITEM_0_HOURGLASS_TIMER)){
item_set(ITEM_6_HOURGLASS,1);
func_803204E4(3,0);
func_803204E4(5,0);
volatileFlag_set(3,0);
volatileFlag_set(5,0);
}
} //L80389370
else{

2
src/BGS/ch/flibbit.c
View File

@@ -154,7 +154,7 @@ bool func_80386A34(Actor * this){
f32 plyrPos[3];
bool out;
if(func_803203FC(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE))
if(volatileFlag_get(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE))
return 0;
player_getPosition(plyrPos);

2
src/BGS/code_3030.c
View File

@@ -80,7 +80,7 @@ void func_80389668(Actor *this) {
local->tiptup_marker = NULL;
local->unk8 = 1.0f;
func_80389488(this, 1);
if (jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !func_803203FC(2) && !func_803203FC(1)) {
if (jiggyscore_isSpawned(JIGGY_27_BGS_TIPTUP) && !volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_1)) {
marker_despawn(this->marker);
}
return;

16
src/BGS/code_3420.c
View File

@@ -362,7 +362,7 @@ void func_8038A068(Actor *this, s32 next_state) {
local->current_type = YUMBLIE;
local->player_score = 0;
local->vile_score = 0;
if (func_803203FC(2) != 0) {
if (volatileFlag_get(VOLATILE_FLAG_2) != 0) {
local->type_change_timer = 5.0f;
} else {
local->type_change_timer = 10.0f;
@@ -640,7 +640,7 @@ void chvilegame_update(Actor *this) {
local->unkC = 3;
local->unkD = 3;
}
if (func_803203FC(2)) {
if (volatileFlag_get(VOLATILE_FLAG_2)) {
local->unkC = 2;
local->unkD = 3;
}
@@ -651,8 +651,8 @@ void chvilegame_update(Actor *this) {
local->vile_marker = actorArray_findClosestActorFromActorId(this->position, 0x13A, -1, &sp4C)->marker;
}
if (this->state == 1) {
if (func_803203FC(2)) {
if (func_803203FC(3)) {
if (volatileFlag_get(VOLATILE_FLAG_2)) {
if (volatileFlag_get(VOLATILE_FLAG_3)) {
func_8038A068(this, 5);
}
} else if (func_8038C2A8(local->vile_marker)) {
@@ -670,7 +670,7 @@ void chvilegame_update(Actor *this) {
if ((local->unkC == 3) || (local->unkC == 6)) {
if (ml_timer_update(&local->type_change_timer, sp50)) {
local->current_type = !local->current_type;
if (func_803203FC(2)) {
if (volatileFlag_get(VOLATILE_FLAG_2)) {
local->type_change_timer = 5.0f;
} else {
local->type_change_timer = 10.0f;
@@ -691,9 +691,9 @@ void chvilegame_update(Actor *this) {
itemPrint_reset();
}
if (item_empty(ITEM_6_HOURGLASS)) {
if (func_803203FC(2)) {
func_803204E4(3, 0);
func_803204E4(5, ( local->vile_score < local->player_score) ? TRUE : FALSE);
if (volatileFlag_get(VOLATILE_FLAG_2)) {
volatileFlag_set(3, 0);
volatileFlag_set(5, ( local->vile_score < local->player_score) ? TRUE : FALSE);
func_8038A068(this, 1);
} else if (local->vile_score < local->player_score) {
if (local->unkC == 3) {