diff --git a/decompressed.pal.yaml b/decompressed.pal.yaml index 444b10f9..3236c82c 100644 --- a/decompressed.pal.yaml +++ b/decompressed.pal.yaml @@ -532,7 +532,7 @@ segments: # - [0xF614B0, c, eggshatter] #DONE # - [0xF61680, c, baeyes] #DONE # - [0xF61A40, c, ba/falldamage] #DONE - # - [0xF61D50, c, code_C3F0] #DONE + # - [0xF61D50, c, baflag] #DONE # - [0xF61E10, c, code_C4B0] # - [0xF63160, c, ba/carry] #DONE # - [0xF63310, c, code_D9B0] #DONE @@ -1396,7 +1396,7 @@ segments: # - [0x0106C980, .bss, eggshatter] # - [0x0106C980, .bss, baeyes] # - [0x0106C980, .bss, ba/falldamage] - # - [0x0106C980, .bss, code_C3F0] + # - [0x0106C980, .bss, baflag] # - [0x0106C980, .bss, code_C4B0] # - [0x0106C980, .bss, ba/carry] # - [0x0106C980, .bss, code_D9B0] diff --git a/decompressed.us.v10.yaml b/decompressed.us.v10.yaml index b13364e4..c4f81df3 100644 --- a/decompressed.us.v10.yaml +++ b/decompressed.us.v10.yaml @@ -532,7 +532,7 @@ segments: - [0xF614B0, c, eggshatter] - [0xF61680, c, baeyes] - [0xF61A40, c, ba/falldamage] - - [0xF61D50, c, code_C3F0] # baflag + - [0xF61D50, c, baflag] - [0xF61E10, c, code_C4B0] - [0xF63160, c, ba/carry] - [0xF63310, c, code_D9B0] @@ -1394,7 +1394,7 @@ segments: - [0x1048560, .bss, eggshatter] - [0x1048560, .bss, baeyes] - [0x1048560, .bss, ba/falldamage] - - [0x1048560, .bss, code_C3F0] + - [0x1048560, .bss, baflag] - [0x1048560, .bss, code_C4B0] - [0x1048560, .bss, ba/carry] - [0x1048560, .bss, code_D9B0] diff --git a/include/enums.h b/include/enums.h index 37ae3c9b..cd22e355 100644 --- a/include/enums.h +++ b/include/enums.h @@ -5334,36 +5334,36 @@ enum bswatergroup_e{ }; enum misc_flag_e{ - 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_LOADZONE, // 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, + BA_FLAG_0, // unused + BA_FLAG_1_ON_FLIGHT_PAD, + BA_FLAG_2_ON_SPRING_PAD, + BA_FLAG_3, + BA_FLAG_4, + BA_FLAG_5_HAS_PECKED, + BA_FLAG_6, + BA_FLAG_7, + BA_FLAG_8, + BA_FLAG_9, + BA_FLAG_A, + BA_FLAG_B, + BA_FLAG_C, + BA_FLAG_D, // unused + BA_FLAG_E_TOUCHING_WADING_BOOTS, + BA_FLAG_F, // related to A button ? + BA_FLAG_10_TOUCHING_TURBO_TRAINERS, + BA_FLAG_11, // unused + BA_FLAG_12_HAS_FLAPPED, // has used flap + BA_FLAG_13, // related to ground damage ? + BA_FLAG_14_LOSE_BOGGY_RACE, // in difficult terrain (mud) + BA_FLAG_15_LOADZONE, // touching loadzone? + BA_FLAG_16, // related to flying + BA_FLAG_17_FIRST_PERSON_VIEW, + BA_FLAG_18, // related to underwater state + BA_FLAG_19, // related to transformations + BA_FLAG_1A, // related to bee transformation + BA_FLAG_1B_TRANSFORMING, - MISC_FLAG_NUM_FLAGS + BA_FLAG_NUM_FLAGS }; enum nc_first_person_state{ diff --git a/include/functions.h b/include/functions.h index bc462f83..3fb9a48f 100644 --- a/include/functions.h +++ b/include/functions.h @@ -508,12 +508,12 @@ 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); +extern void baflag_clearAll(void); +extern bool baflag_isTrue(enum misc_flag_e arg0); +extern bool baflag_isFalse(enum misc_flag_e arg0); +extern void baflag_set(enum misc_flag_e arg0); +extern void baflag_clear(enum misc_flag_e arg0); +extern void baflag_toggle(enum misc_flag_e arg0); extern void piMgr_read(void *vaddr, s32 devaddr, s32 size); diff --git a/manual_syms.pal.txt b/manual_syms.pal.txt index 468a558a..048d2a7c 100644 --- a/manual_syms.pal.txt +++ b/manual_syms.pal.txt @@ -56,10 +56,10 @@ baModel_isVisible = 0x80292368; badrone_goto = 0x80292478; eggShatter_draw = 0x80292900; bafalldamage_get_damage = 0x80292ffc; -miscFlag_isTrue = 0x802931e0; -miscFlag_isFalse = 0x802931f0; -miscFlag_set = 0x80293208; -miscFlag_clear = 0x8029321c; +baflag_isTrue = 0x802931e0; +baflag_isFalse = 0x802931f0; +baflag_set = 0x80293208; +baflag_clear = 0x8029321c; func_80293D2C = 0x80293b4c; func_80293F0C = 0x80293d2c; diff --git a/src/core2/ba/drone.c b/src/core2/ba/drone.c index 54bdc69c..c175d160 100644 --- a/src/core2/ba/drone.c +++ b/src/core2/ba/drone.c @@ -57,7 +57,7 @@ enum bs_e badrone_vanish(void){ } enum bs_e badrone_transform(void){ - miscFlag_clear(MISC_FLAG_19); + baflag_clear(BA_FLAG_19); badrone_set_type(BA_DRONE_TRANSFORM); return func_8029BD90(); } diff --git a/src/core2/ba/marker.c b/src/core2/ba/marker.c index 9b0fe00c..260ccc76 100644 --- a/src/core2/ba/marker.c +++ b/src/core2/ba/marker.c @@ -139,7 +139,7 @@ void __baMarker_8028B904(s32 arg0, s32 arg1, s32 arg2, s32 arg3){ func_80296CC0(&sp1C); func_80296CB4(arg3); - if(miscFlag_isTrue(MISC_FLAG_7)){ + if(baflag_isTrue(BA_FLAG_7)){ func_8029CDA0(); } else{ @@ -726,7 +726,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); + baflag_set(BA_FLAG_2_ON_SPRING_PAD); }else{ if(!volatileFlag_getAndSet(VOLATILE_FLAG_C_HAS_SEEN_SPRING_PAD, 1)){ gcdialog_showText(ASSET_A24_DIALOG_JUMP_PAD_DISCOVERED, 4, 0, 0, 0, 0); @@ -738,7 +738,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); + baflag_set(BA_FLAG_1_ON_FLIGHT_PAD); } else if(! volatileFlag_getAndSet(VOLATILE_FLAG_D_HAS_SEEN_FLIGHT_PAD, 1)){ gcdialog_showText(ASSET_A25_DIALOG_FLY_DISC_DISCOVERED, 4, 0, 0, 0, 0); @@ -757,7 +757,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(chwadingboots_802D6E0C(actor) == 0) return; - miscFlag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS); + baflag_set(BA_FLAG_E_TOUCHING_WADING_BOOTS); func_802A6388(chwadingboots_802D6E4C(actor)); bs_checkInterrupt(BS_INTR_1B); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s16, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z)); @@ -781,7 +781,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ if(!chtrainers_canUse(actor)) return; - miscFlag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS); + baflag_set(BA_FLAG_10_TOUCHING_TURBO_TRAINERS); set_turbo_duration(chtrainers_getDuration(actor)); bs_checkInterrupt(BS_INTR_1A); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s16, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z)); @@ -811,7 +811,7 @@ void __baMarker_resolveCollision(Prop *other_prop){ plyr_collision_type = MARKER_COLLISION_FUNC_0; } if(obj_collision_type){ - miscFlag_set(MISC_FLAG_8); + baflag_set(BA_FLAG_8); } marker_callCollisionFunc(playerMarker, marker, plyr_collision_type); marker_callCollisionFunc(marker, playerMarker, obj_collision_type); @@ -825,10 +825,10 @@ void __baMarker_resolveCollision(Prop *other_prop){ switch (tmp2) { case 0x2E8: - miscFlag_set(MISC_FLAG_1_ON_FLIGHT_PAD); //on flight pad + baflag_set(BA_FLAG_1_ON_FLIGHT_PAD); //on flight pad break; case 0x2DD: //on shock spring pad - miscFlag_set(MISC_FLAG_2_ON_SPRING_PAD); + baflag_set(BA_FLAG_2_ON_SPRING_PAD); break; default: func_80332790(tmp2); @@ -877,9 +877,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(MISC_FLAG_8); + baflag_clear(BA_FLAG_1_ON_FLIGHT_PAD); + baflag_clear(BA_FLAG_2_ON_SPRING_PAD); + baflag_clear(BA_FLAG_8); baMarker_8028D638(0,0); func_8033D2F4(); D_8037BF8C = 0; @@ -910,11 +910,11 @@ void baMarker_update(void){ D_8037BF88 = 0; } }//L8028D364 - miscFlag_clear(MISC_FLAG_8); + baflag_clear(BA_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); + baflag_clear(BA_FLAG_1_ON_FLIGHT_PAD); + baflag_clear(BA_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 @@ -1027,7 +1027,7 @@ void baMarker_8028D7B8(s32 arg0, ActorMarker *arg1, struct5Cs *collision_flags){ s32 tmp_v0; if(func_8033D5A4(collision_flags)) - miscFlag_set(MISC_FLAG_8); + baflag_set(BA_FLAG_8); if((func_80297C6C() != 3 && func_8028F1E0()) || !sp20){ if(!func_8028F25C()){ diff --git a/src/core2/baflag.c b/src/core2/baflag.c new file mode 100644 index 00000000..983287bb --- /dev/null +++ b/src/core2/baflag.c @@ -0,0 +1,40 @@ +#include +#include "functions.h" +#include "variables.h" +#include "enums.h" + +/*.bss */ +u8 BaFlags[0x1C]; + +/* code */ +void baflag_clearAll(void){ + int i; + for(i = 1; i < 0x1C; i++){ + baflag_clear(i); + } +} + +bool baflag_isTrue(enum misc_flag_e arg0){ + return BaFlags[arg0]; +} + +bool baflag_isFalse(enum misc_flag_e arg0){ + return !BaFlags[arg0]; +} + +void baflag_set(enum misc_flag_e arg0){ + BaFlags[arg0] = TRUE; +} + +void baflag_clear(enum misc_flag_e arg0){ + BaFlags[arg0] = FALSE; +} + +void baflag_toggle(enum misc_flag_e arg0){ + if(BaFlags[arg0]){ + BaFlags[arg0] = FALSE; + } + else { + BaFlags[arg0] = TRUE; + } +} diff --git a/src/core2/bs/ant.c b/src/core2/bs/ant.c index 6e90bafd..e5d8c8fc 100644 --- a/src/core2/bs/ant.c +++ b/src/core2/bs/ant.c @@ -55,8 +55,8 @@ void func_8029E4EC(void){ bastick_resetZones(); func_8029E070(0); func_8029E064(0); - miscFlag_clear(MISC_FLAG_3); - miscFlag_clear(MISC_FLAG_4); + baflag_clear(BA_FLAG_3); + baflag_clear(BA_FLAG_4); func_80293D74(); } baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL); @@ -85,8 +85,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(MISC_FLAG_3); - miscFlag_set(MISC_FLAG_4); + baflag_set(BA_FLAG_3); + baflag_set(BA_FLAG_4); func_802900B4(); } @@ -267,7 +267,7 @@ void bsant_fall_update(void){ break; } if(player_isStable()){ - if(miscFlag_isTrue(MISC_FLAG_19)) + if(baflag_isTrue(BA_FLAG_19)) sp2C = badrone_transform(); else sp2C = BS_35_ANT_IDLE; diff --git a/src/core2/bs/bBarge.c b/src/core2/bs/bBarge.c index 8a117035..21107b51 100644 --- a/src/core2/bs/bBarge.c +++ b/src/core2/bs/bBarge.c @@ -75,9 +75,9 @@ void bsbarge_init(void){ func_8029E070(1); D_8037D2A6 = 0; D_8037D2A5 = 0; - miscFlag_clear(MISC_FLAG_A); - miscFlag_clear(MISC_FLAG_B); - miscFlag_clear(MISC_FLAG_C); + baflag_clear(BA_FLAG_A); + baflag_clear(BA_FLAG_B); + baflag_clear(BA_FLAG_C); batimer_set(2, 0.01f); } @@ -89,7 +89,7 @@ void bsbarge_update(void){ sp24 = 0; plyrMvmnt = baanim_getAnimCtrlPtr(); if(bakey_released(BUTTON_B)) - miscFlag_set(MISC_FLAG_A); + baflag_set(BA_FLAG_A); switch(D_8037D2A5){ case 0: if(anctrl_isAt(plyrMvmnt, 0.1392f)) @@ -98,8 +98,8 @@ void bsbarge_update(void){ if(!anctrl_isStopped(plyrMvmnt)) break; - if(miscFlag_isFalse(MISC_FLAG_A)){ - miscFlag_set(MISC_FLAG_C); + if(baflag_isFalse(BA_FLAG_A)){ + baflag_set(BA_FLAG_C); D_8037D2A0 = 850.0f; }else{ D_8037D2A0 = 500.0f; @@ -109,13 +109,13 @@ void bsbarge_update(void){ break; case 1: batimer_decrement(1); - if(miscFlag_isFalse(MISC_FLAG_B) && batimer_isLessThan(1, 0.1f)){ - if(miscFlag_isTrue(MISC_FLAG_C)){ + if(baflag_isFalse(BA_FLAG_B) && batimer_isLessThan(1, 0.1f)){ + if(baflag_isTrue(BA_FLAG_C)){ func_8030E560(SFX_4_KAZOOIE_RUUUUUH, 30000); }else{ func_8030E560(SFX_43_KAZOOIE_RUH, 30000); } - miscFlag_set(MISC_FLAG_B); + baflag_set(BA_FLAG_B); } if(!batimer_isZero(1)) break; @@ -141,7 +141,7 @@ void bsbarge_update(void){ break; case 3: batimer_decrement(0); - if(miscFlag_isFalse(MISC_FLAG_C) || batimer_isZero(0)){ + if(baflag_isFalse(BA_FLAG_C) || batimer_isZero(0)){ D_8037D2A0 -= 80.0f; } baphysics_set_target_horizontal_velocity(D_8037D2A0); diff --git a/src/core2/bs/bFlap.c b/src/core2/bs/bFlap.c index 27ed80e6..814ee84a 100644 --- a/src/core2/bs/bFlap.c +++ b/src/core2/bs/bFlap.c @@ -31,7 +31,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); + baflag_set(BA_FLAG_12_HAS_FLAPPED); batimer_set(0, 2.5f); D_8037D30C = sfxsource_createSfxsourceAndReturnIndex(); basfx_80299BD4(); diff --git a/src/core2/bs/bFly.c b/src/core2/bs/bFly.c index 98811d4e..3026aaca 100644 --- a/src/core2/bs/bFly.c +++ b/src/core2/bs/bFly.c @@ -182,7 +182,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(MISC_FLAG_9)){ + if(baflag_isTrue(BA_FLAG_9)){ baphysics_set_target_horizontal_velocity(0.0f); }else{ baphysics_set_target_horizontal_velocity(600.0f); @@ -263,7 +263,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(MISC_FLAG_9)){ + if(baflag_isTrue(BA_FLAG_9)){ baphysics_set_terminal_velocity(0.0f); baphysics_set_velocity(0); sp38 = 0.0f; @@ -411,7 +411,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(MISC_FLAG_8) || ((sp44 & 0x80) != 0)) { + if (baflag_isTrue(BA_FLAG_8) || ((sp44 & 0x80) != 0)) { func_802A4078(); next_state = BS_18_FLY_KNOCKBACK; } else if (0.4 < sp24) { @@ -784,7 +784,7 @@ void func_802A503C(void){ void func_802A505C(void){ if(bs_getInterruptType() == BS_INTR_9){ func_8029A86C(2); - miscFlag_set(MISC_FLAG_7); + baflag_set(BA_FLAG_7); func_8029CCC4(); }else{ func_80296608(); diff --git a/src/core2/bs/bLongLeg.c b/src/core2/bs/bLongLeg.c index b11e73af..aafb8798 100644 --- a/src/core2/bs/bLongLeg.c +++ b/src/core2/bs/bLongLeg.c @@ -71,7 +71,7 @@ void func_802A5374(void){ func_8029E0F4(1); pitch_setAngVel(1000.0f, 12.0f); roll_setAngularVelocity(1000.0f, 12.0f); - miscFlag_set(MISC_FLAG_3); + baflag_set(BA_FLAG_3); } void func_802A5404(void){ @@ -88,7 +88,7 @@ void func_802A5404(void){ roll_setIdeal(0.0f); stateTimer_clear(STATE_TIMER_2_LONGLEG); func_803219F4(1); - miscFlag_clear(MISC_FLAG_3); + baflag_clear(BA_FLAG_3); batimer_incrementBy(4, 0.5f); func_802A531C(); } @@ -122,7 +122,7 @@ void bsblongleg_enter_init(void){ D_8037D361 = sfxsource_createSfxsourceAndReturnIndex(); 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); + baflag_clear(BA_FLAG_E_TOUCHING_WADING_BOOTS); if(bsbtrot_inSet(bs_getPrevState())) __bsblongleg_enterFromTrot(); else diff --git a/src/core2/bs/bPeck.c b/src/core2/bs/bPeck.c index 60b1fd47..18c9f99c 100644 --- a/src/core2/bs/bPeck.c +++ b/src/core2/bs/bPeck.c @@ -66,7 +66,7 @@ void func_802A664C(void){ sp1C = 1.32f; break; } - miscFlag_set(MISC_FLAG_5_HAS_PECKED); + baflag_set(BA_FLAG_5_HAS_PECKED); func_8030E58C(SFX_42_KAZOOIE_RAH, sp1C); baphysics_set_vertical_velocity(D_80364A64); D_8037D375++; diff --git a/src/core2/bs/bTrot.c b/src/core2/bs/bTrot.c index 7ac43801..cf6ce493 100644 --- a/src/core2/bs/bTrot.c +++ b/src/core2/bs/bTrot.c @@ -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(MISC_FLAG_3); + baflag_set(BA_FLAG_3); func_8029CF48(4,1,0.24f); baModel_setDirection(PLAYER_MODEL_DIR_KAZOOIE); } void func_802A8AD8(void){ basfx_updateClockSfxSource(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(baflag_isTrue(BA_FLAG_10_TOUCHING_TURBO_TRAINERS) &&(bs_getState() != BS_17_BTROT_EXIT)){ + baflag_clear(BA_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(baflag_isFalse(BA_FLAG_14_LOSE_BOGGY_RACE)) sfxsource_playHighPriority(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(MISC_FLAG_3); + baflag_clear(BA_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(MISC_FLAG_F)) + if(baflag_isTrue(BA_FLAG_F)) return arg0; - if(miscFlag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD)) + if(baflag_isTrue(BA_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(MISC_FLAG_F)) + if(baflag_isTrue(BA_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(MISC_FLAG_F)) + if(baflag_isTrue(BA_FLAG_F)) baphysics_reset_horizontal_velocity(); else func_802A89D4(); diff --git a/src/core2/bs/bbuster.c b/src/core2/bs/bbuster.c index d494ff6a..776ff796 100644 --- a/src/core2/bs/bbuster.c +++ b/src/core2/bs/bbuster.c @@ -124,7 +124,7 @@ void bsbbuster_update(void){ baMotor_80250D94(1.0f, 0.3f, 0.4f); D_8037D2B6++; } - D_8037D2B9 = miscFlag_isTrue(MISC_FLAG_8); + D_8037D2B9 = baflag_isTrue(BA_FLAG_8); func_8029445C(sp30); //L8029FF78 if(((0.0f <= sp30[1])? sp30[1] : -sp30[1]) < 1.0){ diff --git a/src/core2/bs/bee.c b/src/core2/bs/bee.c index b47a523c..bbc820bf 100644 --- a/src/core2/bs/bee.c +++ b/src/core2/bs/bee.c @@ -19,8 +19,8 @@ void func_802A02C0(void){ bastick_resetZones(); func_8029E070(0); func_8029E064(0); - miscFlag_clear(MISC_FLAG_3); - miscFlag_clear(MISC_FLAG_4); + baflag_clear(BA_FLAG_3); + baflag_clear(BA_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(MISC_FLAG_3); - miscFlag_set(MISC_FLAG_4); + baflag_set(BA_FLAG_3); + baflag_set(BA_FLAG_4); } } diff --git a/src/core2/bs/beeFly.c b/src/core2/bs/beeFly.c index b81e12f6..f8100596 100644 --- a/src/core2/bs/beeFly.c +++ b/src/core2/bs/beeFly.c @@ -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(MISC_FLAG_9)) + if(baflag_isTrue(BA_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(MISC_FLAG_9)){ + if(baflag_isTrue(BA_FLAG_9)){ baphysics_set_terminal_velocity(0.0f); baphysics_set_velocity(0); sp38 = 0.0f; diff --git a/src/core2/bs/beeMain.c b/src/core2/bs/beeMain.c index 434df3b6..36c50bda 100644 --- a/src/core2/bs/beeMain.c +++ b/src/core2/bs/beeMain.c @@ -274,7 +274,7 @@ void func_802A170C(void){ break; } if(player_isStable()){ - if(miscFlag_isTrue(MISC_FLAG_19)){ + if(baflag_isTrue(BA_FLAG_19)){ sp2c = badrone_transform(); }else{ if(bastick_getZone() > 0) @@ -285,7 +285,7 @@ void func_802A170C(void){ } } else{ - if(miscFlag_isFalse(MISC_FLAG_F) && bakey_pressed(BUTTON_A)) + if(baflag_isFalse(BA_FLAG_F) && bakey_pressed(BUTTON_A)) sp2c = BS_BEE_FLY; }//L802A189C if(player_inWater()) @@ -513,7 +513,7 @@ void func_802A2054(void){ } void func_802A2098(void){ - miscFlag_clear(MISC_FLAG_1A); + baflag_clear(BA_FLAG_1A); baanim_playForDuration_loopSmooth(ASSET_1DE_ANIM_BEE_IDLE, 3.0f); yaw_setIdeal(func_8029B41C()); func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL); diff --git a/src/core2/bs/croc.c b/src/core2/bs/croc.c index 543c1373..7aae4c63 100644 --- a/src/core2/bs/croc.c +++ b/src/core2/bs/croc.c @@ -50,8 +50,8 @@ void __bscroc_jumpSfx(void){ void func_802ABE70(void){ f32 sp1C = stateTimer_get(STATE_TIMER_3_TURBO_TALON); basfx_updateClockSfxSource(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(baflag_isTrue(BA_FLAG_10_TOUCHING_TURBO_TRAINERS) && bs_getState() != BS_17_BTROT_EXIT){ + baflag_clear(BA_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); @@ -82,8 +82,8 @@ void func_802ABFBC(void){ bastick_resetZones(); func_8029E070(0); func_8029E064(0); - miscFlag_clear(MISC_FLAG_3); - miscFlag_clear(MISC_FLAG_4); + baflag_clear(BA_FLAG_3); + baflag_clear(BA_FLAG_4); func_80293D74(); } baanim_setUpdateType(BAANIM_UPDATE_1_NORMAL); @@ -110,8 +110,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(MISC_FLAG_3); - miscFlag_set(MISC_FLAG_4); + baflag_set(BA_FLAG_3); + baflag_set(BA_FLAG_4); func_802900B4(); } @@ -313,7 +313,7 @@ void bscroc_fall_update(void){ if(player_isStable()){ if(bastick_getZone() > 0 || (D_8037D3EC == 2 && anctrl_isStopped(aCtrl))){ - if(miscFlag_isTrue(MISC_FLAG_19)){ + if(baflag_isTrue(BA_FLAG_19)){ next_state = badrone_transform(); }else{ next_state = BS_5E_CROC_IDLE; diff --git a/src/core2/bs/dronelook.c b/src/core2/bs/dronelook.c index b6887cf0..4f67350f 100644 --- a/src/core2/bs/dronelook.c +++ b/src/core2/bs/dronelook.c @@ -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_FIRST_PERSON_VIEW); + baflag_set(BA_FLAG_17_FIRST_PERSON_VIEW); } void bsDroneLook_update(void) { @@ -79,5 +79,5 @@ void bsDroneLook_end(void) { basfx_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000); } ncDynamicCamera_exitFirstPerson(); - miscFlag_clear(MISC_FLAG_17_FIRST_PERSON_VIEW); + baflag_clear(BA_FLAG_17_FIRST_PERSON_VIEW); } diff --git a/src/core2/bs/dronexform.c b/src/core2/bs/dronexform.c index f6dda774..6423a803 100644 --- a/src/core2/bs/dronexform.c +++ b/src/core2/bs/dronexform.c @@ -334,7 +334,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); + baflag_set(BA_FLAG_1B_TRANSFORMING); D_8037D470.state = 0; __bsdronexform_setState(1); } @@ -443,7 +443,7 @@ void bsdronexform_end(void){ func_802AFADC(); func_802B014C(); func_80298A64(); - miscFlag_clear(MISC_FLAG_1B_TRANSFORMING); + baflag_clear(BA_FLAG_1B_TRANSFORMING); } void bsdronexform_interrupt(void){} diff --git a/src/core2/bs/jig.c b/src/core2/bs/jig.c index 0eb25e09..63131921 100644 --- a/src/core2/bs/jig.c +++ b/src/core2/bs/jig.c @@ -42,8 +42,8 @@ void bsjig_jiggy_init(void){ func_8029151C(0xC); func_8029E070(1); func_8030E6D4(SFX_33_BANJO_AHOO); - miscFlag_clear(MISC_FLAG_7); - miscFlag_clear(MISC_FLAG_F); + baflag_clear(BA_FLAG_7); + baflag_clear(BA_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(MISC_FLAG_1A); + baflag_clear(BA_FLAG_1A); anctrl_reset(aCtrl); anctrl_setIndex(aCtrl, ASSET_282_ANIM_BSJIG_NOTEDOOR); anctrl_setDuration(aCtrl, 3.6f); diff --git a/src/core2/bs/jump.c b/src/core2/bs/jump.c index 4deda250..37ac1108 100644 --- a/src/core2/bs/jump.c +++ b/src/core2/bs/jump.c @@ -36,7 +36,7 @@ void bsjump_init(void){ AnimCtrl *aCtrl = baanim_getAnimCtrlPtr(); enum bs_e sp30; - D_8037D4C2 = miscFlag_isTrue(MISC_FLAG_2_ON_SPRING_PAD); + D_8037D4C2 = baflag_isTrue(BA_FLAG_2_ON_SPRING_PAD); sp30 = bs_getPrevState(); if(bsclimb_inSet(sp30)){ climbRelease(); @@ -90,7 +90,7 @@ void bsjump_update(void){ if(D_8037D4C2) func_8029C348(); - if(miscFlag_isTrue(MISC_FLAG_F)){ + if(baflag_isTrue(BA_FLAG_F)){ baphysics_reset_horizontal_velocity(); }else{ func_802B6FA8(); @@ -173,7 +173,7 @@ void bsjump_fall_init(void){ AnimCtrl *aCtrl = baanim_getAnimCtrlPtr(); int sp20; - if(miscFlag_isTrue(MISC_FLAG_7) && 700.0f < baphysics_get_vertical_velocity()) + if(baflag_isTrue(BA_FLAG_7) && 700.0f < baphysics_get_vertical_velocity()) baphysics_set_vertical_velocity(700.0f); sp20 = (bs_getPrevState() == BS_12_BFLIP)? 0 : 1; @@ -192,7 +192,7 @@ void bsjump_fall_update(void){ AnimCtrl *aCtrl = baanim_getAnimCtrlPtr(); f32 player_velocity[3]; - if(miscFlag_isTrue(MISC_FLAG_F)) + if(baflag_isTrue(BA_FLAG_F)) baphysics_reset_horizontal_velocity(); else func_802B6FA8(); @@ -214,11 +214,11 @@ void bsjump_fall_update(void){ case 1: break; }//L802B1824 - if(miscFlag_isFalse(MISC_FLAG_F)){ + if(baflag_isFalse(BA_FLAG_F)){ if(player_isFallTumbling()) sp2C = BS_3D_FALL_TUMBLING; - if(bainput_should_feathery_flap() && miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED)) + if(bainput_should_feathery_flap() && baflag_isFalse(BA_FLAG_5_HAS_PECKED)) sp2C = BS_BFLAP; if(bainput_should_peck()) @@ -232,7 +232,7 @@ void bsjump_fall_update(void){ } else if(player_inWater()){ func_8029CCC4(); - if(miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)){ + if(baflag_isTrue(BA_FLAG_6) || baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE)){ sp2C = BS_D_TIMEOUT; } diff --git a/src/core2/bs/pumpkin.c b/src/core2/bs/pumpkin.c index 4d9afc04..c981e391 100644 --- a/src/core2/bs/pumpkin.c +++ b/src/core2/bs/pumpkin.c @@ -55,8 +55,8 @@ void func_802B229C(void) { bastick_resetZones(); func_8029E070(0); func_8029E064(0); - miscFlag_clear(MISC_FLAG_3); - miscFlag_clear(MISC_FLAG_4); + baflag_clear(BA_FLAG_3); + baflag_clear(BA_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(MISC_FLAG_3); - miscFlag_set(MISC_FLAG_4); + baflag_set(BA_FLAG_3); + baflag_set(BA_FLAG_4); func_802900B4(); } @@ -290,7 +290,7 @@ void bspumpkin_fall_update(void) { break; } if (player_isStable() && ((bastick_getZone() > 0) || (D_8037D4E0 == 2 && anctrl_isStopped(anim_ctrl)))) { - if (miscFlag_isTrue(MISC_FLAG_19)) { + if (baflag_isTrue(BA_FLAG_19)) { next_state = badrone_transform(); } else { next_state = BS_48_PUMPKIN_IDLE; diff --git a/src/core2/bs/rest.c b/src/core2/bs/rest.c index 56e313e8..72c3a89a 100644 --- a/src/core2/bs/rest.c +++ b/src/core2/bs/rest.c @@ -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 && baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE)) { next_state = func_8029CA94(next_state); } bs_setState(next_state); diff --git a/src/core2/bs/stand.c b/src/core2/bs/stand.c index 690dff97..d3c8f7a2 100644 --- a/src/core2/bs/stand.c +++ b/src/core2/bs/stand.c @@ -323,7 +323,7 @@ void func_802B5350(void){ } else if(sp1C == 0x12){//L802B53D0 func_8029A86C(1); - if( bsStoredState_getTransformation() == TRANSFORM_1_BANJO && !miscFlag_isTrue(MISC_FLAG_F) && stateTimer_isDone(STATE_TIMER_0_UNKNOWN)){ + if( bsStoredState_getTransformation() == TRANSFORM_1_BANJO && !baflag_isTrue(BA_FLAG_F) && stateTimer_isDone(STATE_TIMER_0_UNKNOWN)){ bacarriedobj_spawn(baMarker_getCarriedObjectActorId()); func_8029A86C(2); } diff --git a/src/core2/bs/surf.c b/src/core2/bs/surf.c index fe1e186c..adeb01c1 100644 --- a/src/core2/bs/surf.c +++ b/src/core2/bs/surf.c @@ -33,7 +33,7 @@ void func_802B6064(void) { next_state = BS_1_IDLE; } D_8037D560 = 0; - if (miscFlag_isTrue(MISC_FLAG_6)) { + if (baflag_isTrue(BA_FLAG_6)) { next_state = BS_53_TIMEOUT; } bs_setState(next_state); diff --git a/src/core2/bs/swim.c b/src/core2/bs/swim.c index 298cad28..0c7f7925 100644 --- a/src/core2/bs/swim.c +++ b/src/core2/bs/swim.c @@ -179,7 +179,7 @@ void func_802B5950(void) { if (func_80294524() && bakey_pressed(BUTTON_A)) { next_state = BS_5_JUMP; } - if (miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) { + if (baflag_isTrue(BA_FLAG_6) || baflag_isTrue(BA_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() && bakey_pressed(BUTTON_A)) { next_state = BS_5_JUMP; } - if (miscFlag_isTrue(MISC_FLAG_6) || miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) { + if (baflag_isTrue(BA_FLAG_6) || baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE)) { next_state = BS_D_TIMEOUT; } bs_setState(next_state); diff --git a/src/core2/bs/walrus.c b/src/core2/bs/walrus.c index baf195e6..7b15aa20 100644 --- a/src/core2/bs/walrus.c +++ b/src/core2/bs/walrus.c @@ -95,8 +95,8 @@ void func_802B8048(void){ bastick_resetZones(); func_8029E070(0); func_8029E064(0); - miscFlag_clear(MISC_FLAG_3); - miscFlag_clear(MISC_FLAG_4); + baflag_clear(BA_FLAG_3); + baflag_clear(BA_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(MISC_FLAG_3); - miscFlag_set(MISC_FLAG_4); + baflag_set(BA_FLAG_3); + baflag_set(BA_FLAG_4); func_802900B4(); func_802B8110(); } @@ -352,7 +352,7 @@ void bswalrus_fall_update(void){ if( bastick_getZone() > 0 || (D_8037D5C8 == 2 && anctrl_isStopped(aCtrl)) ){ - if(miscFlag_isTrue(MISC_FLAG_19)) + if(baflag_isTrue(BA_FLAG_19)) next_state = badrone_transform(); else next_state = BS_67_WALRUS_IDLE; diff --git a/src/core2/code_14420.c b/src/core2/code_14420.c index d722e8c3..e6f91970 100644 --- a/src/core2/code_14420.c +++ b/src/core2/code_14420.c @@ -239,10 +239,10 @@ enum bs_e func_8029B458(void){ enum bs_e func_8029B504(void){ enum bs_e sp1C; - if(miscFlag_isTrue(MISC_FLAG_F)) + if(baflag_isTrue(BA_FLAG_F)) return 0; - miscFlag_set(MISC_FLAG_F); + baflag_set(BA_FLAG_F); sp1C = func_8029B458(); if(bs_getState() != sp1C) return sp1C; @@ -447,7 +447,7 @@ enum bs_14420_e func_8029BAF0(void){ if (stateTimer_get(STATE_TIMER_2_LONGLEG) != 0.0f) { return BS14420_9_LONGLEG; } - if (miscFlag_isTrue(MISC_FLAG_18)) { + if (baflag_isTrue(BA_FLAG_18)) { return BS14420_5_UNDERWATER; } if (func_8028ECAC() == BSGROUP_3_WONDERWING) { @@ -568,10 +568,10 @@ enum bs_e bs_getIdleState(void){ case TRANSFORM_1_BANJO: default: - if (miscFlag_isTrue(MISC_FLAG_16)) { + if (baflag_isTrue(BA_FLAG_16)) { return BS_24_FLY; } - if (miscFlag_isTrue(MISC_FLAG_18)) { + if (baflag_isTrue(BA_FLAG_18)) { return BS_2B_DIVE_IDLE; } if (stateTimer_get(STATE_TIMER_3_TURBO_TALON) != 0.0f) { @@ -722,7 +722,7 @@ void func_8029C674(void) { D_8037D1E8 = FALSE; if (func_80298850() == BSGROUP_4_LOOK) { D_8037D1E8 = TRUE; - miscFlag_set(MISC_FLAG_17_FIRST_PERSON_VIEW); + baflag_set(BA_FLAG_17_FIRST_PERSON_VIEW); ncDynamicCamera_enterFirstPerson(); func_8028E9C4(5, sp1C); ncFirstPersonCamera_setZoomedOutPosition(sp1C); @@ -747,7 +747,7 @@ void func_8029C6D0(void) { void func_8029C748(void) { if (D_8037D1E8) { - miscFlag_clear(MISC_FLAG_17_FIRST_PERSON_VIEW); + baflag_clear(BA_FLAG_17_FIRST_PERSON_VIEW); ncDynamicCamera_exitFirstPerson(); } } @@ -756,10 +756,10 @@ enum bs_e bs_getTypeOfJump(void){ if(bakey_held(BUTTON_Z) && can_flap_flip()) return BS_12_BFLIP; - if(miscFlag_isTrue(MISC_FLAG_2_ON_SPRING_PAD)) + if(baflag_isTrue(BA_FLAG_2_ON_SPRING_PAD)) return BS_5_JUMP; - if(miscFlag_isTrue(MISC_FLAG_1_ON_FLIGHT_PAD)) + if(baflag_isTrue(BA_FLAG_1_ON_FLIGHT_PAD)) return BS_23_FLY_ENTER; return BS_5_JUMP; @@ -826,7 +826,7 @@ void func_8029C984(void){ } s32 func_8029C9C0(s32 arg0){ - if(miscFlag_isTrue(MISC_FLAG_F)) + if(baflag_isTrue(BA_FLAG_F)) return arg0; if(bakey_pressed(BUTTON_A)) @@ -848,28 +848,28 @@ s32 func_8029C9C0(s32 arg0){ } s32 func_8029CA94(s32 arg0){ - if(miscFlag_isTrue(MISC_FLAG_19)) + if(baflag_isTrue(BA_FLAG_19)) arg0 = badrone_transform(); - if(miscFlag_isTrue(MISC_FLAG_1A)) + if(baflag_isTrue(BA_FLAG_1A)) arg0 = (player_getTransformation() == TRANSFORM_6_BEE) ? 0x46 : BS_34_JIG_NOTEDOOR; - if(miscFlag_isTrue(MISC_FLAG_E_TOUCHING_WADING_BOOTS)) + if(baflag_isTrue(BA_FLAG_E_TOUCHING_WADING_BOOTS)) arg0 = BS_25_LONGLEG_ENTER; - if(miscFlag_isTrue(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS)) + if(baflag_isTrue(BA_FLAG_10_TOUCHING_TURBO_TRAINERS)) arg0 = BS_14_BTROT_ENTER; - if(miscFlag_isTrue(MISC_FLAG_6)) + if(baflag_isTrue(BA_FLAG_6)) arg0 = BS_53_TIMEOUT; - if(miscFlag_isTrue(MISC_FLAG_7)) + if(baflag_isTrue(BA_FLAG_7)) arg0 = BS_44_JIG_JIGGY; - if(miscFlag_isTrue(MISC_FLAG_14_LOSE_BOGGY_RACE)) + if(baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE)) arg0 = (player_getTransformation() == TRANSFORM_4_WALRUS) ? BS_80_WALRUS_SLED_LOSE : BS_53_TIMEOUT; - miscFlag_clear(MISC_FLAG_F); + baflag_clear(BA_FLAG_F); return arg0; } @@ -906,14 +906,14 @@ void func_8029CBF4(void){ } void func_8029CCC4(void){ - 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) + if(baflag_isFalse(BA_FLAG_7)) return; + if( baflag_isTrue(BA_FLAG_F) + && baflag_isFalse(BA_FLAG_6) + && baflag_isFalse(BA_FLAG_14_LOSE_BOGGY_RACE) ){ - miscFlag_clear(MISC_FLAG_F); + baflag_clear(BA_FLAG_F); } - miscFlag_clear(MISC_FLAG_7); + baflag_clear(BA_FLAG_7); func_802B0CD8(); item_inc(ITEM_E_JIGGY); if(jiggyscore_total() == 100 && fileProgressFlag_get(FILEPROG_FC_DEFEAT_GRUNTY)){ diff --git a/src/core2/code_16010.c b/src/core2/code_16010.c index dc17e66e..d3efa709 100644 --- a/src/core2/code_16010.c +++ b/src/core2/code_16010.c @@ -22,7 +22,7 @@ void func_8029CFF8(void){ } void func_8029D01C(void){ - miscFlag_clear(MISC_FLAG_13); + baflag_clear(BA_FLAG_13); D_8037D210 = sfxsource_createSfxsourceAndReturnIndex(); D_8037D212 = 0; } @@ -225,7 +225,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) + && baflag_isFalse(BA_FLAG_E_TOUCHING_WADING_BOOTS) && sp1C != BS_25_LONGLEG_ENTER && player_getWaterState() != BSWATERGROUP_2_UNDERWATER && func_8028EC04() < 1U @@ -316,9 +316,9 @@ void func_8029D968(void){ break; } } - miscFlag_set(MISC_FLAG_13); + baflag_set(BA_FLAG_13); } else{ - miscFlag_clear(MISC_FLAG_13); + baflag_clear(BA_FLAG_13); } } diff --git a/src/core2/code_39D0.c b/src/core2/code_39D0.c index 18fe91a9..e902fa2a 100644 --- a/src/core2/code_39D0.c +++ b/src/core2/code_39D0.c @@ -51,8 +51,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 baflag_isFalse(BA_FLAG_12_HAS_FLAPPED) + && baflag_isFalse(BA_FLAG_5_HAS_PECKED) && ability_hasLearned(ABILITY_7_FEATHERY_FLAP); } @@ -69,13 +69,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 baflag_isFalse(BA_FLAG_5_HAS_PECKED) + && baflag_isFalse(BA_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(MISC_FLAG_19)) + if(baflag_isTrue(BA_FLAG_14_LOSE_BOGGY_RACE) || baflag_isTrue(BA_FLAG_19)) return 0; if(bs_getState() == BS_56_RECOIL) return 0; @@ -184,7 +184,7 @@ int player_isInHorizontalRadius(f32 arg0[3], f32 arg1){ s32 func_8028B120(void){return 0;} int func_8028B128(void){ - return miscFlag_isTrue(MISC_FLAG_13); + return baflag_isTrue(BA_FLAG_13); } bool player_isInRBB(void){ @@ -224,8 +224,8 @@ bool func_8028B3B4(void) { bool sp1C; bool sp18; - sp1C = func_80294610(0x10) && miscFlag_isFalse(MISC_FLAG_3); - sp18 = func_80294610(0x40) && miscFlag_isFalse(MISC_FLAG_4); + sp1C = func_80294610(0x10) && baflag_isFalse(BA_FLAG_3); + sp18 = func_80294610(0x40) && baflag_isFalse(BA_FLAG_4); if(sp1C || sp18) return TRUE; return FALSE; diff --git a/src/core2/code_7060.c b/src/core2/code_7060.c index a138740a..2610d5f7 100644 --- a/src/core2/code_7060.c +++ b/src/core2/code_7060.c @@ -71,8 +71,8 @@ bool func_8028E060(s32 arg0, s32 *arg1){ void func_8028E0B0(ActorMarker *arg0){ bs_setState(bs_getIdleState()); bsStoredState_setTrot(FALSE); - miscFlag_clear(MISC_FLAG_16); - miscFlag_clear(MISC_FLAG_18); + baflag_clear(BA_FLAG_16); + baflag_clear(BA_FLAG_18); } void func_8028E0F0(s32 arg0, s32 arg1[3]) { @@ -118,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(MISC_FLAG_16); + baflag_set(BA_FLAG_16); } break; case MAP_77_GL_RBB_LOBBY: if ((arg0 == 2) && func_802D6088()) { - miscFlag_set(MISC_FLAG_18); + baflag_set(BA_FLAG_18); } break; case MAP_76_GL_640_NOTE_DOOR: if ((arg0 == 1) && func_802D60C4()) { - miscFlag_set(MISC_FLAG_18); + baflag_set(BA_FLAG_18); } break; } @@ -154,8 +154,8 @@ void func_8028E0F0(s32 arg0, s32 arg1[3]) { func_8028F85C(sp7C); func_80295A8C(); bsStoredState_setTrot(FALSE); - miscFlag_clear(MISC_FLAG_16); - miscFlag_clear(MISC_FLAG_18); + baflag_clear(BA_FLAG_16); + baflag_clear(BA_FLAG_18); func_8028E060(arg0, &sp6C); yaw_setIdeal((f32) sp6C); yaw_applyIdeal(); @@ -198,7 +198,7 @@ void func_8028E4B0(void) { D_8037BFB8 = 1; func_80295A8C(); bsStoredState_setTrot(FALSE); - miscFlag_clear(MISC_FLAG_16); + baflag_clear(BA_FLAG_16); yaw_setIdeal(D_8037BFCC); yaw_applyIdeal(); } else if (func_8028DFF0(sp20, sp24)) { @@ -440,10 +440,10 @@ enum bsgroup_e func_8028ECAC(void) { s32 temp_a1; state_id = bs_getState(); - if (miscFlag_isTrue(MISC_FLAG_1B_TRANSFORMING)) { + if (baflag_isTrue(BA_FLAG_1B_TRANSFORMING)) { return BSGROUP_D_TRANSFORMING; } - if (miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW)) { + if (baflag_isTrue(BA_FLAG_17_FIRST_PERSON_VIEW)) { return BSGROUP_4_LOOK; } if (bsbfly_inSet(state_id)) { @@ -458,7 +458,7 @@ enum bsgroup_e func_8028ECAC(void) { if (bswalrus_inSledSet(state_id)) { return BSGROUP_C_WALRUS_SLED; } - if (miscFlag_isTrue(MISC_FLAG_9) != 0) { + if (baflag_isTrue(BA_FLAG_9) != 0) { return 1; } switch(state_id){ @@ -608,7 +608,7 @@ bool func_8028F150(void){ } bool func_8028F170(void){ - return miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW); + return baflag_isTrue(BA_FLAG_17_FIRST_PERSON_VIEW); } int ability_isUnlocked(enum ability_e uid){ diff --git a/src/core2/code_A960.c b/src/core2/code_A960.c index ddd23dd4..99b359d1 100644 --- a/src/core2/code_A960.c +++ b/src/core2/code_A960.c @@ -7,7 +7,7 @@ void codeA960_forceLoadzone(s32); int isLoadzoneFlagSet(void){ - return miscFlag_isTrue(MISC_FLAG_15_LOADZONE); + return baflag_isTrue(BA_FLAG_15_LOADZONE); } void func_80291910(void){ @@ -16,7 +16,7 @@ void func_80291910(void){ void codeA960_forceLoadzone(s32 arg0){ if(!isLoadzoneFlagSet()){ - miscFlag_set(MISC_FLAG_15_LOADZONE); + baflag_set(BA_FLAG_15_LOADZONE); if(arg0){ batimer_set(5, 2.0f); func_8029C984(); diff --git a/src/core2/code_C3F0.c b/src/core2/code_C3F0.c deleted file mode 100644 index edcfd7e8..00000000 --- a/src/core2/code_C3F0.c +++ /dev/null @@ -1,40 +0,0 @@ -#include -#include "functions.h" -#include "variables.h" -#include "enums.h" - -/*.bss */ -u8 gMiscFlags[0x1C]; - -/* code */ -void miscFlag_clearAll(void){ - int i; - for(i = 1; i < 0x1C; i++){ - miscFlag_clear(i); - } -} - -bool miscFlag_isTrue(enum misc_flag_e arg0){ - return gMiscFlags[arg0]; -} - -bool miscFlag_isFalse(enum misc_flag_e arg0){ - return !gMiscFlags[arg0]; -} - -void miscFlag_set(enum misc_flag_e arg0){ - gMiscFlags[arg0] = TRUE; -} - -void miscFlag_clear(enum misc_flag_e arg0){ - gMiscFlags[arg0] = FALSE; -} - -void miscFlag_toggle(enum misc_flag_e arg0){ - if(gMiscFlags[arg0]){ - gMiscFlags[arg0] = FALSE; - } - else { - gMiscFlags[arg0] = TRUE; - } -} diff --git a/src/core2/code_D9B0.c b/src/core2/code_D9B0.c index fce7a7f6..5b1304b5 100644 --- a/src/core2/code_D9B0.c +++ b/src/core2/code_D9B0.c @@ -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); + baflag_clear(BA_FLAG_5_HAS_PECKED); + baflag_clear(BA_FLAG_12_HAS_FLAPPED); } if(player_inWater()){ - miscFlag_clear(MISC_FLAG_5_HAS_PECKED); - miscFlag_clear(MISC_FLAG_12_HAS_FLAPPED); + baflag_clear(BA_FLAG_5_HAS_PECKED); + baflag_clear(BA_FLAG_12_HAS_FLAPPED); } func_80294BDC(); diff --git a/src/core2/code_E910.c b/src/core2/code_E910.c index e16ba90b..d196e973 100644 --- a/src/core2/code_E910.c +++ b/src/core2/code_E910.c @@ -191,7 +191,7 @@ void func_80295914(void){ func_80291910(); badrone_init(); bafalldamage_init(); - miscFlag_clearAll(); + baflag_clearAll(); func_8028B6FC(); func_80291590(); bakey_reset(); diff --git a/src/core2/code_EF50.c b/src/core2/code_EF50.c index 0f434da3..72c5ef81 100644 --- a/src/core2/code_EF50.c +++ b/src/core2/code_EF50.c @@ -60,7 +60,7 @@ enum bs_e func_80295EE0(enum bs_e arg0){ func_8029CDA0(); } else{ - miscFlag_set(MISC_FLAG_7); + baflag_set(BA_FLAG_7); if(sp2C){ func_8029CCC4(); } @@ -303,7 +303,7 @@ void func_80296608(void){ next_state = badrone_transform(); } else{ - miscFlag_set(MISC_FLAG_19); + baflag_set(BA_FLAG_19); next_state = func_8029B504(); } break; @@ -423,7 +423,7 @@ void func_80296608(void){ sp2C = 2; break; case BS_INTR_35: //L80296984 - miscFlag_set(MISC_FLAG_1A); + baflag_set(BA_FLAG_1A); next_state = func_8029B504(); sp2C = 2; break; @@ -441,7 +441,7 @@ void func_80296608(void){ if( !func_80298850() && !sp1C - && !miscFlag_isTrue(MISC_FLAG_F) + && !baflag_isTrue(BA_FLAG_F) && !player_isStable() ){ next_state = BS_4F_CLIMB_IDLE; @@ -497,13 +497,13 @@ void func_80296608(void){ next_state = func_8029BED4(); break; case BS_INTR_F: //L80296B68 - miscFlag_set(MISC_FLAG_6); + baflag_set(BA_FLAG_6); next_state = func_8029B504(); sp2C = 2; break; case BS_INTR_30: //L80296B88 item_set(ITEM_14_HEALTH, 0); - miscFlag_set(MISC_FLAG_6); + baflag_set(BA_FLAG_6); next_state = func_8029B504(); sp2C = 2; break; @@ -514,7 +514,7 @@ void func_80296608(void){ case BS_INTR_2A: //L80296BCC sp2C = 2; next_state = func_8029B504(); - miscFlag_set(MISC_FLAG_14_LOSE_BOGGY_RACE); + baflag_set(BA_FLAG_14_LOSE_BOGGY_RACE); break; case BS_INTR_27_WALRUS_SLED: //L80296BEC if(player_getTransformation() == TRANSFORM_4_WALRUS){ diff --git a/src/core2/snackerctl.c b/src/core2/snackerctl.c index 0e79be65..08dca496 100644 --- a/src/core2/snackerctl.c +++ b/src/core2/snackerctl.c @@ -87,7 +87,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){ if(!func_8028F25C() && func_80321960() == 3) func_803219F4(1); - if(miscFlag_isTrue(MISC_FLAG_17_FIRST_PERSON_VIEW) && !func_8028F25C()){ + if(baflag_isTrue(BA_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){