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

Merge branch 'mr-origin-73'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-13 20:47:15 -05:00
parent 0d83006835 692cfe0ee0
commit 68676056d2
32 changed files with 129 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/fight/chbossjinjobase.c
View File

@@ -71,7 +71,7 @@ void chBossJinjoBase_getHitByEgg(ActorMarker *this, ActorMarker *other) {
actor_base = marker_getActor(this);
if (actor_base->state != CHBOSSJINJOBASE_STATE_3_SPAWNED_BOSS_JINJO) {
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
actor_base->unk38_31++; // hit count
if (actor_base->unk38_31 >= 3) { // spawn Jjnjonator

2
src/fight/chjinjonatorbase.c
View File

@@ -78,7 +78,7 @@ void func_8038E120(ActorMarker * marker, ActorMarker *arg1){
if(actor->state != 3){
if(local->unk0[indx]){
local->unk0[indx]--;
func_8025A70C(COMUSIC_2B_DING_B);
comusic_playTrack(COMUSIC_2B_DING_B);
if(local->unk0[indx] <= 0){
func_8038E0D4(actor, indx + 0x19a, -100.0f, 0.0f, 1.2f);
func_80324D54(1.2f, SFX_90_SWITCH_PRESS, 1.0f, 32000, actor->position, 1000.0f, 2000.0f);