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

4
src/core2/ch/collectible.c
View File

@@ -154,8 +154,8 @@ void chCollectible_update(Actor *this) {
if(!this->unk38_0)
return;
if (volatileFlag_getN(0x23, 3) != this->unk10_12) {
func_802D8C98(this, volatileFlag_getN(0x23, 3));
if (volatileFlag_getN(VOLATILE_FLAG_23_FINAL_BOSS_PHASE, 3) != this->unk10_12) {
func_802D8C98(this, volatileFlag_getN(VOLATILE_FLAG_23_FINAL_BOSS_PHASE, 3));
}
switch (this->state) {

10
src/core2/ch/trainers.c
View File

@@ -66,23 +66,23 @@ void chtrainers_update(Actor *this){
ml_vec3f_copy(this->unk1C, this->position);
this->velocity[0] = this->yaw;
this->velocity[1] = 0.0f;
this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(0x1);
this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(VOLATILE_FLAG_1);
subaddie_set_state(this, 0);
}
if(!volatileFlag_get(0xF) && ability_isUnlocked(ABILITY_11_TURBO_TALON)){
volatileFlag_set(0xF, TRUE);
if(!volatileFlag_get(VOLATILE_FLAG_F) && ability_isUnlocked(ABILITY_11_TURBO_TALON)){
volatileFlag_set(VOLATILE_FLAG_F, TRUE);
}
switch(this->state){
case 0://L802CA5A8
if(func_803296D8(this, 2000) || sp2C){
if( func_80329530(this, 0xfa)
&& !volatileFlag_get(0xf)
&& !volatileFlag_get(VOLATILE_FLAG_F)
&& player_getTransformation() == TRANSFORM_1_BANJO
){
if(func_80311480(0xda4, 0, NULL, NULL, NULL, NULL)){
volatileFlag_set(0xf, TRUE);
volatileFlag_set(VOLATILE_FLAG_F, TRUE);
}
}//L802CA620
_chtrainers_802CA378(this, sp2C);

10
src/core2/ch/wadingboots.c
View File

@@ -41,12 +41,12 @@ void chwadingboots_update(Actor *this){
if(!this->initialized){
this->initialized = TRUE;
this->velocity[0] = this->yaw;
this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(0x1);
this->unk10_12 = !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) && !volatileFlag_get(VOLATILE_FLAG_1);
subaddie_set_state(this, 0);
}
if(!volatileFlag_get(0x10) && ability_isUnlocked(ABILITY_E_WADING_BOOTS)){
volatileFlag_set(0x10, TRUE);
if(!volatileFlag_get(VOLATILE_FLAG_10) && ability_isUnlocked(ABILITY_E_WADING_BOOTS)){
volatileFlag_set(VOLATILE_FLAG_10, TRUE);
}
switch(this->state){
@@ -65,12 +65,12 @@ void chwadingboots_update(Actor *this){
}
}
if(volatileFlag_get(0x10)) break;
if(volatileFlag_get(VOLATILE_FLAG_10)) break;
if(!func_80329530(this, 250)) break;
if(player_getTransformation() != TRANSFORM_1_BANJO) break;
if(func_80311480(ASSET_DA5_DIALOG_WADINGBOOTS_MEET, 0, NULL, NULL, NULL, NULL)){
volatileFlag_set(0x10, TRUE);
volatileFlag_set(VOLATILE_FLAG_10, TRUE);
}
break;