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

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