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

6
src/core2/ba/marker.c
View File

@@ -208,7 +208,7 @@ void __baMarker_8028BB1C(s32 arg0, u32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 a
if(!volatileFlag_get(sp24)){
volatileFlag_set(sp24, 1);
func_8030E6D4(SFX_90_SWITCH_PRESS);
volatileFlag_set(0xBF, 1);
volatileFlag_set(VOLATILE_FLAG_BF, 1);
func_802D6264(1.0f, arg2, arg3, arg4, arg5, arg6);
}
}
@@ -216,7 +216,7 @@ void __baMarker_8028BB1C(s32 arg0, u32 arg1, s32 arg2, s32 arg3, s32 arg4, s32 a
if(!fileProgressFlag_get(arg1)){
fileProgressFlag_set(arg1, 1);
func_8030E6D4(SFX_90_SWITCH_PRESS);
volatileFlag_set(0xBF, 1);
volatileFlag_set(VOLATILE_FLAG_BF, 1);
func_802D6264(1.0f, arg2, arg3, arg4, arg5, arg6);
}
}
@@ -389,7 +389,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
spAC[1] += 40.0f;
if(func_802458E0(spAC, actor, 0x87) == 0)
return;
volatileFlag_set(0x1E, 1);
volatileFlag_set(VOLATILE_FLAG_1E, 1);
if(fileProgressFlag_get(((actor->unkF4_8 - 1) ^ 1) + 0x49)){
actor->unk10_12 = 2;
}

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;

2
src/core2/code_34790.c
View File

