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

Merge branch 'mr-origin-55'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-05 19:56:43 -05:00
parent ec98c1620c 1bf68887e6
commit a39dfa2021
62 changed files with 218 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/core1/code_11AC0.c
View File

@@ -316,7 +316,7 @@ void func_8024F890(u8 arg0, enum comusic_e arg1){
alCSPSetSeq(&D_80281720[arg0].cseqp, &D_80281720[arg0].cseq);
alCSPPlay(&D_80281720[arg0].cseqp);
alCSPSetVol(&D_80281720[arg0].cseqp, D_80281720[arg0].unk0);
if(player_is_present() && func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_is_present() && player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8025F3F0(&D_80281720[arg0].cseqp, 0.0f, 1.0f);
}
else{
@@ -427,7 +427,7 @@ void func_8024FE44(u8 arg0, f32 arg1, f32 arg2){
D_80281720[arg0].unk17C = arg1;
D_80281720[arg0].unk180 = arg2;
if(func_80250074(arg0) == 0){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8025F3F0(&D_80281720[arg0].cseqp, 0.0f, 1.0f);
}else{
func_8025F3F0(&D_80281720[arg0].cseqp, arg1, arg2);

22
src/core1/code_CE60.c
View File

@@ -170,7 +170,7 @@ void func_8024AED8(void){
}
void func_8024AF00(s32 arg0, s32 arg1){
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(arg0);
}
else{
@@ -208,7 +208,7 @@ void func_8024AF48(void){
case MAP_7_TTC_TREASURE_TROVE_COVE: // L8024B094
func_8024A9EC(0);
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x600);
}
else if(func_8024A8DC(-0x12C, 0x58c, 0x866)
@@ -228,7 +228,7 @@ void func_8024AF48(void){
case MAP_B_CC_CLANKERS_CAVERN: // L8024B158
func_8024A9EC(0);
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
if(!(D_802806F8[1] < 0x28b)){
func_8024A8AC(0x8180, 5.0f);
}
@@ -242,7 +242,7 @@ void func_8024AF48(void){
break;
case MAP_12_GV_GOBIS_VALLEY:// L8024B1BC
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8020);
}
else if(func_8024A8DC(-0xf96, 0x1626, 0xe74)){
@@ -262,7 +262,7 @@ void func_8024AF48(void){
break;
case MAP_1_SM_SPIRAL_MOUNTAIN: // L8024B23C
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x9000);
}
else{
@@ -360,7 +360,7 @@ void func_8024AF48(void){
break;
case MAP_45_CCW_AUTUMN:// L8024B4D4
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x600);
}
else{
@@ -382,7 +382,7 @@ void func_8024AF48(void){
break;
case MAP_27_FP_FREEZEEZY_PEAK:// L8024B538
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x400);
}
else if( mapSpecificFlags_get(0) && !jiggyscore_isCollected(JIGGY_2F_FP_XMAS_TREE)){
@@ -453,7 +453,7 @@ void func_8024AF48(void){
break;
case MAP_6B_GL_180_NOTE_DOOR:// L8024B704
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8800);
}
else if(func_8024A8DC(0x10eb, 0x4f5, 0x730)) {
@@ -476,7 +476,7 @@ void func_8024AF48(void){
break;
case MAP_70_GL_CC_LOBBY:// L8024B7B4
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8100);
}
else if(func_8024A8DC(-0x19d6, -0x1d3, 0x71e)){
@@ -520,7 +520,7 @@ void func_8024AF48(void){
break;
case MAP_71_GL_STATUE_ROOM:// L8024B8C0
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x200);
}
else if(func_8024A8DC(-0xf0e, -0x15a, 0x302)){
@@ -570,7 +570,7 @@ void func_8024AF48(void){
break;
case MAP_78_GL_RBB_AND_MMM_PUZZLE:// L8024BA98
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
func_8024A880(0x8200);
}
else if(0x15a <= D_802806F8[1] && func_8024A8DC(-0x89a, 0x21a, 0x368)){

2
src/core2/ba/falldamage.c
View File

@@ -124,7 +124,7 @@ void bafalldamage_init(void){
void bafalldamage_update(void){
s32 player_position;
player_position = func_8028ECAC();
if(func_8028B2E8() || (func_8028EE84() != BSWATERGROUP_0_NONE) || player_position == BSGROUP_A_FLYING){
if(player_isStable() || (player_getWaterState() != BSWATERGROUP_0_NONE) || player_position == BSGROUP_A_FLYING){
bafalldamage_start();
bafalldamage_set_state(1);
}

4
src/core2/ba/marker.c
View File

@@ -529,7 +529,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
player_getPosition(spA0);
jiggy_id = chjiggy_getJiggyId(actor);
if( jiggy_id != JIGGY_2F_FP_XMAS_TREE
|| (func_8028B2E8() && !(3600.0f < ml_distanceSquared_vec3f(actor->position, spA0)))
|| (player_isStable() && !(3600.0f < ml_distanceSquared_vec3f(actor->position, spA0)))
){
jiggyscore_setCollected(jiggy_id, TRUE);
item_adjustByDiffWithoutHud(ITEM_26_JIGGY_TOTAL, 1);
@@ -686,7 +686,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
break;
case MARKER_6B_GLOOPBUBBLE: //L8028CD20
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER){
item_adjustByDiffWithHud(ITEM_17_AIR, fxairscore_count_to_time(2));
}
break;

2
src/core2/ba/model.c
View File

@@ -269,7 +269,7 @@ void baModel_setVisible(s32 arg0){
}
void baModel_802921D4(f32 arg0[3]){
if(func_8028EE84() == BSWATERGROUP_0_NONE){
if(player_getWaterState() == BSWATERGROUP_0_NONE){
D_8037C150.unk0 = 1;
D_8037C150.unk4[0] = arg0[0];
D_8037C150.unk4[1] = arg0[1];

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

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

@@ -48,9 +48,10 @@ void bsbshock_charge_update(void){
AnimCtrl *aCtrl = baanim_getAnimCtrlPtr();
f32 sp1C[3];
if(func_8028B2E8()){
if(globalTimer_getTime() % 2)
if(player_isStable()) {
if(globalTimer_getTime() % 2) {
func_8029C348();
}
}
else
{//L802A6B94
@@ -64,7 +65,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 +91,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 +173,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

6
src/core2/ch/bigbutt.c
View File

@@ -74,7 +74,7 @@ void func_802C5FF8(Actor *this){
if( !this->unk138_28
&& actor_animationIsAt(this, 0.4f)
&& randf() < 0.14
&& func_8028EE84() != BSWATERGROUP_2_UNDERWATER
&& player_getWaterState() != BSWATERGROUP_2_UNDERWATER
){
func_8030E878(SFX_2B_BULL_MOO_1, randf2(0.9f, 1.1f), 32000, this->position, 0.0f, 2000.0f);
}
@@ -136,7 +136,7 @@ void func_802C6240(Actor *this){
|| actor_animationIsAt(this, 0.4f)
|| actor_animationIsAt(this, 0.536f)
){
if(func_8028EE84() != BSWATERGROUP_2_UNDERWATER){
if(player_getWaterState() != BSWATERGROUP_2_UNDERWATER){
func_8030E878(SFX_C8_CRUNCH,randf2(0.93f, 1.07f),10000, this->position, 0.0f, 1800.0f);
}
}
@@ -203,7 +203,7 @@ void func_802C6240(Actor *this){
subaddie_set_state(this, 8);
}
func_802C5F44(this);
if(actor_animationIsAt(this, 0.35f) && func_8028EE84() != BSWATERGROUP_2_UNDERWATER){
if(actor_animationIsAt(this, 0.35f) && player_getWaterState() != BSWATERGROUP_2_UNDERWATER){
func_8030E58C(SFX_3C_BULL_GROWN, randf()/10.0f + 1.0);
this->unk10_12--;
}

4
src/core2/ch/snowman.c
View File

@@ -269,7 +269,7 @@ void chSnowman_update(Actor *this){
else{//L802E2380
if( __chSnowman_isPlayerInAttackRange(this, 500, 2750)
&& __chSnowman_isYawNearYawTarget(this, 3)
&& func_8028EE84() != BSWATERGROUP_2_UNDERWATER
&& player_getWaterState() != BSWATERGROUP_2_UNDERWATER
&& !__chSnowman_CCW_playerInProtectedZone()
){
subaddie_set_state_with_direction(this, CHSNOWMAN_STATE_2_ATTACK, 0.01f, 1);
@@ -285,7 +285,7 @@ void chSnowman_update(Actor *this){
else if(
0.98 < animctrl_getAnimTimer(this->animctrl)
|| !__chSnowman_isPlayerInAttackRange(this, 500, 2750)
|| func_8028EE84() == BSWATERGROUP_2_UNDERWATER
|| player_getWaterState() == BSWATERGROUP_2_UNDERWATER
|| __chSnowman_CCW_playerInProtectedZone()
){
__chSnowman_enterIdle(this);

2
src/core2/code_12F30.c
View File

@@ -120,7 +120,7 @@ void func_80299EC0(f32 arg0[3]) {
if (D_8037C6F0.unk0 == 1) {
sp78 = 50;
} else if (func_8028EE84() == BSWATERGROUP_0_NONE) {
} else if (player_getWaterState() == BSWATERGROUP_0_NONE) {
sp78 = 200;
} else {
sp78 = 250;

14
src/core2/code_14420.c
View File

@@ -455,7 +455,7 @@ enum bs_14420_e func_8029BAF0(void){
return BS14420_D_WONDERWING;
}
if (player_inWater()) {
switch(func_8028EE84()){
switch(player_getWaterState()){
case BSWATERGROUP_2_UNDERWATER:
return BS14420_5_UNDERWATER;
case BSWATERGROUP_1_SURFACE:
@@ -721,9 +721,9 @@ void func_8029C674(void) {
f32 sp1C[3];
D_8037D1E8 = FALSE;
if (func_80298850() == 4) {
if (func_80298850() == BSGROUP_4_LOOK) {
D_8037D1E8 = TRUE;
miscflag_set(0x17);
miscflag_set(MISC_FLAG_17_FPV);
ncDynamicCamera_enterFirstPerson();
func_8028E9C4(5, sp1C);
ncFirstPersonCamera_setZoomedOutPosition(sp1C);
@@ -748,12 +748,12 @@ void func_8029C6D0(void) {
void func_8029C748(void) {
if (D_8037D1E8) {
miscflag_clear(0x17);
miscflag_clear(MISC_FLAG_17_FPV);
ncDynamicCamera_exitFirstPerson();
}
}
enum bs_e func_8029C780(void){
enum bs_e bs_getTypeOfJump(void){
if(button_held(BUTTON_Z) && can_flap_flip())
return BS_12_BFLIP;
@@ -831,7 +831,7 @@ s32 func_8029C9C0(s32 arg0){
return arg0;
if(button_pressed(BUTTON_A))
arg0 = func_8029C780();
arg0 = bs_getTypeOfJump();
if(button_pressed(BUTTON_B) && can_claw())
arg0 = BS_CLAW;
@@ -839,7 +839,7 @@ s32 func_8029C9C0(s32 arg0){
if(button_held(BUTTON_Z) && should_beak_barge())
arg0 = BS_BBARGE;
if(func_80294F78())
if(should_look_first_person_camera())
arg0 = badrone_look();
if(player_isSliding())

6
src/core2/code_16010.c
View File

@@ -186,7 +186,7 @@ bool func_8029D66C(void){
case MAP_6E_GL_GV_LOBBY:
case MAP_72_GL_BGS_LOBBY:
case MAP_8E_GL_FURNACE_FUN://L8029D6FC
return func_80294610(0xE000) && func_8028B2E8();
return func_80294610(0xE000) && player_isStable();
case MAP_31_RBB_RUSTY_BUCKET_BAY:
player_getPosition(sp2C);
@@ -228,7 +228,7 @@ bool func_8029D7B4(void){
&& func_8028ECAC() != BSGROUP_9_LONG_LEG
&& miscflag_isFalse(MISC_FLAG_E_TOUCHING_WADING_BOOTS)
&& sp1C != BS_25_LONGLEG_ENTER
&& func_8028EE84() != BSWATERGROUP_2_UNDERWATER
&& player_getWaterState() != BSWATERGROUP_2_UNDERWATER
&& func_8028EC04() < 1U
&& func_80297C6C() != 3
&& bs_getState() != BS_3D_FALL_TUMBLING
@@ -254,7 +254,7 @@ void func_8029D968(void){
}
temp_v0 = func_8029463C();
if(temp_v0 != NULL){
sp18 = (temp_v0->flags & 0x4000) && func_8028B2E8();
sp18 = (temp_v0->flags & 0x4000) && player_isStable();
}
if (sp1C || sp18) {
rumbleManager_80250D94(1.0f, 0.5f, 0.4f);

16
src/core2/code_39D0.c
View File

@@ -107,15 +107,15 @@ s32 can_wonderwing(void){
return ability_hasLearned(ABILITY_12_WONDERWING);
}
int func_8028ACD8(void){
int can_view_first_person(void){
if( map_get() == MAP_27_FP_FREEZEEZY_PEAK && mapSpecificFlags_get(0xd)){
return 0;
}
if(ncFirstPersonCamera_getState() == 3)
if(ncFirstPersonCamera_getState() == FIRSTPERSON_STATE_3_EXIT)
return 0;
if(!func_8028B2E8() && !player_inWater())
if(!player_isStable() && !player_inWater())
return 0;
return 1;
}
@@ -205,10 +205,10 @@ int player_shouldSlideTrot(void){
}
bool func_8028B254(s32 arg0) {
return (func_8028B2E8() || (baphysics_get_vertical_velocity() < 0.0f && (player_getYPosition() - func_80294438()) < (f32) arg0));
return (player_isStable() || (baphysics_get_vertical_velocity() < 0.0f && (player_getYPosition() - func_80294438()) < (f32) arg0));
}
int func_8028B2E8(void){
int player_isStable(void){
return D_8037BF60 && baphysics_get_vertical_velocity() < 0.0f;
}
@@ -232,10 +232,10 @@ bool func_8028B3B4(void) {
return FALSE;
}
bool func_8028B424(void){
bool player_isFallTumbling(void){
s32 sp1C;
if (func_8028B2E8()) {
if (player_isStable()) {
return FALSE;
}
if (!bafalldamage_get_damage(&sp1C)) {
@@ -280,7 +280,7 @@ void func_8028B534(void){
D_8037BF62 = 1;
}
else{
if(func_8028B2E8() || sp1C == BSGROUP_A_FLYING || sp1C == BSGROUP_5_CLIMB){
if(player_isStable() || sp1C == BSGROUP_A_FLYING || sp1C == BSGROUP_5_CLIMB){
D_8037BF62 = 0;
}
}

2
src/core2/code_43800.c
View File

@@ -30,7 +30,7 @@ Actor *func_802CA7BC(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx){
f32 sp40;
f32 sp34[3];
sp60 = (func_8028EE84() == BSWATERGROUP_2_UNDERWATER) ? 8.0f : 4.0f;
sp60 = (player_getWaterState() == BSWATERGROUP_2_UNDERWATER) ? 8.0f : 4.0f;
this = marker_getActor(marker);
if( !func_8028F070()
|| !func_8028F150()

4
src/core2/code_45310.c
View File

@@ -446,7 +446,7 @@ void func_802CCC5C(Actor *this) {
&& !func_8028F25C()
&& (sp58 > 800.0f)
&& (this->marker->unk14_21)
&& (func_8028EE84() != BSWATERGROUP_2_UNDERWATER)
&& (player_getWaterState() != BSWATERGROUP_2_UNDERWATER)
&& func_802CC57C(this, sp8C)
) {
sp8C[0] = 0.0f;
@@ -463,7 +463,7 @@ void func_802CCC5C(Actor *this) {
spBC = 1;
}
if (this->state == 3) {
if (func_8028F25C() || (func_8028EE84() == BSWATERGROUP_2_UNDERWATER)) {
if (func_8028F25C() || (player_getWaterState() == BSWATERGROUP_2_UNDERWATER)) {
func_802CC640(this, 4);
} else {
if (local->unk3A == 0) {

4
src/core2/code_47BD0.c
View File

@@ -247,7 +247,7 @@ void chBeeSwarm_802CF434(Actor *this) {
void chBeeSwarm_802CF518(Actor *this) {
if( func_803292E0(this)
&& func_80329530(this, 900)
&& func_8028EE84() == BSWATERGROUP_0_NONE
&& player_getWaterState() == BSWATERGROUP_0_NONE
&& player_getTransformation() != TRANSFORM_6_BEE
) {
subaddie_set_state(this, 3);
@@ -258,7 +258,7 @@ void chBeeSwarm_802CF57C(Actor *this) {
ActorLocal_core2_47BD0 *local;
local = (ActorLocal_core2_47BD0 *) &this->local;
if (!func_803292E0(this) || !func_80329530(this, 900) || func_8028EE84() != BSWATERGROUP_0_NONE) {
if (!func_803292E0(this) || !func_80329530(this, 900) || player_getWaterState() != BSWATERGROUP_0_NONE) {
subaddie_set_state(this, 5);
func_802CEF54(this, local->unkC, 100.0f);
}

6
src/core2/code_6B30.c
View File

@@ -29,7 +29,7 @@ void func_8028DB04(void){
D_8037BFA0 = 2;
}
enum hitbox_e func_8028DB14(ActorMarker *arg0){
enum hitbox_e hitbox_getHitboxForActor(ActorMarker *arg0){
s32 retVal;
if(D_8037BFA0)
return HITBOX_3_BEAK_BOMB;
@@ -77,10 +77,10 @@ enum hitbox_e func_8028DB14(ActorMarker *arg0){
break;
case BS_5_JUMP://8028DCD8
case BS_3D_FALL_TUMBLING:
if(baphysics_get_vertical_velocity() < 0.0f && !func_8028B2E8())
if(baphysics_get_vertical_velocity() < 0.0f && !player_isStable())
return HITBOX_A_FAST_FALLING;
case BS_2F_FALL://8028DD10
if(baphysics_get_vertical_velocity() < -1400.0f && !func_8028B2E8())
if(baphysics_get_vertical_velocity() < -1400.0f && !player_isStable())
return HITBOX_A_FAST_FALLING;
default://8028DD4C
return HITBOX_0_NONE;

12
src/core2/code_7060.c
View File

@@ -254,7 +254,7 @@ void func_8028E71C(void) {
enum hitbox_e player_getActiveHitbox(ActorMarker *marker){
return func_8028DB14(marker);
return hitbox_getHitboxForActor(marker);
}
AnimCtrl *player_getAnimCtrlPtr(void){
@@ -444,8 +444,8 @@ enum bsgroup_e func_8028ECAC(void) {
if (miscflag_isTrue(MISC_FLAG_1B_TRANSFORMING)) {
return BSGROUP_D_TRANSFORMING;
}
if (miscflag_isTrue(0x17)) {
return 4;
if (miscflag_isTrue(MISC_FLAG_17_FPV)) {
return BSGROUP_4_LOOK;
}
if (bsbfly_inSet(state_id)) {
return BSGROUP_A_FLYING;
@@ -508,7 +508,7 @@ enum bsgroup_e func_8028ECAC(void) {
}
enum bswatergroup_e func_8028EE84(void) {
enum bswatergroup_e player_getWaterState(void) {
enum bswatergroup_e state_id;
state_id = bs_getState();
@@ -609,7 +609,7 @@ bool func_8028F150(void){
}
bool func_8028F170(void){
return miscflag_isTrue(0x17);
return miscflag_isTrue(MISC_FLAG_17_FPV);
}
int ability_isUnlocked(enum ability_e uid){
@@ -629,7 +629,7 @@ bool func_8028F1E0(void){
}
bool func_8028F20C(void){
return func_8028B2E8();
return player_isStable();
}
bool func_8028F22C(void){

4
src/core2/code_85800.c
View File

@@ -267,11 +267,11 @@ void func_8030D004(s32 arg0, s32 arg1){
s32 func_8030D038(struct45s *arg0, s32 arg1){
if(sfxsource_isFlagSet(arg0,SFX_SRC_FLAG_6_UNKOWN)){
if(sfxsource_isFlagSet(arg0, SFX_SRC_FLAG_7_UNKOWN)){
if(player_is_present() && func_8028EE84() == BSWATERGROUP_2_UNDERWATER)
if(player_is_present() && player_getWaterState() == BSWATERGROUP_2_UNDERWATER)
arg1 *= arg0->unk3C;
}
else{//L8030D0B4
if(player_is_present() && func_8028EE84() != BSWATERGROUP_2_UNDERWATER)
if(player_is_present() && player_getWaterState() != BSWATERGROUP_2_UNDERWATER)
arg1 *= arg0->unk38;
}
}

2
src/core2/code_9290.c
View File

@@ -35,7 +35,7 @@ void func_80290298(void) {
is_pumpkin = player_getTransformation() == TRANSFORM_3_PUMPKIN;
sp30 = (func_8028B528() && !is_pumpkin) ? 6 : 1;
sp24 = func_8028B528() && !is_pumpkin;
if (D_8037C02C || func_8028B2E8() || sp24 || func_8028ECAC() == BSGROUP_5_CLIMB || bs_getState() == BS_B_UNKOWN) {
if (D_8037C02C || player_isStable() || sp24 || func_8028ECAC() == BSGROUP_5_CLIMB || bs_getState() == BS_B_UNKOWN) {
_player_getPosition(D_8037C020);
}

2
src/core2/code_9450.c
View File

@@ -89,7 +89,7 @@ void func_802906D8(void){
int underwater_or_walrus_in_water;
func_80290444();
underwater_or_walrus_in_water = (func_8028EE84() == BSWATERGROUP_2_UNDERWATER);
underwater_or_walrus_in_water = (player_getWaterState() == BSWATERGROUP_2_UNDERWATER);
if(!underwater_or_walrus_in_water){
underwater_or_walrus_in_water = (player_getTransformation() == TRANSFORM_4_WALRUS && player_inWater());
}

2
src/core2/code_9BD0.c
View File

@@ -103,7 +103,7 @@ int func_80290D48(void){
}
int func_80290E8C(void){
if(func_8028EE84() != BSWATERGROUP_2_UNDERWATER)
if(player_getWaterState() != BSWATERGROUP_2_UNDERWATER)
return FALSE;
ncDynamicCamera_setState(3);

4
src/core2/code_BEF20.c
View File

@@ -282,8 +282,8 @@ void func_803465E4(void){
if(!func_8028EC04() && func_8028F070()){
if(level_get() != LEVEL_2_TREASURE_TROVE_COVE || !levelSpecificFlags_get(5)){
is_underwater = (func_8028EE84() == BSWATERGROUP_2_UNDERWATER);
is_on_water_surface = (func_8028EE84() == BSWATERGROUP_1_SURFACE);
is_underwater = (player_getWaterState() == BSWATERGROUP_2_UNDERWATER);
is_on_water_surface = (player_getWaterState() == BSWATERGROUP_1_SURFACE);
is_in_polluted_or_winter_water = ((level_get() == LEVEL_9_RUSTY_BUCKET_BAY) || (map_get() == MAP_46_CCW_WINTER));
if( is_in_polluted_or_winter_water && (is_underwater || is_on_water_surface)){ //L803467EC
D_80385FEC = 2.0f;

6
src/core2/code_D9B0.c
View File

@@ -103,7 +103,7 @@ void func_80294B00(int arg0){
void func_80294B0C(void){
f32 sp1C = player_getYPosition();
int sp18 = func_8028ECAC();
if( func_8028B2E8()
if( player_isStable()
|| player_inWater()
|| (sp18 == BSGROUP_A_FLYING && player_getActiveHitbox(0) != HITBOX_3_BEAK_BOMB)
|| sp18 == BSGROUP_5_CLIMB
@@ -180,11 +180,11 @@ void func_80294E54(int arg0){
}
void func_80294E60(void){
if(func_8028B2E8()){
if(player_isStable()){
_player_getPosition(D_8037C2D8);
}
if(func_8028B2E8() || bsclimb_inSet(bs_getState())){
if(player_isStable() || bsclimb_inSet(bs_getState())){
miscflag_clear(MISC_FLAG_5_HAS_PECKED);
miscflag_clear(MISC_FLAG_12_HAS_FLAPPED);
}

4
src/core2/code_DF70.c
View File

@@ -13,8 +13,8 @@ int should_beak_bust(void){
return button_pressed(BUTTON_Z) && can_beak_bust();
}
int func_80294F78(void){
return button_pressed(BUTTON_C_UP) && func_8028ACD8();
int should_look_first_person_camera(void){
return button_pressed(BUTTON_C_UP) && can_view_first_person();
}
int should_rotate_camera_left(void){

12
src/core2/code_EF50.c
View File

@@ -40,7 +40,7 @@ enum bs_e func_80295EE0(enum bs_e arg0){
sp2C = 0;
sp28 = 0;
current_state = bs_getState();
if(player_getTransformation() != TRANSFORM_1_BANJO || func_8028EE84() != BSWATERGROUP_0_NONE){
if(player_getTransformation() != TRANSFORM_1_BANJO || player_getWaterState() != BSWATERGROUP_0_NONE){
sp2C = 1;
}
if(bsjig_inJiggyJig(current_state)){
@@ -191,7 +191,7 @@ enum bs_e func_802962BC(u32 arg0){
if(bsbtrot_inSet(bs_getState()))
return BS_BTROT_OW;
if(func_8028EE84() == BSWATERGROUP_2_UNDERWATER)
if(player_getWaterState() == BSWATERGROUP_2_UNDERWATER)
return BS_7F_DIVE_OW;
if(func_8028ECAC() == BSGROUP_A_FLYING)
@@ -300,7 +300,7 @@ void func_80296608(void){
break;
case BS_INTR_A: //L8029666C
sp2C = 2;
if(func_8028B2E8()){
if(player_isStable()){
next_state = badrone_transform();
}
else{
@@ -443,7 +443,7 @@ void func_80296608(void){
!func_80298850()
&& !sp1C
&& !miscflag_isTrue(0xf)
&& !func_8028B2E8()
&& !player_isStable()
){
next_state = BS_4F_CLIMB_IDLE;
sp2C = 2;
@@ -474,7 +474,7 @@ void func_80296608(void){
next_state = BS_24_FLY;
}
else{
switch(func_8028EE84()){
switch(player_getWaterState()){
case BSWATERGROUP_1_SURFACE:
next_state = BS_2D_SWIM_IDLE;
break;
@@ -482,7 +482,7 @@ void func_80296608(void){
next_state = BS_2B_DIVE_IDLE;
break;
case BSWATERGROUP_0_NONE://L80296B0C
if(func_8028B2E8())
if(player_isStable())
next_state = bs_getIdleState();
else
next_state = func_8029BA80();

4
src/core2/nc/dynamicCam12.c
View File

@@ -130,7 +130,7 @@ s32 func_802C11C8(f32 arg0[3]) {
sp2C = func_802C0EC0();
func_802C0FF4(sp4C);
if (func_8028EE84() == BSWATERGROUP_2_UNDERWATER) {
if (player_getWaterState() == BSWATERGROUP_2_UNDERWATER) {
func_802BD82C(20.0f, 200.0f);
} else {
func_802BD82C(80.0f, 200.0f);
@@ -226,7 +226,7 @@ void func_802C16CC(s32 arg0) {
s32 sp34;
s16 *sp30;
if ((func_8028ECAC() != 4) && !__is_flying_in_FP()){
if ((func_8028ECAC() != BSGROUP_4_LOOK) && !__is_flying_in_FP()){
sp38 = func_80334524(arg0);
if(sp38 != D_8037DBE0.unk28 && D_8037DBE0.unk28 != -1){
player_getPosition(sp54);

6
src/core2/nc/dynamicCamera.c
View File

@@ -531,7 +531,7 @@ void func_802BD3CC(f32 arg0[3]) {
player_getPosition(arg0);
sp2C = func_8028E82C();
if ((func_8028F2FC() != 0) && (func_8028EE84() != BSWATERGROUP_2_UNDERWATER) && (player_getTransformation() == TRANSFORM_1_BANJO)) {
if ((func_8028F2FC() != 0) && (player_getWaterState() != BSWATERGROUP_2_UNDERWATER) && (player_getTransformation() == TRANSFORM_1_BANJO)) {
temp_f0 = func_8028EF88();
temp_f2 = temp_f0 - 500.0f;
sp2C = ml_map_f(arg0[1], temp_f0 - 80.0f, temp_f2, temp_f0, temp_f2);
@@ -991,11 +991,11 @@ void func_802BE894(f32 position[3], f32 rotation[3]){
void ncDynamicCamera_enterFirstPerson(void){
dynamicCameraInFirstPerson = TRUE;
ncFirstPersonCamera_setState(1);
ncFirstPersonCamera_setState(FIRSTPERSON_STATE_1_ENTER);
ncFirstPersonCamera_setZoomedOutPosition(cameraPosition);
ncFirstPersonCamera_setZoomedOutRotation(cameraRotation);
}
void ncDynamicCamera_exitFirstPerson(void){
ncFirstPersonCamera_setState(3);
ncFirstPersonCamera_setState(FIRSTPERSON_STATE_3_EXIT);
}

12
src/core2/nc/firstpersoncamera.c
View File

@@ -6,14 +6,6 @@
extern void func_802BD780(f32[3], f32[3], f32, f32, f32, f32);
extern f32 func_80257CF8(f32, f32, f32, f32, f32);
enum nc_first_person_state{
FIRSTPERSON_STATE_1_ENTER = 1,
FIRSTPERSON_STATE_2_IDLE,
FIRSTPERSON_STATE_3_EXIT,
FIRSTPERSON_STATE_4_DONE,
};
void ncFirstPersonCamera_setState(enum nc_first_person_state state);
/* .bss */
@@ -42,7 +34,7 @@ void __ncFirstPersonCamera_getPositionAndRotation_entering(f32 arg0[3], f32 arg1
D_8037DC60.rotation[i] = mlNormalizeAngle(D_8037DC60.zoomed_out_rotation[i] + func_80257CF8(D_8037DC60.transistion_timer, 0.5f, 0.0f, 0.0f, mlDiffDegF(D_8037DC60.zoomed_in_rotation[i], D_8037DC60.zoomed_out_rotation[i])));
}
if (D_8037DC60.transistion_timer == 0.0f) {
ncFirstPersonCamera_setState(2);
ncFirstPersonCamera_setState(FIRSTPERSON_STATE_2_IDLE);
}
if (__ncFirstPersonCamera_fullyZoomedIn() && func_8028F150()) {
func_8028FCC8(0);
@@ -61,7 +53,7 @@ void __ncFirstPersonCamera_getPositionAndRotation_exiting(f32 arg0[3], f32 arg1[
D_8037DC60.rotation[i] = mlNormalizeAngle(D_8037DC60.zoomed_in_rotation[i] + func_80257CF8(D_8037DC60.transistion_timer, 1.0f, 0.5f, 0.0f, mlDiffDegF(arg1[i], D_8037DC60.zoomed_in_rotation[i])));
}
if (D_8037DC60.transistion_timer == 0.0f) {
ncFirstPersonCamera_setState(4);
ncFirstPersonCamera_setState(FIRSTPERSON_STATE_4_DONE);
}
if (!__ncFirstPersonCamera_fullyZoomedIn() && !func_8028F150()) {
func_8028FCC8(1);

2
src/core2/snackerctl.c
View File

@@ -83,7 +83,7 @@ static SnackerCtlState _snackerctl_update_bottles_bonus(void){
if(!func_8028F25C() && func_80321960() == 3)
func_803219F4(1);
if(miscflag_isTrue(0x17) && !func_8028F25C()){
if(miscflag_isTrue(MISC_FLAG_17_FPV) && !func_8028F25C()){
if(__snackerctl_player_within_distance(183.0f, -100.0f, 75.0f)){
if(chBottlesBonus_getPuzzleIndex() == 6){
if(!D_8037DCCC){