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

12
src/lair/ch/brentilda.c
View File

@@ -26,7 +26,7 @@ void func_8038BA30(ActorMarker *marker, enum asset_e text_id, s32 arg2){
this = marker_getActor(marker);
phi_v1 = this->unk10_12*2;
func_80320424(0x20 + this->unkF4_8*6 + phi_v1, 2);
volatileFlag_getN(0x20 + this->unkF4_8*6 + phi_v1, 2);
}
void lair_func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -68,18 +68,18 @@ void func_8038BC24(void) {
s32 phi_s0;
s32 phi_s1;
if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !func_803203FC(0x62)) {
if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !volatileFlag_get(0x62)) {
rand_seed(fileProgressFlag_getN(FILEPROG_D3_FF_PATTERN, 8));
for(phi_s1 = 0; phi_s1 < func_8031A45C(3); phi_s1++){
phi_s0 = 0x26 + 2*phi_s1;
temp_v0 = randi2(0, 3);
if (phi_s0 >= 0x61) {
func_80320524(0x26, temp_v0, 2);
volatileFlag_setN(0x26, temp_v0, 2);
} else {
func_80320524(phi_s0, temp_v0, 2);
volatileFlag_setN(phi_s0, temp_v0, 2);
}
}
func_803204E4(0x62, 1);
volatileFlag_set(0x62, 1);
}
}
@@ -161,7 +161,7 @@ void chBrentilda_update(Actor *this) {
}
}
actor_setOpacity(this, sp74);
if (!func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
if (!volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) {
if ((phi_f2 < 600.0) && !this->unk38_0) {
comusic_8025AB44(COMUSIC_7A_BRENTILDA, -1, 0x1F4);
func_8032BB88(this, 0, 0x1F4);

2
src/lair/ch/cauldron.c
View File

@@ -354,7 +354,7 @@ void chWarpCauldron_update(Actor *this) {
func_8030E540(SFX_7C_CHEBOOF);
}
if (actor_animationIsAt(this, 0.63f)) {
func_803204E4(0x1E, 0);
volatileFlag_set(0x1E, 0);
func_802D677C(0);
func_8028FCAC();
nodeprop_getPosition(func_80304C38(D_80393620[this->unkF4_8 - 1].unk6, this), sp54);

38
src/lair/code_0.c
View File

@@ -184,13 +184,13 @@ s16 D_80393454[] = {
s16 D_80393468[] = {
0,
0,
UNKFLAGS1_7F_SANDCASTLE_OPEN_CC,
UNKFLAGS1_84_SANDCASTLE_OPEN_BGS,
UNKFLAGS1_8B_SANDCASTLE_OPEN_FP,
UNKFLAGS1_87_SANDCASTLE_OPEN_GV,
UNKFLAGS1_8C_SANDCASTLE_OPEN_MMM,
UNKFLAGS1_90_SANDCASTLE_OPEN_RBB,
UNKFLAGS1_93_SANDCASTLE_OPEN_CCW,
VOLATILE_FLAG_7F_SANDCASTLE_OPEN_CC,
VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS,
VOLATILE_FLAG_8B_SANDCASTLE_OPEN_FP,
VOLATILE_FLAG_87_SANDCASTLE_OPEN_GV,
VOLATILE_FLAG_8C_SANDCASTLE_OPEN_MMM,
VOLATILE_FLAG_90_SANDCASTLE_OPEN_RBB,
VOLATILE_FLAG_93_SANDCASTLE_OPEN_CCW,
0
};
@@ -362,7 +362,7 @@ void func_803867A8(Actor *this) {
this->unk16C_4 = TRUE;
this->unk158[0] = func_803866D8(0);
this->unk158[1] = func_803866D8(1);
if (func_803203FC(0x86)) {
if (volatileFlag_get(0x86)) {
ability_unlock(ABILITY_D_SHOCK_JUMP);
fileProgressFlag_set(FILEPROG_C6_LAIR_JUMP_PAD_SWITCH_PRESSED, TRUE);
fileProgressFlag_set(FILEPROG_C7_LAIR_JUMP_PAD_ACTIVE, TRUE);
@@ -463,7 +463,7 @@ void func_80386D78(Actor *this) {
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
if (func_803203FC(0x8A)) {
if (volatileFlag_get(0x8A)) {
ability_unlock(ABILITY_9_FLIGHT);
mapSpecificFlags_set(0, TRUE);
this->unk60 = 0.0f;
@@ -472,7 +472,7 @@ void func_80386D78(Actor *this) {
}
}
if ((this->unk1C[1] - 150.0f) <= this->position[1]) {
if (!func_803203FC(0x8A)) {
if (!volatileFlag_get(0x8A)) {
if (this->unk60 != 0.0f) {
this->unk60 -= 1.0f;
if (this->unk60 == 0.0f) {
@@ -525,7 +525,7 @@ void func_803870DC(Actor *this) {
s32 temp_s7;
phi_v1 = fileProgressFlag_get(D_80393454[this->unkF4_8 - 1])
|| (D_80393468[this->unkF4_8 - 1] != 0 && func_803203FC(D_80393468[this->unkF4_8 - 1]));
|| (D_80393468[this->unkF4_8 - 1] != 0 && volatileFlag_get(D_80393468[this->unkF4_8 - 1]));
if (!this->unk16C_4) {
this->unk16C_4 = TRUE;
@@ -666,7 +666,7 @@ void func_80387730(Actor *this) {
marker_despawn(this->marker);
return;
}
if ((this->unkF4_8 >= 2U) && (this->unkF4_8 < 8U) && func_803203FC(D_80393494[this->unkF4_8 - 2])) {
if ((this->unkF4_8 >= 2U) && (this->unkF4_8 < 8U) && volatileFlag_get(D_80393494[this->unkF4_8 - 2])) {
marker_despawn(this->marker);
return;
}
@@ -872,7 +872,7 @@ void func_803880BC(Actor *this)
__spawnQueue_add_1((GenFunction_1)func_80387E94, reinterpret_cast(s32, this->marker));
if (func_803203FC(0xBC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED))
if (volatileFlag_get(0xBC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED))
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.75f, 30000);
}
@@ -892,7 +892,7 @@ void func_803880BC(Actor *this)
}
}
if (func_803203FC(0xBC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE))
if (volatileFlag_get(0xBC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE))
{
this->position_y += 1.7;
@@ -944,7 +944,7 @@ void func_803882B0(Actor *this)
this->unk60 = 0;
}
if (this->pitch == 90.f || !func_803203FC(0xBB))
if (this->pitch == 90.f || !volatileFlag_get(0xBB))
return;
if (this->pitch == 0)
@@ -1300,7 +1300,7 @@ void func_80388FC8(Actor *this)
this->unk60 = 0;
if (func_803203FC(0x7D))
if (volatileFlag_get(0x7D))
{
this->position_y = this->unk1C[1];
this->unk60 = 1.f;
@@ -1377,7 +1377,7 @@ void lair_func_80389204(Actor *this)
this->position_y -= 280.f;
this->unk60 = 0;
if (func_803203FC(0x7E))
if (volatileFlag_get(0x7E))
{
this->position_y = this->unk1C[1];
this->unk60 = 1.f;
@@ -1481,7 +1481,7 @@ void lair_func_803894B0(Actor *this)
return;
}
this->unk1C[0] = func_803203FC(0xBD) ? 22 : 0;
this->unk1C[0] = volatileFlag_get(0xBD) ? 22 : 0;
}
if (!this->unk1C[0])
@@ -1612,7 +1612,7 @@ void func_80389934(Actor *this)
{
case 21:
{
if (func_803203FC(0xBE))
if (volatileFlag_get(0xBE))
{
this->unk1C[0] = 25;

43
src/lair/code_5ED0.c
View File

@@ -61,7 +61,6 @@ extern int quizQuestionAskedBitfield_get(u32); // ff_isAsked_flag_get
extern void BKModel_getMeshCenter(BKModel *model, s32 mesh_id, s16 [3]); //! $a2 type unk
extern s32 func_803203FC(s32); // get volatile flag
extern void ability_setAllLearned(s32); // set unlocked moves bitfield
extern s32 ability_getAllLearned(void); // get unlocked moves bitfield
@@ -574,10 +573,10 @@ void lair_func_8038CD48(void)
if (D_8037DCB8->UNK_18)
lair_func_8038CC9C();
if (!func_803203FC(1) && !func_803203FC(2))
func_803204E4(0, FALSE);
if (!volatileFlag_get(VOLATILE_FLAG_1) && !volatileFlag_get(VOLATILE_FLAG_2))
volatileFlag_set(0, FALSE);
if (!func_803203FC(0))
if (!volatileFlag_get(VOLATILE_FLAG_0))
func_8038CCEC();
}
@@ -627,7 +626,7 @@ void lair_func_8038CF18(void)
D_8037DCB8->unk0 = mapModel_getModel(0);
D_8037DCB8->unk11 = 0;
if (func_803203FC(2) && !func_803203FC(4))
if (volatileFlag_get(VOLATILE_FLAG_2) && !volatileFlag_get(VOLATILE_FLAG_4))
{
quizQuestionAskedBitfield_free();
quizQuestionAskedBitfield_init();
@@ -659,7 +658,7 @@ void lair_func_8038CF18(void)
func_80347A14(0);
if (func_803203FC(1))
if (volatileFlag_get(VOLATILE_FLAG_1))
{
levelSpecificFlags_clear();
func_8038CE00();
@@ -667,7 +666,7 @@ void lair_func_8038CF18(void)
}
else
{
if (func_803203FC(2))
if (volatileFlag_get(VOLATILE_FLAG_2))
{
levelSpecificFlags_clear();
func_8038D670(FFA_5_FORGET_MOVES_2);
@@ -824,7 +823,7 @@ void func_8038D48C(void)
void func_8038D4BC(void)
{
func_803204E4(2, TRUE);
volatileFlag_set(2, TRUE);
func_802E4A70();
// restore moves after a delay
@@ -967,7 +966,7 @@ void func_8038D670(enum FF_Action next_state) {
if (D_8037DCB8->unk4->unk8 == FFTT_5_GRUNTY) {
func_80356540(0xA2);
}
if (func_803203FC(0xA0)) {
if (volatileFlag_get(0xA0)) {
func_80356540(0xA1);
}
func_80356540(0xA0);
@@ -996,7 +995,7 @@ void func_8038D670(enum FF_Action next_state) {
quizQuestionAskedBitfield_set(func_8038D60C(D_8037DCB8->unk8), TRUE);
lair_func_8038C640(D_8037DCB8->unk8, D_8037DCB8->unk4);
}
if (func_803203FC(0xA3)) {
if (volatileFlag_get(0xA3)) {
func_80356540(0xA4);
}
func_80356540(0xA3);
@@ -1013,9 +1012,9 @@ void func_8038D670(enum FF_Action next_state) {
func_8025AB00();
func_8025A70C(JINGLE_DOOR_OF_GRUNTY_OPENED);
fileProgressFlag_set(FILEPROG_A6_FURNACE_FUN_COMPLETE, TRUE);
func_803204E4(0, FALSE);
func_803204E4(0xA6, TRUE);
func_803204E4(0xA7, TRUE);
volatileFlag_set(0, FALSE);
volatileFlag_set(0xA6, TRUE);
volatileFlag_set(0xA7, TRUE);
next_state = 9;
mapSpecificFlags_set(0xA, TRUE);
func_8028F918(2);
@@ -1284,24 +1283,24 @@ void lair_func_8038E0B0(void) {
break;
case 4://L8038E64C
if (func_803203FC(1)) {
func_803204E4(1, 0);
if (volatileFlag_get(VOLATILE_FLAG_1)) {
volatileFlag_set(1, 0);
func_8038E070();
func_8025A55C(6000, 500, 0xA);
}
break;
case 5://L8038E684
if (func_803203FC(2)) {
if (func_803203FC(4)) {
if (volatileFlag_get(VOLATILE_FLAG_2)) {
if (volatileFlag_get(VOLATILE_FLAG_4)) {
func_8038E070();
D_8037DCB8->unkF = func_803203FC(5);
D_8037DCB8->unkF = volatileFlag_get(VOLATILE_FLAG_5);
func_8038D670(6);
} else {
func_8038D670(1);
}
func_803204E4(2, FALSE);
func_803204E4(4, FALSE);
volatileFlag_set(2, FALSE);
volatileFlag_set(4, FALSE);
}
break;
@@ -1335,11 +1334,11 @@ void lair_func_8038E768(Gfx **dl, Mtx **m, Vtx **v)
void func_8038E7C4(void)
{
if (func_803203FC(0))
if (volatileFlag_get(VOLATILE_FLAG_0))
return;
func_8038CE28();
func_803204E4(0, TRUE);
volatileFlag_set(0, TRUE);
}
/**

2
src/lair/code_9C40.c
View File

@@ -91,7 +91,7 @@ void func_803902B8(Actor *this) {
sp54 = this->marker->id - 0x16D;
if (!this->initialized) {
marker_setFreeMethod(this->marker, func_80390298);
this->unk138_24 = func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE);
this->unk138_24 = volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
this->initialized = TRUE;
}
_player_getPosition(sp5C);

2
src/lair/code_A810.c
View File

@@ -131,7 +131,7 @@ void func_80390E28(Actor *this) {
switch (this->state) {
case 0:
if( !func_8031A3BC() && (sp38 < 2) && (randf() < 0.1) && !mapSpecificFlags_get(0xA) && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
if( !func_8031A3BC() && (sp38 < 2) && (randf() < 0.1) && !mapSpecificFlags_get(0xA) && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) {
sp38++;
mapSpecificFlags_setN(0, sp38, 2);
func_80390D3C(this, (randf() < 0.5) ? 2 :1);

4
src/lair/code_BBD0.c
View File

@@ -48,7 +48,7 @@ Actor *func_80391FC0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
}
void func_80392014(Actor *this, enum sfx_e sfx_id, f32 arg2, f32 arg3, s32 arg4) {
if (mapSpecificFlags_get(0xA) || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
if (mapSpecificFlags_get(0xA) || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) {
arg4 = arg4 * 0.5;
}
if (mapSpecificFlags_get(5)) {
@@ -119,7 +119,7 @@ void func_8039217C(Actor *this) {
break;
case 5: //L803923C0
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) {
subaddie_set_state(this, 8U);
break;
}