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

Merge branch 'level_specific_flags' into 'master'

Browse Source 
Document level specific flags

See merge request banjo.decomp/banjo-kazooie!88
This commit is contained in:
Banjo Kazooie
2024-10-08 06:07:43 +00:00
parent 2710315cb0 ea6b1e5291
commit 01b63ee455
47 changed files with 274 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/MMM/ch/loggo.c
View File

@@ -70,8 +70,9 @@ void chLoggo_update(Actor *this){
subaddie_set_state_with_direction(this, 1, 0.01f, 1);
actor_loopAnimation(this);
this->lifetime_value = 0.0f;
if(!fileProgressFlag_get(FILEPROG_8A_EXITED_LOGGO) && levelSpecificFlags_get(0x33)){
if(gcdialog_showText(ASSET_AE0_TEXT_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)){
if (!fileProgressFlag_get(FILEPROG_8A_EXITED_LOGGO) && levelSpecificFlags_get(LEVEL_FLAG_33_MMM_UNKNOWN)) {
if (gcdialog_showText(ASSET_AE0_TEXT_EXIT_LOGGO, 4, NULL, NULL, NULL, NULL)) {
fileProgressFlag_set(FILEPROG_8A_EXITED_LOGGO, TRUE);
}
}
@@ -107,7 +108,7 @@ void chLoggo_update(Actor *this){
if(actor_animationIsAt(this, 0.46f)){
this->marker->propPtr->unk8_3 = FALSE;
FUNC_8030E8B4(SFX_92_TOILET_FLUSH, 1.0f, 32000, this->position, 600, 1500);
levelSpecificFlags_set(0x33, TRUE);
levelSpecificFlags_set(LEVEL_FLAG_33_MMM_UNKNOWN, TRUE);
ml_vec3f_assign(sp38, this->position_x - 50.0f, this->position_y + 50.0f, this->position_z);
func_8028F6E4(BS_INTR_2F_LOGGO, sp38);
}

7
src/MMM/code_2040.c
View File

@@ -370,10 +370,13 @@ void func_80388FE4(Actor *this) {
void func_80389004(Actor *this){
func_802D3CE8(this);
if(!this->volatile_initialized){
if (!this->volatile_initialized) {
this->volatile_initialized = TRUE;
if(levelSpecificFlags_get(0x2e))
if (levelSpecificFlags_get(LEVEL_FLAG_2E_MMM_UNKNOWN)) {
marker_despawn(this->marker);
}
}
}

5
src/MMM/code_3120.c
View File

@@ -104,11 +104,12 @@ void func_8038966C(void){
if((s32)(tmp_v0->flags << 4) < 0){
FUNC_8030E624(SFX_6B_LOCKUP_OPENING, 1.4f, 32750);
MMM_D_8038C4E0.unk1 = 2;
if(!levelSpecificFlags_get(0x1b)){
if (!levelSpecificFlags_get(LEVEL_FLAG_1B_MMM_UNKNOWN)) {
func_80324E38(0.0f, 3);
timed_setStaticCameraToNode(0.0f, 0);
func_80324DBC(0.0f, 0xad7, 6, NULL, NULL, func_803895D8, NULL);
levelSpecificFlags_set(0x1b, TRUE);
levelSpecificFlags_set(LEVEL_FLAG_1B_MMM_UNKNOWN, TRUE);
}
}
}

6
src/MMM/code_3D50.c
View File

@@ -251,11 +251,11 @@ void func_8038AA44(void){
&& MMM_D_8038C510.unkC != NULL
&& func_8038AD4C(MMM_D_8038C510.unkC, MMM_D_8038C510.unk10)
){
if(!levelSpecificFlags_get(0x2f)){
levelSpecificFlags_set(0x2f, TRUE);
if (!levelSpecificFlags_get(LEVEL_FLAG_2F_MMM_UNKNOWN)) {
levelSpecificFlags_set(LEVEL_FLAG_2F_MMM_UNKNOWN, TRUE);
func_8038A140(2);
}
else{
else {
func_8038A140(3);
}
}