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

Renaming spawn functions

Browse Source
This commit is contained in:
Nabnut
2024-09-23 19:13:12 +02:00
parent fbe20325c2
commit 7086187288
80 changed files with 287 additions and 273 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->unk28 = 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);

12
src/MM/ch/hut.c
View File

@@ -19,8 +19,8 @@
/* extern function declarations */
void func_802C8F70(f32);
void func_802C4218(s32, s32, s32, s32);
void bundle_setYaw(f32);
void spawnQueue_bundle_f32(s32, s32, s32, s32);
/* public function declarations */
Actor *chhut_draw(ActorMarker *, Gfx **, Mtx**, Vtx **);
@@ -58,8 +58,8 @@ void func_803869EC(ActorMarker *this){
f32 *pos;
actorPtr = marker_getActor(this);
actorPtr = spawn_actor_f32(0x4B, actorPtr->position, 0);
spawn_actor_f32(ACTOR_4D_STEAM_2, actorPtr->position, 0);
actorPtr = actor_spawnWithYaw_f32(0x4B, actorPtr->position, 0);
actor_spawnWithYaw_f32(ACTOR_4D_STEAM_2, actorPtr->position, 0);
if(this);
}
@@ -95,9 +95,9 @@ void chhut_update(Actor *this){
subaddie_set_state(this, HUT_STATE_DAMAGED);
actor_playAnimationOnce(this);
__spawnQueue_add_1((GenFunction_1)func_803869EC, (s32)this->marker);
func_802C8F70(this->yaw);
bundle_setYaw(this->yaw);
if(D_8037DCB0 < 5){
__spawnQueue_add_4((GenFunction_4)func_802C4218, D_803898D8[D_8037DCB0], *(s32*)(&diff_pos[0]),*(s32*)(&diff_pos[1]),*(s32*)(&diff_pos[2]));
__spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, D_803898D8[D_8037DCB0], *(s32*)(&diff_pos[0]),*(s32*)(&diff_pos[1]),*(s32*)(&diff_pos[2]));
}
else{
jiggy_spawn(JIGGY_5_MM_HUTS, diff_pos);

2
src/MM/ch/juju.c
View File

@@ -70,7 +70,7 @@ void func_803890A0(ActorMarker *marker, s32 arg1){
position[1] = actorPtr->position_y;
position[2] = actorPtr->position_z;
for(i = 0; i < 4; i++){
jujuPtr = spawn_actor_f32(ACTOR_59_JUJU, actorPtr->position, actorPtr->yaw);
jujuPtr = actor_spawnWithYaw_f32(ACTOR_59_JUJU, actorPtr->position, actorPtr->yaw);
jujuPtr->marker->collidable = FALSE;
actorPtr = marker_getActor(marker);
func_80388DE8(actorPtr, i, jujuPtr);

2
src/MM/ch/jujuhitbox.c
View File

@@ -74,7 +74,7 @@ void func_80388BEC(NodeProp *node, ActorMarker *marker){
((ActorLocal_JujuHitbox *)&closest_actor->local)->unk4++;
func_803892A8(((ActorLocal_JujuHitbox *)&closest_actor->local)->unk8);
func_80353580(marker);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x58, *(s32 *)&position[0], *(s32 *)&position[1], *(s32 *)&position[2]);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x58, *(s32 *)&position[0], *(s32 *)&position[1], *(s32 *)&position[2]);
}
}
}