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

document more vola flags

Browse Source
This commit is contained in:
mariob92
2024-09-08 15:21:48 +02:00
parent 615e2bda33
commit 35f93d5505
42 changed files with 259 additions and 204 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
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;
volatileFlag_getN(0x20 + this->unkF4_8*6 + phi_v1, 2);
volatileFlag_getN(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE + this->unkF4_8*6 + phi_v1, 2);
}
void lair_func_8038BA88(ActorMarker *marker, enum asset_e text_id, s32 arg2){
@@ -63,23 +63,26 @@ void func_8038BBC0(Actor *this) {
}
}
void func_8038BC24(void) {
s32 temp_v0;
s32 phi_s0;
s32 phi_s1;
void gzquiz_initGruntyQuestions(void) {
s32 pattern;
enum volatile_flags_e question_id;
s32 i;
if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !volatileFlag_get(0x62)) {
if (fileProgressFlag_get(FILEPROG_5C_FF_PATTERN_SET) && !volatileFlag_get(VOLATILE_FLAG_62_FF_GRUNTY_QUESTIONS_INITIALIZED)) {
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) {
volatileFlag_setN(0x26, temp_v0, 2);
} else {
volatileFlag_setN(phi_s0, temp_v0, 2);
}
for(i = 0; i < func_8031A45C(FFQT_3_GRUNTY); i++){
question_id = VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS + 2 * i;
pattern = randi2(0, 3);
if (question_id >= 0x61) {
volatileFlag_setN(VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS, pattern, 2);
} else {
volatileFlag_setN(question_id, pattern, 2);
}
}
volatileFlag_set(0x62, 1);
volatileFlag_set(VOLATILE_FLAG_62_FF_GRUNTY_QUESTIONS_INITIALIZED, 1);
}
}
@@ -104,7 +107,7 @@ void chBrentilda_update(Actor *this) {
fileProgressFlag_setN(FILEPROG_D3_FF_PATTERN, randi2(0, 0x100), 8);
fileProgressFlag_set(FILEPROG_5C_FF_PATTERN_SET, TRUE);
}
func_8038BC24();
gzquiz_initGruntyQuestions();
actor_setOpacity(this, 0x40);
this->initialized = TRUE;
}

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)) {
volatileFlag_set(0x1E, 0);
volatileFlag_set(VOLATILE_FLAG_1E, 0);
func_802D677C(0);
func_8028FCAC();
nodeprop_getPosition(func_80304C38(D_80393620[this->unkF4_8 - 1].unk6, this), sp54);

20
src/lair/code_0.c
View File

@@ -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 (volatileFlag_get(0x86)) {
if (volatileFlag_get(VOLATILE_FLAG_86_SANDCASTLE_SHOCKSPRING_JUMP_UNLOCKED)) {
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 (volatileFlag_get(0x8A)) {
if (volatileFlag_get(VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED)) {
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 (!volatileFlag_get(0x8A)) {
if (!volatileFlag_get(VOLATILE_FLAG_8A_SANDCASTLE_FLIGHT_UNLOCKED)) {
if (this->unk60 != 0.0f) {
this->unk60 -= 1.0f;
if (this->unk60 == 0.0f) {
@@ -872,7 +872,7 @@ void func_803880BC(Actor *this)
__spawnQueue_add_1((GenFunction_1)func_80387E94, reinterpret_cast(s32, this->marker));
if (volatileFlag_get(0xBC) && !fileProgressFlag_get(FILEPROG_9A_CC_WITCH_SWITCH_PRESSED))
if (volatileFlag_get(VOLATILE_FLAG_BC) && !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 (volatileFlag_get(0xBC) && !fileProgressFlag_get(FILEPROG_9B_LAIR_CC_WITCH_SWITCH_EYES_ACTIVE))
if (volatileFlag_get(VOLATILE_FLAG_BC) && !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 || !volatileFlag_get(0xBB))
if (this->pitch == 90.f || !volatileFlag_get(VOLATILE_FLAG_BB))
return;
if (this->pitch == 0)
@@ -1300,7 +1300,7 @@ void func_80388FC8(Actor *this)
this->unk60 = 0;
if (volatileFlag_get(0x7D))
if (volatileFlag_get(VOLATILE_FLAG_7D_SANDCASTLE_RAISE_PIPES_TO_CC))
{
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 (volatileFlag_get(0x7E))
if (volatileFlag_get(VOLATILE_FLAG_7E_SANDCASTLE_RAISE_PIPE_TO_BRENTILDA))
{
this->position_y = this->unk1C[1];
this->unk60 = 1.f;
@@ -1481,7 +1481,7 @@ void lair_func_803894B0(Actor *this)
return;
}
this->unk1C[0] = volatileFlag_get(0xBD) ? 22 : 0;
this->unk1C[0] = volatileFlag_get(VOLATILE_FLAG_BD) ? 22 : 0;
}
if (!this->unk1C[0])
@@ -1612,7 +1612,7 @@ void func_80389934(Actor *this)
{
case 21:
{
if (volatileFlag_get(0xBE))
if (volatileFlag_get(VOLATILE_FLAG_BE))
{
this->unk1C[0] = 25;

24
src/lair/code_5ED0.c
View File

@@ -574,7 +574,7 @@ void lair_func_8038CD48(void)
lair_func_8038CC9C();
if (!volatileFlag_get(VOLATILE_FLAG_1) && !volatileFlag_get(VOLATILE_FLAG_2))
volatileFlag_set(0, FALSE);
volatileFlag_set(VOLATILE_FLAG_0, FALSE);
if (!volatileFlag_get(VOLATILE_FLAG_0))
func_8038CCEC();
@@ -611,7 +611,7 @@ void func_8038CE28(void)
D_8037DCB8->currFfMode = 1;
D_8037DCB8->unk48 = malloc(0x90);
func_8038BC24();
gzquiz_initGruntyQuestions();
}
void lair_func_8038CF18(void)
@@ -823,7 +823,7 @@ void func_8038D48C(void)
void func_8038D4BC(void)
{
volatileFlag_set(2, TRUE);
volatileFlag_set(VOLATILE_FLAG_2, TRUE);
func_802E4A70();
// restore moves after a delay
@@ -966,7 +966,7 @@ void func_8038D670(enum FF_Action next_state) {
if (D_8037DCB8->unk4->unk8 == FFTT_5_GRUNTY) {
func_80356540(0xA2);
}
if (volatileFlag_get(0xA0)) {
if (volatileFlag_get(VOLATILE_FLAG_A0)) {
func_80356540(0xA1);
}
func_80356540(0xA0);
@@ -995,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 (volatileFlag_get(0xA3)) {
if (volatileFlag_get(VOLATILE_FLAG_A3)) {
func_80356540(0xA4);
}
func_80356540(0xA3);
@@ -1012,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);
volatileFlag_set(0, FALSE);
volatileFlag_set(0xA6, TRUE);
volatileFlag_set(0xA7, TRUE);
volatileFlag_set(VOLATILE_FLAG_0, FALSE);
volatileFlag_set(VOLATILE_FLAG_A6, TRUE);
volatileFlag_set(VOLATILE_FLAG_A7, TRUE);
next_state = 9;
mapSpecificFlags_set(0xA, TRUE);
func_8028F918(2);
@@ -1284,7 +1284,7 @@ void lair_func_8038E0B0(void) {
case 4://L8038E64C
if (volatileFlag_get(VOLATILE_FLAG_1)) {
volatileFlag_set(1, 0);
volatileFlag_set(VOLATILE_FLAG_1, 0);
func_8038E070();
func_8025A55C(6000, 500, 0xA);
}
@@ -1299,8 +1299,8 @@ void lair_func_8038E0B0(void) {
} else {
func_8038D670(1);
}
volatileFlag_set(2, FALSE);
volatileFlag_set(4, FALSE);
volatileFlag_set(VOLATILE_FLAG_2, FALSE);
volatileFlag_set(VOLATILE_FLAG_4, FALSE);
}
break;
@@ -1338,7 +1338,7 @@ void func_8038E7C4(void)
return;
func_8038CE28();
volatileFlag_set(0, TRUE);
volatileFlag_set(VOLATILE_FLAG_0, TRUE);
}
/**