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

2
src/FP/ch/boggy2.c
View File

@@ -390,7 +390,7 @@ void func_803895E0(void){
f20 = (f32)func_80304DA8(s0);
f8 = (f32)func_80304DB8(s0);
f22 = f8*0.01;
actor = spawn_actor_f32(D_80391DB8[i].actor_id, sp64, (s32)f20);
actor = actor_spawnWithYaw_f32(D_80391DB8[i].actor_id, sp64, (s32)f20);
actor->scale = f22;
}
}

2
src/FP/ch/twinkly.c
View File

@@ -233,7 +233,7 @@ void func_8038C8F0(ActorMarker *marker){
this = marker_getActor(reinterpret_cast(ActorMarker *, marker));
other = marker_getActor(this->unk100);
muncher = spawn_actor_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392070, 170);
muncher = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392070, 170);
muncher->unk100 = other->marker;
muncher->unkF4_8 = 1;

6
src/FP/ch/twinklybox.c
View File

@@ -3,7 +3,7 @@
#include "variables.h"
extern void func_80324CD8(f32);
extern Actor *spawn_actor_f32(enum actor_e, f32[3], s32);
extern Actor *actor_spawnWithYaw_f32(enum actor_e, f32[3], s32);
Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_8038D6C8(Actor *this);
@@ -209,9 +209,9 @@ void func_8038D41C(ActorMarker *marker){
ActorMarker *_marker = reinterpret_cast(ActorMarker *, marker);
Actor *actor;
actor = spawn_actor_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392354, 170);
actor = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392354, 170);
actor->unk100 = _marker;
actor = spawn_actor_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392360, 170);
actor = actor_spawnWithYaw_f32(ACTOR_337_TWINKLY_MUNCHER, D_80392360, 170);
actor->unk100 = _marker;
if(pad[0]);
}

2
src/FP/ch/wozzasjig.c
View File

@@ -74,7 +74,7 @@ void func_8038FF54(Actor *this){
sp40[0] = (f32)(s32)sp40[0];
sp40[1] = (f32)(s32)sp40[1];
sp40[2] = (f32)(s32)sp40[2];
func_802C8F70(this->yaw + 90.0f);
bundle_setYaw(this->yaw + 90.0f);
jiggy_spawn(JIGGY_32_FP_WOZZA, sp40);
levelSpecificFlags_set(0x26, TRUE);
marker_despawn(this->marker);

2
src/FP/ch/xmastree.c
View File

@@ -53,7 +53,7 @@ void __chXmasTree_80386F84(Actor * this){
void __chXmasTree_spawnSwitch(void){
static s32 chXmasTree_switch_spawn_position[3] = {-0x1220, 0x6A, 0x1945};
func_8032811C(ACTOR_338_XMAS_TREE_SWITCH, chXmasTree_switch_spawn_position, 350);
actor_spawnWithYaw_s32(ACTOR_338_XMAS_TREE_SWITCH, chXmasTree_switch_spawn_position, 350);
}
void __chXmasTree_spawnStar(void *marker){

16
src/FP/racectrl.c
View File

@@ -90,8 +90,8 @@ void func_8038AC90(s32 indx, s32 arg1){
Actor *a1;
Actor *a2;
m1 = spawn_actor_f32(0x161, D_80392F70[indx].position, 0)->marker;
m2 = spawn_actor_f32(0x162, D_80393280[indx].position, 0)->marker;
m1 = actor_spawnWithYaw_f32(0x161, D_80392F70[indx].position, 0)->marker;
m2 = actor_spawnWithYaw_f32(0x162, D_80393280[indx].position, 0)->marker;
a1 = marker_getActor(m1);
a2 = marker_getActor(m2);
@@ -143,23 +143,23 @@ void func_8038AEE0(s32 indx){
Actor *sp1C;
switch(indx){
case 0:// L8038AF0C
sp1C = spawn_actor_f32(0x22d, D_80391ED0, D_80391EDC);
sp1C = actor_spawnWithYaw_f32(0x22d, D_80391ED0, D_80391EDC);
break;
case 1:// L8038AF38
sp1C = spawn_actor_f32(0x22e, D_80391EE0, D_80391EEC);
sp1C = actor_spawnWithYaw_f32(0x22e, D_80391EE0, D_80391EEC);
break;
case 2:// L8038AF64
sp1C = spawn_actor_f32(0x22d, D_80391EF0, FP_D_80391EFC);
sp1C = actor_spawnWithYaw_f32(0x22d, D_80391EF0, FP_D_80391EFC);
break;
case 3:// L8038AF90
sp1C = spawn_actor_f32(0x22d, D_80391F00, D_80391F0C);
sp1C = actor_spawnWithYaw_f32(0x22d, D_80391F00, D_80391F0C);
break;
case 4:// L8038AFBC
sp1C = spawn_actor_f32(0x22d, D_80391F10, D_80391F1C);
sp1C = actor_spawnWithYaw_f32(0x22d, D_80391F10, D_80391F1C);
break;
}
D_80393590[indx] = sp1C->marker;
@@ -191,7 +191,7 @@ void FP_func_8038B0B8(void){
}
void func_8038B0F8(void){
Actor *trainers = spawn_actor_f32(ACTOR_2C_TURBO_TALON_TRAINERS, D_80391F20, 100);
Actor *trainers = actor_spawnWithYaw_f32(ACTOR_2C_TURBO_TALON_TRAINERS, D_80391F20, 100);
trainers->unk10_1 = FALSE;
}

2
src/FP/sirslushgame.c
View File

@@ -54,7 +54,7 @@ void fp_sirslushgame_update(void){
if(D_80392F30.unk1C){
func_802BAFE4(0x12);
jiggy_spawn(JIGGY_31_FP_SIR_SLUSH, D_80392F30.spawn_pos);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, D_80392F30.spawn_pos[0]),
reinterpret_cast(s32, D_80392F30.spawn_pos[1]),
reinterpret_cast(s32, D_80392F30.spawn_pos[2])

2
src/FP/snowmanbuttongame.c
View File

@@ -52,7 +52,7 @@ void fp_snowmanButtonGame_update(void){
if(D_80392F50.unk18){
func_802BAFE4(0x11);
jiggy_spawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, D_80392F50.spawn_pos);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM,
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, D_80392F50.spawn_pos[0]),
reinterpret_cast(s32, D_80392F50.spawn_pos[1]),
reinterpret_cast(s32, D_80392F50.spawn_pos[2])