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

created enums for misc flags

Browse Source
This commit is contained in:
mariob92
2024-09-08 19:57:16 +02:00
parent f85116d50c
commit 3b092f2749
36 changed files with 209 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/enums.h
View File

@@ -4753,22 +4753,36 @@ enum bswatergroup_e{
};
enum misc_flag_e{
MISC_FLAG_1_ON_FLIGHT_PAD = 0x1,
MISC_FLAG_0, // unused
MISC_FLAG_1_ON_FLIGHT_PAD,
MISC_FLAG_2_ON_SPRING_PAD,
MISC_FLAG_3,
MISC_FLAG_4,
MISC_FLAG_5_HAS_PECKED,
MISC_FLAG_6,
MISC_FLAG_7,
MISC_FLAG_8,
MISC_FLAG_9,
MISC_FLAG_A,
MISC_FLAG_B,
MISC_FLAG_C,
MISC_FLAG_D, // unused
MISC_FLAG_E_TOUCHING_WADING_BOOTS,
MISC_FLAG_F, // related to A button ?
MISC_FLAG_10_TOUCHING_TURBO_TRAINERS,
MISC_FLAG_11, // unused
MISC_FLAG_12_HAS_FLAPPED, // has used flap
MISC_FLAG_13, // related to ground damage ?
MISC_FLAG_14_LOSE_BOGGY_RACE, // in difficult terrain (mud)
MISC_FLAG_15, // touching loadzone?
MISC_FLAG_16, // related to flying
MISC_FLAG_17_FIRST_PERSON_VIEW,
MISC_FLAG_18, // related to underwater state
MISC_FLAG_19, // related to transformations
MISC_FLAG_1A, // related to bee transformation
MISC_FLAG_1B_TRANSFORMING,
MISC_FLAG_5_HAS_PECKED = 0x5,
MISC_FLAG_E_TOUCHING_WADING_BOOTS = 0xE,
MISC_FLAG_10_TOUCHING_TURBO_TRAINERS = 0x10,
//0x12 has used flap
MISC_FLAG_12_HAS_FLAPPED = 0x12,
//0x13 in difficult terrain (mud)
MISC_FLAG_14_LOSE_BOGGY_RACE = 0x14,
//0x15 touching loadzone?
MISC_FLAG_17_FPV = 0x17,
MISC_FLAG_1B_TRANSFORMING = 0x1B
MISC_FLAG_NUM_FLAGS
};
enum nc_first_person_state{

7
include/functions.h
View File

@@ -575,4 +575,11 @@ extern void itemscore_noteScores_clear(void);
extern s32 itemscore_noteScores_get(enum level_e lvl_id);
extern void itemscore_timeScores_clear(void);
extern void miscFlag_clearAll(void);
extern bool miscFlag_isTrue(enum misc_flag_e arg0);
extern bool miscFlag_isFalse(enum misc_flag_e arg0);
extern void miscFlag_set(enum misc_flag_e arg0);
extern void miscFlag_clear(enum misc_flag_e arg0);
extern void miscFlag_toggle(enum misc_flag_e arg0);
#endif

2
src/core2/ba/drone.c
View File

@@ -57,7 +57,7 @@ enum bs_e badrone_vanish(void){
}
enum bs_e badrone_transform(void){
miscflag_clear(0x19);
miscFlag_clear(MISC_FLAG_19);
badrone_set_type(BA_DRONE_TRANSFORM);
return func_8029BD90();
}

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

@@ -142,7 +142,7 @@ void __baMarker_8028B904(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
func_80296CC0(&sp1C);
func_80296CB4(arg3);
if(miscflag_isTrue(7)){
if(miscFlag_isTrue(MISC_FLAG_7)){
func_8029CDA0();
}
else{
@@ -715,7 +715,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case MARKER_D4_SPRING_PAD: //L8028CDEC
case 0x242: //L8028CDEC
if(ability_isUnlocked(ABILITY_D_SHOCK_JUMP)){
miscflag_set(MISC_FLAG_2_ON_SPRING_PAD);
miscFlag_set(MISC_FLAG_2_ON_SPRING_PAD);
}else{
if(!volatileFlag_getAndSet(VOLATILE_FLAG_C_HAS_SEEN_SPRING_PAD, 1)){
func_80311480(0xA24, 4, 0, 0, 0, 0);
@@ -727,7 +727,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case MARKER_240_LAIR_SWITCH_FLIGHT_PAD: //L8028CE3C
case MARKER_261_FIGHT_FLIGHT_PAD: //L8028CE3C
if(ability_isUnlocked(ABILITY_9_FLIGHT)){
miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD);
miscFlag_set(MISC_FLAG_1_ON_FLIGHT_PAD);
}
else if(! volatileFlag_getAndSet(VOLATILE_FLAG_D_HAS_SEEN_FLIGHT_PAD, 1)){
func_80311480(0xA25, 4, 0, 0, 0, 0);
@@ -746,7 +746,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
if(chwadingboots_802D6E0C(actor) == 0)
return;
miscflag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
miscFlag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
func_802A6388(chwadingboots_802D6E4C(actor));
bs_checkInterrupt(BS_INTR_1B);
__spawnQueue_add_4((GenFunction_4)func_802C418C, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z));
@@ -770,7 +770,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
if(!chtrainers_canUse(actor))
return;
miscflag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
miscFlag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
set_turbo_duration(chtrainers_getDuration(actor));
bs_checkInterrupt(BS_INTR_1A);
__spawnQueue_add_4((GenFunction_4)func_802C418C, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z));
@@ -800,7 +800,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
plyr_collision_type = MARKER_COLLISION_FUNC_0;
}
if(obj_collision_type){
miscflag_set(8);
miscFlag_set(MISC_FLAG_8);
}
marker_callCollisionFunc(playerMarker, marker, plyr_collision_type);
marker_callCollisionFunc(marker, playerMarker, obj_collision_type);
@@ -814,10 +814,10 @@ void __baMarker_resolveCollision(Prop *other_prop){
switch (tmp2)
{
case 0x2E8:
miscflag_set(MISC_FLAG_1_ON_FLIGHT_PAD); //on flight pad
miscFlag_set(MISC_FLAG_1_ON_FLIGHT_PAD); //on flight pad
break;
case 0x2DD: //on shock spring pad
miscflag_set(MISC_FLAG_2_ON_SPRING_PAD);
miscFlag_set(MISC_FLAG_2_ON_SPRING_PAD);
break;
default:
func_80332790(tmp2);
@@ -866,9 +866,9 @@ void baMarker_init(void){
playerMarker->unk2C_1 = 1;
marker_setCollisionScripts(playerMarker, NULL, func_80291634, func_80291610);
func_803300B8(playerMarker, baMarker_8028D7B8);
miscflag_clear(MISC_FLAG_1_ON_FLIGHT_PAD);
miscflag_clear(MISC_FLAG_2_ON_SPRING_PAD);
miscflag_clear(8);
miscFlag_clear(MISC_FLAG_1_ON_FLIGHT_PAD);
miscFlag_clear(MISC_FLAG_2_ON_SPRING_PAD);
miscFlag_clear(MISC_FLAG_8);
baMarker_8028D638(0,0);
func_8033D2F4();
D_8037BF8C = 0;
@@ -899,11 +899,11 @@ void baMarker_update(void){
D_8037BF88 = 0;
}
}//L8028D364
miscflag_clear(8);
miscFlag_clear(MISC_FLAG_8);
if(playerMarker->collidable){
temp_s0_2 = __baMarker_8028B750();
miscflag_clear(MISC_FLAG_1_ON_FLIGHT_PAD);
miscflag_clear(MISC_FLAG_2_ON_SPRING_PAD);
miscFlag_clear(MISC_FLAG_1_ON_FLIGHT_PAD);
miscFlag_clear(MISC_FLAG_2_ON_SPRING_PAD);
_player_getPosition(sp168);
func_8032F64C(sp168, playerMarker);
for(D_8037BF8C = NULL, i = 0, temp_s2 = 0; i < 2;i++){//L8028D3DC
@@ -1016,7 +1016,7 @@ void baMarker_8028D7B8(s32 arg0, ActorMarker *arg1, struct5Cs *collision_flags){
s32 tmp_v0;
if(func_8033D5A4(collision_flags))
miscflag_set(8);
miscFlag_set(MISC_FLAG_8);
if((func_80297C6C() != 3 && func_8028F1E0()) || !sp20){
if(!func_8028F25C()){

10
src/core2/bs/ant.c
View File

@@ -54,8 +54,8 @@ void func_8029E4EC(void){
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
miscflag_clear(3);
miscflag_clear(4);
miscFlag_clear(MISC_FLAG_3);
miscFlag_clear(MISC_FLAG_4);
func_80293D74();
}
baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL);
@@ -84,8 +84,8 @@ void bsant_idle_init(void){
baphysics_set_target_horizontal_velocity(0.0f);
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
miscflag_set(3);
miscflag_set(4);
miscFlag_set(MISC_FLAG_3);
miscFlag_set(MISC_FLAG_4);
func_802900B4();
}
@@ -266,7 +266,7 @@ void bsant_fall_update(void){
break;
}
if(player_isStable()){
if(miscflag_isTrue(0x19))
if(miscFlag_isTrue(MISC_FLAG_19))
sp2C = badrone_transform();
else
sp2C = BS_35_ANT_IDLE;

20
src/core2/bs/bBarge.c
View File

@@ -76,9 +76,9 @@ void bsbarge_init(void){
func_8029E070(1);
D_8037D2A6 = 0;
D_8037D2A5 = 0;
miscflag_clear(0xA);
miscflag_clear(0xB);
miscflag_clear(0xC);
miscFlag_clear(MISC_FLAG_A);
miscFlag_clear(MISC_FLAG_B);
miscFlag_clear(MISC_FLAG_C);
func_8029E3C0(2, 0.01f);
}
@@ -90,7 +90,7 @@ void bsbarge_update(void){
sp24 = 0;
plyrMvmnt = baanim_getAnimCtrlPtr();
if(button_released(BUTTON_B))
miscflag_set(0xA);
miscFlag_set(MISC_FLAG_A);
switch(D_8037D2A5){
case 0:
if(animctrl_isAt(plyrMvmnt, 0.1392f))
@@ -99,8 +99,8 @@ void bsbarge_update(void){
if(!animctrl_isStopped(plyrMvmnt))
break;
if(miscflag_isFalse(0xA)){
miscflag_set(0xC);
if(miscFlag_isFalse(MISC_FLAG_A)){
miscFlag_set(MISC_FLAG_C);
D_8037D2A0 = 850.0f;
}else{
D_8037D2A0 = 500.0f;
@@ -110,13 +110,13 @@ void bsbarge_update(void){
break;
case 1:
func_8029E1A8(1);
if(miscflag_isFalse(0xB) && func_8029E2E0(1, 0.1f)){
if(miscflag_isTrue(0xC)){
if(miscFlag_isFalse(MISC_FLAG_B) && func_8029E2E0(1, 0.1f)){
if(miscFlag_isTrue(MISC_FLAG_C)){
func_8030E560(SFX_4_KAZOOIE_RUUUUUH, 30000);
}else{
func_8030E560(SFX_43_KAZOOIE_RUH, 30000);
}
miscflag_set(0xB);
miscFlag_set(MISC_FLAG_B);
}
if(!func_8029E384(1))
break;
@@ -142,7 +142,7 @@ void bsbarge_update(void){
break;
case 3:
func_8029E1A8(0);
if(miscflag_isFalse(0xC) || func_8029E384(0)){
if(miscFlag_isFalse(MISC_FLAG_C) || func_8029E384(0)){
D_8037D2A0 -= 80.0f;
}
baphysics_set_target_horizontal_velocity(D_8037D2A0);

2
src/core2/bs/bFlap.c
View File

@@ -30,7 +30,7 @@ void bsbflap_init(void) {
baphysics_set_vertical_velocity(0.0f);
baphysics_set_gravity(D_80364A14);
func_8029E070(1);
miscflag_set(MISC_FLAG_12_HAS_FLAPPED);
miscFlag_set(MISC_FLAG_12_HAS_FLAPPED);
func_8029E3C0(0, 2.5f);
D_8037D30C = func_8030D90C();
func_80299BD4();

8
src/core2/bs/bFly.c
View File

@@ -180,7 +180,7 @@ void bsbfly_enter_end(void){
void bsbfly_init(void){
baanim_playForDuration_loopSmooth(ASSET_38_ANIM_BSBFLY, 0.62f);
func_8029C7F4(1,1,3, BA_PHYSICS_LOCKED_ROTATION);
if(miscflag_isTrue(9)){
if(miscFlag_isTrue(MISC_FLAG_9)){
baphysics_set_target_horizontal_velocity(0.0f);
}else{
baphysics_set_target_horizontal_velocity(600.0f);
@@ -261,7 +261,7 @@ void bsbfly_update(void){
func_8030EBC8(SFX_2_CLAW_SWIPE, 0.6f, 0.7f, 0x2710, 0x2ee0);
}
baphysics_set_gravity(-300.0f);
if(miscflag_isTrue(9)){
if(miscFlag_isTrue(MISC_FLAG_9)){
baphysics_set_terminal_velocity(0.0f);
baphysics_set_velocity(0);
sp38 = 0.0f;
@@ -409,7 +409,7 @@ void func_802A411C(void) {
ml_vec3f_copy(sp28, D_8037D338);
ml_vec3f_normalize(sp28);
sp24 = mlAbsF(sp34[0] * sp28[0] + sp34[1] * sp28[1] + sp34[2] * sp28[2]);
if (miscflag_isTrue(8) || ((sp44 & 0x80) != 0)) {
if (miscFlag_isTrue(MISC_FLAG_8) || ((sp44 & 0x80) != 0)) {
func_802A4078();
next_state = BS_18_FLY_KNOCKBACK;
} else if (0.4 < sp24) {
@@ -782,7 +782,7 @@ void func_802A503C(void){
void func_802A505C(void){
if(bs_getInterruptType() == BS_INTR_9){
func_8029A86C(2);
miscflag_set(7);
miscFlag_set(MISC_FLAG_7);
func_8029CCC4();
}else{
func_80296608();

6
src/core2/bs/bLongLeg.c
View File

@@ -70,7 +70,7 @@ void func_802A5374(void){
func_8029E0F4(1);
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
miscflag_set(3);
miscFlag_set(MISC_FLAG_3);
}
void func_802A5404(void){
@@ -87,7 +87,7 @@ void func_802A5404(void){
roll_setIdeal(0.0f);
stateTimer_clear(STATE_TIMER_2_LONGLEG);
func_803219F4(1);
miscflag_clear(3);
miscFlag_clear(MISC_FLAG_3);
func_8029E180(4, 0.5f);
func_802A531C();
}
@@ -121,7 +121,7 @@ void bsblongleg_enter_init(void){
D_8037D361 = func_8030D90C();
sfxsource_setSfxId(D_8037D361, SFX_2C_PULLING_NOISE);
func_8030E04C(D_8037D361, 0.8f, 1.9f, 1.2f);
miscflag_clear(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
miscFlag_clear(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
if(bsbtrot_inSet(bs_getPrevState()))
__bsblongleg_enterFromTrot();
else

2
src/core2/bs/bPeck.c
View File

@@ -66,7 +66,7 @@ void func_802A664C(void){
sp1C = 1.32f;
break;
}
miscflag_set(MISC_FLAG_5_HAS_PECKED);
miscFlag_set(MISC_FLAG_5_HAS_PECKED);
func_8030E58C(SFX_42_KAZOOIE_RAH, sp1C);
baphysics_set_vertical_velocity(D_80364A64);
D_8037D375++;

18
src/core2/bs/bTrot.c
View File

@@ -106,15 +106,15 @@ void func_802A8A40(void){
func_8029E064(1);
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
miscflag_set(3);
miscFlag_set(MISC_FLAG_3);
func_8029CF48(4,1,0.24f);
baModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE);
}
void func_802A8AD8(void){
func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), stateTimer_get(STATE_TIMER_3_TURBO_TALON));
if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) &&(bs_getState() != BS_17_BTROT_EXIT)){
miscflag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
if(miscFlag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) &&(bs_getState() != BS_17_BTROT_EXIT)){
miscFlag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
stateTimer_set(STATE_TIMER_3_TURBO_TALON, get_turbo_duration());
func_803219F4(4);
}
@@ -122,7 +122,7 @@ void func_802A8AD8(void){
if(stateTimer_isDone(STATE_TIMER_3_TURBO_TALON)){
if(func_8029DFE0()){
func_8029E0DC(0);
if(miscflag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE))
if(miscFlag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE))
func_8030E484(0x3eb);
func_803219F4(1);
}
@@ -143,7 +143,7 @@ void func_802A8BB0(void){
func_8029E064(0);
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
miscflag_clear(3);
miscFlag_clear(MISC_FLAG_3);
if(next_state != BS_5A_LOADZONE)
stateTimer_set(STATE_TIMER_3_TURBO_TALON, 0.0f);
func_802A8AD8();
@@ -177,10 +177,10 @@ enum asset_e func_802A8D00(enum asset_e arg0, enum asset_e arg1){
}
enum bs_e func_802A8D34(enum bs_e arg0){
if(miscflag_isTrue(0xf))
if(miscFlag_isTrue(MISC_FLAG_F))
return arg0;
if(miscflag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD))
if(miscFlag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD))
return BS_23_FLY_ENTER;
return BS_8_BTROT_JUMP;
@@ -377,7 +377,7 @@ void bsbtrot_jump_update(void){
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
func_802A87C0();
if(miscflag_isTrue(0xF))
if(miscFlag_isTrue(MISC_FLAG_F))
baphysics_reset_horizontal_velocity();
else
func_802A89D4();
@@ -588,7 +588,7 @@ void bsbtrot_fall_update(void){
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
func_802A87C0();
if(miscflag_isTrue(0xf))
if(miscFlag_isTrue(MISC_FLAG_F))
baphysics_reset_horizontal_velocity();
else
func_802A89D4();

2
src/core2/bs/bbuster.c
View File

@@ -124,7 +124,7 @@ void bsbbuster_update(void){
rumbleManager_80250D94(1.0f, 0.3f, 0.4f);
D_8037D2B6++;
}
D_8037D2B9 = miscflag_isTrue(8);
D_8037D2B9 = miscFlag_isTrue(MISC_FLAG_8);
func_8029445C(sp30);
//L8029FF78
if(((0.0f <= sp30[1])? sp30[1] : -sp30[1]) < 1.0){

8
src/core2/bs/bee.c
View File

@@ -19,8 +19,8 @@ void func_802A02C0(void){
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
miscflag_clear(3);
miscflag_clear(4);
miscFlag_clear(MISC_FLAG_3);
miscFlag_clear(MISC_FLAG_4);
func_80293D74();
}
baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL);
@@ -31,8 +31,8 @@ void func_802A0340(void){
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_80293D48(50.0f, 25.0f);
miscflag_set(3);
miscflag_set(4);
miscFlag_set(MISC_FLAG_3);
miscFlag_set(MISC_FLAG_4);
}
}

4
src/core2/bs/beeFly.c
View File

@@ -152,7 +152,7 @@ void bsbeefly_enter(void){
mvmnt = bs_getPrevState();
baanim_playForDuration_loopSmooth(ASSET_1DC_ANIM_BEE_FLY, 0.38);
func_8029C7F4(1, 1, 3, BA_PHYSICS_LOCKED_ROTATION);
if(miscflag_isTrue(9))
if(miscFlag_isTrue(MISC_FLAG_9))
baphysics_set_target_horizontal_velocity(0.0f);
else
baphysics_set_target_horizontal_velocity(600.0f);
@@ -235,7 +235,7 @@ void bsbeefly_update(void){
}
break;
}//L802A0DF0
if(miscflag_isTrue(9)){
if(miscFlag_isTrue(MISC_FLAG_9)){
baphysics_set_terminal_velocity(0.0f);
baphysics_set_velocity(0);
sp38 = 0.0f;

6
src/core2/bs/beeMain.c
View File

@@ -275,7 +275,7 @@ void func_802A170C(void){
break;
}
if(player_isStable()){
if(miscflag_isTrue(0x19)){
if(miscFlag_isTrue(MISC_FLAG_19)){
sp2c = badrone_transform();
}else{
if(func_8029B300() > 0)
@@ -286,7 +286,7 @@ void func_802A170C(void){
}
}
else{
if(miscflag_isFalse(0xf) && button_pressed(BUTTON_A))
if(miscFlag_isFalse(MISC_FLAG_F) && button_pressed(BUTTON_A))
sp2c = BS_BEE_FLY;
}//L802A189C
if(player_inWater())
@@ -514,7 +514,7 @@ void func_802A2054(void){
}
void func_802A2098(void){
miscflag_clear(0x1A);
miscFlag_clear(MISC_FLAG_1A);
baanim_playForDuration_loopSmooth(ASSET_1DE_ANIM_BEE_IDLE, 3.0f);
yaw_setIdeal(func_8029B41C());
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);

14
src/core2/bs/croc.c
View File

@@ -49,8 +49,8 @@ void __bscroc_jumpSfx(void){
void func_802ABE70(void){
f32 sp1C = stateTimer_get(STATE_TIMER_3_TURBO_TALON);
func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), sp1C);
if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) && bs_getState() != BS_17_BTROT_EXIT){
miscflag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
if(miscFlag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS) && bs_getState() != BS_17_BTROT_EXIT){
miscFlag_clear(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
stateTimer_set(STATE_TIMER_3_TURBO_TALON, get_turbo_duration());
func_8025A6EC(COMUSIC_8A_GETTING_TURBO_TRAINERS, -1);
func_8029E0DC(1);
@@ -81,8 +81,8 @@ void func_802ABFBC(void){
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
miscflag_clear(3);
miscflag_clear(4);
miscFlag_clear(MISC_FLAG_3);
miscFlag_clear(MISC_FLAG_4);
func_80293D74();
}
baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL);
@@ -109,8 +109,8 @@ void bscroc_idle_init(void){
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_80293D48(50.0f, 25.0f);
miscflag_set(3);
miscflag_set(4);
miscFlag_set(MISC_FLAG_3);
miscFlag_set(MISC_FLAG_4);
func_802900B4();
}
@@ -312,7 +312,7 @@ void bscroc_fall_update(void){
if(player_isStable()){
if(func_8029B300() > 0 || (D_8037D3EC == 2 && animctrl_isStopped(aCtrl))){
if(miscflag_isTrue(0x19)){
if(miscFlag_isTrue(MISC_FLAG_19)){
next_state = badrone_transform();
}else{
next_state = BS_5E_CROC_IDLE;

4
src/core2/bs/dronelook.c
View File

@@ -30,7 +30,7 @@ void bsDroneLook_init(void) {
eye_rotation[1] += 180.0f;
eye_rotation[2] = 0.0f;
ncFirstPersonCamera_setZoomedOutRotation(eye_rotation);
miscflag_set(MISC_FLAG_17_FPV);
miscFlag_set(MISC_FLAG_17_FIRST_PERSON_VIEW);
}
void bsDroneLook_update(void) {
@@ -79,5 +79,5 @@ void bsDroneLook_end(void) {
func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
}
ncDynamicCamera_exitFirstPerson();
miscflag_clear(MISC_FLAG_17_FPV);
miscFlag_clear(MISC_FLAG_17_FIRST_PERSON_VIEW);
}

4
src/core2/bs/dronexform.c
View File

@@ -335,7 +335,7 @@ void bsdronexform_init(void){
func_802B016C();
D_8037D470.player_transformation = bsStoredState_getTransformation();
D_8037D470.room_transformation = func_80294A4C();
miscflag_set(MISC_FLAG_1B_TRANSFORMING);
miscFlag_set(MISC_FLAG_1B_TRANSFORMING);
D_8037D470.state = 0;
__bsdronexform_setState(1);
}
@@ -444,7 +444,7 @@ void bsdronexform_end(void){
func_802AFADC();
func_802B014C();
func_80298A64();
miscflag_clear(MISC_FLAG_1B_TRANSFORMING);
miscFlag_clear(MISC_FLAG_1B_TRANSFORMING);
}
void bsdronexform_interrupt(void){}

6
src/core2/bs/jig.c
View File

@@ -42,8 +42,8 @@ void bsjig_jiggy_init(void){
func_8029151C(0xC);
func_8029E070(1);
func_8030E6D4(SFX_33_BANJO_AHOO);
miscflag_clear(7);
miscflag_clear(0xf);
miscFlag_clear(MISC_FLAG_7);
miscFlag_clear(MISC_FLAG_F);
baMarker_collisionOff();
chJigsawDance_setState(marker_getActor(bsjig_gJiggyMarker), 1);
D_8037D4B0 = 0;
@@ -164,7 +164,7 @@ void bsjig_notedoor_end(void){
void bsjig_notedoor_init(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
D_8037D4B2 = (bs_getPrevState() == BS_44_JIG_JIGGY);
miscflag_clear(0x1A);
miscFlag_clear(MISC_FLAG_1A);
animctrl_reset(aCtrl);
animctrl_setIndex(aCtrl, ASSET_282_ANIM_BSJIG_NOTEDOOR);
animctrl_setDuration(aCtrl, 3.6f);

14
src/core2/bs/jump.c
View File

@@ -35,7 +35,7 @@ void bsjump_init(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
enum bs_e sp30;
D_8037D4C2 = miscflag_isTrue(2);
D_8037D4C2 = miscFlag_isTrue(MISC_FLAG_2_ON_SPRING_PAD);
sp30 = bs_getPrevState();
if(bsclimb_inSet(sp30)){
climbRelease();
@@ -89,7 +89,7 @@ void bsjump_update(void){
if(D_8037D4C2)
func_8029C348();
if(miscflag_isTrue(0xf)){
if(miscFlag_isTrue(MISC_FLAG_F)){
baphysics_reset_horizontal_velocity();
}else{
func_802B6FA8();
@@ -172,7 +172,7 @@ void bsjump_fall_init(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
int sp20;
if(miscflag_isTrue(7) && 700.0f < baphysics_get_vertical_velocity())
if(miscFlag_isTrue(MISC_FLAG_7) && 700.0f < baphysics_get_vertical_velocity())
baphysics_set_vertical_velocity(700.0f);
sp20 = (bs_getPrevState() == BS_12_BFLIP)? 0 : 1;
@@ -191,7 +191,7 @@ void bsjump_fall_update(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
f32 player_velocity[3];
if(miscflag_isTrue(0xf))
if(miscFlag_isTrue(MISC_FLAG_F))
baphysics_reset_horizontal_velocity();
else
func_802B6FA8();
@@ -213,11 +213,11 @@ void bsjump_fall_update(void){
case 1:
break;
}//L802B1824
if(miscflag_isFalse(0xf)){
if(miscFlag_isFalse(MISC_FLAG_F)){
if(player_isFallTumbling())
sp2C = BS_3D_FALL_TUMBLING;
if(should_feathery_flap() && miscflag_isFalse(MISC_FLAG_5_HAS_PECKED))
if(should_feathery_flap() && miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED))
sp2C = BS_BFLAP;
if(should_peck())
@@ -231,7 +231,7 @@ void bsjump_fall_update(void){
}
else if(player_inWater()){
func_8029CCC4();
if(miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)){
if(miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)){
sp2C = BS_D_TIMEOUT;
}

10
src/core2/bs/pumpkin.c
View File

@@ -55,8 +55,8 @@ void func_802B229C(void) {
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
miscflag_clear(3);
miscflag_clear(4);
miscFlag_clear(MISC_FLAG_3);
miscFlag_clear(MISC_FLAG_4);
func_80293D74();
}
baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL);
@@ -80,8 +80,8 @@ void bspumpkin_idle_init(void) {
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_80293D48(50.0f, 25.0f);
miscflag_set(3);
miscflag_set(4);
miscFlag_set(MISC_FLAG_3);
miscFlag_set(MISC_FLAG_4);
func_802900B4();
}
@@ -290,7 +290,7 @@ void bspumpkin_fall_update(void) {
break;
}
if (player_isStable() && ((func_8029B300() > 0) || (D_8037D4E0 == 2 && animctrl_isStopped(anim_ctrl)))) {
if (miscflag_isTrue(0x19)) {
if (miscFlag_isTrue(MISC_FLAG_19)) {
next_state = badrone_transform();
} else {
next_state = BS_48_PUMPKIN_IDLE;

2
src/core2/bs/rest.c
View File

@@ -160,7 +160,7 @@ void func_802B3E64(void) {
if (func_802B3BB0()) {
next_state = bs_getIdleState();
}
if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
if (map_get() == MAP_27_FP_FREEZEEZY_PEAK && miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
next_state = func_8029CA94(next_state);
}
bs_setState(next_state);

2
src/core2/bs/stand.c
View File

@@ -323,7 +323,7 @@ void func_802B5350(void){
}
else if(sp1C == 0x12){//L802B53D0
func_8029A86C(1);
if( bsStoredState_getTransformation() == TRANSFORM_1_BANJO && !miscflag_isTrue(0xF) && stateTimer_isDone(STATE_TIMER_0_UNKNOWN)){
if( bsStoredState_getTransformation() == TRANSFORM_1_BANJO && !miscFlag_isTrue(MISC_FLAG_F) && stateTimer_isDone(STATE_TIMER_0_UNKNOWN)){
func_8028DE6C(baMarker_getCarriedObjectActorId());
func_8029A86C(2);
}

2
src/core2/bs/surf.c
View File

@@ -33,7 +33,7 @@ void func_802B6064(void) {
next_state = BS_1_IDLE;
}
D_8037D560 = 0;
if (miscflag_isTrue(6)) {
if (miscFlag_isTrue(MISC_FLAG_6)) {
next_state = BS_53_TIMEOUT;
}
bs_setState(next_state);

4
src/core2/bs/swim.c
View File

@@ -179,7 +179,7 @@ void func_802B5950(void) {
if (func_80294524() && button_pressed(BUTTON_A)) {
next_state = BS_5_JUMP;
}
if (miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
if (miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
next_state = BS_D_TIMEOUT;
}
bs_setState(next_state);
@@ -256,7 +256,7 @@ void func_802B5C40(void) {
if (func_80294524() && button_pressed(BUTTON_A)) {
next_state = BS_5_JUMP;
}
if (miscflag_isTrue(6) || miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
if (miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) {
next_state = BS_D_TIMEOUT;
}
bs_setState(next_state);

10
src/core2/bs/walrus.c
View File

@@ -95,8 +95,8 @@ void func_802B8048(void){
func_8029B0C0();
func_8029E070(0);
func_8029E064(0);
miscflag_clear(3);
miscflag_clear(4);
miscFlag_clear(MISC_FLAG_3);
miscFlag_clear(MISC_FLAG_4);
func_80293D74();
func_8029CF48(4, 0, 0.0f);
}
@@ -148,8 +148,8 @@ void bswalrus_idle_init(void){
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
func_80293D48(50.0f, 25.0f);
miscflag_set(3);
miscflag_set(4);
miscFlag_set(MISC_FLAG_3);
miscFlag_set(MISC_FLAG_4);
func_802900B4();
func_802B8110();
}
@@ -352,7 +352,7 @@ void bswalrus_fall_update(void){
if( func_8029B300() > 0
|| (D_8037D5C8 == 2 && animctrl_isStopped(aCtrl))
){
if(miscflag_isTrue(0x19))
if(miscFlag_isTrue(MISC_FLAG_19))
next_state = badrone_transform();
else
next_state = BS_67_WALRUS_IDLE;

48
src/core2/code_14420.c
View File

@@ -240,10 +240,10 @@ enum bs_e func_8029B458(void){
enum bs_e func_8029B504(void){
enum bs_e sp1C;
if(miscflag_isTrue(0xF))
if(miscFlag_isTrue(MISC_FLAG_F))
return 0;
miscflag_set(0xF);
miscFlag_set(MISC_FLAG_F);
sp1C = func_8029B458();
if(bs_getState() != sp1C)
return sp1C;
@@ -448,7 +448,7 @@ enum bs_14420_e func_8029BAF0(void){
if (stateTimer_get(STATE_TIMER_2_LONGLEG) != 0.0f) {
return BS14420_9_LONGLEG;
}
if (miscflag_isTrue(0x18)) {
if (miscFlag_isTrue(MISC_FLAG_18)) {
return BS14420_5_UNDERWATER;
}
if (func_8028ECAC() == BSGROUP_3_WONDERWING) {
@@ -569,10 +569,10 @@ enum bs_e bs_getIdleState(void){
case TRANSFORM_1_BANJO:
default:
if (miscflag_isTrue(0x16)) {
if (miscFlag_isTrue(MISC_FLAG_16)) {
return BS_24_FLY;
}
if (miscflag_isTrue(0x18)) {
if (miscFlag_isTrue(MISC_FLAG_18)) {
return BS_2B_DIVE_IDLE;
}
if (stateTimer_get(STATE_TIMER_3_TURBO_TALON) != 0.0f) {
@@ -723,7 +723,7 @@ void func_8029C674(void) {
D_8037D1E8 = FALSE;
if (func_80298850() == BSGROUP_4_LOOK) {
D_8037D1E8 = TRUE;
miscflag_set(MISC_FLAG_17_FPV);
miscFlag_set(MISC_FLAG_17_FIRST_PERSON_VIEW);
ncDynamicCamera_enterFirstPerson();
func_8028E9C4(5, sp1C);
ncFirstPersonCamera_setZoomedOutPosition(sp1C);
@@ -748,7 +748,7 @@ void func_8029C6D0(void) {
void func_8029C748(void) {
if (D_8037D1E8) {
miscflag_clear(MISC_FLAG_17_FPV);
miscFlag_clear(MISC_FLAG_17_FIRST_PERSON_VIEW);
ncDynamicCamera_exitFirstPerson();
}
}
@@ -757,10 +757,10 @@ enum bs_e bs_getTypeOfJump(void){
if(button_held(BUTTON_Z) && can_flap_flip())
return BS_12_BFLIP;
if(miscflag_isTrue(MISC_FLAG_2_ON_SPRING_PAD))
if(miscFlag_isTrue(MISC_FLAG_2_ON_SPRING_PAD))
return BS_5_JUMP;
if(miscflag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD))
if(miscFlag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD))
return BS_23_FLY_ENTER;
return BS_5_JUMP;
@@ -827,7 +827,7 @@ void func_8029C984(void){
}
s32 func_8029C9C0(s32 arg0){
if(miscflag_isTrue(0xF))
if(miscFlag_isTrue(MISC_FLAG_F))
return arg0;
if(button_pressed(BUTTON_A))
@@ -849,28 +849,28 @@ s32 func_8029C9C0(s32 arg0){
}
s32 func_8029CA94(s32 arg0){
if(miscflag_isTrue(0x19))
if(miscFlag_isTrue(MISC_FLAG_19))
arg0 = badrone_transform();
if(miscflag_isTrue(0x1A))
if(miscFlag_isTrue(MISC_FLAG_1A))
arg0 = (player_getTransformation() == TRANSFORM_6_BEE) ? 0x46 : BS_34_JIG_NOTEDOOR;
if(miscflag_isTrue(MISC_FLAG_E_TOUCHING_WADING_BOOTS))
if(miscFlag_isTrue(MISC_FLAG_E_TOUCHING_WADING_BOOTS))
arg0 = BS_25_LONGLEG_ENTER;
if(miscflag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS))
if(miscFlag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS))
arg0 = BS_14_BTROT_ENTER;
if(miscflag_isTrue(0x6))
if(miscFlag_isTrue(MISC_FLAG_6))
arg0 = BS_53_TIMEOUT;
if(miscflag_isTrue(0x7))
if(miscFlag_isTrue(MISC_FLAG_7))
arg0 = BS_44_JIG_JIGGY;
if(miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE))
if(miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE))
arg0 = (player_getTransformation() == TRANSFORM_4_WALRUS) ? BS_80_WALRUS_SLED_LOSE : BS_53_TIMEOUT;
miscflag_clear(0xF);
miscFlag_clear(MISC_FLAG_F);
return arg0;
}
@@ -907,14 +907,14 @@ void func_8029CBF4(void){
}
void func_8029CCC4(void){
if(miscflag_isFalse(7)) return;
if( miscflag_isTrue(0xF)
&& miscflag_isFalse(6)
&& miscflag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE)
if(miscFlag_isFalse(MISC_FLAG_7)) return;
if( miscFlag_isTrue(MISC_FLAG_F)
&& miscFlag_isFalse(MISC_FLAG_6)
&& miscFlag_isFalse(MISC_FLAG_14_LOSE_BOGGY_RACE)
){
miscflag_clear(0xF);
miscFlag_clear(MISC_FLAG_F);
}
miscflag_clear(7);
miscFlag_clear(MISC_FLAG_7);
func_802B0CD8();
item_inc(ITEM_E_JIGGY);
if(jiggyscore_total() == 100 && fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)){

8
src/core2/code_16010.c
View File

@@ -23,7 +23,7 @@ void func_8029CFF8(void){
}
void func_8029D01C(void){
miscflag_clear(0x13);
miscFlag_clear(MISC_FLAG_13);
D_8037D210 = func_8030D90C();
D_8037D212 = 0;
}
@@ -226,7 +226,7 @@ bool func_8029D7B4(void){
&& stateTimer_isDone(STATE_TIMER_2_LONGLEG)
&& func_8028ECAC() != BSGROUP_3_WONDERWING
&& func_8028ECAC() != BSGROUP_9_LONG_LEG
&& miscflag_isFalse(MISC_FLAG_E_TOUCHING_WADING_BOOTS)
&& miscFlag_isFalse(MISC_FLAG_E_TOUCHING_WADING_BOOTS)
&& sp1C != BS_25_LONGLEG_ENTER
&& player_getWaterState() != BSWATERGROUP_2_UNDERWATER
&& func_8028EC04() < 1U
@@ -317,9 +317,9 @@ void func_8029D968(void){
break;
}
}
miscflag_set(0x13);
miscFlag_set(MISC_FLAG_13);
}
else{
miscflag_clear(0x13);
miscFlag_clear(MISC_FLAG_13);
}
}

16
src/core2/code_39D0.c
View File

@@ -52,8 +52,8 @@ s32 can_egg(void){
}
int can_feathery_flap(void){
return miscflag_isFalse(MISC_FLAG_12_HAS_FLAPPED)
&& miscflag_isFalse(MISC_FLAG_5_HAS_PECKED)
return miscFlag_isFalse(MISC_FLAG_12_HAS_FLAPPED)
&& miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED)
&& ability_hasLearned(ABILITY_7_FEATHERY_FLAP);
}
@@ -70,13 +70,13 @@ s32 can_control_jump_height(void){
}
int can_peck(void){
return miscflag_isFalse(MISC_FLAG_5_HAS_PECKED)
&& miscflag_isFalse(MISC_FLAG_12_HAS_FLAPPED)
return miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED)
&& miscFlag_isFalse(MISC_FLAG_12_HAS_FLAPPED)
&& ability_hasLearned(ABILITY_B_RATATAT_RAP);
}
int func_8028ABB8(void){
if(miscflag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE) || miscflag_isTrue(0x19))
if(miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE) || miscFlag_isTrue(MISC_FLAG_19))
return 0;
if(bs_getState() == BS_56_RECOIL)
return 0;
@@ -185,7 +185,7 @@ int player_isInHorizontalRadius(f32 arg0[3], f32 arg1){
s32 func_8028B120(void){return 0;}
int func_8028B128(void){
return miscflag_isTrue(0x13);
return miscFlag_isTrue(MISC_FLAG_13);
}
bool player_isInRBB(void){
@@ -225,8 +225,8 @@ bool func_8028B3B4(void) {
bool sp1C;
bool sp18;
sp1C = func_80294610(0x10) && miscflag_isFalse(3);
sp18 = func_80294610(0x40) && miscflag_isFalse(4);
sp1C = func_80294610(0x10) && miscFlag_isFalse(MISC_FLAG_3);
sp18 = func_80294610(0x40) && miscFlag_isFalse(MISC_FLAG_4);
if(sp1C || sp18)
return TRUE;
return FALSE;

25
src/core2/code_7060.c
View File

@@ -13,7 +13,6 @@
extern bool player_isInHorizontalRadius(f32[3], f32);
extern bool player_isInVerticalRange(f32[3], f32);
extern void miscflag_clear(s32);
extern void func_80295A8C(void);
extern void climbSet(f32[3], f32[3], f32, u32);
extern void func_80296C90(f32);
@@ -72,8 +71,8 @@ bool func_8028E060(s32 arg0, s32 *arg1){
void func_8028E0B0(ActorMarker *arg0){
bs_setState(bs_getIdleState());
bsStoredState_setTrot(FALSE);
miscflag_clear(0x16);
miscflag_clear(0x18);
miscFlag_clear(MISC_FLAG_16);
miscFlag_clear(MISC_FLAG_18);
}
void func_8028E0F0(s32 arg0, s32 arg1[3]) {
@@ -119,17 +118,17 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
switch (map_get()) {
case MAP_27_FP_FREEZEEZY_PEAK:
if (arg0 == 0xD) {
miscflag_set(0x16);
miscFlag_set(MISC_FLAG_16);
}
break;
case MAP_77_GL_RBB_LOBBY:
if ((arg0 == 2) && func_802D6088()) {
miscflag_set(0x18);
miscFlag_set(MISC_FLAG_18);
}
break;
case MAP_76_GL_640_NOTE_DOOR:
if ((arg0 == 1) && func_802D60C4()) {
miscflag_set(0x18);
miscFlag_set(MISC_FLAG_18);
}
break;
}
@@ -155,8 +154,8 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) {
func_8028F85C(&sp7C);
func_80295A8C();
bsStoredState_setTrot(FALSE);
miscflag_clear(0x16);
miscflag_clear(0x18);
miscFlag_clear(MISC_FLAG_16);
miscFlag_clear(MISC_FLAG_18);
func_8028E060(arg0, &sp6C);
yaw_setIdeal((f32) sp6C);
yaw_applyIdeal();
@@ -199,7 +198,7 @@ void func_8028E4B0(void) {
D_8037BFB8 = 1;
func_80295A8C();
bsStoredState_setTrot(FALSE);
miscflag_clear(0x16);
miscFlag_clear(MISC_FLAG_16);
yaw_setIdeal(D_8037BFCC);
yaw_applyIdeal();
} else if (func_8028DFF0(sp20, sp24)) {
@@ -441,10 +440,10 @@ enum bsgroup_e func_8028ECAC(void) {
s32 temp_a1;
state_id = bs_getState();
if (miscflag_isTrue(MISC_FLAG_1B_TRANSFORMING)) {
if (miscFlag_isTrue(MISC_FLAG_1B_TRANSFORMING)) {
return BSGROUP_D_TRANSFORMING;
}
if (miscflag_isTrue(MISC_FLAG_17_FPV)) {
if (miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW)) {
return BSGROUP_4_LOOK;
}
if (bsbfly_inSet(state_id)) {
@@ -459,7 +458,7 @@ enum bsgroup_e func_8028ECAC(void) {
if (bswalrus_inSledSet(state_id)) {
return BSGROUP_C_WALRUS_SLED;
}
if (miscflag_isTrue(9) != 0) {
if (miscFlag_isTrue(MISC_FLAG_9) != 0) {
return 1;
}
switch(state_id){
@@ -609,7 +608,7 @@ bool func_8028F150(void){
}
bool func_8028F170(void){
return miscflag_isTrue(MISC_FLAG_17_FPV);
return miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW);
}
int ability_isUnlocked(enum ability_e uid){

4
src/core2/code_A960.c
View File

@@ -6,7 +6,7 @@
void func_80291930(s32);
int func_802918F0(void){
return miscflag_isTrue(0x15);
return miscFlag_isTrue(MISC_FLAG_15);
}
void func_80291910(void){
@@ -15,7 +15,7 @@ void func_80291910(void){
void func_80291930(s32 arg0){
if(!func_802918F0()){
miscflag_set(0x15);
miscFlag_set(MISC_FLAG_15);
if(arg0){
func_8029E3C0(5, 2.0f);
func_8029C984();

33
src/core2/code_C3F0.c
View File

@@ -1,41 +1,40 @@
#include <ultra64.h>
#include "functions.h"
#include "variables.h"
void miscflag_clear(enum misc_flag_e arg0);
#include "enums.h"
/*.bss */
u8 D_8037C1D0[0x1C];
u8 gMiscFlags[0x1C];
/* code */
void miscflag_clearAll(void){
void miscFlag_clearAll(void){
int i;
for(i = 1; i < 0x1C; i++){
miscflag_clear(i);
miscFlag_clear(i);
}
}
bool miscflag_isTrue(enum misc_flag_e arg0){
return D_8037C1D0[arg0];
bool miscFlag_isTrue(enum misc_flag_e arg0){
return gMiscFlags[arg0];
}
bool miscflag_isFalse(enum misc_flag_e arg0){
return !D_8037C1D0[arg0];
bool miscFlag_isFalse(enum misc_flag_e arg0){
return !gMiscFlags[arg0];
}
void miscflag_set(enum misc_flag_e arg0){
D_8037C1D0[arg0] = TRUE;
void miscFlag_set(enum misc_flag_e arg0){
gMiscFlags[arg0] = TRUE;
}
void miscflag_clear(enum misc_flag_e arg0){
D_8037C1D0[arg0] = FALSE;
void miscFlag_clear(enum misc_flag_e arg0){
gMiscFlags[arg0] = FALSE;
}
void miscflag_toggle(enum misc_flag_e arg0){
if(D_8037C1D0[arg0]){
D_8037C1D0[arg0] = FALSE;
void miscFlag_toggle(enum misc_flag_e arg0){
if(gMiscFlags[arg0]){
gMiscFlags[arg0] = FALSE;
}
else {
D_8037C1D0[arg0] = TRUE;
gMiscFlags[arg0] = TRUE;
}
}

8
src/core2/code_D9B0.c
View File

@@ -185,13 +185,13 @@ void func_80294E60(void){
}
if(player_isStable() || bsclimb_inSet(bs_getState())){
miscflag_clear(MISC_FLAG_5_HAS_PECKED);
miscflag_clear(MISC_FLAG_12_HAS_FLAPPED);
miscFlag_clear(MISC_FLAG_5_HAS_PECKED);
miscFlag_clear(MISC_FLAG_12_HAS_FLAPPED);
}
if(player_inWater()){
miscflag_clear(MISC_FLAG_5_HAS_PECKED);
miscflag_clear(MISC_FLAG_12_HAS_FLAPPED);
miscFlag_clear(MISC_FLAG_5_HAS_PECKED);
miscFlag_clear(MISC_FLAG_12_HAS_FLAPPED);
}
func_80294BDC();

2
src/core2/code_E910.c
View File

@@ -191,7 +191,7 @@ void func_80295914(void){
func_80291910();
badrone_init();
bafalldamage_init();
miscflag_clearAll();
miscFlag_clearAll();
func_8028B6FC();
func_80291590();
func_802953A0();

14
src/core2/code_EF50.c
View File

@@ -61,7 +61,7 @@ enum bs_e func_80295EE0(enum bs_e arg0){
func_8029CDA0();
}
else{
miscflag_set(7);
miscFlag_set(MISC_FLAG_7);
if(sp2C){
func_8029CCC4();
}
@@ -304,7 +304,7 @@ void func_80296608(void){
next_state = badrone_transform();
}
else{
miscflag_set(0x19);
miscFlag_set(MISC_FLAG_19);
next_state = func_8029B504();
}
break;
@@ -424,7 +424,7 @@ void func_80296608(void){
sp2C = 2;
break;
case BS_INTR_35: //L80296984
miscflag_set(0x1a);
miscFlag_set(MISC_FLAG_1A);
next_state = func_8029B504();
sp2C = 2;
break;
@@ -442,7 +442,7 @@ void func_80296608(void){
if(
!func_80298850()
&& !sp1C
&& !miscflag_isTrue(0xf)
&& !miscFlag_isTrue(MISC_FLAG_F)
&& !player_isStable()
){
next_state = BS_4F_CLIMB_IDLE;
@@ -498,13 +498,13 @@ void func_80296608(void){
next_state = func_8029BED4();
break;
case BS_INTR_F: //L80296B68
miscflag_set(6);
miscFlag_set(MISC_FLAG_6);
next_state = func_8029B504();
sp2C = 2;
break;
case BS_INTR_30: //L80296B88
item_set(ITEM_14_HEALTH, 0);
miscflag_set(6);
miscFlag_set(MISC_FLAG_6);
next_state = func_8029B504();
sp2C = 2;
break;
@@ -515,7 +515,7 @@ void func_80296608(void){
case BS_INTR_2A: //L80296BCC
sp2C = 2;
next_state = func_8029B504();
miscflag_set(MISC_FLAG_14_LOSE_BOGGY_RACE);
miscFlag_set(MISC_FLAG_14_LOSE_BOGGY_RACE);
break;
case BS_INTR_27_WALRUS_SLED: //L80296BEC
if(player_getTransformation() == TRANSFORM_4_WALRUS){

2
src/core2/snackerctl.c
View File

@@ -83,7 +83,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){
if(!func_8028F25C() && func_80321960() == 3)
func_803219F4(1);
if(miscflag_isTrue(MISC_FLAG_17_FPV) && !func_8028F25C()){
if(miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW) && !func_8028F25C()){
if(__snackerctl_player_within_distance(183.0f, -100.0f, 75.0f)){
if(chBottlesBonus_getPuzzleIndex() == 6){
if(!D_8037DCCC){