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

Merge branch 'mr-origin-84'

Browse Source
This commit is contained in:
Banjo Kazooie
2024-09-26 19:28:18 -05:00
parent 6ce93c3cd2 2e10d1803c
commit 5fd7e7f3cc
83 changed files with 428 additions and 397 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/MM/ch/conga.c
View File

@@ -14,9 +14,9 @@
void func_80328FB0(Actor *, f32);
void subaddie_set_state_with_direction(Actor*, s32, f32, s32);
void func_802C8F70(f32);
void bundle_setYaw(f32);
void timed_exitStaticCamera(f32);
Actor *func_8032811C(s32 actor_id, s32 position[3], s32 yaw);
Actor *actor_spawnWithYaw_s32(s32 actor_id, s32 position[3], s32 yaw);
void MM_func_80387F44(void);
void func_803876D0(Actor *);
@@ -111,7 +111,7 @@ void func_80387100(ActorMarker *this){
position[0] = actorPtr->position_x;
position[1] = actorPtr->position_y + 60.0f;
position[2] = actorPtr->position_z;
func_802C8F70(0.0f);
bundle_setYaw(0.0f);
func_80333270(JIGGY_A_MM_CONGA, position, func_803870D0, m);
}
@@ -182,7 +182,7 @@ void __chConga_sendOrangeProjectile(ActorMarker *congaMarker){
congaPtr->unk10_12 -= (congaPtr->unk10_12 && ( conga_state == 7));
MM_func_80387F44();
congaPtr->actor_specific_1_f = 2.0f;
orangePtr = func_8032811C(ACTOR_14_ORANGE_PROJECTILE, conga_localPtr->orangeSpawnPosition, congaPtr->yaw);
orangePtr = actor_spawnWithYaw_s32(ACTOR_14_ORANGE_PROJECTILE, conga_localPtr->orangeSpawnPosition, congaPtr->yaw);
if(orangePtr != NULL){
player_getPosition(plyr.pos);