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

2
src/core2/gc/dialog.c
View File

@@ -922,7 +922,7 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca
g_Dialog.unk148[temp_v1].unk20 = arg6;
g_Dialog.unk12C_15++;
if(arg1 & 0x08){
if(!( func_802E4A08() || volatileFlag_get(0x1f)) || !g_Dialog.unk128_3){//L8031141C
if(!( func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){//L8031141C
if(!func_8028EC04()){
if(pos != NULL){
func_8028F94C(2, pos);

7
src/core2/gc/parade.c
View File

@@ -7,7 +7,6 @@
extern void func_8028F918(s32);
extern void func_80311714(int);
extern void volatileFlag_set(s32, s32);
typedef struct struct_1C_s{
u8 map;
@@ -166,7 +165,7 @@ void gcparade_8031ABF8(void) {
func_80347A7C();
func_8031FBF8();
func_8031FBA0();
volatileFlag_set(0x1F, 1);
volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, 1);
if (D_803830F0.parade_id == PARADE_1_POST_GRUNTY_BATTLE) {
volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, TRUE);
}
@@ -243,7 +242,7 @@ void gcparade_setState(enum parade_state_e next_state) {
timedFunc_set_1(0.25f, (GenFunction_1)gcparade_setState, (D_803830F0.indx == D_803830F0.count) ? PARADE_STATE_8_END : PARADE_STATE_3_WARP);
break;
case PARADE_STATE_8_END:
volatileFlag_set(0x1F, 0);
volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, 0);
volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, FALSE);
func_802E412C(1, 8);
func_802E40C4(0xA);
@@ -334,7 +333,7 @@ void gcparade_free(void){}
void gcparade_start(void){
volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, FALSE);
volatileFlag_set(0x1F, TRUE);
volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, TRUE);
if(volatileFlag_getAndSet(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE))
gcparade_setState(PARADE_STATE_2_INIT_FINAL_PARADE);
else

8
src/core2/gc/pauseMenu.c
View File

@@ -988,9 +988,9 @@ s32 gcPauseMenu_update(void){
D_80383010.unk3_7 = 1;
break;
case 1://L80313908 //return to lair
volatileFlag_set(0x16, 1);
volatileFlag_set(VOLATILE_FLAG_16, 1);
if(map_get() == MAP_8E_GL_FURNACE_FUN){
volatileFlag_set(0,0);
volatileFlag_set(VOLATILE_FLAG_0,0);
func_802E4078(MAP_80_GL_FF_ENTRANCE, 2, 1);
}else{
func_802E4078(D_8036C560[level-1].map, D_8036C560[level-1].exit, 1);
@@ -1003,7 +1003,7 @@ s32 gcPauseMenu_update(void){
break;
case 3://L8031399C
func_802C5994();
volatileFlag_set(0,0);
volatileFlag_set(VOLATILE_FLAG_0,0);
if(!fileProgressFlag_get(FILEPROG_BD_ENTER_LAIR_CUTSCENE) || fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){
gcPauseMenu_setState(0x14);
}else{
@@ -1431,7 +1431,7 @@ void gcpausemenu_80314B24(void){
void gcpausemenu_returnToLair(void){
s32 level = level_get();
if(0 < level && level < 0xC && D_8036C560[level-1].map != -1){
volatileFlag_set(0x16, TRUE);
volatileFlag_set(VOLATILE_FLAG_16, TRUE);
func_802E4078(D_8036C560[level-1].map, D_8036C560[level-1].exit, 1);
}
}