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

Documenting Player Utilities and Related

Browse Source
This commit is contained in:
Shmoopi
2024-11-03 17:19:48 +00:00
committed by Banjo Kazooie
parent 1772033ec8
commit 0d223bfc2b
78 changed files with 243 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -94,7 +94,7 @@ void bsant_idle_update(void){
enum bs_e new_state = 0;
func_80299628(0);
if(func_8028B094())
if(player_shouldFall())
new_state = BS_38_ANT_FALL;
if(bainput_should_look_first_person_camera())
@@ -138,7 +138,7 @@ void bsant_walk_update(void){
if(bastick_getZone() == 0 && baphysics_is_slower_than(1.0f))
sp1C = BS_35_ANT_IDLE;
if(func_8028B094())
if(player_shouldFall())
sp1C = BS_38_ANT_FALL;
if(bakey_pressed(BUTTON_A))
@@ -267,7 +267,7 @@ void bsant_fall_update(void){
break;
}
if(player_isStable()){
if(baflag_isTrue(BA_FLAG_19))
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM))
sp2C = badrone_transform();
else
sp2C = BS_35_ANT_IDLE;

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

@@ -54,7 +54,7 @@ void bseggass_update(void) {
} else if (0.6 < (f64) anctrl_getAnimTimer(plyr_mvmt)) {
next_state = func_802ADCD4(0);
}
if (func_8028B094())
if (player_shouldFall())
next_state = BS_2F_FALL;
bs_setState(next_state);
}

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

@@ -63,7 +63,7 @@ void bsegghead_update(void) {
} else if (0.65 < (f64) anctrl_getAnimTimer(aCtrl)) {
next_state = func_802ADCD4(0);
}
if (func_8028B094())
if (player_shouldFall())
next_state = BS_2F_FALL;
bs_setState(next_state);
}

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

