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

documented volatile flag functions and enums and some Actor struct members

Browse Source
This commit is contained in:
mariob92
2024-09-08 12:22:27 +02:00
parent 347c3edcdf
commit 615e2bda33
111 changed files with 584 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,7 +228,7 @@ void func_8030F338(void){
}
}
if(g_Dialog.unk128_31 & 0x8){
if((!func_802E4A08() && !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){
if((!func_802E4A08() && !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){
func_8028F918(0);
}
}//L8030F3E8
@@ -710,13 +710,13 @@ void func_803106BC(s32 text_id, s32 arg1, ActorMarker *marker, void(*callback)(A
g_Dialog.active_zoombox = 1;
}//L8031095C
g_Dialog.unk128_6 = 1;
g_Dialog.unk12C_23 = ((func_802E4A08() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3) ? 1 : -1;
g_Dialog.unk12C_23 = ((func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3) ? 1 : -1;
g_Dialog.caller = marker;
g_Dialog.unk13C = callback;
g_Dialog.unk140 = arg4;
g_Dialog.unk144 = (void *)arg5;
g_Dialog.unk138 = (marker != NULL )? ((marker->unk5C)? marker->unk5C : -1) : 0;
gcdialog_setState(((func_802E4A08() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3) ? 6 : 1);
gcdialog_setState(((func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3) ? 6 : 1);
//L803109EC
}
@@ -795,7 +795,7 @@ void func_80310D2C(void){
g_Dialog.unk138 = sp24->unk14;
func_8025A55C(8000, 300, 2);
if((sp24->unk2 & 0x8) && !((func_802E4A08() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3)){//L80310E6C
if((sp24->unk2 & 0x8) && !((func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) && g_Dialog.unk128_3)){//L80310E6C
func_8028F918(0);
if( 0.0f == sp24->unk4_x
&& 0.0f == sp24->unk4_y
@@ -871,13 +871,13 @@ int func_80311174(s32 text_id, s32 arg1, f32 *pos, ActorMarker *marker, void(*ca
f32 pad;
s32 temp_v1;
if(func_803203FC(1) || func_802D686C())
if(volatileFlag_get(VOLATILE_FLAG_1) || func_802D686C())
return 0;
if(!func_803114B0()){
func_80310B1C(text_id, arg1, marker, (void *)callback, (void *)arg5, arg6);
if(arg1 & 8){
if(!(func_802E4A08() || func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){//L80311214
if(!(func_802E4A08() || volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) || !g_Dialog.unk128_3){//L80311214
if(pos != NULL){
func_8028F94C(((g_Dialog.string_cmd[1] < 0)? 1 : 3), pos);
}else{//L8031126C
@@ -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() || func_803203FC(0x1f, &g_Dialog)) || !g_Dialog.unk128_3){//L8031141C
if(!( func_802E4A08() || volatileFlag_get(0x1f)) || !g_Dialog.unk128_3){//L8031141C
if(!func_8028EC04()){
if(pos != NULL){
func_8028F94C(2, pos);

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

@@ -7,7 +7,7 @@
extern void func_8028F918(s32);
extern void func_80311714(int);
extern void func_803204E4(s32, s32);
extern void volatileFlag_set(s32, s32);
typedef struct struct_1C_s{
u8 map;
@@ -166,9 +166,9 @@ void gcparade_8031ABF8(void) {
func_80347A7C();
func_8031FBF8();
func_8031FBA0();
func_803204E4(0x1F, 1);
volatileFlag_set(0x1F, 1);
if (D_803830F0.parade_id == PARADE_1_POST_GRUNTY_BATTLE) {
func_803204E4(UNKFLAGS1_C1_IN_FINAL_CHARACTER_PARADE, TRUE);
volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, TRUE);
}
func_803228D8();
func_802E4A70();
@@ -203,7 +203,7 @@ void gcparade_setState(enum parade_state_e next_state) {
gcparade_8031AC8C();
break;
case PARADE_STATE_2_INIT_FINAL_PARADE: //parade 1 init
func_803204E4(0xC1, TRUE);
volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, TRUE);
D_803830F0.parade_element = D_8036DAE4;
D_803830F0.indx = 0;
D_803830F0.parade_id = PARADE_1_POST_GRUNTY_BATTLE;
@@ -243,8 +243,8 @@ 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:
func_803204E4(0x1F, 0);
func_803204E4(0xC1, FALSE);
volatileFlag_set(0x1F, 0);
volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, FALSE);
func_802E412C(1, 8);
func_802E40C4(0xA);
if (D_803830F0.parade_id == 0) {
@@ -286,7 +286,7 @@ void gcparade_update(void) {
gcparade_beginFinalParade();
return;
}
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE) != 0) {
if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE) != 0) {
snackerctl_update();
switch (D_803830F0.state) {
case PARADE_STATE_3_WARP:
@@ -333,9 +333,9 @@ void gcparade_update(void) {
void gcparade_free(void){}
void gcparade_start(void){
func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, FALSE);
func_803204E4(0x1F, TRUE);
if(func_80320454(UNKFLAGS1_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE))
volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, FALSE);
volatileFlag_set(0x1F, TRUE);
if(volatileFlag_getAndSet(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE))
gcparade_setState(PARADE_STATE_2_INIT_FINAL_PARADE);
else
gcparade_setState(PARADE_STATE_1_INIT_FF_PARADE);
@@ -348,11 +348,11 @@ void gcparade_init(void) {
s32 temp_v0;
s32 var_s2;
if (func_803203FC(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE)) {
if (volatileFlag_get(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE)) {
gcparade_start();
return;
}
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) {
if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) {
func_80347A14(0);
if ((D_803830F0.state == 3)){
var_s2 = FALSE;
@@ -390,18 +390,18 @@ int gcparade_8031B4F4(void){
}
void gcparade_beginFFParade(void){
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) return;
if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) return;
func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, TRUE);
volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, TRUE);
gcparade_init();
}
void gcparade_beginFinalParade(void){
if (func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE)) return;
if (volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE)) return;
func_803204E4(UNKFLAGS1_20_BEGIN_CHARACTER_PARADE, TRUE);
func_803204E4(UNKFLAGS1_C0_BEGIN_FINAL_CHARACTER_PARADE, TRUE);
volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, TRUE);
volatileFlag_set(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, TRUE);
D_803830F0.jiggyscore = jiggyscore_total();
gcparade_init();
}

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

@@ -24,7 +24,7 @@ typedef struct struct_1A_s{
extern void func_802C5994(void);
extern void func_802E412C(s32, s32);
void func_803204E4(s32, s32);
void volatileFlag_set(s32, s32);
f32 func_8024DE1C(f32, f32, f32 *, f32 *);
void mlMtxApply(Mtx*);
void func_80310D2C(void);
@@ -988,9 +988,9 @@ s32 gcPauseMenu_update(void){
D_80383010.unk3_7 = 1;
break;
case 1://L80313908 //return to lair
func_803204E4(0x16, 1);
volatileFlag_set(0x16, 1);
if(map_get() == MAP_8E_GL_FURNACE_FUN){
func_803204E4(0,0);
volatileFlag_set(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();
func_803204E4(0,0);
volatileFlag_set(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){
func_803204E4(0x16, TRUE);
volatileFlag_set(0x16, TRUE);
func_802E4078(D_8036C560[level-1].map, D_8036C560[level-1].exit, 1);
}
}

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

@@ -990,7 +990,7 @@ void gczoombox_draw(GcZoombox *this, Gfx **gdl, Mtx ** mptr, void *vptr){
|| ( getGameMode() != GAME_MODE_3_NORMAL
&& getGameMode() != GAME_MODE_8_BOTTLES_BONUS
&& getGameMode() != GAME_MODE_A_SNS_PICTURE
&& !func_803203FC(UNKFLAGS1_1F_IN_CHARACTER_PARADE))
&& !volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE))
){//L80316C64
func_80316764(this, 0);
}