@@ -338,7 +338,7 @@ void func_802BC2CC(s32 arg0) {
f32 *sp20 = D_8037D918;
s32 sp1C;
if (volatileFlag_get(0xE) != 0) {
if (volatileFlag_get(VOLATILE_FLAG_E) != 0) {
func_80347A14(0);
}
if (volatileFlag_getAndSet(0xE, 0) || func_802D686C() || (arg0 == 0x63) || !func_802BB720(arg0, D_8037D908, D_8037D918, &sp1C)) {

2
src/core2/code_39D0.c
View File

@@ -133,7 +133,7 @@ int func_8028ADB4(void){
}
int func_8028ADF0(void){
return volatileFlag_get(0x9d);
return volatileFlag_get(VOLATILE_FLAG_9D_SANDCASTLE_WISHY_WASHY);
}
bool func_8028AE10(void) {

31
src/core2/code_4C020.c
View File

@@ -14,7 +14,6 @@ extern void ml_vec3f_assign(f32[3], f32, f32, f32);
extern void func_802EE2E8(Actor *arg0, s32 arg1, s32 cnt, s32 arg3, f32 arg4, f32 arg5, f32 arg6);
extern void func_80319EA4(void);
extern void fileProgressFlag_set(s32, bool);
extern void volatileFlag_set(s32, bool);
void func_802D3D54(Actor *this);
void func_802D3DA4(Actor *this);
@@ -575,7 +574,7 @@ void func_802D4680(Actor *this){
if(func_80258640(this->position, sp1C) < 150.0f && func_8028F20C()){
if(func_8028ECAC() == 0 || func_8028ECAC() == BSGROUP_8_TROT){
if(map_get() == MAP_8E_GL_FURNACE_FUN){
volatileFlag_set(0, 0);
volatileFlag_set(VOLATILE_FLAG_0, 0);
func_802D4614(MAP_80_GL_FF_ENTRANCE);
}
else{
@@ -764,7 +763,7 @@ void func_802D5000(enum map_e map_id){
}
void func_802D5058(enum map_e map_id, s32 arg1, bool arg2) {
volatileFlag_set(1, 1);
volatileFlag_set(VOLATILE_FLAG_1, 1);
D_80367684 = map_id;
D_80367688 = arg1;
if (arg2) {
@@ -787,7 +786,7 @@ void func_802D5058(enum map_e map_id, s32 arg1, bool arg2) {
void func_802D5140(ActorMarker *caller, enum asset_e text_id, s32 arg2){
itemscore_noteScores_get(volatileFlag_getN(0x19, 4));
itemscore_noteScores_get(volatileFlag_getN(VOLATILE_FLAG_19_CURRENT_LEVEL_ID, 4));
}
void func_802D5178(s32 arg0, enum file_progress_e arg1, s32 arg2, enum map_e arg3, s32 arg4, s32 arg5, enum actor_e arg6, s32 arg7){
@@ -1023,16 +1022,16 @@ void func_802D5628(void){
func_802D5178(0x24, 0x30, 0x37, MAP_79_GL_CCW_LOBBY, 0xF, 0xB, ACTOR_234_CCW_ENTRANCE_DOOR, 0xA);
func_802D5178(0x20, 0x2C, 0x38, MAP_6F_GL_FP_LOBBY, 0x11, 0xA, ACTOR_235_FP_ENTANCE_DOOR, 0xA);
func_802D5178(0x3F, 0xE2, 0x40, MAP_93_GL_DINGPOT, 0x10, 0xA, ACTOR_2E5_DOOR_OF_GRUNTY, 0x28);
if(volatileFlag_get(0x18)){
if(volatileFlag_get(VOLATILE_FLAG_18)){
if(!fileProgressFlag_get(FILEPROG_99_PAST_50_NOTE_DOOR_TEXT)){
func_80311174(0xF75, 0xE, NULL, NULL, NULL, NULL, func_802D5140);
fileProgressFlag_set(FILEPROG_99_PAST_50_NOTE_DOOR_TEXT, TRUE);
volatileFlag_set(0x18, 0);
volatileFlag_set(VOLATILE_FLAG_18, 0);
}
else{//L802D5DD8
if(!volatileFlag_get(0x16)){
if(!volatileFlag_get(VOLATILE_FLAG_16)){
func_80311174(0xF77, 0x4, NULL, NULL, NULL, NULL, func_802D5140);
volatileFlag_set(0x18, 0);
volatileFlag_set(VOLATILE_FLAG_18, 0);
}
}
}//L802D5E18
@@ -1045,7 +1044,7 @@ void func_802D5628(void){
&& !fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)
){
D_8037DE04 += time_getDelta();
if(D_80367680 < D_8037DE04 && !volatileFlag_get(0x16)){
if(D_80367680 < D_8037DE04 && !volatileFlag_get(VOLATILE_FLAG_16)){
if(fileProgressFlag_get(FILEPROG_A6_FURNACE_FUN_COMPLETE)){
sp4C = 0xF9D;
}
@@ -1057,10 +1056,10 @@ void func_802D5628(void){
D_8037DE00 = randi2(0xF86, sp4C);
}//L802D5F1C
if(volatileFlag_get(0x22)){
if(volatileFlag_get(VOLATILE_FLAG_22)){
if(func_80311480(0xF82, 4, NULL, NULL, NULL, NULL)){
fileProgressFlag_set(FILEPROG_C1_BADDIES_ESCAPE_TEXT, TRUE);
volatileFlag_set(0x22, 0);
volatileFlag_set(VOLATILE_FLAG_22, 0);
D_8037DE04 = 0.0f;
D_80367680 += 60.0;
if(300.0 < D_80367680)
@@ -1112,7 +1111,7 @@ void func_802D6114(void){
if(map_getLevel(sp24) != map_getLevel(map_get())){
func_802E4A70();
}//L802D6194
volatileFlag_set(0x21, 1);
volatileFlag_set(VOLATILE_FLAG_21, 1);
if(sp24 != 0x1C || !func_8025ADBC(COMUSIC_23_MMM_INSIDE_CHURCH)){
func_803228D8();
}
@@ -1197,7 +1196,7 @@ void func_802D63D4(void){
default: //L802D6460
func_802BAFE4(D_80367688);
timedFuncQueue_update();
volatileFlag_set(0xbf, 0);
volatileFlag_set(VOLATILE_FLAG_BF, 0);
func_802D6750();
break;
}
@@ -1231,7 +1230,7 @@ void func_802D6494(void){
}
break;
case ACTOR_210_BGS_ENTRANCE_DOOR:// L802D65F8
if(!volatileFlag_get(0x84)){
if(!volatileFlag_get(VOLATILE_FLAG_84_SANDCASTLE_OPEN_BGS)){
FUNC_8030E624(SFX_6B_LOCKUP_OPENING, 0.6f, 32000);
func_8025A6CC(COMUSIC_64_WORLD_OPENING_A, 32000);
}
@@ -1314,14 +1313,14 @@ s32 func_802D683C(s32 arg0){
}
int func_802D686C(void){
if(volatileFlag_get(0x1E)){
if(volatileFlag_get(VOLATILE_FLAG_1E)){
return FALSE;
}
return map_get() == D_80367684;
}
int func_802D68B4(void){
return func_802D686C() || volatileFlag_get(0x21);
return func_802D686C() || volatileFlag_get(VOLATILE_FLAG_21);
}
//BREAK????

2
src/core2/code_57C70.c
View File

@@ -22,7 +22,7 @@ ActorAnimationInfo D_80368300[] ={
f32 D_80368330[3] = {0.0f, 0.0f, 0.0f};
ActorInfo D_8036833C = {
0x294, 0x19B, 0x56D,
0x294, 0x19B, ASSET_56D_MUMBOS_HAND_WITH_PICTURE,
0x1, D_80368300,
func_802DEE1C, func_80326224, func_802DEC00,
0, 0, 0.0f, 0

2
src/core2/code_7060.c
View File

@@ -189,7 +189,7 @@ void func_8028E4B0(void) {
sp20 = exit_get();
D_8037BFB8 = 0;
player_setPosition(D_803636C0);
if (volatileFlag_get(0xE) || func_802D686C() || (sp20 == 0x65)){
if (volatileFlag_get(VOLATILE_FLAG_E) || func_802D686C() || (sp20 == 0x65)){
return;
}
if (sp20 == 0x63) {

2
src/core2/code_91E10.c
View File

@@ -163,7 +163,7 @@ s32 func_80318F60(enum ff_question_type_e question_type, s32 q_indx, s32 arg2) {
phi_v1 = arg2;
} else {
if (question_type == FFQT_3_GRUNTY) {
phi_a0 = volatileFlag_getN((q_indx * 2) + 0x26, 2);
phi_a0 = volatileFlag_getN((q_indx * 2) + VOLATILE_FLAG_26_FF_GRUNTY_QUESTIONS, 2);
} else {
phi_a0 = 0;
}

12
src/core2/code_935F0.c
View File

@@ -130,15 +130,15 @@ void __chMinigame_setState(Actor *this, u32 arg1) {
break;
case MINIGAME_STATE_2_IN_PROGESS:
func_8028F918(0);
volatileFlag_set(3, 1);
volatileFlag_set(VOLATILE_FLAG_3, 1);
break;
case MINIGAME_STATE_3_RETURN_TO_FF:
volatileFlag_set(4, 1);
volatileFlag_set(VOLATILE_FLAG_4, 1);
func_8028F918(2);
func_8025AB00();
func_8025A70C((volatileFlag_get(VOLATILE_FLAG_5)) ? COMUSIC_3B_MINIGAME_VICTORY : COMUSIC_3C_MINIGAME_LOSS);
func_802E4A70();
volatileFlag_set(0x21, TRUE);
volatileFlag_set(VOLATILE_FLAG_21, TRUE);
timedFunc_set_3(2.0f, (GenFunction_3)func_802E4078, MAP_8E_GL_FURNACE_FUN, 1, 1);
break;
}
@@ -146,7 +146,7 @@ void __chMinigame_setState(Actor *this, u32 arg1) {
}
void __chMinigame_free(Actor *this){
volatileFlag_set(3, 0);
volatileFlag_set(VOLATILE_FLAG_3, 0);
}
void chMinigame_update(Actor *this){
@@ -169,8 +169,8 @@ void chMinigame_update(Actor *this){
marker_despawn(this->marker);
return;
}
volatileFlag_set(5, 0);
volatileFlag_set(3, 0);
volatileFlag_set(VOLATILE_FLAG_5, 0);
volatileFlag_set(VOLATILE_FLAG_3, 0);
__chMinigame_setState(this, MINIGAME_STATE_1_INTRODUCE_GAME);
gcpausemenu_80314AC8(0);
}

6
src/core2/code_956B0.c
View File

@@ -9,8 +9,6 @@ extern s32 fileProgressFlag_get(s32);
extern s32 fileProgressFlag_getN(s32 offset, s32 numBits);
extern void func_8031FFAC(void);
extern void fileProgressFlag_set(s32 index, s32 set);
extern void volatileFlag_clear(void);
extern void volatileFlag_set(s32 arg0, s32 arg1);
extern void ml_vec3h_to_vec3f(f32 *, s32);
extern NodeProp *func_80304ED0(void*, f32 *);
extern void func_8031CD44(s32, s32, f32, f32, s32);
@@ -299,7 +297,7 @@ void warp_gvEnterMatchingPyramid(s32 arg0, s32 arg1) {
void warp_gvEnterWaterPyramidUpper(s32 arg0, s32 arg1) {
func_80244C78(0);
volatileFlag_set(0xAC, 1);
volatileFlag_set(VOLATILE_FLAG_AC, 1);
func_8031CC8C(arg0, 0x1502);
}
@@ -536,7 +534,7 @@ void func_8031DAA8(s32 arg0, s32 arg1) {
void func_8031DAE0(s32 arg0, s32 arg1) {
if (mapSpecificFlags_get(2) == 0) {
volatileFlag_set(0xAD, 1);
volatileFlag_set(VOLATILE_FLAG_AD, 1);
func_80244C78(0);
mapSpecificFlags_set(2, 1);
func_8025A6EC(COMUSIC_3B_MINIGAME_VICTORY, 0x6D60);

4
src/core2/code_98CB0.c
View File

@@ -247,8 +247,8 @@ s32 volatileFlag_get(s32 index) {
return bitfield_get_bit(gVolatileFlags.unk8, index);
}
void volatileFlag_getN(s32 index, s32 numBits) {
bitfield_get_n_bits(gVolatileFlags.unk8, index, numBits);
s32 volatileFlag_getN(s32 index, s32 numBits) {
return bitfield_get_n_bits(gVolatileFlags.unk8, index, numBits);
}
s32 volatileFlag_getAndSet(s32 index, s32 arg1) {

4
src/core2/code_9A740.c
View File

@@ -42,7 +42,7 @@ void func_803216D0(enum map_e map){
&& D_80383300.level != LEVEL_D_CUTSCENE
&& map != MAP_91_FILE_SELECT
){
volatileFlag_set(0x18, TRUE);
volatileFlag_set(VOLATILE_FLAG_18, TRUE);
}
if(D_80383300.level == LEVEL_9_RUSTY_BUCKET_BAY){
@@ -74,7 +74,7 @@ void func_80321854(void){
&& fileProgressFlag_get(FILEPROG_31_MM_OPEN)
&& !fileProgressFlag_get(FILEPROG_C1_BADDIES_ESCAPE_TEXT)
){
volatileFlag_set(0x22, 1);
volatileFlag_set(VOLATILE_FLAG_22, 1);
}
bsStoredState_8029A924(); //null
func_803465BC(); //null

4
src/core2/code_9E370.c
View File

@@ -528,7 +528,7 @@ void func_803268B4(void) {
if (suBaddieActorArray != NULL) {
sp54 = volatileFlag_get(101);
sp54 = volatileFlag_get(VOLATILE_FLAG_65_CHEAT_ENTERED);
for(temp_v1 = suBaddieActorArray->cnt - 1; temp_v1 >= 0; temp_v1--){
actor = &suBaddieActorArray->data[temp_v1];
actor_info = actor->actor_info;
@@ -1517,7 +1517,7 @@ bool func_803294F0(Actor *this, s32 arg1, s32 arg2){
bool func_80329530(Actor *this, s32 dist){
if( func_8028F098()
&& !volatileFlag_get(0xBF)
&& !volatileFlag_get(VOLATILE_FLAG_BF)
&& subaddie_playerIsWithinSphere(this, dist)
){
return TRUE;

2
src/core2/code_A5BC0.c
View File

@@ -888,7 +888,7 @@ void cube_fromFile(Struct61s *file_ptr, Cube *cube) {
}
if (file_getByte_ifExpected(file_ptr, 8, &sp47)) {
sp34 = volatileFlag_get(VOLATILE_FLAG_1) + volatileFlag_get(VOLATILE_FLAG_2) + volatileFlag_get(0x1F);
sp34 = volatileFlag_get(VOLATILE_FLAG_1) + volatileFlag_get(VOLATILE_FLAG_2) + volatileFlag_get(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE);
if ((sp34) && gcparade_8031B4CC()) {
sp34 = 0;

17
src/core2/code_BEF20.c
View File

@@ -7,9 +7,6 @@ f32 time_getDelta(void);
void func_80346DB4(s32);
s32 item_adjustByDiffWithHud(enum item_e item, s32 diff);
void itemscore_noteScores_clear(void);
s32 itemscore_noteScores_get(enum level_e lvl_id);
void itemscore_timeScores_clear(void);
/* .bss */
s32 D_80385F30[0x2C];
@@ -308,7 +305,7 @@ void func_803465E4(void){
}//L803469E4
}//L803469E4
if(!volatileFlag_get(0xbf)){
if(!volatileFlag_get(VOLATILE_FLAG_BF)){
for(i = 0; i < 6; i++){
if(D_80385F30[ITEM_6_HOURGLASS + i]){
func_80345EB0(ITEM_0_HOURGLASS_TIMER + i);
@@ -406,9 +403,9 @@ void func_80346DB4(s32 note_count) {
if (!levelSpecificFlags_get(0x34) && (func_80311480(0xF76, 0, NULL, NULL, NULL, NULL))) {
levelSpecificFlags_set(0x34, TRUE);
}
if (volatileFlag_get(0x17) == 0) {
volatileFlag_set(0x17, 1);
volatileFlag_setN(0x19, level_id, 4);
if (volatileFlag_get(VOLATILE_FLAG_17) == 0) {
volatileFlag_set(VOLATILE_FLAG_17, 1);
volatileFlag_setN(VOLATILE_FLAG_19_CURRENT_LEVEL_ID, level_id, 4);
}
}
}
@@ -537,7 +534,7 @@ void func_8034789C(void) {
} else {
D_80385F30[ITEM_15_HEALTH_TOTAL] = 5 + MIN(3, (sp1C / 6));
}
if (volatileFlag_get(0x94)) {
if (volatileFlag_get(VOLATILE_FLAG_94_SANDCASTLE_INFINITE_HEALTH)) {
temp_v0 = D_80385F30[ITEM_15_HEALTH_TOTAL];
if (temp_v0 >= 9) {
D_80385F30[ITEM_15_HEALTH_TOTAL] = temp_v0;
@@ -597,8 +594,8 @@ void func_80347A7C(void){
void func_80347AA8(void) {
volatileFlag_restoreAll();
volatileFlag_set(0x1F, FALSE);
volatileFlag_set(0x20, FALSE);
volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, FALSE);
volatileFlag_set(VOLATILE_FLAG_20_BEGIN_CHARACTER_PARADE, FALSE);
volatileFlag_set(VOLATILE_FLAG_C1_IN_FINAL_CHARACTER_PARADE, FALSE);
volatileFlag_set(VOLATILE_FLAG_C0_BEGIN_FINAL_CHARACTER_PARADE, FALSE);
item_set(ITEM_16_LIFE, D_80386068);

12
src/core2/code_C4320.c
View File

@@ -207,7 +207,7 @@ void func_8034B8C0(enum map_e map_id, s32 demo_id) {
demo_load(map_id,demo_id);
D_80386118 = D_8038611C = 0;
if (D_80386114->unk1 == 6) {
volatileFlag_set(0x1F, 1);
volatileFlag_set(VOLATILE_FLAG_1F_IN_CHARACTER_PARADE, 1);
func_802E4A70();
}
if ((demo_id == 0x5B) || (demo_id == 0x5F)) {
@@ -305,8 +305,8 @@ void func_8034BB90(void) {
&& sp18
&& !D_8038611C
&& (getGameMode() != GAME_MODE_8_BOTTLES_BONUS)
&& ((volatileFlag_get(0x64) && (getGameMode() != GAME_MODE_A_SNS_PICTURE))
|| volatileFlag_get(0x63))
&& ((volatileFlag_get(VOLATILE_FLAG_64) && (getGameMode() != GAME_MODE_A_SNS_PICTURE))
|| volatileFlag_get(VOLATILE_FLAG_63))
) {
func_8034B7F0(D_80386114->unk1);
if (getGameMode() == GAME_MODE_9_BANJO_AND_KAZOOIE) {
@@ -317,7 +317,7 @@ void func_8034BB90(void) {
} else {
func_802DF0C8();
}
} else if (volatileFlag_get(0x64)) {
} else if (volatileFlag_get(VOLATILE_FLAG_64)) {
func_802E412C(1, D_80386114->unk5);
func_8034B994();
} else {
@@ -329,8 +329,8 @@ void func_8034BB90(void) {
func_8025A58C(0, 800);
func_8025AB00();
}
volatileFlag_set(0x64, 0);
volatileFlag_set(0x63, 0);
volatileFlag_set(VOLATILE_FLAG_64, 0);
volatileFlag_set(VOLATILE_FLAG_63, 0);
D_8038611C = 1;
}
}

12
src/core2/code_DA760.c
View File

@@ -33,8 +33,8 @@ int func_803616F0(Actor *this){
}
void func_80361828(Actor *this){
if(volatileFlag_get(0x16) && level_get() == LEVEL_6_LAIR){
volatileFlag_set(0x16, 0);
if(volatileFlag_get(VOLATILE_FLAG_16) && level_get() == LEVEL_6_LAIR){
volatileFlag_set(VOLATILE_FLAG_16, 0);
}
}
@@ -54,19 +54,19 @@ void func_80361870(Actor *this){
}
}
else if(func_803616F0(this)){
sp28 = (volatileFlag_get(0x16)?0xf6e:0xf68) + this->unkF4_8 - 1;
if(!volatileFlag_get(0x16) && level_get() == LEVEL_6_LAIR){
sp28 = (volatileFlag_get(VOLATILE_FLAG_16)?0xf6e:0xf68) + this->unkF4_8 - 1;
if(!volatileFlag_get(VOLATILE_FLAG_16) && level_get() == LEVEL_6_LAIR){
this->unk138_24 = TRUE;
}
else{
if(func_80311480(sp28, 0, 0, 0, 0, 0)){
this->unk138_24 = TRUE;
volatileFlag_set(0x16, 0);
volatileFlag_set(VOLATILE_FLAG_16, 0);
}
}
}
else{//L80361A14
volatileFlag_set(0x16, 0);
volatileFlag_set(VOLATILE_FLAG_16, 0);
}
}//L80361A20
}

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);
}
}