@@ -596,7 +596,7 @@ void func_802A48B4(void) {
if (anctrl_isStopped(sp18)) {
next_state = BS_1_IDLE;
}
if (func_8028B094()) {
if (player_shouldFall()) {
next_state = BS_2F_FALL;
}
break;
@@ -743,7 +743,7 @@ void func_802A4EC8(void) {
if (player_isStable()) {
next_state = BS_20_LANDING;
}
if (anctrl_isStopped(sp18) && (func_8028B094() || func_80294530())) {
if (anctrl_isStopped(sp18) && (player_shouldFall() || func_80294530())) {
D_8037D346 = 1;
next_state = BS_24_FLY;
}
@@ -784,7 +784,7 @@ void func_802A503C(void){
void func_802A505C(void){
if(bs_getInterruptType() == BS_INTR_9){
func_8029A86C(2);
baflag_set(BA_FLAG_7);
baflag_set(BA_FLAG_7_TOUCHING_JIGGY);
func_8029CCC4();
}else{
func_80296608();

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

@@ -88,7 +88,7 @@ void bsbshock_charge_update(void){
}//L802A6CAC
if(func_8028B254(0x3C)){
if(anctrl_getAnimTimer(aCtrl) < 0.3637 && bakey_released(8)){
if(anctrl_getAnimTimer(aCtrl) < 0.3637 && bakey_released(BUTTON_A)){
D_8037D380 = 0;
}//L802A6CF4
if(player_isStable())

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

@@ -51,7 +51,7 @@ void func_802A8850(void){
}
f32 func_802A88B0(void){
if(func_8028B128())
if(player_isOnDangerousGround())
return D_80364AA0;
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
@@ -69,7 +69,7 @@ f32 func_802A8900(void){
}
f32 func_802A8934(void){
if(func_8028B128())
if(player_isOnDangerousGround())
return D_80364AB8;
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
@@ -79,7 +79,7 @@ f32 func_802A8934(void){
}
f32 func_802A8984(void){
if(func_8028B128())
if(player_isOnDangerousGround())
return D_80364AB4;
if(stateTimer_isActive(STATE_TIMER_3_TURBO_TALON))
@@ -193,7 +193,7 @@ enum bs_e func_802A8D84(enum bs_e arg0){
if(bainput_should_look_first_person_camera())
arg0 = badrone_look();
if(func_8028B094())
if(player_shouldFall())
arg0 = BS_71_BTROT_FALL;
if(func_802A8C60())
@@ -316,7 +316,7 @@ void bsbtrot_walk_update(void){
if(!bastick_getZone() && baphysics_is_slower_than(1.0f))
sp1C = BS_15_BTROT_IDLE;
if(func_8028B094())
if(player_shouldFall())
sp1C = BS_71_BTROT_FALL;
if(func_802A8C60())

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

@@ -69,7 +69,7 @@ void func_802A10D4(void){
s0 = 0;
func_80299628(0);
if(func_8028B094())
if(player_shouldFall())
s0 = 0x88;
if(bainput_should_look_first_person_camera())
@@ -111,7 +111,7 @@ void func_802A1214(void){
if(bastick_getZone() == 0 && baphysics_is_slower_than(1.0f))
s0 = BS_85_BEE_IDLE;
if(func_8028B094())
if(player_shouldFall())
s0 = BS_88_BEE_FALL;
if(bakey_pressed(BUTTON_A))
@@ -274,7 +274,7 @@ void func_802A170C(void){
break;
}
if(player_isStable()){
if(baflag_isTrue(BA_FLAG_19)){
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM)){
sp2c = badrone_transform();
}else{
if(bastick_getZone() > 0)
@@ -513,7 +513,7 @@ void func_802A2054(void){
}
void func_802A2098(void){
baflag_clear(BA_FLAG_1A);
baflag_clear(BA_FLAG_1A_OPEN_NOTEDOOR);
baanim_playForDuration_loopSmooth(ASSET_1DE_ANIM_BEE_IDLE, 3.0f);
yaw_setIdeal(func_8029B41C());
func_8029C7F4(1,1,3, BA_PHYSICS_NORMAL);

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

@@ -119,7 +119,7 @@ void bscroc_idle_update(void){
enum bs_e next_state = 0;
func_802ABE70();
func_80299628(0);
if(func_8028B094())
if(player_shouldFall())
next_state = BS_61_CROC_FALL;
if(bainput_should_look_first_person_camera())
@@ -163,7 +163,7 @@ void bscroc_walk_update(void){
if(bastick_getZone() == 0 && baphysics_is_slower_than(1.0f))
next_state = BS_5E_CROC_IDLE;
if(func_8028B094())
if(player_shouldFall())
next_state = BS_61_CROC_FALL;
if(bakey_pressed(BUTTON_B))
@@ -313,7 +313,7 @@ void bscroc_fall_update(void){
if(player_isStable()){
if(bastick_getZone() > 0 || (D_8037D3EC == 2 && anctrl_isStopped(aCtrl))){
if(baflag_isTrue(BA_FLAG_19)){
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM)){
next_state = badrone_transform();
}else{
next_state = BS_5E_CROC_IDLE;
@@ -544,7 +544,7 @@ void bscroc_bite_update(void){
}
if(D_8037D3F4 == 3){
if(func_8028B094())
if(player_shouldFall())
next_state = BS_61_CROC_FALL;
else
next_state = BS_CROC_WALK;

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

@@ -161,7 +161,7 @@ void bscrouch_update(void){
if(player_isSliding())
sp34 = BS_SLIDE;
if(func_8028B094())
if(player_shouldFall())
sp34 = BS_2F_FALL;
sp34 = func_802ADCD4(sp34);

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

@@ -42,7 +42,7 @@ void bsjig_jiggy_init(void){
func_8029151C(0xC);
func_8029E070(1);
func_8030E6D4(SFX_33_BANJO_AHOO);
baflag_clear(BA_FLAG_7);
baflag_clear(BA_FLAG_7_TOUCHING_JIGGY);
baflag_clear(BA_FLAG_F);
baMarker_collisionOff();
chJigsawDance_setState(marker_getActor(bsjig_gJiggyMarker), 1);
@@ -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);
baflag_clear(BA_FLAG_1A);
baflag_clear(BA_FLAG_1A_OPEN_NOTEDOOR);
anctrl_reset(aCtrl);
anctrl_setIndex(aCtrl, ASSET_282_ANIM_BSJIG_NOTEDOOR);
anctrl_setDuration(aCtrl, 3.6f);

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

@@ -173,7 +173,7 @@ void bsjump_fall_init(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
int sp20;
if(baflag_isTrue(BA_FLAG_7) && 700.0f < baphysics_get_vertical_velocity())
if(baflag_isTrue(BA_FLAG_7_TOUCHING_JIGGY) && 700.0f < baphysics_get_vertical_velocity())
baphysics_set_vertical_velocity(700.0f);
sp20 = (bs_getPrevState() == BS_12_BFLIP)? 0 : 1;

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

@@ -89,7 +89,7 @@ void bspumpkin_idle_update(void) {
s32 next_state;
next_state = 0;
if (func_8028B094()) {
if (player_shouldFall()) {
next_state = BS_4B_PUMPKIN_FALL;
}
if (bainput_should_look_first_person_camera()) {
@@ -134,7 +134,7 @@ void bspumpkin_walk_update(void) {
if ((bastick_getZone() == 0) && baphysics_is_slower_than(1.0f)) {
next_state = BS_48_PUMPKIN_IDLE;
}
if (func_8028B094()) {
if (player_shouldFall()) {
next_state = BS_4B_PUMPKIN_FALL;
}
if (bakey_pressed(BUTTON_A)) {
@@ -290,7 +290,7 @@ void bspumpkin_fall_update(void) {
break;
}
if (player_isStable() && ((bastick_getZone() > 0) || (D_8037D4E0 == 2 && anctrl_isStopped(anim_ctrl)))) {
if (baflag_isTrue(BA_FLAG_19)) {
if (baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM)) {
next_state = badrone_transform();
} else {
next_state = BS_48_PUMPKIN_IDLE;

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

@@ -125,7 +125,7 @@ void func_802B3954(void) {
if (player_isFallTumbling() && D_8037D500 == 0) {
next_state = BS_3D_FALL_TUMBLING;
}
if (anctrl_isStopped(anim_ctrl) && func_8028B094() && (D_8037D500 == 0)) {
if (anctrl_isStopped(anim_ctrl) && player_shouldFall() && (D_8037D500 == 0)) {
next_state = BS_2F_FALL;
}
bs_setState(next_state);

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

@@ -55,7 +55,7 @@ void bssplat_update(void){
if(140.0f < baphysics_get_target_horizontal_velocity())
func_802929F8();
if(func_8028B094())
if(player_shouldFall())
sp1C = BS_2F_FALL;
if(anctrl_isStopped(aCtrl)){
@@ -71,7 +71,7 @@ void bssplat_update(void){
if(anctrl_isStopped(aCtrl))
sp1C = BS_1_IDLE;
if(func_8028B094())
if(player_shouldFall())
sp1C = BS_2F_FALL;
break;
}//L802B4808

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

@@ -266,7 +266,7 @@ void bsstand_update(void) {
func_8029E070(0);
}
}
if (func_8028B094() != 0) {
if (player_shouldFall() != 0) {
next_state = BS_2F_FALL;
}
bs_setState(next_state);

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

@@ -43,7 +43,7 @@ void func_802B6D00(void){
sp1C = bastick_getZonePosition();
sp18 = bastick_getZone();
if(func_8028B128()){
if(player_isOnDangerousGround()){
if(sp18 == 0){
baphysics_set_target_horizontal_velocity(0.0f);
}else{//L802B6D48
@@ -158,13 +158,13 @@ void bswalk_creep_update(void){
next_state = BS_4_WALK_FAST;
break;
}//L802B7194
if(func_8028B128())
if(player_isOnDangerousGround())
next_state = BS_WALK_MUD;
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))
@@ -231,13 +231,13 @@ void bswalk_slow_upate(void){
next_state = BS_4_WALK_FAST;
break;
}//L802B7194
if(func_8028B128())
if(player_isOnDangerousGround())
next_state = BS_WALK_MUD;
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))
@@ -303,7 +303,7 @@ void bswalk_update(void){
next_state = BS_4_WALK_FAST;
break;
}//L802B76B8
if(func_8028B128())
if(player_isOnDangerousGround())
next_state = BS_WALK_MUD;
if(func_8028B4C4() && bsWalkSkidVelocity < baphysics_get_horizontal_velocity()){
@@ -313,7 +313,7 @@ void bswalk_update(void){
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))
@@ -406,14 +406,14 @@ void bswalk_fast_update(void){
next_state = badrone_look();
break;
}//L802B7AA4
if(func_8028B128())
if(player_isOnDangerousGround())
next_state = BS_WALK_MUD;
if(func_8028B4C4() && bsWalkSkidVelocity < baphysics_get_horizontal_velocity()){
next_state = BS_SKID;
}
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))
@@ -453,7 +453,7 @@ void bswalk_mud_update(void){
func_8029AD28(0.4f, 4);
func_8029AD28(0.9f, 3);
func_802B6D00();
if(!func_8028B128())
if(!player_isOnDangerousGround())
next_state = BS_2_WALK_SLOW;
if(!bastick_getZone())
@@ -462,7 +462,7 @@ void bswalk_mud_update(void){
if(bainput_should_look_first_person_camera())
next_state = badrone_look();
if(func_8028B094())
if(player_shouldFall())
next_state = BS_2F_FALL;
if(bakey_held(BUTTON_Z))

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

@@ -159,7 +159,7 @@ void bswalrus_idle_update(void){
func_80299628(0);
if(func_8028B094())
if(player_shouldFall())
next_state = BS_6A_WALRUS_FALL;
if(bainput_should_look_first_person_camera())
@@ -197,7 +197,7 @@ void bswalrus_walk_update(void){
if(bastick_getZone() == 0 && baphysics_is_slower_than(1.0f))
next_state = BS_67_WALRUS_IDLE;
if(func_8028B094())
if(player_shouldFall())
next_state = BS_6A_WALRUS_FALL;
if(bakey_pressed(BUTTON_A))
@@ -352,7 +352,7 @@ void bswalrus_fall_update(void){
if( bastick_getZone() > 0
|| (D_8037D5C8 == 2 && anctrl_isStopped(aCtrl))
){
if(baflag_isTrue(BA_FLAG_19))
if(baflag_isTrue(BA_FLAG_19_SHOULD_TRANSFORM))
next_state = badrone_transform();
else
next_state = BS_67_WALRUS_IDLE;

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

@@ -80,7 +80,7 @@ void func_802B9B14(void){
break;
case 5: // L802B9BE8
if(baanim_isStopped()){
if(func_8028ADF0())
if(wishyWashyFlag_get())
next_state = BS_1_IDLE;
else
func_802B9980(6);