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

rename miscFlags to baflag

Browse Source
This commit is contained in:
banjo.decomp
2024-10-31 00:59:44 -05:00
parent 622902575b
commit 1772033ec8
40 changed files with 241 additions and 241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

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

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

@@ -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();

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

@@ -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();

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

@@ -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

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);
baflag_set(BA_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(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();

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

@@ -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){

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

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

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(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;

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

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

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

@@ -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;

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

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

@@ -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){}

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

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

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

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

@@ -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;

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 && baflag_isTrue(BA_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(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);
}

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(MISC_FLAG_6)) {
if (baflag_isTrue(BA_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() && 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);

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

@@ -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;