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

Function and Enum Naming

Browse Source 
Enum Changes:

BSGROUP_4_LOOK = 0x4

MISC_FLAG_17_FPV = 0x17

Moved nc_first_person_state to global enums.h

Function names:

func_8028EE84() -> player_getWaterState()

func_8028B2E8() -> player_isStable()

func_80294F78() -> should_look_first_person_camera()

func_80294F78() -> can_view_first_person()

func_8028B424() -> player_isFallTumbling()

func_8029C780() -> bs_getTypeOfJump()

func_8028DB14() -> hitbox_getHitboxForActor()
This commit is contained in:
Shmoopi
2024-09-02 08:40:25 -10:00
parent 98e97f4e95
commit 1bf68887e6
62 changed files with 216 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,7 +96,7 @@ void bsant_idle_update(void){
if(func_8028B094())
new_state = BS_38_ANT_FALL;
if(func_80294F78())
if(should_look_first_person_camera())
new_state = badrone_look();
if(func_8029B300() > 0)
@@ -203,7 +203,7 @@ void bsant_jump_update(void){
break;
case 2://L8029EAF4
func_80299628(0);
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
bsant_substate = 3;
}
@@ -213,7 +213,7 @@ void bsant_jump_update(void){
sp2C = BS_35_ANT_IDLE;
break;
}//L8029EB38
if(func_8028B2E8()){
if(player_isStable()){
baphysics_set_target_horizontal_velocity(0.0f);
if(func_8029B300() > 0)
sp2C = BS_ANT_WALK;
@@ -265,7 +265,7 @@ void bsant_fall_update(void){
case 1:
break;
}
if(func_8028B2E8()){
if(player_isStable()){
if(miscflag_isTrue(0x19))
sp2C = badrone_transform();
else
@@ -329,7 +329,7 @@ static void __bsant_recoil_update(void){
break;
}
if(func_8028B2E8())
if(player_isStable())
sp1C = BS_35_ANT_IDLE;
bs_setState(sp1C);
@@ -411,7 +411,7 @@ void bsant_die_update(void){
func_80299628(0);
switch(bsant_substate){
case 0://L8029F270
if(func_8028B2E8()){
if(player_isStable()){
baanim_setEnd(1.0f);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.8f, 18000);

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

@@ -154,7 +154,7 @@ void bsbarge_update(void){
func_8029F4F0();
break;
case 4:
if(!func_8028B2E8())
if(!player_isStable())
sp24 = BS_2F_FALL;
if(animctrl_isAt(plyrMvmnt, 0.7f)){
D_8037D2A0 = 0.0f;

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

@@ -169,7 +169,7 @@ void bsbflap_update(void){
}
break;
case 4:
if(func_8028B424())
if(player_isFallTumbling())
sp1c = BS_3D_FALL_TUMBLING;
break;
}//L802A2C94
@@ -180,7 +180,7 @@ void bsbflap_update(void){
if(should_beak_bust())
sp1c = BS_F_BBUSTER;
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
sp1c = BS_2_WALK_SLOW;
}

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

@@ -112,7 +112,7 @@ void bsbflip_update(void){
}
break;
case 2://L802A3184
if(func_8028B424())
if(player_isFallTumbling())
sp24 = BS_3D_FALL_TUMBLING;
if(button_released(BUTTON_A)){
animctrl_reset(aCtrl);
@@ -124,7 +124,7 @@ void bsbflip_update(void){
baphysics_reset_terminal_velocity();
D_8037D310 = 3;
}//L802A320C
if(func_8028B2E8()){
if(player_isStable()){
_bsbflip_802A2DC0();
sp24 = func_8029C9C0(sp24);
D_8037D310 = 4;
@@ -134,9 +134,9 @@ void bsbflip_update(void){
}
break;
case 3://L802A3258
if(func_8028B424())
if(player_isFallTumbling())
sp24 = BS_3D_FALL_TUMBLING;
if(func_8028B2E8()){
if(player_isStable()){
func_8029E070(0);
_bsbflip_802A2DC0();
sp24 = func_8029C9C0(sp24);

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

@@ -25,7 +25,7 @@ u8 D_8037D347;
/* .code */
int func_802A3350(void){
if(!func_8028B2E8())
if(!player_isStable())
return 0;
if(func_80294684() & 8){
return 0;
@@ -389,7 +389,7 @@ void func_802A411C(void) {
case 1:
func_802A36D0();
D_8037D324 += time_getDelta();
sp40 = func_8028B2E8();
sp40 = player_isStable();
if (player_inWater()) {
next_state = BS_4C_LANDING_IN_WATER;
}
@@ -495,7 +495,7 @@ void func_802A4548(void){
if(should_beak_bust())
next_state = BS_F_BBUSTER;
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
next_state = BS_20_LANDING;
}
@@ -665,7 +665,7 @@ void func_802A4C34(s32 arg0) {
if (animctrl_isStopped(baanim_getAnimCtrlPtr())) {
next_state = BS_24_FLY;
}
if (func_8028B2E8()) {
if (player_isStable()) {
next_state = BS_2_WALK_SLOW;
}
bs_setState(next_state);
@@ -738,7 +738,7 @@ void func_802A4EC8(void) {
next_state = 0;
sp18 = baanim_getAnimCtrlPtr();
if (func_8028B2E8()) {
if (player_isStable()) {
next_state = BS_20_LANDING;
}
if (animctrl_isStopped(sp18) && (func_8028B094() || func_80294530())) {

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

@@ -167,7 +167,7 @@ void bsblongleg_stand_update(void){
enum bs_e next_state = 0;
func_802A531C();
func_80299594(1, 0.5f);
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
if(button_pressed(BUTTON_B))
@@ -179,7 +179,7 @@ void bsblongleg_stand_update(void){
if(player_shouldSlideTrot())
next_state = BS_LONGLEG_SLIDE;
if(button_pressed(BUTTON_A) && func_8028B2E8())
if(button_pressed(BUTTON_A) && player_isStable())
next_state = BS_LONGLEG_JUMP;
if(stateTimer_isDone(STATE_TIMER_2_LONGLEG))
@@ -230,7 +230,7 @@ void bsblongleg_walk_update(void){
if(player_shouldSlideTrot())
next_state = BS_LONGLEG_SLIDE;
if(button_pressed(BUTTON_A) && func_8028B2E8())
if(button_pressed(BUTTON_A) && player_isStable())
next_state = BS_LONGLEG_JUMP;
if(stateTimer_isDone(STATE_TIMER_2_LONGLEG))
@@ -371,7 +371,7 @@ void bsblongleg_jump_update(void){
case 2://L802A6020
animctrl_setAnimTimer(aCtrl, ml_map_f(sp30, D_8037D354, 1.0f, D_8037D350, 0.6703f));
func_80299594(1, 0.5f);
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
animctrl_setSubRange(aCtrl, 0.0f, 1.0f);
animctrl_setDuration(aCtrl, 1.3f);

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

@@ -118,7 +118,7 @@ void bsbpeck_update(void){
break;
}//L802A68D8
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
sp24 = BS_1_IDLE;
}

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

@@ -48,7 +48,7 @@ void bsbshock_charge_update(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
f32 sp1C[3];
if(func_8028B2E8()){
if(player_isStable()){
if(func_8023DB5C() % 2)
func_8029C348();
}
@@ -64,7 +64,7 @@ void bsbshock_charge_update(void){
switch(D_8037D381){
case 0:
if(func_8028B424())
if(player_isFallTumbling())
sp2C = BS_3D_FALL_TUMBLING;
if(func_8028B254(0x82)){
@@ -90,7 +90,7 @@ void bsbshock_charge_update(void){
if(animctrl_getAnimTimer(aCtrl) < 0.3637 && button_released(8)){
D_8037D380 = 0;
}//L802A6CF4
if(func_8028B2E8())
if(player_isStable())
baphysics_set_target_horizontal_velocity(0.0f);
}
else{//L802A6D18
@@ -172,8 +172,8 @@ void bsbshock_update(void){
sp2C = BS_2F_FALL;
}
if(!func_8028B2E8()){
if(func_8028B424())
if(!player_isStable()){
if(player_isFallTumbling())
sp2C = BS_3D_FALL_TUMBLING;
if(should_feathery_flap())

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

@@ -127,7 +127,7 @@ void func_802A7674() {
func_802A71D8();
func_802A7304();
if (func_80294F78()) {
if (should_look_first_person_camera()) {
state_id = badrone_look();
}
if (button_held(BUTTON_A)) {
@@ -558,7 +558,7 @@ void func_802A85EC(void) {
D_8037D398 += ml_max_f(mlAbsF(D_8037D398) * 0.1, 50.0f);
baphysics_set_vertical_velocity(D_8037D398);
}
if (func_8028B2E8()) {
if (player_isStable()) {
next_state = BS_2D_SWIM_IDLE;
}
if (!player_inWater()) {

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

@@ -190,7 +190,7 @@ enum bs_e func_802A8D84(enum bs_e arg0){
if( func_8029B300(arg0) > 0)
arg0 = BS_16_BTROT_WALK;
if(func_80294F78())
if(should_look_first_person_camera())
arg0 = badrone_look();
if(func_8028B094())
@@ -405,7 +405,7 @@ void bsbtrot_jump_update(void){
break;
case 2://L802A95C4
func_80299628(1);
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
animctrl_setSubRange(aCtrl, 0.0f, 0.8798f);
animctrl_setDuration(aCtrl, 0.9f);
@@ -457,13 +457,13 @@ void bsbtrot_jump_update(void){
if(should_peck())
sp2C = BS_11_BPECK;
if(func_8028B424())
if(player_isFallTumbling())
sp2C = BS_3D_FALL_TUMBLING;
if(player_inWater())
sp2C = BS_4C_LANDING_IN_WATER;
if(func_8028B2E8()){
if(player_isStable()){
if(button_pressed(BUTTON_A))
sp2C = func_802A8D34(sp2C);
@@ -540,7 +540,7 @@ void bsbtrot_slide_update(void){
if(player_inWater())
sp3C = BS_2D_SWIM_IDLE;
if(D_8037D3A0 == 0.0f && button_pressed(BUTTON_A) && func_8028B2E8())
if(D_8037D3A0 == 0.0f && button_pressed(BUTTON_A) && player_isStable())
sp3C = func_802A8D34(sp3C);
@@ -605,7 +605,7 @@ void bsbtrot_fall_update(void){
break;
case 1://L802A9DDC
func_80299628(1);
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
animctrl_setSubRange(aCtrl, 0.0f, 0.8798f);
animctrl_setDuration(aCtrl, 0.9f);
@@ -660,10 +660,10 @@ void bsbtrot_fall_update(void){
if(player_inWater())
sp2C = BS_4C_LANDING_IN_WATER;
if(func_8028B424())
if(player_isFallTumbling())
sp2C = BS_3D_FALL_TUMBLING;
if(func_8028B2E8()){
if(player_isStable()){
if(button_pressed(BUTTON_A))
sp2C = func_802A8D34(sp2C);
@@ -736,10 +736,10 @@ void bsbtrot_ow_update(void){
if(baanim_isAt(0.3f))
func_80292EA4();
if(func_8028B424())
if(player_isFallTumbling())
sp1C = BS_3D_FALL_TUMBLING;
if(func_8028B2E8() && baanim_isStopped())
if(player_isStable() && baanim_isStopped())
sp1C = BS_15_BTROT_IDLE;
if(animctrl_isStopped(baanim_getAnimCtrlPtr()) && player_inWater())

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

@@ -56,7 +56,7 @@ enum bs_e func_802AA510(enum bs_e arg0){
if(button_released(BUTTON_Z))
arg0 = BS_1E_WONDERWING_EXIT;
if(button_pressed(BUTTON_A) && func_8028B2E8())
if(button_pressed(BUTTON_A) && player_isStable())
arg0 = BS_1D_WONDERWING_JUMP;
if(player_inWater())
@@ -151,7 +151,7 @@ void bsbwhirl_walk_update(void){
if(button_released(BUTTON_Z))
sp1C = BS_1E_WONDERWING_EXIT;
if(button_pressed(BUTTON_A) && func_8028B2E8())
if(button_pressed(BUTTON_A) && player_isStable())
sp1C = BS_1D_WONDERWING_JUMP;
if(player_inWater())
@@ -217,7 +217,7 @@ void bsbwhirl_jump_update(void){
if(player_inWater())
sp2C = BS_2D_SWIM_IDLE;
if(func_8028B2E8()){
if(player_isStable()){
D_8037D3B4 = 2;
func_8029C5E8();
}

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

@@ -135,7 +135,7 @@ void bsbbuster_update(void){
if(D_8037D2B7 == 2){
D_8037D2B7 = 0;
}
if(func_8028B2E8() || D_8037D2B9 || !(D_8037D2BC < 4)){
if(player_isStable() || D_8037D2B9 || !(D_8037D2BC < 4)){
func_802BB3DC( 0, 45.0f, 0.71f);
func_8029AE74(0);
func_8029FB30();
@@ -183,7 +183,7 @@ void bsbbuster_update(void){
animctrl_setDuration(aCtrl, 15.0f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
}
if(func_8028B2E8()){
if(player_isStable()){
animctrl_setSubRange(aCtrl, 0.0f, 1.0f);
animctrl_setDuration(aCtrl, 1.9f);
animctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);

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

@@ -253,7 +253,7 @@ void bsbeefly_update(void){
sp38 += (f64)sp38;
}
baphysics_set_target_horizontal_velocity(sp38);
if(func_8028B2E8() && !player_inWater())
if(player_isStable() && !player_inWater())
sp4C = BS_85_BEE_IDLE;
func_8028FFF0();
bs_setState(sp4C);

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

@@ -73,7 +73,7 @@ void func_802A10D4(void){
if(func_8028B094())
s0 = 0x88;
if(func_80294F78())
if(should_look_first_person_camera())
s0 = badrone_look();
if(func_8029B300() > 0)
@@ -188,7 +188,7 @@ void func_802A1438(void){
break;
case 2:
func_80299628(0);
if(func_8028B2E8()){
if(player_isStable()){
func_802A0F90();
baanim_setEndAndDuration(1.0f, 0.7f);
D_8037D2D4 = 3;
@@ -202,7 +202,7 @@ void func_802A1438(void){
}
break;
}
if(func_8028B2E8()){
if(player_isStable()){
if(func_8029B300() > 0)
sp2c = BS_BEE_WALK;
if(button_pressed(BUTTON_A)){
@@ -259,7 +259,7 @@ void func_802A170C(void){
break;
case 1:
func_80299628(0);
if(func_8028B2E8()){
if(player_isStable()){
func_802A0F90();
baphysics_set_target_horizontal_velocity(0.0f);
baanim_setEndAndDuration(1.0f, 0.7f);
@@ -274,7 +274,7 @@ void func_802A170C(void){
}
break;
}
if(func_8028B2E8()){
if(player_isStable()){
if(miscflag_isTrue(0x19)){
sp2c = badrone_transform();
}else{
@@ -352,7 +352,7 @@ void func_802A1A50(void){
case 1:
break;
}
if(func_8028B2E8())
if(player_isStable())
sp1C = BS_85_BEE_IDLE;
if(0.65 < baanim_getTimer() && player_inWater()){
sp1C = 0x8C;
@@ -436,7 +436,7 @@ void func_802A1DD8(void){
func_80299628(0);
switch(D_8037D2D4){
case 0:
if(!func_8028B2E8())
if(!player_isStable())
break;
baanim_setEnd(0.7453f);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
@@ -445,7 +445,7 @@ void func_802A1DD8(void){
D_8037D2D4 = 1;
break;
case 1:
if(!func_8028B2E8())
if(!player_isStable())
break;
baanim_setEnd(1.0f);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);

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

@@ -54,14 +54,14 @@ void bsclaw_update(void){
if(animctrl_isStopped(aCtrl))
sp2C = BS_1_IDLE;
if(!func_8028B2E8())
if(!player_isStable())
sp2C = BS_2F_FALL;
if(player_inWater())
sp2C = BS_4C_LANDING_IN_WATER;
if(button_pressed(BUTTON_A))
sp2C = func_8029C780();
sp2C = bs_getTypeOfJump();
bs_setState(sp2C);
}

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

@@ -121,7 +121,7 @@ void bscroc_idle_update(void){
if(func_8028B094())
next_state = BS_61_CROC_FALL;
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
if(func_8029B300() > 0)
@@ -235,7 +235,7 @@ void bscroc_jump_update(void){
break;
case 2:
func_80299628(0);
if(func_8028B2E8()){
if(player_isStable()){
func_8029AE48();
baanim_setEndAndDuration(1.0f, 1.0f);
D_8037D3EC = 3;
@@ -250,7 +250,7 @@ void bscroc_jump_update(void){
break;
}//L802AC66C
if(func_8028B2E8()){
if(player_isStable()){
if(func_8029B300() > 0)
sp2C = BS_CROC_WALK;
@@ -300,7 +300,7 @@ void bscroc_fall_update(void){
}
break;
case 1:
if(func_8028B2E8()){
if(player_isStable()){
func_8029AE48();
baphysics_set_target_horizontal_velocity(0.0f);
baanim_setEndAndDuration(1.0f, 1.0f);
@@ -310,7 +310,7 @@ void bscroc_fall_update(void){
break;
}//L802AC850
if(func_8028B2E8()){
if(player_isStable()){
if(func_8029B300() > 0 || (D_8037D3EC == 2 && animctrl_isStopped(aCtrl))){
if(miscflag_isTrue(0x19)){
next_state = badrone_transform();
@@ -376,7 +376,7 @@ static void __bscroc_recoil_update(void){
case 1:
break;
}
if(func_8028B2E8())
if(player_isStable())
next_state = BS_5E_CROC_IDLE;
bs_setState(next_state);
@@ -458,7 +458,7 @@ void bscroc_die_update(void){
func_80299628(0);
switch(D_8037D3EC){
case 0:
if(func_8028B2E8()){
if(player_isStable()){
baanim_setEnd(0.7453f);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.8f, 18000);
@@ -467,7 +467,7 @@ void bscroc_die_update(void){
}
break;
case 1:
if(func_8028B2E8()){
if(player_isStable()){
baanim_setEnd(1.0f);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.8f, 18000);
@@ -505,7 +505,7 @@ int bscroc_hitboxActive(void){
static void func_802ACF58(void){
f32 sp2C;
f32 sp20[3];
sp2C = func_8028B2E8() ? 500.0f : 400.0f;
sp2C = player_isStable() ? 500.0f : 400.0f;
func_802589E4(sp20, yaw_get(), sp2C);
sp20[1] = 200.0f;
baphysics_set_velocity(sp20);
@@ -549,7 +549,7 @@ void bscroc_bite_update(void){
next_state = BS_CROC_WALK;
}
if(func_8028B2E8() && button_pressed(BUTTON_A))
if(player_isStable() && button_pressed(BUTTON_A))
next_state = BS_CROC_JUMP;
bs_setState(next_state);

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

@@ -183,7 +183,7 @@ enum bs_e func_802ADCD4(enum bs_e arg0){
arg0 = BS_CLAW;
if(button_pressed(BUTTON_A))
arg0 = func_8029C780();
arg0 = bs_getTypeOfJump();
}else{
if(should_wonderwing())

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

@@ -10,7 +10,7 @@ s32 D_8037D414;
/* .code */
int _bsdie_802ADE00(void){
return func_8028B2E8();
return player_isStable();
}
void _bsdie_802ADE20(void){

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

@@ -40,7 +40,7 @@ void func_802AEC08(void){
void func_802AEC28(void){
baphysics_reset_horizontal_velocity();
if(func_8028B2E8() || player_inWater())
if(player_isStable() || player_inWater())
__bsDroneGoTo_set_substate(2);
}
@@ -91,7 +91,7 @@ void func_802AEDC8(void){
void bsDroneGoTo_init(void){
bsdronetogo_substate = 0;
func_8031F9F4(1);
if( !func_8028B2E8() && func_8029BDE8()){
if( !player_isStable() && func_8029BDE8()){
__bsDroneGoTo_set_substate(1);
}else{
__bsDroneGoTo_set_substate(2);

8
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(0x17);
miscflag_set(MISC_FLAG_17_FPV);
}
void bsDroneLook_update(void) {
@@ -42,7 +42,7 @@ void bsDroneLook_update(void) {
next_state = 0;
dt = time_getDelta();
if (ncFirstPersonCamera_getState() == 2) {
if (ncFirstPersonCamera_getState() == FIRSTPERSON_STATE_2_IDLE) {
//camera is in "idle" state
ncFirstPersonCamera_getZoomedInRotation(eye_rotation);
eye_rotation[0] -= func_8029B2DC() * 90.0f * dt;
@@ -59,7 +59,7 @@ void bsDroneLook_update(void) {
}
// 1st person cancelled via entering water
if (player_inWater()) {
if (player_getTransformation() == TRANSFORM_1_BANJO && func_8028EE84() == BSWATERGROUP_0_NONE) {
if (player_getTransformation() == TRANSFORM_1_BANJO && player_getWaterState() == BSWATERGROUP_0_NONE) {
exit_first_person += TRUE;
}
} else if (func_8028B254(25) == 0) {
@@ -79,5 +79,5 @@ void bsDroneLook_end(void) {
func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
}
ncDynamicCamera_exitFirstPerson();
miscflag_clear(0x17);
miscflag_clear(MISC_FLAG_17_FPV);
}

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

@@ -134,7 +134,7 @@ void bsjump_update(void){
break;
}//L802B1548
if(func_8028B424())
if(player_isFallTumbling())
sp34 = BS_3D_FALL_TUMBLING;
if(button_released(BUTTON_A))
@@ -149,7 +149,7 @@ void bsjump_update(void){
if(should_beak_bust())
sp34 = BS_F_BBUSTER;
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
sp34 = BS_20_LANDING;
}
@@ -214,7 +214,7 @@ void bsjump_fall_update(void){
break;
}//L802B1824
if(miscflag_isFalse(0xf)){
if(func_8028B424())
if(player_isFallTumbling())
sp2C = BS_3D_FALL_TUMBLING;
if(should_feathery_flap() && miscflag_isFalse(MISC_FLAG_5_HAS_PECKED))
@@ -237,7 +237,7 @@ void bsjump_fall_update(void){
}//L802B18E8
if(func_8028B2E8()){
if(player_isStable()){
func_8029C5E8();
sp2C = BS_20_LANDING;
}
@@ -311,7 +311,7 @@ void func_802B1A54(void) {
case 2:
break;
}
if (func_8028B2E8()) {
if (player_isStable()) {
func_8029C5E8();
next_state = BS_20_LANDING;
}
@@ -371,7 +371,7 @@ void func_802B1CF8(void) {
case 1:
break;
}
if (func_8028B2E8() != 0) {
if (player_isStable() != 0) {
next_state = 1;
}
bs_setState(next_state);
@@ -424,7 +424,7 @@ void bsjump_tumble_update(void){
if(player_inWater())
sp1C = BS_4C_LANDING_IN_WATER;
if(func_8028B2E8())
if(player_isStable())
sp1C = BS_SPLAT;
bs_setState(sp1C);

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

@@ -50,10 +50,10 @@ void bsow_update(void) {
if (baanim_isAt(0.3f) != 0) {
func_80292EA4();
}
if (func_8028B424() != 0) {
if (player_isFallTumbling() != 0) {
sp1C = BS_3D_FALL_TUMBLING;
}
if (func_8028B2E8() != 0) {
if (player_isStable() != 0) {
sp1C = BS_2_WALK_SLOW;
}
if ((player_inWater() != 0) && (baphysics_get_vertical_velocity() <= 0.0f)) {

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

@@ -92,7 +92,7 @@ void bspumpkin_idle_update(void) {
if (func_8028B094()) {
next_state = BS_4B_PUMPKIN_FALL;
}
if (func_80294F78()) {
if (should_look_first_person_camera()) {
next_state = badrone_look();
}
if (func_8029B300() > 0) {
@@ -208,7 +208,7 @@ void bspumpkin_jump_update(void) {
}
break;
case 2:
if (func_8028B2E8()) {
if (player_isStable()) {
func_8029AE48();
animctrl_setSubRange(anim_ctrl, 0.0f, 1.0f);
animctrl_setDuration(anim_ctrl, 1.2f);
@@ -224,7 +224,7 @@ void bspumpkin_jump_update(void) {
}
break;
}
if (func_8028B2E8()) {
if (player_isStable()) {
if (func_8029B300() > 0) {
next_state = BS_49_PUMPKIN_WALK;
}
@@ -277,7 +277,7 @@ void bspumpkin_fall_update(void) {
}
break;
case 1:
if (func_8028B2E8()) {
if (player_isStable()) {
func_8029AE48();
baphysics_set_target_horizontal_velocity(0.0f);
animctrl_setSubRange(anim_ctrl, 0.0f, 1.0f);
@@ -289,7 +289,7 @@ void bspumpkin_fall_update(void) {
case 2:
break;
}
if (func_8028B2E8() && ((func_8029B300() > 0) || (D_8037D4E0 == 2 && animctrl_isStopped(anim_ctrl)))) {
if (player_isStable() && ((func_8029B300() > 0) || (D_8037D4E0 == 2 && animctrl_isStopped(anim_ctrl)))) {
if (miscflag_isTrue(0x19)) {
next_state = badrone_transform();
} else {
@@ -475,7 +475,7 @@ void bspumpkin_die_update(void){
break;
case 1://L802B32AC
if(func_8028B2E8()) {
if(player_isStable()) {
func_8029AE48();
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.8f, 18000);
@@ -502,7 +502,7 @@ void bspumpkin_die_update(void){
case 4://L802B3384
D_8037D4F4 = ml_max_f(0.0f, D_8037D4F4 - 10.0f);
if (func_8028B2E8()) {
if (player_isStable()) {
func_8029AE48();
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.8f, 18000);

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

@@ -118,10 +118,10 @@ void func_802B3954(void) {
baMarker_collisionOn();
}
func_802B37DC();
if (func_8028B2E8()) {
if (player_isStable()) {
next_state = BS_20_LANDING;
}
if (func_8028B424() && D_8037D500 == 0) {
if (player_isFallTumbling() && D_8037D500 == 0) {
next_state = BS_3D_FALL_TUMBLING;
}
if (animctrl_isStopped(anim_ctrl) && func_8028B094() && (D_8037D500 == 0)) {

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

@@ -111,7 +111,7 @@ void bsslide_update(void){
sp3C = BS_4C_LANDING_IN_WATER;
if(D_8037D528 == 0.0f && button_pressed(BUTTON_A))
sp3C = func_8029C780();
sp3C = bs_getTypeOfJump();
bs_setState(sp3C);
}

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

@@ -76,7 +76,7 @@ void bssplat_update(void){
break;
}//L802B4808
if(func_8028B2E8() == 0 && player_inWater())
if(player_isStable() == 0 && player_inWater())
sp1C = BS_2D_SWIM_IDLE;
bs_setState(sp1C);

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

@@ -71,9 +71,9 @@ s32 func_802B488C(s32 arg0){
retVal = BS_CLAW;
if(button_pressed(BUTTON_A))
retVal = func_8029C780();
retVal = bs_getTypeOfJump();
if(func_80294F78())
if(should_look_first_person_camera())
retVal = badrone_look();
if(player_isSliding())

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

@@ -170,7 +170,7 @@ void func_802B5950(void) {
if (!player_inWater()) {
next_state = BS_1_IDLE;
}
if (func_80294F78()) {
if (should_look_first_person_camera()) {
next_state = badrone_look();
}
if (should_dive()) {

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

@@ -60,7 +60,7 @@ void bsturn_update(void){
sp2C = BS_CLAW;
if(button_pressed(BUTTON_A))
sp2C = func_8029C780();
sp2C = bs_getTypeOfJump();
bs_setState(sp2C);
}

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

@@ -66,9 +66,9 @@ void bstwirl_update(void){
}//L802B6C4C
if(button_pressed(BUTTON_A))
sp1C = func_8029C780();
sp1C = bs_getTypeOfJump();
if(0.6 < animctrl_getAnimTimer(aCtrl) && !func_8028B2E8())
if(0.6 < animctrl_getAnimTimer(aCtrl) && !player_isStable())
sp1C = BS_2F_FALL;
if(player_inWater())

24
src/core2/bs/walk.c
View File

@@ -162,7 +162,7 @@ void bswalk_creep_update(void){
if(func_8028B128())
next_state = BS_WALK_MUD;
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
@@ -174,7 +174,7 @@ void bswalk_creep_update(void){
next_state = func_802B6F20(next_state);
if(button_pressed(BUTTON_A))
next_state = func_8029C780();
next_state = bs_getTypeOfJump();
if(player_isSliding())
next_state = BS_SLIDE;
@@ -235,7 +235,7 @@ void bswalk_slow_upate(void){
if(func_8028B128())
next_state = BS_WALK_MUD;
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
@@ -247,7 +247,7 @@ void bswalk_slow_upate(void){
next_state = func_802B6F20(next_state);
if(button_pressed(BUTTON_A))
next_state = func_8029C780();
next_state = bs_getTypeOfJump();
if(player_isSliding())
next_state = BS_SLIDE;
@@ -311,7 +311,7 @@ void bswalk_update(void){
next_state = BS_SKID;
}
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
@@ -323,7 +323,7 @@ void bswalk_update(void){
next_state = func_802B6F20(next_state);
if(button_pressed(BUTTON_A))
next_state = func_8029C780();
next_state = bs_getTypeOfJump();
if(player_isSliding())
next_state = BS_SLIDE;
@@ -386,7 +386,7 @@ void bswalk_fast_update(void){
if(baphysics_is_slower_than(18.0f))
next_state = BS_1_IDLE;
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
break;
@@ -395,7 +395,7 @@ void bswalk_fast_update(void){
if(baphysics_is_slower_than(bsWalkSlowWalkWalkVelocityThreshold))
next_state = BS_2_WALK_SLOW;
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
break;
@@ -403,7 +403,7 @@ void bswalk_fast_update(void){
if(baphysics_is_slower_than(bsWalkWalkFastWalkVelocityThreshold) && func_802B6EF4())
next_state = BS_WALK;
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
break;
}//L802B7AA4
@@ -423,7 +423,7 @@ void bswalk_fast_update(void){
next_state = func_802B6F20(next_state);
if(button_pressed(BUTTON_A))
next_state = func_8029C780();
next_state = bs_getTypeOfJump();
if(player_isSliding())
next_state = BS_SLIDE;
@@ -460,7 +460,7 @@ void bswalk_mud_update(void){
if(!func_8029B300())
next_state = BS_1_IDLE;
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
@@ -472,7 +472,7 @@ void bswalk_mud_update(void){
next_state = func_802B6F20(next_state);
if(button_pressed(BUTTON_A))
next_state = func_8029C780();
next_state = bs_getTypeOfJump();
if(player_isSliding())
next_state = BS_SLIDE;

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

@@ -162,7 +162,7 @@ void bswalrus_idle_update(void){
if(func_8028B094())
next_state = BS_6A_WALRUS_FALL;
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
if(func_8029B300() > 0)
@@ -270,7 +270,7 @@ void bswalrus_jump_update(void){
break;
case 2://L802B87B4
func_80299628(0);
if(func_8028B2E8()){
if(player_isStable()){
func_8029AE48();
animctrl_setSubRange(aCtrl, 0.0f, 1.0f);
animctrl_setDuration(aCtrl, 1.0f);
@@ -287,7 +287,7 @@ void bswalrus_jump_update(void){
break;
}//L802B8838
if(func_8028B2E8()){
if(player_isStable()){
if(func_8029B300() > 0)
next_state = BS_WALRUS_WALK;
@@ -335,7 +335,7 @@ void bswalrus_fall_update(void){
}
break;
case 1://L802B89E0
if(func_8028B2E8()){
if(player_isStable()){
func_8029AE48();
baphysics_set_target_horizontal_velocity(0.0f);
animctrl_setSubRange(aCtrl, 0.0f, 1.0f);
@@ -348,7 +348,7 @@ void bswalrus_fall_update(void){
break;
}//L802B8A38
if(func_8028B2E8()){
if(player_isStable()){
if( func_8029B300() > 0
|| (D_8037D5C8 == 2 && animctrl_isStopped(aCtrl))
){
@@ -399,7 +399,7 @@ static void __bswalrus_recoil_update(void){
if(baanim_isAt(0.5f))
func_80292EA4();
if(func_8028B2E8())
if(player_isStable())
next_state = BS_67_WALRUS_IDLE;
bs_setState(next_state);
@@ -483,7 +483,7 @@ void bswalrus_die_update(void){
func_80299628(0);
switch(D_8037D5C8){
case 0://L802B8F54
if(func_8028B2E8()){
if(player_isStable()){
baanim_setEnd(1.0f);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.8f, 18000);
@@ -578,7 +578,7 @@ void bswalrus_sled_update(void){
func_80299628(0);
func_802B7F28();
if(func_80294F78())
if(should_look_first_person_camera())
next_state = badrone_look();
if(button_pressed(BUTTON_A))
@@ -648,7 +648,7 @@ void bswalrus_sled_jump_update(void){
break;
}//L802B9530
if(func_8028B2E8()){
if(player_isStable()){
if(button_pressed(BUTTON_A))
next_state = BS_7E_WALRUS_SLED;
@@ -693,7 +693,7 @@ void func_802B963C(void){
}
break;
case 1://L802B96C0
if(func_8028B2E8()){
if(player_isStable()){
func_8029AE48();
baphysics_set_target_horizontal_velocity(0.0f);
D_8037D5C8 = 2;
@@ -703,7 +703,7 @@ void func_802B963C(void){
break;
}//L802B96F0
if(func_8028B2E8()){
if(player_isStable()){
if( func_8029B300() > 0
|| (D_8037D5C8 == 2 && animctrl_isStopped(aCtrl))
){

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

@@ -58,15 +58,15 @@ void func_802B9B14(void){
switch(D_8037D5D0){
case 0: // L802B9B48
if(func_8028B2E8())
if(player_isStable())
func_802B9980(1);
break;
case 1: // L802B9B68
if(func_8028B2E8())
if(player_isStable())
func_802B9980(2);
break;
case 2: // L802B9B88
if(func_8028B2E8())
if(player_isStable())
func_802B9980(3);
break;
case 3: // L802B9BA8