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

document baeyes.c, bainput.c, and basfx.c

Browse Source
This commit is contained in:
banjo.decomp
2024-10-30 23:47:11 -05:00
parent 01a4051a87
commit 622902575b
46 changed files with 690 additions and 691 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -97,7 +97,7 @@ void bsant_idle_update(void){
if(func_8028B094())
new_state = BS_38_ANT_FALL;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
new_state = badrone_look();
if(bastick_getZone() > 0)
@@ -309,7 +309,7 @@ static void __bsant_recoil_init(int take_damage){
baphysics_set_vertical_velocity(510.0f);
baphysics_set_gravity(-1200.0f);
baMarker_collisionOff();
func_80292E48();
baeyes_close();
bsant_substate = 0;
}
@@ -317,7 +317,7 @@ static void __bsant_recoil_update(void){
enum bs_e sp1C = 0;
if(baanim_isAt(0.5f))
func_80292EA4();
baeyes_open();
switch(bsant_substate){
case 0:
@@ -340,7 +340,7 @@ static void __bsant_recoil_end(void){
func_80297CA8();
baphysics_reset_gravity();
baMarker_collisionOn();
func_80292EA4();
baeyes_open();
func_8029E4EC();
}
@@ -401,7 +401,7 @@ void bsant_die_init(void){
func_8029C984();
bsant_substate = 0;
baMarker_collisionOff();
func_80292E48();
baeyes_close();
batimer_set(0, 2.9f);
}
@@ -446,7 +446,7 @@ void bsant_die_end(void){
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_80291548();
func_80292EA4();
baeyes_open();
}
void func_8029F398(void){

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

@@ -93,7 +93,7 @@ void bsbarge_update(void){
switch(D_8037D2A5){
case 0:
if(anctrl_isAt(plyrMvmnt, 0.1392f))
func_80299BD4();
basfx_80299BD4();
if(!anctrl_isStopped(plyrMvmnt))
break;

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

@@ -16,7 +16,7 @@ void bseggass_init(void){
baphysics_set_target_horizontal_velocity(0.0f);
func_8029E058(1);
D_8037D2E0 = (D_8037D2E1 = 1);
func_802952A8(5,0);
bainput_enable(5,0);
}
void bseggass_update(void) {
@@ -30,7 +30,7 @@ void bseggass_update(void) {
next_state = 0;
plyr_mvmt = baanim_getAnimCtrlPtr();
has_eggs = (item_empty(ITEM_D_EGGS) == 0);
if (should_poop_egg()) {
if (bainput_should_poop_egg()) {
if (has_eggs)
D_8037D2E0 = ml_min_w(D_8037D2E0 + 1, 3);
else
@@ -61,7 +61,7 @@ void bseggass_update(void) {
void bseggass_end(void){
func_802952A8(5, 1);
bainput_enable(5, 1);
baphysics_reset_gravity();
func_8029E058(0);
}

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

@@ -19,7 +19,7 @@ void bsegghead_init(void){
baphysics_set_target_horizontal_velocity(0.0f);
func_8029E070(1);
D_8037D2F0 = (D_8037D2F1 = 1);
func_802952A8(2,0);
bainput_enable(2,0);
}
void bsegghead_update(void) {
@@ -33,7 +33,7 @@ void bsegghead_update(void) {
next_state = 0;
aCtrl = baanim_getAnimCtrlPtr();
has_eggs = (item_empty(ITEM_D_EGGS) == 0);
if (should_shoot_egg()) {
if (bainput_should_shoot_egg()) {
if (has_eggs)
D_8037D2F0 = ml_min_w(D_8037D2F0 + 1, 3);
else
@@ -69,7 +69,7 @@ void bsegghead_update(void) {
}
void bsegghead_end(void){
func_802952A8(2, 1);
bainput_enable(2, 1);
baphysics_reset_gravity();
func_8029E070(0);
}

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

@@ -34,7 +34,7 @@ void bsbflap_init(void) {
miscFlag_set(MISC_FLAG_12_HAS_FLAPPED);
batimer_set(0, 2.5f);
D_8037D30C = sfxsource_createSfxsourceAndReturnIndex();
func_80299BD4();
basfx_80299BD4();
D_8037D301 = 0;
D_8037D308 = 0.0f;
D_8037D300 = 0;
@@ -179,7 +179,7 @@ void bsbflap_update(void){
if(batimer_isZero(0))
sp1c = BS_2F_FALL;
if(should_beak_bust())
if(bainput_should_beak_bust())
sp1c = BS_F_BBUSTER;
if(player_isStable()){

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

@@ -55,7 +55,7 @@ void bsbflip_init(void){
bastick_setZoneMax(0, 0.03f);
bastick_setZoneMax(1, 1.0f);
func_8029E070(1);
func_80299BD4();
basfx_80299BD4();
D_8037D310 = 0;
}
@@ -107,7 +107,7 @@ void bsbflip_update(void){
anctrl_start(aCtrl, "bsbflip.c", 0xd9);
D_8037D310 = 2;
}//L802A316C
if(should_beak_bust()){
if(bainput_should_beak_bust()){
sp24 =BS_F_BBUSTER;
}
break;
@@ -129,7 +129,7 @@ void bsbflip_update(void){
sp24 = func_8029C9C0(sp24);
D_8037D310 = 4;
}
else if(should_beak_bust()){
else if(bainput_should_beak_bust()){
sp24 = BS_F_BBUSTER;
}
break;
@@ -142,7 +142,7 @@ void bsbflip_update(void){
sp24 = func_8029C9C0(sp24);
D_8037D310 = 4;
}
else if(should_beak_bust()){
else if(bainput_should_beak_bust()){
sp24 = BS_F_BBUSTER;
}
break;

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

@@ -146,7 +146,7 @@ void bsbfly_enter_init(void){
baphysics_set_target_horizontal_velocity(0.0f);
baphysics_set_gravity(-1200.0f);
func_8029E070(1);
func_80299BD4();
basfx_80299BD4();
D_8037D344 = 0;
D_8037D346 = 0;
}
@@ -287,7 +287,7 @@ void bsbfly_update(void){
baphysics_set_target_yaw(yaw_get());
baphysics_set_target_horizontal_velocity(sp38);
if(should_beak_bust())
if(bainput_should_beak_bust())
sp54 = BS_F_BBUSTER;
D_8037D320 = ml_max_f(D_8037D320 - time_getDelta(), 0.0f);
@@ -382,7 +382,7 @@ void func_802A411C(void) {
func_802914CC(5);
ncDynamicCam5_func_802BF590(&D_8037D338);
anctrl_setDuration(sp58, 0.05f);
func_80299CF4(SFX_50_KAZOOIE_RRRUH, 1.3f, 0x7FFF);
basfx_80299CF4(SFX_50_KAZOOIE_RRRUH, 1.3f, 0x7FFF);
D_8037D345 = 1;
D_8037D324 = 0.0f;
D_8037D344 = 1;
@@ -441,7 +441,7 @@ void func_802A411C(void) {
}
void func_802A4404(void){
func_80299E6C();
basfx_80299E6C();
D_8037D345 = 0;
func_802A34C8();
}
@@ -466,8 +466,8 @@ void func_802A4430(void){
baphysics_reset_gravity();
baphysics_reset_terminal_velocity();
baModel_setYDisplacement(0.0f);
func_80299CF4(SFX_31_BANJO_OHHWAAOOO, 1.0f, 0x7fff);
func_80299D2C(SFX_61_CARTOONY_FALL, 1.0f, 0x7fff);
basfx_80299CF4(SFX_31_BANJO_OHHWAAOOO, 1.0f, 0x7fff);
basfx_80299D2C(SFX_61_CARTOONY_FALL, 1.0f, 0x7fff);
D_8037D320 = 0.35f;
D_8037D344 = 0;
}
@@ -491,10 +491,10 @@ void func_802A4548(void){
D_8037D346 = 1;
next_state = BS_24_FLY;
}
if(should_peck())
if(bainput_should_peck())
next_state = BS_11_BPECK;
if(should_beak_bust())
if(bainput_should_beak_bust())
next_state = BS_F_BBUSTER;
if(player_isStable()){
@@ -510,8 +510,8 @@ void func_802A4548(void){
void func_802A4664(void){
s32 next_state;
func_80299E6C();
func_80299E90();
basfx_80299E6C();
basfx_80299E90();
next_state = bs_getNextState();
if(next_state == BS_20_LANDING || next_state == BS_24_FLY || next_state == BS_2D_SWIM_IDLE){
sfxsource_playHighPriority(SFX_3EA_UNKNOWN);
@@ -534,7 +534,7 @@ void bsbfly_beakbomb_crash_init(void) {
func_8029C7F4(1, 1, 3, BA_PHYSICS_LOCKED_ROTATION);
func_8029E070(1);
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
func_80299CF4(SFX_36_BANJO_DOH, 1.0f, 28000);
basfx_80299CF4(SFX_36_BANJO_DOH, 1.0f, 28000);
baMotor_80250D94(1.0f, 0.5f, 0.5f);
item_dec(ITEM_14_HEALTH);
func_802A46C8();
@@ -548,11 +548,11 @@ void func_802A47E0(void) {
sp1C = baanim_getAnimCtrlPtr();
if (anctrl_isAt(sp1C, 0.3659f)) {
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 1.0f, 14000);
func_80299CF4(SFX_8B_KAZOOIE_RAWW, 1.0f, 28000);
basfx_80299CF4(SFX_8B_KAZOOIE_RAWW, 1.0f, 28000);
}
if (anctrl_isAt(sp1C, 0.6862f)) {
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 18000);
func_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 22000);
basfx_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 22000);
}
if (anctrl_isAt(sp1C, 0.92f)) {
baphysics_set_target_horizontal_velocity(0.0f);
@@ -588,7 +588,7 @@ void func_802A48B4(void) {
break;
case 1:
if (anctrl_isAt(sp18, 0.219f)) {
func_80299CF4(SFX_36_BANJO_DOH, 1.0f, 16000);
basfx_80299CF4(SFX_36_BANJO_DOH, 1.0f, 16000);
}
if (anctrl_isAt(sp18, 0.63f)) {
next_state = BS_20_LANDING;
@@ -635,7 +635,7 @@ void func_802A4A78(s32 arg0) {
}
func_802BB3DC(2, 100.0f, 0.85f);
baanim_playForDuration_onceSmooth(ASSET_D3_ANIM_BSBFLY_BEAKBOMB_REBOUND, 1.2f);
func_80299BFC(1.0f);
basfx_playOwSfx(1.0f);
baMotor_80250D94(1.0f, 0.5f, 0.5f);
_player_getPosition(sp3C);
func_80294980(sp30);
@@ -815,7 +815,7 @@ void func_802A5120(void){
baphysics_set_target_horizontal_velocity(0.0f);
baphysics_set_velocity(0);
baphysics_set_vertical_velocity(2000.0f);
func_80299CF4(SFX_63_BANJO_UWAAAAOOH, 1.0f, 32000);
basfx_80299CF4(SFX_63_BANJO_UWAAAAOOH, 1.0f, 32000);
}
void func_802A5190(void){

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

@@ -57,7 +57,7 @@ int bslongleg_inSet(s32 move_indx){
}
void func_802A531C(void){
func_80299650(stateTimer_getPrevious(STATE_TIMER_2_LONGLEG), stateTimer_get(STATE_TIMER_2_LONGLEG));
basfx_updateClockSfxSource(stateTimer_getPrevious(STATE_TIMER_2_LONGLEG), stateTimer_get(STATE_TIMER_2_LONGLEG));
if(stateTimer_isAt(STATE_TIMER_2_LONGLEG, 0.01f))
sfxsource_playHighPriority(SFX_3EB_UNKNOWN);
}
@@ -130,7 +130,7 @@ void bsblongleg_enter_init(void){
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
func_802A5374();
func_80299BD4();
basfx_80299BD4();
}
void bsblongleg_enter_update(void){
@@ -168,7 +168,7 @@ void bsblongleg_stand_update(void){
enum bs_e next_state = 0;
func_802A531C();
func_80299594(1, 0.5f);
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(bakey_pressed(BUTTON_B))
@@ -422,7 +422,7 @@ void bsblongleg_slide_init(void){
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
baphysics_set_target_horizontal_velocity(0.0f);
func_80299AAC();
basfx_80299AAC();
D_8037D358 = 1.0f;
}
@@ -432,7 +432,7 @@ void bsblongleg_slide_update(void){
f32 sp2C;
func_802A531C();
func_80299AAC();
basfx_80299AAC();
D_8037D358 = ml_max_f(D_8037D358 - time_getDelta(), 0.0f);
if(player_isSliding()){

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

@@ -33,7 +33,7 @@ void bsbshock_charge_init(void){
baphysics_set_horizontal_velocity(yaw_getIdeal(), baphysics_get_target_horizontal_velocity());
func_8029E064(1);
func_8029E070(1);
func_80299BD4();
basfx_80299BD4();
D_8037D382 = sfxsource_createSfxsourceAndReturnIndex();
sfxsource_setSfxId(D_8037D382, SFX_2C_PULLING_NOISE);
func_8030E04C(D_8037D382, 1.4f, 0.4f, -1.2f);
@@ -95,10 +95,10 @@ void bsbshock_charge_update(void){
baphysics_set_target_horizontal_velocity(0.0f);
}
else{//L802A6D18
if(should_feathery_flap())
if(bainput_should_feathery_flap())
sp2C = BS_BFLAP;
if(should_beak_bust())
if(bainput_should_beak_bust())
sp2C = BS_F_BBUSTER;
}//L802A6D44
if(anctrl_isAt( aCtrl, 0.3637f) && D_8037D380)
@@ -177,10 +177,10 @@ void bsbshock_update(void){
if(player_isFallTumbling())
sp2C = BS_3D_FALL_TUMBLING;
if(should_feathery_flap())
if(bainput_should_feathery_flap())
sp2C = BS_BFLAP;
if(should_beak_bust())
if(bainput_should_beak_bust())
sp2C =BS_F_BBUSTER;
}

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

@@ -126,7 +126,7 @@ void func_802A7674() {
func_802A71D8();
func_802A7304();
if (should_look_first_person_camera()) {
if (bainput_should_look_first_person_camera()) {
state_id = badrone_look();
}
if (bakey_held(BUTTON_A)) {
@@ -286,7 +286,7 @@ void func_802A7BD0(void) {
func_80298760(func_80296560());
baanim_playForDuration_onceSmooth(0x1A0, 1.4f);
func_80299BFC(1.0f);
basfx_playOwSfx(1.0f);
_player_getPosition(sp30);
func_80294980(sp24);
func_80257F18(sp24, sp30, &sp3C);
@@ -297,7 +297,7 @@ void func_802A7BD0(void) {
baphysics_set_horizontal_velocity(sp3C, baphysics_get_target_horizontal_velocity());
func_8029C7F4(1, 1, 2, BA_PHYSICS_LOCKED_ROTATION);
baMarker_collisionOff();
func_80292E48();
baeyes_close();
func_802A744C();
}
@@ -313,7 +313,7 @@ void func_802A7CA8(void) {
particleEmitter_setParticleVelocityRange(p_ctrl, -60.0f, -50.0f, -60.0f, 60.0f, 100.0f, 60.0f);
particleEmitter_emitN(p_ctrl, 1);
if (baanim_isAt(0.3f)) {
func_80292EA4();
baeyes_open();
}
if (anctrl_isStopped(baanim_getAnimCtrlPtr())) {
next_state = BS_2B_DIVE_IDLE;
@@ -325,7 +325,7 @@ void func_802A7CA8(void) {
void func_802A7D74(void) {
func_80297CA8();
baMarker_collisionOn();
func_80292EA4();
baeyes_open();
func_802A75B0();
}
@@ -337,7 +337,7 @@ void bsSwim_dive_init(void) {
baphysics_set_target_velocity(0);
func_802A744C();
pitch_setAngVel(200.0f, 2.5f);
func_80299BD4();
basfx_80299BD4();
D_8037D396 = 0;
}
@@ -405,7 +405,7 @@ void func_802A7F6C(void) {
batimer_set(0, 0.0f);
batimer_set(1, 0.0f);
func_802906A4(3);
func_80299CF4(SFX_CA_BANJO_DROWNING_1, 1.0f, 24000);
basfx_80299CF4(SFX_CA_BANJO_DROWNING_1, 1.0f, 24000);
}
void func_802A8098(void) {
@@ -423,7 +423,7 @@ void func_802A8098(void) {
|| batimer_isAt(1, 0.8f)
|| batimer_isAt(1, 1.4f)
) {
func_80299CF4(SFX_CB_BANJO_DROWNING_2, 1.0f, 24000);
basfx_80299CF4(SFX_CB_BANJO_DROWNING_2, 1.0f, 24000);
}
switch (D_8037D396) {
case 0:

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

@@ -112,7 +112,7 @@ void func_802A8A40(void){
}
void func_802A8AD8(void){
func_80299650(stateTimer_getPrevious(STATE_TIMER_3_TURBO_TALON), stateTimer_get(STATE_TIMER_3_TURBO_TALON));
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);
stateTimer_set(STATE_TIMER_3_TURBO_TALON, get_turbo_duration());
@@ -190,7 +190,7 @@ enum bs_e func_802A8D84(enum bs_e arg0){
if( bastick_getZone(arg0) > 0)
arg0 = BS_16_BTROT_WALK;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
arg0 = badrone_look();
if(func_8028B094())
@@ -217,14 +217,14 @@ void bsbtrot_enter_init(void){
func_8029C7F4(1,1,2, BA_PHYSICS_NORMAL);
baphysics_set_target_horizontal_velocity(0.0f);
func_802A8A40();
func_80299BD4();
func_802952A8(0,0);
basfx_80299BD4();
bainput_enable(0,0);
}
void bsbtrot_enter_update(void){
enum bs_e next_state = 0;
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
func_802952A8(0,1);
bainput_enable(0,1);
func_80299628(1);
if(anctrl_isStopped(aCtrl))
next_state = BS_15_BTROT_IDLE;
@@ -237,7 +237,7 @@ void bsbtrot_enter_update(void){
}
void bsbtrot_enter_end(void){
func_802952A8(0,1);
bainput_enable(0,1);
func_802A8BB0();
}
@@ -413,13 +413,13 @@ void bsbtrot_jump_update(void){
func_8029957C(1);
D_8037D3A4 = 3;
if(220.0f < baphysics_get_target_horizontal_velocity())
func_80299AAC();
basfx_80299AAC();
func_8029C22C();
}
break;
case 3://L802A9660
if(220.0f < baphysics_get_target_horizontal_velocity())
func_80299AAC();
basfx_80299AAC();
func_802A9320();
func_80299628(1);
if(anctrl_isStopped(aCtrl)){
@@ -432,7 +432,7 @@ void bsbtrot_jump_update(void){
break;
case 4://L802A96F0
if(220.0f < baphysics_get_target_horizontal_velocity())
func_80299AAC();
basfx_80299AAC();
func_802A9320();
func_80299628(1);
@@ -446,7 +446,7 @@ void bsbtrot_jump_update(void){
break;
case 5://L802A9780
if(220.0f < baphysics_get_target_horizontal_velocity())
func_80299AAC();
basfx_80299AAC();
func_802A9320();
func_80299628(1);
if(anctrl_isStopped(aCtrl))
@@ -454,7 +454,7 @@ void bsbtrot_jump_update(void){
break;
}//LL802A97D0
if(should_peck())
if(bainput_should_peck())
sp2C = BS_11_BPECK;
if(player_isFallTumbling())
@@ -513,7 +513,7 @@ void bsbtrot_slide_init(void){
pitch_setAngVel(1000.0f, 12.0f);
roll_setAngularVelocity(1000.0f, 12.0f);
baphysics_set_target_horizontal_velocity(0.0f);
func_80299AAC();
basfx_80299AAC();
D_8037D3A0 = 1.0f;
}
@@ -525,7 +525,7 @@ void bsbtrot_slide_update(void){
func_802A8AD8();
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
func_802A87C0();
func_80299AAC();
basfx_80299AAC();
D_8037D3A0 = ml_max_f(D_8037D3A0-time_getDelta(), 0.0f);
if(player_shouldSlideTrot()){
func_80294480(sp30);
@@ -612,7 +612,7 @@ void bsbtrot_fall_update(void){
anctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
func_8029957C(1);
if(220.0f < baphysics_get_target_horizontal_velocity()){
func_80299AAC();
basfx_80299AAC();
}
func_8029C22C();
D_8037D3A4 = 2;
@@ -620,7 +620,7 @@ void bsbtrot_fall_update(void){
break;
case 2://L802A9E78
if(220.0f < baphysics_get_target_horizontal_velocity())
func_80299AAC();
basfx_80299AAC();
func_802A9320();
func_80299628(1);
@@ -634,7 +634,7 @@ void bsbtrot_fall_update(void){
break;
case 3://L802A9F08
if(220.0f < baphysics_get_target_horizontal_velocity())
func_80299AAC();
basfx_80299AAC();
func_802A9320();
func_80299628(1);
@@ -648,7 +648,7 @@ void bsbtrot_fall_update(void){
break;
case 4://802A9F98
if(220.0f < baphysics_get_target_horizontal_velocity())
func_80299AAC();
basfx_80299AAC();
func_802A9320();
func_80299628(1);
@@ -710,7 +710,7 @@ void bsbtrot_ow_init(void){
func_802A8A40();
func_80298760(func_80296560());
baanim_playForDuration_onceSmooth(ASSET_66_ANIM_BSBTROT_OW, 1.1f);
func_80299BFC(1.0f);
basfx_playOwSfx(1.0f);
_player_getPosition(sp30);
func_80294980(sp24);
func_80257F18(sp24, sp30, &sp3C);
@@ -725,7 +725,7 @@ void bsbtrot_ow_init(void){
baphysics_set_vertical_velocity(func_802987C4());
baphysics_set_gravity(func_802987E4());
baMarker_collisionOff();
func_80292E48();
baeyes_close();
}
void bsbtrot_ow_update(void){
@@ -734,7 +734,7 @@ void bsbtrot_ow_update(void){
func_802B6FA8();
if(baanim_isAt(0.3f))
func_80292EA4();
baeyes_open();
if(player_isFallTumbling())
sp1C = BS_3D_FALL_TUMBLING;
@@ -752,7 +752,7 @@ void bsbtrot_ow_end(void){
func_80297CA8();
baphysics_reset_gravity();
baMarker_collisionOn();
func_80292EA4();
baeyes_open();
func_802A8BB0();
}

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

@@ -89,20 +89,20 @@ void bsbwhirl_enter_init(void){
core1_ce60_incOrDecCounter(FALSE);
func_8025A55C(0, 0xfa0, 0xd);
func_8025A6EC(0x25, 0x6d60);
func_80299BD4();
func_802952A8(1,0);
basfx_80299BD4();
bainput_enable(1,0);
}
void bsbwhirl_enter_update(void){
enum bs_e sp1C = 0;
func_802952A8(1,1);
bainput_enable(1,1);
if(anctrl_isStopped(baanim_getAnimCtrlPtr()))
sp1C = BS_1B_WONDERWING_IDLE;
bs_setState(sp1C);
}
void bsbwhirl_enter_end(void){
func_802952A8(1,1);
bainput_enable(1,1);
__bsbwhirl_end();
}
@@ -189,7 +189,7 @@ void bsbwhirl_jump_init(void){
baphysics_set_horizontal_velocity(yaw_getIdeal(), baphysics_get_target_horizontal_velocity());
baphysics_set_vertical_velocity(D_80364AE0);
baphysics_set_gravity(D_80364AE4);
func_80299B58(0.91f, 1.09f);
basfx_playJumpSfx(0.91f, 1.09f);
D_8037D3B4 = 0;
}

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

@@ -91,7 +91,7 @@ void bsbbuster_update(void){
D_8037D2B8 = 0;
if(anctrl_isAt(aCtrl, 0.24f))
func_80299BD4();
basfx_80299BD4();
switch(D_8037D2BA){
case 0://8029FDF0

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

@@ -72,7 +72,7 @@ void func_802A10D4(void){
if(func_8028B094())
s0 = 0x88;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
s0 = badrone_look();
if(bastick_getZone() > 0)
@@ -330,7 +330,7 @@ void func_802A18E8(s32 arg0){
baphysics_set_vertical_velocity(510.0f);
baphysics_set_gravity(-1200.0f);
baMarker_collisionOff();
func_80292E48();
baeyes_close();
D_8037D2D4 = 0;
}
@@ -339,7 +339,7 @@ void func_802A1A50(void){
sp1C= 0;
if(baanim_isAt(0.5f)){
func_80292EA4();
baeyes_open();
}
switch(D_8037D2D4){
case 0:
@@ -363,7 +363,7 @@ void func_802A1B28(void){
func_80297CA8();
baphysics_reset_gravity();
baMarker_collisionOn();
func_80292EA4();
baeyes_open();
func_802A02C0();
}
@@ -421,7 +421,7 @@ void bsbeemain_die_init(void){
baphysics_set_gravity(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
baMarker_collisionOff();
func_80292E48();
baeyes_close();
func_802914CC(0xd);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029C984();
@@ -471,7 +471,7 @@ void func_802A1F2C(void){
core1_ce60_incOrDecCounter(FALSE);
baphysics_reset_gravity();
func_80291548();
func_80292EA4();
baeyes_open();
func_802A02C0();
}

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

@@ -148,17 +148,17 @@ void bsclimb_move_update(void){
|| map == MAP_31_RBB_RUSTY_BUCKET_BAY
){
if(baanim_isAt(0.25f))
func_80299D2C(SFX_D2_QUIET_METALLIC, 1.1f, 32000);
basfx_80299D2C(SFX_D2_QUIET_METALLIC, 1.1f, 32000);
if(baanim_isAt(0.75f))
func_80299D2C(SFX_D2_QUIET_METALLIC, 1.2f, 32000);
basfx_80299D2C(SFX_D2_QUIET_METALLIC, 1.2f, 32000);
}
else{//L802ABB34
if(baanim_isAt(0.25f))
func_80299D2C(SFX_D3_JINXIE_SNIFFLING_1, 0.77f, 22000);
basfx_80299D2C(SFX_D3_JINXIE_SNIFFLING_1, 0.77f, 22000);
if(baanim_isAt(0.75f))
func_80299D2C(SFX_D3_JINXIE_SNIFFLING_1, 0.87f, 22000);
basfx_80299D2C(SFX_D3_JINXIE_SNIFFLING_1, 0.87f, 22000);
}//L802ABB84
if(!func_802AB788() && baphysics_get_vertical_velocity() < 30.0f)

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

@@ -49,7 +49,7 @@ 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);
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);
stateTimer_set(STATE_TIMER_3_TURBO_TALON, get_turbo_duration());
@@ -122,7 +122,7 @@ void bscroc_idle_update(void){
if(func_8028B094())
next_state = BS_61_CROC_FALL;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(bastick_getZone() > 0)
@@ -357,7 +357,7 @@ static void __bscroc_recoil_init(s32 damage){
baphysics_set_vertical_velocity(510.0f);
baphysics_set_gravity(-1200.0f);
baMarker_collisionOff();
func_80292E48();
baeyes_close();
D_8037D3EC = 0;
}
@@ -365,7 +365,7 @@ static void __bscroc_recoil_update(void){
enum bs_e next_state = 0;
func_802ABE70();
if(baanim_isAt(0.5f))
func_80292EA4();
baeyes_open();
switch(D_8037D3EC){
case 0:
@@ -387,7 +387,7 @@ void __bscroc_recoil_end(void){
func_80297CA8();
baphysics_reset_gravity();
baMarker_collisionOn();
func_80292EA4();
baeyes_open();
func_802ABFBC();
}
@@ -443,7 +443,7 @@ void bscroc_die_init(void){
baphysics_set_gravity(-1200.0f);
pitch_setAngVel(1000.0f, 12.0f);
baMarker_collisionOff();
func_80292E48();
baeyes_close();
func_802914CC(0xd);
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029C984();
@@ -496,7 +496,7 @@ void bscroc_die_end(void){
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_80291548();
func_80292EA4();
baeyes_open();
}
int bscroc_hitboxActive(void){

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

@@ -70,7 +70,7 @@ void bscrouch_init(void){
baphysics_get_velocity(sp28);
D_8037D400 = gu_sqrtf(sp28[0]*sp28[0] + sp28[2]*sp28[2]);
if(140.0f < D_8037D400)
func_80299AAC();
basfx_80299AAC();
if(func_8025801C(sp28, &sp20))
baphysics_set_target_yaw(sp20);
@@ -94,7 +94,7 @@ void bscrouch_update(void){
if(220.0f < sp30)
func_802929F8();
if(160.0f < sp30)
func_80299AAC();
basfx_80299AAC();
sp20 = yaw_getIdeal();
temp_f2 = mlAbsF(mlDiffDegF(sp20, yaw_get()));
@@ -187,22 +187,22 @@ enum bs_e func_802ADCD4(enum bs_e arg0){
arg0 = bs_getTypeOfJump();
}else{
if(should_wonderwing())
if(bainput_should_wonderwing())
func_80346C10(&arg0, -1, BS_1A_WONDERWING_ENTER, ITEM_10_GOLD_FEATHER, 1);
if(should_trot())
if(bainput_should_trot())
arg0 = BS_14_BTROT_ENTER;
if(should_poop_egg())
if(bainput_should_poop_egg())
func_80346C10(&arg0, -1, BS_A_EGG_ASS, ITEM_D_EGGS, 0);
if(should_shoot_egg())
if(bainput_should_shoot_egg())
func_80346C10(&arg0, -1, BS_9_EGG_HEAD, ITEM_D_EGGS, 0);
if(should_flap_flip())
if(bainput_should_flap_flip())
arg0 = BS_12_BFLIP;
if(should_beak_barge())
if(bainput_should_beak_barge())
arg0 = BS_BBARGE;

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

@@ -60,7 +60,7 @@ void bsdie_init(void){
batimer_set(0,2.9f);
D_8037D414 = 0;
baMarker_collisionOff();
func_80292E48();
baeyes_close();
}
void bsdie_update(void){
@@ -74,7 +74,7 @@ void bsdie_update(void){
anctrl_setSubRange(aCtrl, 0.0f, 1.0f);
anctrl_setPlaybackType(aCtrl, ANIMCTRL_ONCE);
baphysics_set_vertical_velocity(400.0f);
func_80299DB8();
basfx_80299DB8();
FUNC_8030E624(SFX_39_BANJO_AYE_2, 1.0f, 18000);
baMotor_80250D94(1.0f, 1.0f, 0.4f);
_bsdie_802ADE20();
@@ -83,7 +83,7 @@ void bsdie_update(void){
break;
case 1://L802AE134
if(_bsdie_802ADE00()){
func_80299E00();
basfx_80299E00();
FUNC_8030E624(SFX_38_BANJO_AYE_1, 1.0f, 18000);
baMotor_80250D94(1.0f, 0.5f, 0.4f);
D_8037D414 = 2;
@@ -131,5 +131,5 @@ void bsdie_end(void){
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_80291548();
func_80292EA4();
baeyes_open();
}

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

@@ -16,7 +16,7 @@ void bsDroneLook_init(void) {
f32 eye_rotation[3];
enum asset_e anim_id;
func_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.2f, 12000);
basfx_80299D2C(SFX_12D_CAMERA_ZOOM_CLOSEST, 1.2f, 12000);
func_8029BCF8(&anim_id, &anim_duration);
baanim_playForDuration_loopSmooth(anim_id, anim_duration);
func_8029C7F4(1, 1, 3, BA_PHYSICS_NORMAL);
@@ -76,7 +76,7 @@ void bsDroneLook_update(void) {
void bsDroneLook_end(void) {
if (func_80298850() == 0) {
func_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
basfx_80299D2C(SFX_12E_CAMERA_ZOOM_MEDIUM, 1.2f, 12000);
}
ncDynamicCamera_exitFirstPerson();
miscFlag_clear(MISC_FLAG_17_FIRST_PERSON_VIEW);

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

@@ -62,7 +62,7 @@ void bsjig_jiggy_update(void){
yaw_setIdeal(func_8029B41C());
if(anctrl_isAt(aCtrl, 0.6502f))
func_80299BD4();
basfx_80299BD4();
if(anctrl_isAt(aCtrl, 0.835f)){
D_8037D4B0++;
@@ -188,7 +188,7 @@ void bsjig_notedoor_update(void){
enum bs_e sp1C = 0;
if(baanim_isAt(0.59f) || baanim_isAt(0.84f))
func_80299CF4(SFX_3EA_UNKNOWN, 1.0f, 30000);
basfx_80299CF4(SFX_3EA_UNKNOWN, 1.0f, 30000);
if(baanim_isStopped())
sp1C = BS_1_IDLE;

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

@@ -9,7 +9,7 @@
#include "core2/ba/timer.h"
f32 func_80294438(void);
void func_80299B58(f32, f32);
void basfx_playJumpSfx(f32, f32);
f32 bastick_distance(void);
f32 bastick_getAngleRelativeToBanjo(void);
void baanim_playForDuration_loop(s32, f32);
@@ -29,7 +29,7 @@ u8 D_8037D4C2;
/* .code */
void func_802B1100(void){
func_80299B58(0.91f, 1.09f);
basfx_playJumpSfx(0.91f, 1.09f);
}
void bsjump_init(void){
@@ -141,13 +141,13 @@ void bsjump_update(void){
if(bakey_released(BUTTON_A))
D_8037D4C2 = 0;
if(should_feathery_flap())
if(bainput_should_feathery_flap())
sp34 = BS_BFLAP;
if(should_peck())
if(bainput_should_peck())
sp34 = BS_11_BPECK;
if(should_beak_bust())
if(bainput_should_beak_bust())
sp34 = BS_F_BBUSTER;
if(player_isStable()){
@@ -218,13 +218,13 @@ void bsjump_fall_update(void){
if(player_isFallTumbling())
sp2C = BS_3D_FALL_TUMBLING;
if(should_feathery_flap() && miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED))
if(bainput_should_feathery_flap() && miscFlag_isFalse(MISC_FLAG_5_HAS_PECKED))
sp2C = BS_BFLAP;
if(should_peck())
if(bainput_should_peck())
sp2C = BS_11_BPECK;
if(should_beak_bust())
if(bainput_should_beak_bust())
sp2C = BS_F_BBUSTER;
if(player_inWater())
@@ -393,7 +393,7 @@ void bsjump_tumble_init(void){
if(bafalldamage_get_state() == 1){
batimer_set(0, 0.5f);
batimer_set(1, 0.41f);
func_80299CF4(SFX_52_BANJO_YAH_OH, 1.0f, 22000);
basfx_80299CF4(SFX_52_BANJO_YAH_OH, 1.0f, 22000);
}else{
batimer_set(0, 0.0f);
batimer_set(1, 0.01f);
@@ -404,7 +404,7 @@ void bsjump_tumble_init(void){
void bsjump_tumble_update(void){
enum bs_e sp1C = 0;
if(batimer_decrement(1))
func_80299CF4(SFX_63_BANJO_UWAAAAOOH, 1.0f, 32000);
basfx_80299CF4(SFX_63_BANJO_UWAAAAOOH, 1.0f, 32000);
batimer_decrement(0);
func_802B6FA8();
@@ -412,13 +412,13 @@ void bsjump_tumble_update(void){
pitch_setIdeal(pitch_getIdeal() + 20.0f);
}
if(batimer_isNonzero(0)){
if(should_feathery_flap())
if(bainput_should_feathery_flap())
sp1C = BS_BFLAP;
if(should_peck())
if(bainput_should_peck())
sp1C = BS_11_BPECK;
if(should_beak_bust())
if(bainput_should_beak_bust())
sp1C = BS_F_BBUSTER;
}//L802B1F2C
@@ -441,5 +441,5 @@ void bsjump_tumble_end(void){
}
func_8029CB84();
baModel_setYDisplacement(0.0f);
func_80299E6C();
basfx_80299E6C();
}

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

@@ -22,10 +22,10 @@ void bsow_init(void){
anctrl_setDuration(plyr_mvmnt, 1.70000004768f);
anctrl_setPlaybackType(plyr_mvmnt, ANIMCTRL_ONCE);
anctrl_start(plyr_mvmnt, "bsow.c", 0x50);
func_80299BFC(1.0f);
basfx_playOwSfx(1.0f);
func_802B360C();
baMarker_collisionOff();
func_80292E48();
baeyes_close();
D_8037D4D0 = 0;
func_802B1FD0(1);
}
@@ -48,7 +48,7 @@ void bsow_update(void) {
}
if (baanim_isAt(0.3f) != 0) {
func_80292EA4();
baeyes_open();
}
if (player_isFallTumbling() != 0) {
sp1C = BS_3D_FALL_TUMBLING;
@@ -69,5 +69,5 @@ void bsow_end(void){
func_80297CA8();
baphysics_reset_gravity();
baMarker_collisionOn();
func_80292EA4();
baeyes_open();
}

20
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 (should_look_first_person_camera()) {
if (bainput_should_look_first_person_camera()) {
next_state = badrone_look();
}
if (bastick_getZone() > 0) {
@@ -187,7 +187,7 @@ void bspumpkin_jump_update(void) {
case 0:
if (baphysics_get_vertical_velocity() < 0.0f) {
if (func_8028B254(130)) {
func_80292E48();
baeyes_close();
anctrl_setDuration(anim_ctrl, 0.7f);
anctrl_setSubRange(anim_ctrl, 0.0f, 0.8059f);
anctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
@@ -201,7 +201,7 @@ void bspumpkin_jump_update(void) {
break;
case 1:
if (func_8028B254(130)) {
func_80292E48();
baeyes_close();
anctrl_setSubRange(anim_ctrl, 0.0f, 0.8059f);
anctrl_setPlaybackType(anim_ctrl, ANIMCTRL_ONCE);
D_8037D4E0 = 2;
@@ -218,7 +218,7 @@ void bspumpkin_jump_update(void) {
break;
case 3:
if (anctrl_isStopped(anim_ctrl)) {
func_80292EA4();
baeyes_open();
baphysics_set_target_horizontal_velocity(0.0f);
next_state = BS_48_PUMPKIN_IDLE;
}
@@ -236,7 +236,7 @@ void bspumpkin_jump_update(void) {
}
void bspumpkin_jump_end(void){
func_80292EA4();
baeyes_open();
baphysics_reset_gravity();
func_802B229C();
}
@@ -365,7 +365,7 @@ void __bspumpkin_bounce_init(s32 arg0) {
baphysics_set_vertical_velocity(510.0f);
baphysics_set_gravity(-1200.0f);
baMarker_collisionOff();
func_80292E48();
baeyes_close();
D_8037D4E0 = 0;
}
@@ -374,7 +374,7 @@ void __bspumpkin_bounce_update(void) {
next_state = 0;
if (baanim_isAt(0.61f)) {
func_80292EA4();
baeyes_open();
}
switch (D_8037D4E0) {
case 0:
@@ -397,7 +397,7 @@ void __bspumpkin_bounce_end(void) {
func_80297CA8();
baphysics_reset_gravity();
baMarker_collisionOn();
func_80292EA4();
baeyes_open();
func_802B229C();
}
@@ -458,7 +458,7 @@ void bspumpkin_die_init(void) {
ncDynamicCamD_func_802BF2C0(30.0f);
func_8029C984();
baMarker_collisionOff();
func_80292E48();
baeyes_close();
batimer_set(1, 2.9f);
D_8037D4E0 = 0;
}
@@ -528,7 +528,7 @@ void bspumpkin_die_end(void) {
baphysics_reset_gravity();
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_80292EA4();
baeyes_open();
func_80291548();
}

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

@@ -73,7 +73,7 @@ void bsslide_init(void){
baphysics_set_horizontal_velocity(yaw_getIdeal() ,baphysics_get_target_horizontal_velocity());
pitch_setAngVel(800.0f, 8.0f);
baphysics_set_target_horizontal_velocity(0.0f);
func_80299AAC();
basfx_80299AAC();
D_8037D524 = 0;
D_8037D528 = 1.0f;
@@ -85,7 +85,7 @@ void bsslide_update(void){
f32 sp2C;
f32 sp28;
func_80299AAC();
basfx_80299AAC();
D_8037D528 = ml_max_f(D_8037D528 - time_getDelta(), 0.0f);
if(player_isSliding()){
func_80294480(sp30);

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

@@ -34,7 +34,7 @@ void bssplat_init(void){
FUNC_8030E624(SFX_1F_HITTING_AN_ENEMY_3, 0.8f, 32750);
baMotor_80250D94(1.0f, 0.5f, 0.4f);
}
func_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 28000);
basfx_80299CF4(SFX_38_BANJO_AYE_1, 1.0f, 28000);
func_802B4570();
func_802BB3DC(0, 45.0f, 0.71f);
if(item_getCount(ITEM_14_HEALTH) == 0)

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

@@ -73,7 +73,7 @@ s32 func_802B488C(s32 arg0){
if(bakey_pressed(BUTTON_A))
retVal = bs_getTypeOfJump();
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
retVal = badrone_look();
if(player_isSliding())
@@ -106,7 +106,7 @@ void func_802B4A10(AnimCtrl *arg0){
}//L802B4A54
if(anctrl_isAt(arg0, 0.2057f)) //(30/145)
func_80292E48();
baeyes_close();
//L802B4A78
if(anctrl_isAt(arg0, 0.2555f)){ //(37/145)
@@ -124,7 +124,7 @@ void func_802B4A10(AnimCtrl *arg0){
}//L802B4B0C
if(anctrl_isAt(arg0, 0.3607f)){
func_80292EA4();
baeyes_open();
}//L802B4B30
if(anctrl_isAt(arg0, 0.4183f)){
@@ -149,7 +149,7 @@ void func_802B4A10(AnimCtrl *arg0){
}//L802B4BF4
if(anctrl_isAt(arg0, 0.6688f))
func_80292E48();
baeyes_close();
//L802B4C18
if(anctrl_isAt(arg0, 0.6964f)){
@@ -158,7 +158,7 @@ void func_802B4A10(AnimCtrl *arg0){
}//L802B4C50
if(anctrl_isAt(arg0, 0.7747f))
func_80292EA4();
baeyes_open();
//L802B4C74
if(anctrl_isAt(arg0, 0.7822f)){
@@ -204,7 +204,7 @@ void bsstand_update(void) {
sp18 = D_80364D20[D_8037D540];
if (sp18 & 8) {
if (sp18 & 4) {
if (anctrl_isAt(anim_ctrl, 0.0909f)) func_80299BD4();
if (anctrl_isAt(anim_ctrl, 0.0909f)) basfx_80299BD4();
if (anctrl_isAt(anim_ctrl, 0.0909f)) func_8029E070(1);
if (anctrl_isAt(anim_ctrl, 0.6818f)) func_8029E070(0);
}//L802B4E70
@@ -224,16 +224,16 @@ void bsstand_update(void) {
anctrl_start(anim_ctrl, "bsstand.c", 0x170);
}
} else {
if (anctrl_isAt(anim_ctrl, 0.069f)) func_80299D2C(SFX_4B_GULPING, 1.4f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.1677f)) func_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.0f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.2441f)) func_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.03f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.3141f)) func_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.06f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.3859f)) func_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.5f, 0x7D00);
if (anctrl_isAt(anim_ctrl, 0.414f)) func_80299CF4(SFX_2D_KABOING, 1.0f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.55f)) func_80299CF4(SFX_A3_BANJO_DOUBLE_COUGH, 1.0f, 0x6D60);
if (anctrl_isAt(anim_ctrl, 0.6187f)) func_80299D2C(SFX_A0_COUGHING, 1.7f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.7108f)) func_80299D2C(SFX_A0_COUGHING, 1.6f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.7927f)) func_80299D2C(SFX_A0_COUGHING, 1.5f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.069f)) basfx_80299D2C(SFX_4B_GULPING, 1.4f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.1677f)) basfx_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.0f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.2441f)) basfx_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.03f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.3141f)) basfx_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.06f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.3859f)) basfx_80299D2C(SFX_8B_KAZOOIE_RAWW, 1.5f, 0x7D00);
if (anctrl_isAt(anim_ctrl, 0.414f)) basfx_80299CF4(SFX_2D_KABOING, 1.0f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.55f)) basfx_80299CF4(SFX_A3_BANJO_DOUBLE_COUGH, 1.0f, 0x6D60);
if (anctrl_isAt(anim_ctrl, 0.6187f)) basfx_80299D2C(SFX_A0_COUGHING, 1.7f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.7108f)) basfx_80299D2C(SFX_A0_COUGHING, 1.6f, 0x4650);
if (anctrl_isAt(anim_ctrl, 0.7927f)) basfx_80299D2C(SFX_A0_COUGHING, 1.5f, 0x4650);
}
} else /*L802B50D4*/if ((sp18 & 0x10) != 0) {
func_802B4A10(anim_ctrl);
@@ -275,7 +275,7 @@ void bsstand_update(void) {
void bsstand_end(void){
func_8029E070(0);
func_802900FC();
func_80292EA4();
baeyes_open();
}
//bsStand_Land_init
@@ -291,12 +291,12 @@ void bsstand_landing_update(void){
if(anctrl_getIndex(sp18) == ASSET_D2_ANIM_BSSPLAT){
if(anctrl_isAt(sp18, 0.8264f)){
func_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
basfx_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
}
//L802B52F8
if(anctrl_isAt(sp18, 0.8864f)){
func_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
basfx_80299CF4(SFX_6F_BANJO_HEADSCRATCH, 1.0f, 0x36b0);
}
}
//L802B531C

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

@@ -5,7 +5,7 @@
#include "core2/ba/anim.h"
#include "core2/ba/physics.h"
extern void func_80295328(s32, f32);
extern void bainput_setDiveCooldown(s32, f32);
bool bsswim_inset(enum bs_e state_id);
@@ -119,11 +119,11 @@ void func_802B5774(void) {
}
if (bsbswim_inSet(prev_state) != 0) {
if (prev_state == BS_54_SWIM_DIE) {
func_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, 30000);
basfx_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, 30000);
} else {
func_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, (s32) ml_map_f(item_getCount(ITEM_17_AIR), 3600.0f, 0.0f, 8000.0f, 30000.0f));
basfx_80299CF4(SFX_AF_BANJO_CATCHING_BREATH, 1.0f, (s32) ml_map_f(item_getCount(ITEM_17_AIR), 3600.0f, 0.0f, 8000.0f, 30000.0f));
}
func_80295328(4, 0.7f);
bainput_setDiveCooldown(4, 0.7f);
}
if ((anctrl_getIndex(anim_ctrl) == ASSET_57_ANIM_BSSWIM_IDLE) && (prev_state != BS_4C_LANDING_IN_WATER)) {
anctrl_setSmoothTransition(anim_ctrl, 0);
@@ -170,10 +170,10 @@ void func_802B5950(void) {
if (!player_inWater()) {
next_state = BS_1_IDLE;
}
if (should_look_first_person_camera()) {
if (bainput_should_look_first_person_camera()) {
next_state = badrone_look();
}
if (should_dive()) {
if (bainput_should_dive()) {
next_state = BS_30_DIVE_ENTER;
}
if (func_80294524() && bakey_pressed(BUTTON_A)) {
@@ -250,7 +250,7 @@ void func_802B5C40(void) {
}
}
}
if (should_dive() != 0) {
if (bainput_should_dive() != 0) {
next_state = BS_30_DIVE_ENTER;
}
if (func_80294524() && bakey_pressed(BUTTON_A)) {

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

@@ -5,7 +5,7 @@
#include "core2/ba/timer.h"
void func_80292E80(s32, f32);
void baeyes_openSingleEye(s32, f32);
f32 func_8029B41C(void);
void ncDynamicCamD_func_802BF2C0(f32);
@@ -26,14 +26,14 @@ void func_802B6270(void){
void func_802B6314(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
if(anctrl_isAt(aCtrl, 0.0625f))
func_80292E48();
baeyes_close();
if(anctrl_isAt(aCtrl, 0.18f))
FUNC_8030E624(SFX_3EB_UNKNOWN, 1.0f, 18000);
if(anctrl_isAt(aCtrl, 0.8421f)){
func_80292E80(0, 0.3f);
func_80292E80(1, 0.3f);
baeyes_openSingleEye(0, 0.3f);
baeyes_openSingleEye(1, 0.3f);
}
if(anctrl_isAt(aCtrl, 0.84f))
@@ -41,7 +41,7 @@ void func_802B6314(void){
}
void func_802B63C8(void){
func_80292EA4();
baeyes_open();
func_80291548();
core1_ce60_incOrDecCounter(TRUE);
}

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

@@ -32,7 +32,7 @@ void bstwirl_init(void){
baphysics_set_type(BA_PHYSICS_LOCKED_ROTATION);
D_8037D5A0 = baphysics_get_target_horizontal_velocity();
baphysics_set_target_horizontal_velocity(600.0f);
func_80299CF4(SFX_32_BANJO_EGHEE, 1.0f, 0x6590);
basfx_80299CF4(SFX_32_BANJO_EGHEE, 1.0f, 0x6590);
_bstwirlHitboxActive = TRUE;
batimer_set(0, 0.01f);
D_8037D5A4 = 0;

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

@@ -161,7 +161,7 @@ void bswalk_creep_update(void){
if(func_8028B128())
next_state = BS_WALK_MUD;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
@@ -234,7 +234,7 @@ void bswalk_slow_upate(void){
if(func_8028B128())
next_state = BS_WALK_MUD;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
@@ -310,7 +310,7 @@ void bswalk_update(void){
next_state = BS_SKID;
}
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
@@ -385,7 +385,7 @@ void bswalk_fast_update(void){
if(baphysics_is_slower_than(18.0f))
next_state = BS_1_IDLE;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
break;
@@ -394,7 +394,7 @@ void bswalk_fast_update(void){
if(baphysics_is_slower_than(bsWalkSlowWalkWalkVelocityThreshold))
next_state = BS_2_WALK_SLOW;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
break;
@@ -402,7 +402,7 @@ void bswalk_fast_update(void){
if(baphysics_is_slower_than(bsWalkWalkFastWalkVelocityThreshold) && func_802B6EF4())
next_state = BS_WALK;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
break;
}//L802B7AA4
@@ -459,7 +459,7 @@ void bswalk_mud_update(void){
if(!bastick_getZone())
next_state = BS_1_IDLE;
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())

18
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(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(bastick_getZone() > 0)
@@ -390,14 +390,14 @@ static void __bswalrus_recoil_init(s32 damage){
baphysics_set_vertical_velocity(func_802987C4());
baphysics_set_gravity(func_802987E4());
baMarker_collisionOff();
func_80292E48();
baeyes_close();
func_802B8110();
}
static void __bswalrus_recoil_update(void){
enum bs_e next_state = 0;
if(baanim_isAt(0.5f))
func_80292EA4();
baeyes_open();
if(player_isStable())
next_state = BS_67_WALRUS_IDLE;
@@ -408,7 +408,7 @@ static void __bswalrus_recoil_update(void){
static void __bswalrus_recoil_end(void){
baphysics_reset_gravity();
baMarker_collisionOn();
func_80292EA4();
baeyes_open();
func_802B8048();
}
@@ -470,7 +470,7 @@ void bswalrus_die_init(void){
func_8025A2FC(0, 0xfa0);
comusic_playTrack(0x1A);
baMarker_collisionOff();
func_80292E48();
baeyes_close();
batimer_set(0, 1.5f);
func_802B8110();
D_8037D5C8 = 0;
@@ -513,7 +513,7 @@ void bswalrus_die_end(void){
pitch_setIdeal(0.0f);
roll_setIdeal(0.0f);
func_80291548();
func_80292EA4();
baeyes_open();
}
void bswalrus_drone_init(void){
@@ -578,7 +578,7 @@ void bswalrus_sled_update(void){
func_80299628(0);
func_802B7F28();
if(should_look_first_person_camera())
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(bakey_pressed(BUTTON_A))
@@ -736,7 +736,7 @@ void bswalrus_timeout_init(void) {
baMarker_collisionOff();
batimer_set(0, 2.9f);
func_802B813C();
func_80292E48();
baeyes_close();
}
void func_802B9830(void) {
@@ -751,7 +751,7 @@ void func_802B9880(void) {
func_80291548();
core1_ce60_incOrDecCounter(TRUE);
func_8025A904();
func_80292EA4();
baeyes_open();
func_802B80D0();
}