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

Renaming Juju

Browse Source
This commit is contained in:
Nabnut
2024-09-22 11:30:51 +02:00
parent 0224f95863
commit 249f5a7329
75 changed files with 426 additions and 390 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/core2/code_DA760.c
View File

@@ -46,21 +46,21 @@ void func_80361870(Actor *this){
this->volatile_initialized = TRUE;
}
if(!this->is_first_encounter && func_80329530(this, 400) && !func_80329530(this, 50)){
if(!this->has_met_before && func_80329530(this, 400) && !func_80329530(this, 50)){
if(this->unkF4_8 == 1 && !fileProgressFlag_get(FILEPROG_31_MM_OPEN) && level_get() == LEVEL_6_LAIR){
text_id = fileProgressFlag_get(FILEPROG_A7_NEAR_PUZZLE_PODIUM_TEXT)? 0xF80 : 0xF7F;
if(gcdialog_showText(text_id, 0, 0, 0, 0, 0)){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
}
else if(func_803616F0(this)){
sp28 = (volatileFlag_get(VOLATILE_FLAG_16)?0xf6e:0xf68) + this->unkF4_8 - 1;
if(!volatileFlag_get(VOLATILE_FLAG_16) && level_get() == LEVEL_6_LAIR){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
}
else{
if(gcdialog_showText(sp28, 0, 0, 0, 0, 0)){
this->is_first_encounter = TRUE;
this->has_met_before = TRUE;
volatileFlag_set(VOLATILE_FLAG_16, 0);
}
}