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

4
include/enums.h
View File

@@ -1752,6 +1752,7 @@ enum actor_e
ACTOR_67_SNIPPET = 0x67, ACTOR_67_SNIPPET = 0x67,
ACTOR_68_SNACKER, ACTOR_68_SNACKER,
ACTOR_69_CLAM, ACTOR_69_CLAM,
ACTOR_6A_UNKNOWN,
ACTOR_6D_GV_BANJO_DOOR = 0x6D, ACTOR_6D_GV_BANJO_DOOR = 0x6D,
@@ -2047,7 +2048,8 @@ enum actor_e
ACTOR_34F_MUMMUM, ACTOR_34F_MUMMUM,
ACTOR_350_SEAMAN_GRUBLIN, ACTOR_350_SEAMAN_GRUBLIN,
ACTOR_353_XMAS_TREE_EGG_TOLL = 0x353, ACTOR_352_UNKOWN = 0x352,
ACTOR_353_XMAS_TREE_EGG_TOLL,
ACTOR_354_DRIPS, ACTOR_354_DRIPS,
ACTOR_367_GRUNTLING_RED = 0x367, ACTOR_367_GRUNTLING_RED = 0x367,

8
include/functions.h
View File

@@ -222,7 +222,7 @@ void particleEmitter_setPosition(ParticleEmitter *, f32[3]);
ParticleEmitter *partEmitMgr_newEmitter(u32); ParticleEmitter *partEmitMgr_newEmitter(u32);
void func_802BB3DC(s32, f32, f32); void func_802BB3DC(s32, f32, f32);
void __spawnQueue_add_4(GenFunction_4, s32, s32, s32, s32); void __spawnQueue_add_4(GenFunction_4, s32, s32, s32, s32);
Actor *func_802C4140(enum actor_e actor_id, s32 x, s32 y, s32 z); Actor *spawnQueue_actor_f32(enum actor_e actor_id, s32 x, s32 y, s32 z);
void func_8030DA44(u8); void func_8030DA44(u8);
@@ -379,7 +379,7 @@ extern s32 func_802F9AA8(enum sfx_e);
Actor * func_803055E0(enum actor_e id, s32 pos[3], s32 arg2, s32 arg3, s32 arg4); Actor * func_803055E0(enum actor_e id, s32 pos[3], s32 arg2, s32 arg3, s32 arg4);
Actor * spawn_actor(enum actor_e id, s32 pos[3], s32 yaw); Actor * __actor_spawnWithYaw_s32(enum actor_e id, s32 pos[3], s32 yaw);
f32 mapModel_getFloorY(f32[3]); f32 mapModel_getFloorY(f32[3]);
BKModelBin *func_8030A428(s32); BKModelBin *func_8030A428(s32);
u8 sfxsource_createSfxsourceAndReturnIndex(void); u8 sfxsource_createSfxsourceAndReturnIndex(void);
@@ -425,7 +425,7 @@ void func_80326244(Actor *);
void func_8032728C(f32[3], f32, s32, int(*)(Actor *)); void func_8032728C(f32[3], f32, s32, int(*)(Actor *));
Actor *spawn_actor_f32(enum actor_e actor_id, f32 position[3], s32 yaw); Actor *actor_spawnWithYaw_f32(enum actor_e actor_id, f32 position[3], s32 yaw);
int func_8032863C(AnimCtrl *, f32, f32); int func_8032863C(AnimCtrl *, f32, f32);
int func_80328A2C(Actor *, f32, s32, f32); int func_80328A2C(Actor *, f32, s32, f32);
void subaddie_set_state(Actor *, u32); void subaddie_set_state(Actor *, u32);
@@ -497,7 +497,7 @@ int actor_animationIsAt(Actor*, f32);
void rumbleManager_80250E94(f32, f32, f32, f32, f32, f32); void rumbleManager_80250E94(f32, f32, f32, f32, f32, f32);
void func_802C8F70(f32); void bundle_setYaw(f32);
void func_802F9DB8(s32, f32, f32, f32); void func_802F9DB8(s32, f32, f32, f32);
void func_802F9F80(s32, f32, f32, f32); void func_802F9F80(s32, f32, f32, f32);
void func_802FA060(s32, s32, s32, f32); void func_802FA060(s32, s32, s32, f32);

2
include/prop.h
View File

@@ -162,7 +162,7 @@ typedef struct actor_s{
u32 unk10_4:1; u32 unk10_4:1;
u32 unk10_3:2; u32 unk10_3:2;
u32 unk10_1:1; u32 unk10_1:1;
u32 unk10_0:1; u32 is_bundle:1;
AnimCtrl *animctrl; AnimCtrl *animctrl;
ActorAnimationInfo *unk18; ActorAnimationInfo *unk18;
TUPLE(f32, unk1C); TUPLE(f32, unk1C);

4
manual_syms.pal.txt
View File

@@ -121,7 +121,7 @@ ncFirstPersonCamera_getState = 0x802c2980;
spawnQueue_func_802C3A18 = 0x802C3898; spawnQueue_func_802C3A18 = 0x802C3898;
spawnQueue_flush = 0x802c38b8; spawnQueue_flush = 0x802c38b8;
__spawnQueue_add_4 = 0x802c3d84; __spawnQueue_add_4 = 0x802c3d84;
func_802C418C = 0x802c400c; spawnQueue_actor_s16 = 0x802c400c;
func_802C5A30 = 0x802c5b20; func_802C5A30 = 0x802c5b20;
chjiggy_getJiggyId = 0x802c8248; chjiggy_getJiggyId = 0x802c8248;
func_802C9C14 = 0x802c9dd4; func_802C9C14 = 0x802c9dd4;
@@ -251,7 +251,7 @@ func_80324DBC = 0x8032520c;
timedFunc_set_1 = 0x80325334; timedFunc_set_1 = 0x80325334;
timedFunc_set_2 = 0x80325370; timedFunc_set_2 = 0x80325370;
timedFunc_set_3 = 0x803253b4; timedFunc_set_3 = 0x803253b4;
func_8032811C = 0x80328574; actor_spawnWithYaw_s32 = 0x80328574;
marker_despawn = 0x8032874c; marker_despawn = 0x8032874c;
marker_getActor = 0x80329db0; marker_getActor = 0x80329db0;
func_8032AD7C = 0x8032b1d4; func_8032AD7C = 0x8032b1d4;

4
src/BGS/ch/code_8A60.c
View File

@@ -26,7 +26,7 @@ void func_8038EE50(void){
if(nodeProp_findPositionFromActorId(0x14d, sp24)){ if(nodeProp_findPositionFromActorId(0x14d, sp24)){
jiggy_spawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24); jiggy_spawn(JIGGY_20_BGS_ELEVATED_WALKWAY, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[1]),
reinterpret_cast(s32, sp24[2]) reinterpret_cast(s32, sp24[2])
@@ -69,7 +69,7 @@ void func_8038F018(void){
if(nodeProp_findPositionFromActorId(0x1fc, sp24)){ if(nodeProp_findPositionFromActorId(0x1fc, sp24)){
jiggy_spawn(JIGGY_25_BGS_MAZE, sp24); jiggy_spawn(JIGGY_25_BGS_MAZE, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[0]),
reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[1]),
reinterpret_cast(s32, sp24[2]) reinterpret_cast(s32, sp24[2])

8
src/BGS/ch/mudhut.c
View File

@@ -8,7 +8,7 @@ extern void player_stateTimer_set(enum state_timer_e, f32);
extern f32 player_stateTimer_get(enum state_timer_e); extern f32 player_stateTimer_get(enum state_timer_e);
void func_802C4218(u32,f32,f32,f32); void spawnQueue_bundle_f32(u32,f32,f32,f32);
void subaddie_set_state(Actor *, u32); void subaddie_set_state(Actor *, u32);
/* local declarations */ /* local declarations */
@@ -61,8 +61,8 @@ void func_8038EB4C(ActorMarker *this){
Actor *thisActor; Actor *thisActor;
thisActor = marker_getActor(this); thisActor = marker_getActor(this);
thisActor = spawn_actor_f32(ACTOR_D_WOOD_DEMOLISHED, thisActor->position, NULL); thisActor = actor_spawnWithYaw_f32(ACTOR_D_WOOD_DEMOLISHED, thisActor->position, NULL);
thisActor = spawn_actor_f32(ACTOR_4D_STEAM_2, thisActor->position, NULL); thisActor = actor_spawnWithYaw_f32(ACTOR_4D_STEAM_2, thisActor->position, NULL);
if(this); if(this);
} }
@@ -105,7 +105,7 @@ void chmudhut_update(Actor *this){
} }
__spawnQueue_add_1((GenFunction_1)func_8038EB4C, reinterpret_cast(s32, this->marker)); __spawnQueue_add_1((GenFunction_1)func_8038EB4C, reinterpret_cast(s32, this->marker));
if(tmp < 5){ if(tmp < 5){
__spawnQueue_add_4((GenFunction_4)func_802C4218, D_80390B50[tmp], __spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, D_80390B50[tmp],
reinterpret_cast(s32, diffPos[0]), reinterpret_cast(s32, diffPos[0]),
reinterpret_cast(s32, diffPos[1]), reinterpret_cast(s32, diffPos[1]),
reinterpret_cast(s32, diffPos[2]) reinterpret_cast(s32, diffPos[2])

4
src/BGS/ch/tanktup.c
View File

@@ -46,7 +46,7 @@ void func_8038F470(ActorMarker *this, s32 arg1, enum chtanktup_leg_e leg_id){
sp18[2] = thisActor->position_z; sp18[2] = thisActor->position_z;
sp18[1] += 50.0f; sp18[1] += 50.0f;
leg = spawn_actor_f32(leg_id + ACTOR_E9_TANKTUP_LEG_FL, sp18, (s32)thisActor->yaw); leg = actor_spawnWithYaw_f32(leg_id + ACTOR_E9_TANKTUP_LEG_FL, sp18, (s32)thisActor->yaw);
subaddie_set_state_with_direction(leg, arg1 + 1, 0, -1); subaddie_set_state_with_direction(leg, arg1 + 1, 0, -1);
leg->unk10_12 = leg_id; leg->unk10_12 = leg_id;
} }
@@ -205,7 +205,7 @@ void func_8038F6A4(Actor *this)
{ {
f32 sp34[3]; f32 sp34[3];
func_8034A174(this->marker->unk44, 6, sp34); func_8034A174(this->marker->unk44, 6, sp34);
func_802C8F70(this->yaw); bundle_setYaw(this->yaw);
sp34[1] -= 125.0f; sp34[1] -= 125.0f;
jiggy_spawn(JIGGY_26_BGS_TANKTUP, sp34); jiggy_spawn(JIGGY_26_BGS_TANKTUP, sp34);
} }

12
src/BGS/code_3420.c
View File

@@ -5,7 +5,7 @@
extern f32 func_80256AB4(f32, f32, f32, f32); extern f32 func_80256AB4(f32, f32, f32, f32);
extern f32 func_8025715C(f32, f32); extern f32 func_8025715C(f32, f32);
extern f32 *chVile_getPostion(ActorMarker *); extern f32 *chVile_getPostion(ActorMarker *);
extern void func_802C8F7C(f32); extern void bundle_setRandomVelocity(f32);
extern void func_802FDCB8(s32); extern void func_802FDCB8(s32);
enum chvilegame_piece_type_e { enum chvilegame_piece_type_e {
@@ -140,7 +140,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
sp94[0] = vile->position[0] + sp7C[0]; sp94[0] = vile->position[0] + sp7C[0];
sp94[1] = vile->position[1] + sp7C[1]; sp94[1] = vile->position[1] + sp7C[1];
sp94[2] = vile->position[2] + sp7C[2]; sp94[2] = vile->position[2] + sp7C[2];
func_802C8F70(vile->yaw); bundle_setYaw(vile->yaw);
jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94); jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94);
} else { } else {
sp7C[0] = 0.0f - vile->position[0]; sp7C[0] = 0.0f - vile->position[0];
@@ -151,7 +151,7 @@ void BGS_func_80389850(Actor *this, s32 arg1) {
sp94[0] = vile->position[0] + sp7C[0]; sp94[0] = vile->position[0] + sp7C[0];
sp94[1] = vile->position[1] + sp7C[1]; sp94[1] = vile->position[1] + sp7C[1];
sp94[2] = vile->position[2] + sp7C[2]; sp94[2] = vile->position[2] + sp7C[2];
func_802C8F70(func_8025715C(sp7C[0], sp7C[2])); bundle_setYaw(func_8025715C(sp7C[0], sp7C[2]));
jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94); jiggy_spawn(JIGGY_28_BGS_MR_VILE, sp94);
} }
} }
@@ -302,9 +302,9 @@ void func_80389F08(ActorMarker *marker) {
} }
for(i = 0; i < 3; i++){ for(i = 0; i < 3; i++){
if (var_s2 < 3) { if (var_s2 < 3) {
func_802C8F70(vile->yaw + (f32) (i * 30)); bundle_setYaw(vile->yaw + (f32) (i * 30));
func_802C8F7C(2.0f); bundle_setRandomVelocity(2.0f);
func_802C937C(6, vile->position); bundle_spawn_f32(6, vile->position);
var_s2 += 1; var_s2 += 1;
} else { } else {
item_inc(ITEM_16_LIFE); item_inc(ITEM_16_LIFE);

2
src/CCW/ch/grublinhood.c
View File

@@ -87,7 +87,7 @@ void __chgrublinhood_die(ActorMarker* marker, s32 arg1) {
FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actor->position, 1250, 2500); FUNC_8030E8B4(SFX_C2_GRUBLIN_EGH, 1.0f, 32000, actor->position, 1250, 2500);
pCtrl = partEmitMgr_newEmitter(1); pCtrl = partEmitMgr_newEmitter(1);
__chgrublinhood_emitHat(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT); __chgrublinhood_emitHat(pCtrl, actor, ASSET_52D_MODEL_GRUBLIN_HOOD_HAT);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z)); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32,actor->position_x), reinterpret_cast(s32,actor->position_y), reinterpret_cast(s32,actor->position_z));
actor_collisionOff(actor); actor_collisionOff(actor);
actor->has_met_before = TRUE; actor->has_met_before = TRUE;
} }

2
src/CCW/code_160.c
View File

@@ -195,7 +195,7 @@ void func_8038687C(Actor *this) {
break; break;
} }
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x29B, reinterpret_cast(s32, sp4C[0]), reinterpret_cast(s32, sp4C[1]), reinterpret_cast(s32, sp4C[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x29B, reinterpret_cast(s32, sp4C[0]), reinterpret_cast(s32, sp4C[1]), reinterpret_cast(s32, sp4C[2]));
local->unk4++; local->unk4++;
} }
local->unkC = randf2(0.5 - ((local->unk8 / 10) * 0.4), 1.0 - ((local->unk8 / 10) * 0.8)); local->unkC = randf2(0.5 - ((local->unk8 / 10) * 0.4), 1.0 - ((local->unk8 / 10) * 0.8));

2
src/CCW/code_3310.c
View File

@@ -109,7 +109,7 @@ void func_80389700(ActorMarker *marker, enum asset_e text_id, s32 arg2) {
void func_80389740(ActorMarker *marker) { void func_80389740(ActorMarker *marker) {
Actor *this = marker_getActor(marker); Actor *this = marker_getActor(marker);
if (this->marker->unk14_21) { if (this->marker->unk14_21) {
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x30C, reinterpret_cast(s32, D_8038FDE0[0]), reinterpret_cast(s32, D_8038FDE0[1]), reinterpret_cast(s32, D_8038FDE0[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x30C, reinterpret_cast(s32, D_8038FDE0[0]), reinterpret_cast(s32, D_8038FDE0[1]), reinterpret_cast(s32, D_8038FDE0[2]));
} }
} }

2
src/CCW/code_5540.c
View File

@@ -55,7 +55,7 @@ void chnabnut_setState(Actor *this, s32 next_state) {
if (next_state == NABNUT_STATE_4_THANK_PLAYER) { if (next_state == NABNUT_STATE_4_THANK_PLAYER) {
skeletalAnim_set(this->unk148, ASSET_22E_ANIM_NABNUT_STAND, 0.2f, 3.53f); skeletalAnim_set(this->unk148, ASSET_22E_ANIM_NABNUT_STAND, 0.2f, 3.53f);
skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_1_LOOP); skeletalAnim_setBehavior(this->unk148, SKELETAL_ANIM_1_LOOP);
func_802C8F70(this->yaw - 40.0f); bundle_setYaw(this->yaw - 40.0f);
jiggy_spawn(JIGGY_4A_CCW_NABNUT, this->position); jiggy_spawn(JIGGY_4A_CCW_NABNUT, this->position);
} }

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

@@ -390,7 +390,7 @@ void func_803895E0(void){
f20 = (f32)func_80304DA8(s0); f20 = (f32)func_80304DA8(s0);
f8 = (f32)func_80304DB8(s0); f8 = (f32)func_80304DB8(s0);
f22 = f8*0.01; 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; 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)); this = marker_getActor(reinterpret_cast(ActorMarker *, marker));
other = marker_getActor(this->unk100); 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->unk100 = other->marker;
muncher->unkF4_8 = 1; muncher->unkF4_8 = 1;

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

@@ -3,7 +3,7 @@
#include "variables.h" #include "variables.h"
extern void func_80324CD8(f32); 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); Actor *FP_func_8038CED0(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
void func_8038D6C8(Actor *this); void func_8038D6C8(Actor *this);
@@ -209,9 +209,9 @@ void func_8038D41C(ActorMarker *marker){
ActorMarker *_marker = reinterpret_cast(ActorMarker *, marker); ActorMarker *_marker = reinterpret_cast(ActorMarker *, marker);
Actor *actor; 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->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; actor->unk100 = _marker;
if(pad[0]); 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[0] = (f32)(s32)sp40[0];
sp40[1] = (f32)(s32)sp40[1]; sp40[1] = (f32)(s32)sp40[1];
sp40[2] = (f32)(s32)sp40[2]; 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); jiggy_spawn(JIGGY_32_FP_WOZZA, sp40);
levelSpecificFlags_set(0x26, TRUE); levelSpecificFlags_set(0x26, TRUE);
marker_despawn(this->marker); 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){ void __chXmasTree_spawnSwitch(void){
static s32 chXmasTree_switch_spawn_position[3] = {-0x1220, 0x6A, 0x1945}; 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){ 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 *a1;
Actor *a2; Actor *a2;
m1 = spawn_actor_f32(0x161, D_80392F70[indx].position, 0)->marker; m1 = actor_spawnWithYaw_f32(0x161, D_80392F70[indx].position, 0)->marker;
m2 = spawn_actor_f32(0x162, D_80393280[indx].position, 0)->marker; m2 = actor_spawnWithYaw_f32(0x162, D_80393280[indx].position, 0)->marker;
a1 = marker_getActor(m1); a1 = marker_getActor(m1);
a2 = marker_getActor(m2); a2 = marker_getActor(m2);
@@ -143,23 +143,23 @@ void func_8038AEE0(s32 indx){
Actor *sp1C; Actor *sp1C;
switch(indx){ switch(indx){
case 0:// L8038AF0C case 0:// L8038AF0C
sp1C = spawn_actor_f32(0x22d, D_80391ED0, D_80391EDC); sp1C = actor_spawnWithYaw_f32(0x22d, D_80391ED0, D_80391EDC);
break; break;
case 1:// L8038AF38 case 1:// L8038AF38
sp1C = spawn_actor_f32(0x22e, D_80391EE0, D_80391EEC); sp1C = actor_spawnWithYaw_f32(0x22e, D_80391EE0, D_80391EEC);
break; break;
case 2:// L8038AF64 case 2:// L8038AF64
sp1C = spawn_actor_f32(0x22d, D_80391EF0, FP_D_80391EFC); sp1C = actor_spawnWithYaw_f32(0x22d, D_80391EF0, FP_D_80391EFC);
break; break;
case 3:// L8038AF90 case 3:// L8038AF90
sp1C = spawn_actor_f32(0x22d, D_80391F00, D_80391F0C); sp1C = actor_spawnWithYaw_f32(0x22d, D_80391F00, D_80391F0C);
break; break;
case 4:// L8038AFBC case 4:// L8038AFBC
sp1C = spawn_actor_f32(0x22d, D_80391F10, D_80391F1C); sp1C = actor_spawnWithYaw_f32(0x22d, D_80391F10, D_80391F1C);
break; break;
} }
D_80393590[indx] = sp1C->marker; D_80393590[indx] = sp1C->marker;
@@ -191,7 +191,7 @@ void FP_func_8038B0B8(void){
} }
void func_8038B0F8(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; trainers->unk10_1 = FALSE;
} }

2
src/FP/sirslushgame.c
View File

@@ -54,7 +54,7 @@ void fp_sirslushgame_update(void){
if(D_80392F30.unk1C){ if(D_80392F30.unk1C){
func_802BAFE4(0x12); func_802BAFE4(0x12);
jiggy_spawn(JIGGY_31_FP_SIR_SLUSH, D_80392F30.spawn_pos); 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[0]),
reinterpret_cast(s32, D_80392F30.spawn_pos[1]), reinterpret_cast(s32, D_80392F30.spawn_pos[1]),
reinterpret_cast(s32, D_80392F30.spawn_pos[2]) 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){ if(D_80392F50.unk18){
func_802BAFE4(0x11); func_802BAFE4(0x11);
jiggy_spawn(JIGGY_2D_FP_SNOWMAN_BUTTONS, D_80392F50.spawn_pos); 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[0]),
reinterpret_cast(s32, D_80392F50.spawn_pos[1]), reinterpret_cast(s32, D_80392F50.spawn_pos[1]),
reinterpret_cast(s32, D_80392F50.spawn_pos[2]) reinterpret_cast(s32, D_80392F50.spawn_pos[2])

6
src/GV/ch/ancientone.c
View File

@@ -89,7 +89,7 @@ void func_803867F4(void){
func_802BAFE4(4); func_802BAFE4(4);
if(nodeProp_findPositionFromActorId(0x148, sp24)){ if(nodeProp_findPositionFromActorId(0x148, sp24)){
jiggy_spawn(JIGGY_46_GV_ANCIENT_ONES, sp24); jiggy_spawn(JIGGY_46_GV_ANCIENT_ONES, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
} }
} }
@@ -183,10 +183,10 @@ void chAncientOne_update(Actor *this){
this->position_z += (sp38 & 2) ? 0xC : -0xC; this->position_z += (sp38 & 2) ? 0xC : -0xC;
if(this->unkF4_8 != 1){ if(this->unkF4_8 != 1){
if(sp38 == 6){ if(sp38 == 6){
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x4C, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z)); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
} }
if(sp38 == 4 && this->position_y < LOCAL_CH_ANCIENT_ONE(this)->unk1C - 600.0f){ if(sp38 == 4 && this->position_y < LOCAL_CH_ANCIENT_ONE(this)->unk1C - 600.0f){
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x11f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z)); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x11f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
}//L80386D80 }//L80386D80
} }
if(LOCAL_CH_ANCIENT_ONE(this)->unk1C <= this->position_y){ if(LOCAL_CH_ANCIENT_ONE(this)->unk1C <= this->position_y){

4
src/GV/ch/gobi3.c
View File

@@ -22,9 +22,9 @@ void __chGobi3_spawnHoneyComb(Actor *this){
s32 pad24; s32 pad24;
f32 sp18[3]; f32 sp18[3];
TUPLE_ASSIGN(sp18, -6885.0f, 2383.0f, 1335.0f); TUPLE_ASSIGN(sp18, -6885.0f, 2383.0f, 1335.0f);
func_802C8F70(this->yaw); bundle_setYaw(this->yaw);
func_802CA1CC(HONEYCOMB_C_GV_GOBI_3); func_802CA1CC(HONEYCOMB_C_GV_GOBI_3);
func_802C937C(0xd, sp18); bundle_spawn_f32(0xd, sp18);
} }
void __chGobi3_runaway(ActorMarker *caller, enum asset_e text_id, s32 arg2){ void __chGobi3_runaway(ActorMarker *caller, enum asset_e text_id, s32 arg2){

2
src/GV/code_5570.c
View File

@@ -200,7 +200,7 @@ void GV_func_8038BEA0(Actor *this){
this->unk38_31 = 0; this->unk38_31 = 0;
D_80391A80 = this->state; D_80391A80 = this->state;
func_802BB3DC(0, 14.0f, 0.92f); func_802BB3DC(0, 14.0f, 0.92f);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x11f, __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x11f,
reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z) reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z)
); );
} }

2
src/GV/code_7FF0.c
View File

@@ -448,7 +448,7 @@ void func_8038F028(UNK_TYPE(s32) arg0, ActorMarker *arg1, s32 arg2, s32 arg3){
sp24[0] = (f32)arg1->propPtr->x; sp24[0] = (f32)arg1->propPtr->x;
sp24[1] = (f32)arg1->propPtr->y; sp24[1] = (f32)arg1->propPtr->y;
sp24[2] = (f32)arg1->propPtr->z; sp24[2] = (f32)arg1->propPtr->z;
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x4e, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x4e, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
func_8025A6EC(COMUSIC_2B_DING_B, 22000); func_8025A6EC(COMUSIC_2B_DING_B, 22000);
if(mapSpecificFlags_get(arg3)){ if(mapSpecificFlags_get(arg3)){
timedFunc_set_0(2.0f, func_8038F004); timedFunc_set_0(2.0f, func_8038F004);

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

@@ -14,9 +14,9 @@
void func_80328FB0(Actor *, f32); void func_80328FB0(Actor *, f32);
void subaddie_set_state_with_direction(Actor*, s32, f32, s32); void subaddie_set_state_with_direction(Actor*, s32, f32, s32);
void func_802C8F70(f32); void bundle_setYaw(f32);
void timed_exitStaticCamera(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 MM_func_80387F44(void);
void func_803876D0(Actor *); void func_803876D0(Actor *);
@@ -111,7 +111,7 @@ void func_80387100(ActorMarker *this){
position[0] = actorPtr->position_x; position[0] = actorPtr->position_x;
position[1] = actorPtr->position_y + 60.0f; position[1] = actorPtr->position_y + 60.0f;
position[2] = actorPtr->position_z; position[2] = actorPtr->position_z;
func_802C8F70(0.0f); bundle_setYaw(0.0f);
func_80333270(JIGGY_A_MM_CONGA, position, func_803870D0, m); 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)); congaPtr->unk10_12 -= (congaPtr->unk10_12 && ( conga_state == 7));
MM_func_80387F44(); MM_func_80387F44();
congaPtr->actor_specific_1_f = 2.0f; 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){ if(orangePtr != NULL){
player_getPosition(plyr.pos); player_getPosition(plyr.pos);

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

@@ -6,8 +6,9 @@
#include "prop.h" #include "prop.h"
/* extern function declarations */ /* 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 */ /* public function declarations */
Actor *chhut_draw(ActorMarker *, Gfx **, Mtx **, Vtx **); Actor *chhut_draw(ActorMarker *, Gfx **, Mtx **, Vtx **);
@@ -42,8 +43,8 @@ Actor *chhut_draw(ActorMarker *this, Gfx **gfx, Mtx **mtx, Vtx **vtx) {
void __chhut_spawnExplosion(ActorMarker *this) { void __chhut_spawnExplosion(ActorMarker *this) {
Actor *actorPtr = marker_getActor(this); Actor *actorPtr = marker_getActor(this);
actorPtr = spawn_actor_f32(ACTOR_4B_WOOD_EXPLOSION_2, actorPtr->position, 0); actorPtr = actor_spawnWithYaw_f32(ACTOR_4B_WOOD_EXPLOSION_2, actorPtr->position, 0);
spawn_actor_f32(ACTOR_4D_STEAM_2, actorPtr->position, 0); actor_spawnWithYaw_f32(ACTOR_4D_STEAM_2, actorPtr->position, 0);
if (this); if (this);
} }
@@ -83,10 +84,10 @@ void chhut_update(Actor *this) {
subaddie_set_state(this, HUT_STATE_1_DAMAGED); subaddie_set_state(this, HUT_STATE_1_DAMAGED);
actor_playAnimationOnce(this); actor_playAnimationOnce(this);
__spawnQueue_add_1((GenFunction_1) __chhut_spawnExplosion, (s32) this->marker); __spawnQueue_add_1((GenFunction_1) __chhut_spawnExplosion, (s32) this->marker);
func_802C8F70(this->yaw); bundle_setYaw(this->yaw);
if (mm_hut_smash_count < 5) { if (mm_hut_smash_count < 5) {
__spawnQueue_add_4((GenFunction_4) func_802C4218, D_803898D8[mm_hut_smash_count], *(s32 * )(&diff_pos[0]), *(s32 * )(&diff_pos[1]),*(s32 * )(&diff_pos[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, D_803898D8[mm_hut_smash_count], *(s32*)(&diff_pos[0]),*(s32*)(&diff_pos[1]),*(s32*)(&diff_pos[2]));
} }
else { else {
jiggy_spawn(JIGGY_5_MM_HUTS, diff_pos); jiggy_spawn(JIGGY_5_MM_HUTS, diff_pos);

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

@@ -81,9 +81,8 @@ void __chjuju_initialize_all(ActorMarker *marker, s32 count) {
position[0] = actorPtr->position_x; position[0] = actorPtr->position_x;
position[1] = actorPtr->position_y; position[1] = actorPtr->position_y;
position[2] = actorPtr->position_z; position[2] = actorPtr->position_z;
for(i = 0; i < 4; i++){
for (i = 0; i < 4; i++) { jujuPtr = actor_spawnWithYaw_f32(ACTOR_59_JUJU, actorPtr->position, actorPtr->yaw);
jujuPtr = spawn_actor_f32(ACTOR_59_JUJU, actorPtr->position, actorPtr->yaw);
jujuPtr->marker->collidable = FALSE; jujuPtr->marker->collidable = FALSE;
actorPtr = marker_getActor(marker); actorPtr = marker_getActor(marker);

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

@@ -76,7 +76,7 @@ void func_80388BEC(NodeProp *node, ActorMarker *marker) {
((ActorLocal_JujuHitbox *) &closest_actor->local)->unk4++; ((ActorLocal_JujuHitbox *) &closest_actor->local)->unk4++;
func_803892A8(((ActorLocal_JujuHitbox *) &closest_actor->local)->jujus); func_803892A8(((ActorLocal_JujuHitbox *) &closest_actor->local)->jujus);
func_80353580(marker); 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]);
} }
} }
} }

2
src/RBB/ch/boombox.c
View File

@@ -5,7 +5,7 @@
extern void ml_interpolate_vec3f(f32 [3], f32 [3], f32 [3], f32); extern void ml_interpolate_vec3f(f32 [3], f32 [3], f32 [3], f32);
extern void func_802C8F70(f32); extern void bundle_setYaw(f32);
extern int func_80309EB0(f32(*)[3], f32, f32 (*)[3], s32); extern int func_80309EB0(f32(*)[3], f32, f32 (*)[3], s32);
extern int func_803342AC(f32(*)[3], f32(*)[3],f32); extern int func_803342AC(f32(*)[3], f32(*)[3],f32);

4
src/RBB/ch/bossboombox.c
View File

@@ -375,12 +375,12 @@ void RBB_func_8038CC9C(Actor *this, s32 new_state){
sp68[0] = this->position_x + 200.0f*local->unk0->unk4; sp68[0] = this->position_x + 200.0f*local->unk0->unk4;
sp68[1] = this->position_y + 80.0f*local->unk0->unk4; sp68[1] = this->position_y + 80.0f*local->unk0->unk4;
sp68[2] = this->position_z; sp68[2] = this->position_z;
__spawnQueue_add_4((GenFunction_4)func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
sp68[0] = this->position_x - 200.0f*local->unk0->unk4; sp68[0] = this->position_x - 200.0f*local->unk0->unk4;
sp68[1] = this->position_y + 80.0f*local->unk0->unk4; sp68[1] = this->position_y + 80.0f*local->unk0->unk4;
sp68[2] = this->position_z; sp68[2] = this->position_z;
__spawnQueue_add_4((GenFunction_4)func_802C4140, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, local->unk0->unk0 + 1, reinterpret_cast(s32, sp68[0]), reinterpret_cast(s32, sp68[1]), reinterpret_cast(s32, sp68[2]));
} }
}//L8038D378 }//L8038D378

2
src/RBB/ch/bossboomboxctrl.c
View File

@@ -24,7 +24,7 @@ void chBossBoomBoxCtrl_update(Actor *this){
if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){ if(jiggyscore_isSpawned(JIGGY_56_RBB_BOSS_BOOM_BOX) && !volatileFlag_get(VOLATILE_FLAG_2_FF_IN_MINIGAME)){
marker_despawn(this->marker); marker_despawn(this->marker);
}else{ }else{
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_281_BOSS_BOOM_BOX_LARGEST, reinterpret_cast(s32,this->position_x), reinterpret_cast(s32,this->position_y), reinterpret_cast(s32,this->position_z)); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_281_BOSS_BOOM_BOX_LARGEST, reinterpret_cast(s32,this->position_x), reinterpret_cast(s32,this->position_y), reinterpret_cast(s32,this->position_z));
__chBossBoomBoxCtrl_setState(this, 1); __chBossBoomBoxCtrl_setState(this, 1);
} }
}//L8038DEF4 }//L8038DEF4

2
src/RBB/ch/whistlectrl.c
View File

@@ -27,7 +27,7 @@ void __chWhistleCtrl_setState(Actor *actor, s32 arg1){
} }
void __chWhistleCtrl_soundWhistle(void){ void __chWhistleCtrl_soundWhistle(void){
func_802C8F70(225.0f); bundle_setYaw(225.0f);
jiggy_spawn(JIGGY_54_RBB_WHISTLE, D_80390A74); jiggy_spawn(JIGGY_54_RBB_WHISTLE, D_80390A74);
} }

4
src/RBB/code_9670.c
View File

@@ -19,8 +19,8 @@ u8 D_803912B0;
/* .code */ /* .code */
void RBB_func_8038FA60(ActorMarker *marker){ void RBB_func_8038FA60(ActorMarker *marker){
Actor *actor = marker_getActor(marker); Actor *actor = marker_getActor(marker);
func_802C8F70(actor->yaw); bundle_setYaw(actor->yaw);
func_802C937C(6, &actor->position); bundle_spawn_f32(6, &actor->position);
} }
void func_8038FA9C(Actor *this, s32 arg1){ void func_8038FA9C(Actor *this, s32 arg1){

4
src/SM/ch/vegetables.c
View File

@@ -6,7 +6,7 @@
//external //external
f32 mapModel_getFloorY(f32*); f32 mapModel_getFloorY(f32*);
void func_802C4218(s32, f32, f32, f32); void spawnQueue_bundle_f32(s32, f32, f32, f32);
void timed_mapSpecificFlags_setTrue(f32, s32); void timed_mapSpecificFlags_setTrue(f32, s32);
void subaddie_set_state_with_direction(Actor *, s32, f32, s32); void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
@@ -203,7 +203,7 @@ void func_80387C28(Actor * this){
if(this->unk38_31){ if(this->unk38_31){
this->position_y += 100.0f; this->position_y += 100.0f;
func_802CA1CC(HONEYCOMB_17_SM_COLIWOBBLE); func_802CA1CC(HONEYCOMB_17_SM_COLIWOBBLE);
__spawnQueue_add_4((GenFunction_4)func_802C4218, 0x1f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z)); __spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, 0x1f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, this->position_y), reinterpret_cast(s32, this->position_z));
}//L80387D64 }//L80387D64
timed_mapSpecificFlags_setTrue(1.5f, 7); timed_mapSpecificFlags_setTrue(1.5f, 7);
actor_collisionOff(this); actor_collisionOff(this);

4
src/SM/code_5B0.c
View File

@@ -5,7 +5,7 @@
#include "prop.h" #include "prop.h"
void func_803869A0(Actor*, f32, f32); void func_803869A0(Actor*, f32, f32);
void func_802C4218(s32, f32, f32, f32); void spawnQueue_bundle_f32(s32, f32, f32, f32);
void SM_func_80386EF4(Actor *this); void SM_func_80386EF4(Actor *this);
void SM_func_80386A00(Actor *this); void SM_func_80386A00(Actor *this);
@@ -113,7 +113,7 @@ void SM_func_80386D68(Actor *this){
if(this->unk100 && func_803870E8(this->unk100)){ if(this->unk100 && func_803870E8(this->unk100)){
func_802CA1CC(HONEYCOMB_18_SM_QUARRIES); func_802CA1CC(HONEYCOMB_18_SM_QUARRIES);
__spawnQueue_add_4((GenFunction_4)func_802C4218, 0x1F, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, 0x1F, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
} }
marker_despawn(this->marker); marker_despawn(this->marker);
} }

2
src/TTC/ch/blubber.c
View File

@@ -69,7 +69,7 @@ void func_80387574(ActorMarker *caller, enum asset_e text_id, s32 arg1){
if(nodeProp_findPositionFromActorId(0x14b, sp24)){ if(nodeProp_findPositionFromActorId(0x14b, sp24)){
jiggy_spawn(JIGGY_14_TTC_BLUBBER, sp24); jiggy_spawn(JIGGY_14_TTC_BLUBBER, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
} }
} }

6
src/TTC/ch/clam.c
View File

@@ -2,7 +2,7 @@
#include "functions.h" #include "functions.h"
#include "variables.h" #include "variables.h"
extern void func_802C4218(s32, s32, s32, s32); extern void spawnQueue_bundle_f32(s32, s32, s32, s32);
extern f32 func_80257204(f32, f32, f32, f32); extern f32 func_80257204(f32, f32, f32, f32);
extern ActorProp * func_80320EB0(ActorMarker *, f32, s32); extern ActorProp * func_80320EB0(ActorMarker *, f32, s32);
@@ -240,8 +240,8 @@ void __chClam_playerDropsItem(s32 index, enum item_e item_id){
f32 position[3]; f32 position[3];
player_getPosition(position); player_getPosition(position);
func_802C8F70(randf2(0.0f, 359.0f)); bundle_setYaw(randf2(0.0f, 359.0f));
__spawnQueue_add_4((GenFunction_4)func_802C4218, index, reinterpret_cast(s32, position[0]), reinterpret_cast(s32, position[1]), reinterpret_cast(s32, position[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, index, reinterpret_cast(s32, position[0]), reinterpret_cast(s32, position[1]), reinterpret_cast(s32, position[2]));
item_dec(item_id); item_dec(item_id);
} }

2
src/TTC/ch/treasure.c
View File

@@ -22,7 +22,7 @@ ActorInfo gChTreasureInfo = {
/* .code */ /* .code */
void __chtreasure_die(ActorMarker *marker, ActorMarker *otherMarker){ void __chtreasure_die(ActorMarker *marker, ActorMarker *otherMarker){
Actor *this = marker_getActor(marker); Actor *this = marker_getActor(marker);
__spawnQueue_add_4((GenFunction_4) func_802C4140, 0x4C, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2])); __spawnQueue_add_4((GenFunction_4) spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
func_802EE278(this, 3, 0xf, 0x3C, 0.2f, 1.2f); func_802EE278(this, 3, 0xf, 0x3C, 0.2f, 1.2f);
func_803115C4(0xA19); func_803115C4(0xA19);
jiggy_spawn(JIGGY_11_TTC_RED_X, this->position); jiggy_spawn(JIGGY_11_TTC_RED_X, this->position);

6
src/TTC/ch/treasurehunt.c
View File

@@ -92,7 +92,7 @@ void func_80389A1C(void) {
Actor *actor; Actor *actor;
ActorLocal_TreasureHunt *local; ActorLocal_TreasureHunt *local;
actor = spawn_actor_f32(0x55, D_8038C820[D_8037DCB4], 0); actor = actor_spawnWithYaw_f32(0x55, D_8038C820[D_8037DCB4], 0);
local = (ActorLocal_TreasureHunt *)&actor->local; local = (ActorLocal_TreasureHunt *)&actor->local;
actor->yaw = D_8038C868[D_8037DCB4]; actor->yaw = D_8038C868[D_8037DCB4];
local->unk0 = D_8037DCB4; local->unk0 = D_8037DCB4;
@@ -105,7 +105,7 @@ void func_80389A9C(void) {
ActorLocal_TreasureHunt *local; ActorLocal_TreasureHunt *local;
s32 actor_id; s32 actor_id;
actor = spawn_actor_f32((D_8038C898 - 1)[D_8037DCB4], D_8038C820[D_8037DCB4 - 1], 0); actor = actor_spawnWithYaw_f32((D_8038C898 - 1)[D_8037DCB4], D_8038C820[D_8037DCB4 - 1], 0);
local = (ActorLocal_TreasureHunt *)&actor->local; local = (ActorLocal_TreasureHunt *)&actor->local;
actor->yaw = D_8038C880[D_8037DCB4 - 1]; actor->yaw = D_8038C880[D_8037DCB4 - 1];
local->unk0 = D_8037DCB4; local->unk0 = D_8037DCB4;
@@ -157,7 +157,7 @@ void func_80389CC4(s16 arg0[3], s32 arg1){
D_8038D708[1] = (f32)arg0[1]; D_8038D708[1] = (f32)arg0[1];
D_8038D708[2] = (f32)arg0[2]; D_8038D708[2] = (f32)arg0[2];
D_8038D708[1] = mapModel_getFloorY(D_8038D708); D_8038D708[1] = mapModel_getFloorY(D_8038D708);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0xF4, reinterpret_cast(s32, D_8038D708[0]), reinterpret_cast(s32, D_8038D708[1]), reinterpret_cast(s32, D_8038D708[2]));
D_8038D700 = partEmitMgr_newEmitter(3); D_8038D700 = partEmitMgr_newEmitter(3);
particleEmitter_setRGB(D_8038D700, D_8038C91C); particleEmitter_setRGB(D_8038D700, D_8038C91C);
particleEmitter_setSprite(D_8038D700, ASSET_700_SPRITE_DUST); particleEmitter_setSprite(D_8038D700, ASSET_700_SPRITE_DUST);

12
src/core2/ba/marker.c
View File

@@ -9,7 +9,7 @@
extern void func_803012F8(void); extern void func_803012F8(void);
extern f32 ml_distanceSquared_vec3f(f32 arg0[3], f32 arg1[3]); extern f32 ml_distanceSquared_vec3f(f32 arg0[3], f32 arg1[3]);
extern void __baMarker_8028BA00(s32); extern void __baMarker_8028BA00(s32);
extern void func_802C418C(void); extern void spawnQueue_actor_s16(void);
extern void func_802A6388(f32); extern void func_802A6388(f32);
extern f32 chwadingboots_802D6E4C(Actor *); extern f32 chwadingboots_802D6E4C(Actor *);
extern void set_turbo_duration(f32); extern void set_turbo_duration(f32);
@@ -160,7 +160,7 @@ void __baMarker_8028B9A8(s32 arg0){
tmp_v0 = cubeList_findNodePropByActorId(0x1F6, 0); tmp_v0 = cubeList_findNodePropByActorId(0x1F6, 0);
nodeprop_getPosition_s32(tmp_v0, &ideal_yaw); nodeprop_getPosition_s32(tmp_v0, &ideal_yaw);
func_802CA1CC(arg0); func_802CA1CC(arg0);
func_8032811C(ACTOR_47_EMPTY_HONEYCOMB, &ideal_yaw, 0); actor_spawnWithYaw_s32(ACTOR_47_EMPTY_HONEYCOMB, &ideal_yaw, 0);
func_8025A6EC(COMUSIC_2B_DING_B, 28000); func_8025A6EC(COMUSIC_2B_DING_B, 28000);
} }
@@ -263,7 +263,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
if(actor->despawn_flag) if(actor->despawn_flag)
return; return;
if(actor->unk10_0 && func_802C9C14(actor)) if(actor->is_bundle && func_802C9C14(actor))
return; return;
}//L8028BD1C }//L8028BD1C
@@ -575,7 +575,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case 0x54: //L8028C820 case 0x54: //L8028C820
func_8025A6EC(COMUSIC_19_LOW_PITCH_FLUTES, 28000); func_8025A6EC(COMUSIC_19_LOW_PITCH_FLUTES, 28000);
func_803012F8(); func_803012F8();
__spawnQueue_add_4((GenFunction_4)func_802C418C, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z)); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s16, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z));
marker_despawn(marker); marker_despawn(marker);
break; break;
@@ -748,7 +748,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
miscFlag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS); miscFlag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
func_802A6388(chwadingboots_802D6E4C(actor)); func_802A6388(chwadingboots_802D6E4C(actor));
bs_checkInterrupt(BS_INTR_1B); bs_checkInterrupt(BS_INTR_1B);
__spawnQueue_add_4((GenFunction_4)func_802C418C, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z)); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s16, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z));
chwadingboots_802D6E54(actor); chwadingboots_802D6E54(actor);
break; break;
@@ -772,7 +772,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
miscFlag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS); miscFlag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
set_turbo_duration(chtrainers_getDuration(actor)); set_turbo_duration(chtrainers_getDuration(actor));
bs_checkInterrupt(BS_INTR_1A); bs_checkInterrupt(BS_INTR_1A);
__spawnQueue_add_4((GenFunction_4)func_802C418C, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z)); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s16, 0x4E, reinterpret_cast(u32, other_prop->actorProp.x), reinterpret_cast(u32, other_prop->actorProp.y), reinterpret_cast(u32, other_prop->actorProp.z));
chtrainers_pickup(actor); chtrainers_pickup(actor);
break; break;

2
src/core2/ba/model.c
View File

@@ -145,7 +145,7 @@ void baModel_reset(void){
if(!func_8028ADB4()) if(!func_8028ADB4())
baModel_updateModel(); baModel_updateModel();
player_getPosition(plyr_pos); player_getPosition(plyr_pos);
__spawnQueue_add_4((GenFunction_4)func_802C4140, __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32,
ACTOR_17_PLAYER_SHADOW, ACTOR_17_PLAYER_SHADOW,
reinterpret_cast(s32, plyr_pos[0]), reinterpret_cast(s32, plyr_pos[0]),
reinterpret_cast(s32, plyr_pos[1]), reinterpret_cast(s32, plyr_pos[1]),

2
src/core2/ch/badShad.c
View File

@@ -114,7 +114,7 @@ void func_802D71A0(s32 this, s32 arg1){
sp2C[0] = (s32) D_8037DE10[0]; sp2C[0] = (s32) D_8037DE10[0];
sp2C[1] = (s32) D_8037DE10[1]; sp2C[1] = (s32) D_8037DE10[1];
sp2C[2] = (s32) D_8037DE10[2]; sp2C[2] = (s32) D_8037DE10[2];
sp3C = spawn_actor(0x108, sp2C, (s32)sp38->yaw); sp3C = __actor_spawnWithYaw_s32(0x108, sp2C, (s32)sp38->yaw);
if(sp3C){ if(sp3C){
marker_getActor(marker)->unk104 = sp3C->marker; marker_getActor(marker)->unk104 = sp3C->marker;
sp3C->unk104 = marker; sp3C->unk104 = marker;

4
src/core2/ch/beehive.c
View File

@@ -31,8 +31,8 @@ void chBeehive_die(ActorMarker *this, ActorMarker *other){
actor_playAnimationOnce(actor); actor_playAnimationOnce(actor);
this->collidable = FALSE; this->collidable = FALSE;
actor->unk138_27 = 3; actor->unk138_27 = 3;
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4A_WOOD_EXPLOSION, reinterpret_cast(s32, actor->position[0]), reinterpret_cast(s32, actor->position[1]), reinterpret_cast(s32, actor->position[2]));
actor->marker->propPtr->unk8_3 = 0; actor->marker->propPtr->unk8_3 = 0;
func_803115C4(ASSET_D96_DIALOG_BEEHIVE_MEET); func_803115C4(ASSET_D96_DIALOG_BEEHIVE_MEET);
func_803115C4(ASSET_DA6_TEXT_BEEHIVE_WITH_BEES); func_803115C4(ASSET_DA6_TEXT_BEEHIVE_WITH_BEES);

2
src/core2/ch/bottlesbonus.c
View File

@@ -548,7 +548,7 @@ void chBottlesBonus_update(Actor *this) {
void __chBottlesBonus_spawn(void){ void __chBottlesBonus_spawn(void){
Actor *actor; Actor *actor;
if(chBottlesBonusMarker == NULL){ if(chBottlesBonusMarker == NULL){
actor = spawn_actor_f32(0x1E0, D_803682C4, 0); actor = actor_spawnWithYaw_f32(0x1E0, D_803682C4, 0);
chBottlesBonusMarker = actor->marker; chBottlesBonusMarker = actor->marker;
chBottlesBonusCursor_spawn(); chBottlesBonusCursor_spawn();
func_802DF270(); func_802DF270();

2
src/core2/ch/bottlesbonuscursor.c
View File

@@ -170,7 +170,7 @@ void chBottlesBonusCursor_draw(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
} }
ActorMarker *chBottlesBonusCursor_spawn(void){ ActorMarker *chBottlesBonusCursor_spawn(void){
Actor *this = spawn_actor_f32(0x2B4, D_80368400, 0); Actor *this = actor_spawnWithYaw_f32(0x2B4, D_80368400, 0);
chBottlesBonusCursorMarker = this->marker; chBottlesBonusCursorMarker = this->marker;
return chBottlesBonusCursorMarker; return chBottlesBonusCursorMarker;
} }

2
src/core2/ch/crab.c
View File

@@ -179,7 +179,7 @@ void __chCrab_die(ActorMarker *marker, ActorMarker *other){
is_black_snippet = this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET; is_black_snippet = this->modelCacheIndex == ACTOR_F2_BLACK_SNIPPET;
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 32750, this->position, 950, 1900); FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 32750, this->position, 950, 1900);
FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 28000, this->position, 950, 1900); FUNC_8030E8B4(SFX_79_TICKER_DEATH, 1.0f, 28000, this->position, 950, 1900);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
this->lifetime_value = 5.0f; this->lifetime_value = 5.0f;
marker->collidable = FALSE; marker->collidable = FALSE;
this->unk138_27 = 1; this->unk138_27 = 1;

2
src/core2/ch/gameSelect.c
View File

@@ -287,7 +287,7 @@ void func_802C4BB4(ActorMarker *marker){
sp20 = marker->id - 0xe4; sp20 = marker->id - 0xe4;
this = marker_getActor(marker); this = marker_getActor(marker);
sp18 = this->scale; sp18 = this->scale;
other = spawn_actor_f32(sp20 + 0x198, this->position, (s32)this->yaw); other = actor_spawnWithYaw_f32(sp20 + 0x198, this->position, (s32)this->yaw);
other->scale = sp18; other->scale = sp18;
} }

2
src/core2/ch/gloop.c
View File

@@ -38,7 +38,7 @@ void chgloop_spawnBubble(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
sp1C[0] = reinterpret_cast(f32, arg0); sp1C[0] = reinterpret_cast(f32, arg0);
sp1C[1] = reinterpret_cast(f32, arg1); sp1C[1] = reinterpret_cast(f32, arg1);
sp1C[2] = reinterpret_cast(f32, arg2); sp1C[2] = reinterpret_cast(f32, arg2);
spawn_actor_f32(ACTOR_E7_GLOOP_BUBBLE, sp1C, (s32)reinterpret_cast(f32, arg3)); actor_spawnWithYaw_f32(ACTOR_E7_GLOOP_BUBBLE, sp1C, (s32)reinterpret_cast(f32, arg3));
} }
void chgloop_update(Actor *this){ void chgloop_update(Actor *this){

6
src/core2/ch/icecube.c
View File

@@ -5,7 +5,7 @@
#define _HorzDist3v(v1, v2) ((v1[0]-v2[0])*(v1[0]-v2[0]) + (v1[2]-v2[2])*(v1[2]-v2[2])) #define _HorzDist3v(v1, v2) ((v1[0]-v2[0])*(v1[0]-v2[0]) + (v1[2]-v2[2])*(v1[2]-v2[2]))
extern void func_802D729C(Actor *, f32); extern void func_802D729C(Actor *, f32);
extern f32 func_80257204(f32, f32, f32, f32); extern f32 func_80257204(f32, f32, f32, f32);
extern Actor *func_802C937C(enum actor_e, f32[3]); extern Actor *bundle_spawn_f32(enum actor_e, f32[3]);
void chicecube_update(Actor *this); void chicecube_update(Actor *this);
Actor *chicecube_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); Actor *chicecube_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -201,8 +201,8 @@ void __chicecube_spawnHalfCubes(ActorMarker *marker){
sp54[2] = actor->position[2]; sp54[2] = actor->position[2];
sp54[1] += 100.0f; sp54[1] += 100.0f;
for(i = 0; i < 2; i++){//L8035A7FC for(i = 0; i < 2; i++){//L8035A7FC
func_802C8F70((i & 1)? actor->yaw : actor->yaw + 180.0f); bundle_setYaw((i & 1)? actor->yaw : actor->yaw + 180.0f);
other = func_802C937C(0x21, sp54); other = bundle_spawn_f32(0x21, sp54);
other->unkF4_8 = 1; //don't spawn more other->unkF4_8 = 1; //don't spawn more
other->scale = randf2(0.5f, 0.6f)*actor->scale; other->scale = randf2(0.5f, 0.6f)*actor->scale;
actor->yaw = randi2(0, 359); actor->yaw = randi2(0, 359);

6
src/core2/ch/jiggy.c
View File

@@ -13,7 +13,7 @@ typedef struct chjiggy_s{
u32 index; u32 index;
} ActorLocal_Jiggy; } ActorLocal_Jiggy;
Actor *func_802C41D8(f32, f32, f32); Actor *spawnQueue_actor_s32(f32, f32, f32);
void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3); void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3);
Actor *chjiggy_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3); Actor *chjiggy_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3);
void func_802C7D98(Actor * arg0); void func_802C7D98(Actor * arg0);
@@ -63,8 +63,8 @@ void func_802C7AB0(ActorMarker * arg0, u32 arg1){
} }
void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3){ void func_802C7AF8(u32 x, u32 y, u32 z, u32 arg3){
__spawnQueue_add_4((GenFunction_4)func_802C41D8, ACTOR_4C_STEAM, x, y, z); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s32, ACTOR_4C_STEAM, x, y, z);
__spawnQueue_add_4((GenFunction_4)func_802C41D8, ACTOR_14F_DESTROYED_JIGGY, x, y, z); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s32, ACTOR_14F_DESTROYED_JIGGY, x, y, z);
mapSpecificFlags_set(arg3, 1); mapSpecificFlags_set(arg3, 1);
} }

2
src/core2/ch/overlaycopyright.c
View File

@@ -34,7 +34,7 @@ void chOverlayCopyright_update(Actor *this){
void __chOverlayCopyright_spawn(void) { void __chOverlayCopyright_spawn(void) {
Actor *actor; Actor *actor;
if (chOverlayCopyrightMarker == 0) { if (chOverlayCopyrightMarker == 0) {
actor = spawn_actor_f32(ACTOR_1DD_COPYRIGHT_OVERLAY, D_803680D0, 0); actor = actor_spawnWithYaw_f32(ACTOR_1DD_COPYRIGHT_OVERLAY, D_803680D0, 0);
chOverlayCopyrightMarker = actor->marker; chOverlayCopyrightMarker = actor->marker;
} }
} }

4
src/core2/ch/overlaynocontroller.c
View File

@@ -5,7 +5,7 @@
#include <core1/viewport.h> #include <core1/viewport.h>
extern Actor *spawn_actor_f32(enum actor_e, f32[3], s32); extern Actor *actor_spawnWithYaw_f32(enum actor_e, f32[3], s32);
extern void actor_postdrawMethod(ActorMarker *marker); extern void actor_postdrawMethod(ActorMarker *marker);
Actor *chOverlayNoController_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); Actor *chOverlayNoController_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -76,7 +76,7 @@ void chOverlayNoController_update(Actor *this) {
void __chOverlayNoController_spawn(void){ void __chOverlayNoController_spawn(void){
if(chOverlayNoController_marker == NULL){ if(chOverlayNoController_marker == NULL){
chOverlayNoController_marker = spawn_actor_f32(ACTOR_1DF_NO_CONTROLLER_OVERLAY, D_80368168, 0)->marker; chOverlayNoController_marker = actor_spawnWithYaw_f32(ACTOR_1DF_NO_CONTROLLER_OVERLAY, D_80368168, 0)->marker;
} }
} }

4
src/core2/ch/overlaypressstart.c
View File

@@ -8,7 +8,7 @@
extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32); extern void subaddie_set_state_with_direction(Actor *, s32, f32, s32);
extern void actor_predrawMethod(Actor *); extern void actor_predrawMethod(Actor *);
extern void actor_postdrawMethod(ActorMarker *); extern void actor_postdrawMethod(ActorMarker *);
extern Actor *spawn_actor_f32(enum actor_e id, f32[3], s32); extern Actor *actor_spawnWithYaw_f32(enum actor_e id, f32[3], s32);
Actor *chOverlayPressStart_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx); Actor *chOverlayPressStart_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -88,7 +88,7 @@ void chOverlayPressStart_update(Actor *this){
void __chOverlayPressStart_spawn(void){ void __chOverlayPressStart_spawn(void){
if(D_8037DE80 == NULL){ if(D_8037DE80 == NULL){
D_8037DE80 = spawn_actor_f32(ACTOR_1DE_PRESS_START_OVERLAY, D_80368118, 0)->marker; D_8037DE80 = actor_spawnWithYaw_f32(ACTOR_1DE_PRESS_START_OVERLAY, D_80368118, 0)->marker;
} }
} }

2
src/core2/ch/shrapnel.c
View File

@@ -50,7 +50,7 @@ void chShrapnel_func_802D0AB8(Actor *this) {
void chShrapnel_spawnExplodeActor(s32 arg0){ void chShrapnel_spawnExplodeActor(s32 arg0){
Actor *this = reinterpret_cast(Actor *, arg0); Actor *this = reinterpret_cast(Actor *, arg0);
spawn_actor_f32(0xF3, this->unk1C, 0); actor_spawnWithYaw_f32(0xF3, this->unk1C, 0);
} }
void chShrapnel_emitExplosion(Actor *this) { void chShrapnel_emitExplosion(Actor *this) {

2
src/core2/ch/snacker.c
View File

@@ -359,7 +359,7 @@ void chSnacker_spawn(void) {
} }
} }
snacker = spawn_actor_f32(ACTOR_68_SNACKER, spawn_position, 0); snacker = actor_spawnWithYaw_f32(ACTOR_68_SNACKER, spawn_position, 0);
s_chSnacker_marker = snacker->marker; s_chSnacker_marker = snacker->marker;
local = (ChSnackerLocal *)&snacker->local; local = (ChSnackerLocal *)&snacker->local;

2
src/core2/ch/soundsource.c
View File

@@ -110,7 +110,7 @@ void func_802D096C(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
sp1C[0] = reinterpret_cast(f32, arg0); sp1C[0] = reinterpret_cast(f32, arg0);
sp1C[1] = reinterpret_cast(f32, arg1); sp1C[1] = reinterpret_cast(f32, arg1);
sp1C[2] = reinterpret_cast(f32, arg2); sp1C[2] = reinterpret_cast(f32, arg2);
spawn_actor_f32(0x28B, sp1C, arg3); actor_spawnWithYaw_f32(0x28B, sp1C, arg3);
} }

2
src/core2/code_16010.c
View File

@@ -53,7 +53,7 @@ void func_8029D0D8(void) {
void func_8029D154(void){ void func_8029D154(void){
f32 plyr_pos[3]; f32 plyr_pos[3];
player_getPosition(plyr_pos); player_getPosition(plyr_pos);
spawn_actor_f32(0x188, plyr_pos, (s32)yaw_get()); actor_spawnWithYaw_f32(0x188, plyr_pos, (s32)yaw_get());
} }
void func_8029D194(void) { void func_8029D194(void) {

414
src/core2/code_41FB0.c
View File

@@ -10,41 +10,47 @@ extern bool func_80309D58(f32[3], s32);
extern void ml_vec3f_normalize(f32 [3]); extern void ml_vec3f_normalize(f32 [3]);
typedef struct { typedef struct {
s16 unk0; s16 flags;
// u8 pad2[0x2]; // u8 pad2[0x2];
s32 actor_id; s32 actor_id;
s32 count; s32 count;
s16 unkC; s16 sfx_id;
s16 unkE; s16 sfx_volume;
s16 unk10; s16 sfx_sampleRate;
// u8 pad12[0x2]; // u8 pad12[0x2];
f32 unk14; f32 velocity_x;
f32 unk18; f32 randomVelocity_x;
f32 unk1C; f32 velocity_y;
f32 unk20; f32 randomVelocity_y;
f32 unk24; f32 velocity_z;
f32 unk28; f32 randomVelocity_z;
f32 unk2C; f32 bounce_factor;
f32 unk30; f32 yaw;
} struct41FB0s; } BundleInfo;
typedef struct { typedef struct {
s32 unk0; s32 index;
s16 unk4; s16 flags;
s16 unk6; s16 unk6;
f32 unk8[3]; f32 position[3];
f32 unk14[3]; f32 velocity[3];
f32 unk20; f32 yaw;
f32 unk24; f32 yaw_speed;
f32 unk28; f32 elapsed_time;
u8 unk2C; u8 unk2C;
u8 unk2D; u8 unk2D;
u8 unk2E; u8 unk2E;
u8 unk2F; u8 state;
} struct41FB0s_1; } Bundle;
/* .data */ /* .data */
enum core2_41FB0_e{ enum bundle_state_e {
BUNDLE_STATE_1_MOVING = 1,
BUNDLE_STATE_2_YAWING,
BUNDLE_STATE_3_IDLE
};
enum core2_41FB0_e {
CORE2_41FB0_0_MM_HUT_NOTES, CORE2_41FB0_0_MM_HUT_NOTES,
CORE2_41FB0_1_MM_HUT_EGGS, CORE2_41FB0_1_MM_HUT_EGGS,
CORE2_41FB0_2_MM_HUT_GRUBLIN, CORE2_41FB0_2_MM_HUT_GRUBLIN,
@@ -60,148 +66,152 @@ enum core2_41FB0_e{
CORE2_41FB0_E_YUMYUM_EGG = 0xe, CORE2_41FB0_E_YUMYUM_EGG = 0xe,
CORE2_41FB0_F_YUMYUM_RED_FEATHER CORE2_41FB0_F_YUMYUM_RED_FEATHER
}; };
// #define 41FB0_FLAG_SET_YAW 0x0020 // #define 41FB0_FLAG_SET_YAW 0x0020
struct41FB0s D_80366460[] = { BundleInfo gBundle_array[] = {
/*MM HUT 1*/ {0x0021, ACTOR_51_MUSIC_NOTE, 5, SFX_3E9_UNKNOWN, 1, 16000, 125.0f, 25.0f, 725.0f, 125.0f, 125.0f, 25.0f, 0.6f, 0.0f}, /*MM HUT 1*/ {0x0021, ACTOR_51_MUSIC_NOTE, 5, SFX_3E9_UNKNOWN, 1, 16000, 125.0f, 25.0f, 725.0f, 125.0f, 125.0f, 25.0f, 0.6f, 0.0f},
/*MM HUT 2*/ {0x0021, ACTOR_52_BLUE_EGG, 5, SFX_21_EGG_BOUNCE_1, 1, 16000, 100.0f, 50.0f, 500.0f, 250.0f, 100.0f, 50.0f, 0.6f, 0.0f}, /*MM HUT 2*/ {0x0021, ACTOR_52_BLUE_EGG, 5, SFX_21_EGG_BOUNCE_1, 1, 16000, 100.0f, 50.0f, 500.0f, 250.0f, 100.0f, 50.0f, 0.6f, 0.0f},
/*MM HUT 3*/ {0x0021, ACTOR_6_GRUBLIN, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 0.0f, 0.0f, 550.0f, 250.0f, 200.0f, 0.0f, 0.6f, 0.0f}, /*MM HUT 3*/ {0x0021, ACTOR_6_GRUBLIN, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 0.0f, 0.0f, 550.0f, 250.0f, 200.0f, 0.0f, 0.6f, 0.0f},
/*MM HUT 4*/ {0x0021, ACTOR_62_JINJO_GREEN, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 100.0f, 50.0f, 500.0f, 250.0f, 100.0f, 50.0f, 0.6f, 0.0f}, /*MM HUT 4*/ {0x0021, ACTOR_62_JINJO_GREEN, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 100.0f, 50.0f, 500.0f, 250.0f, 100.0f, 50.0f, 0.6f, 0.0f},
/*MM HUT 6*/ {0x0021, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 100.0f, 50.0f, 500.0f, 250.0f, 100.0f, 50.0f, 0.6f, 0.0f}, /*MM HUT 6*/ {0x0021, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 100.0f, 50.0f, 500.0f, 250.0f, 100.0f, 50.0f, 0.6f, 0.0f},
{0x0001, ACTOR_50_HONEYCOMB, 3, SFX_3E9_UNKNOWN, 1, 16000, 50.0f, 150.0f, 500.0f, 250.0f, 50.0f, 150.0f, 0.6f, 0.0f}, {0x0001, ACTOR_50_HONEYCOMB, 3, SFX_3E9_UNKNOWN, 1, 16000, 50.0f, 150.0f, 500.0f, 250.0f, 50.0f, 150.0f, 0.6f, 0.0f},
/*MM HUT 5*/ {0x0021, ACTOR_49_EXTRA_LIFE, 1, SFX_3E9_UNKNOWN, 1, 16000, 100.0f, 50.0f, 500.0f, 250.0f, 100.0f, 50.0f, 0.6f, 0.0f}, /*MM HUT 5*/ {0x0021, ACTOR_49_EXTRA_LIFE, 1, SFX_3E9_UNKNOWN, 1, 16000, 100.0f, 50.0f, 500.0f, 250.0f, 100.0f, 50.0f, 0.6f, 0.0f},
{0x0001, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 1000.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f}, {0x0001, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 1000.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x0005, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 90.0f, 0.0f, 930.0f, 0.0f, 100.0f, 0.0f, 0.6f, 0.0f}, {0x0005, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 90.0f, 0.0f, 930.0f, 0.0f, 100.0f, 0.0f, 0.6f, 0.0f},
{0x0049, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 1000.0f, 0.0f, 300.0f, 0.0f, 0.5f, 0.0f}, {0x0049, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 1000.0f, 0.0f, 300.0f, 0.0f, 0.5f, 0.0f},
/*BGS HUT 1,2,4,5 */{0x002D, ACTOR_B_SHOCKSPRING_PAD, 1, 0, 1, 16000, 0.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.2f, 315.0f}, /*BGS HUT 1,2,4,5*/ {0x002D, ACTOR_B_SHOCKSPRING_PAD, 1, 0, 1, 16000, 0.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.2f, 315.0f},
/*BGS HUT 3 */ {0x0005, ACTOR_51_MUSIC_NOTE, 5, SFX_3E9_UNKNOWN, 1, 16000, 75.0f, 0.0f, 725.0f, 0.0f, 75.0f, 0.0f, 0.6f, 0.0f}, /*BGS HUT 3*/ {0x0005, ACTOR_51_MUSIC_NOTE, 5, SFX_3E9_UNKNOWN, 1, 16000, 75.0f, 0.0f, 725.0f, 0.0f, 75.0f, 0.0f, 0.6f, 0.0f},
/*BGS HUT 4 */ {0x0005, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 1000.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f}, /*BGS HUT 4*/ {0x0005, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 1000.0f, 0.0f, 0.0f, 0.0f, 0.5f, 0.0f},
{0x0009, ACTOR_47_EMPTY_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 200.0f, 0.0f, 300.0f, 0.0f, 0.6f, 0.0f}, {0x0009, ACTOR_47_EMPTY_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 200.0f, 0.0f, 300.0f, 0.0f, 0.6f, 0.0f},
/*YUM YUM EGG*/ {0x0001, ACTOR_52_BLUE_EGG, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 0.0f, 350.0f, 500.0f, 500.0f, 0.0f, 350.0f, 0.6f, 0.0f}, /*YUM YUM EGG*/ {0x0001, ACTOR_52_BLUE_EGG, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 0.0f, 350.0f, 500.0f, 500.0f, 0.0f, 350.0f, 0.6f, 0.0f},
/*YUM YUM FEATHER*/ {0x0001, ACTOR_129_RED_FEATHER, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 0.0f, 350.0f, 500.0f, 500.0f, 0.0f, 350.0f, 0.6f, 0.0f}, /*YUM YUM FEATHER*/ {0x0001, ACTOR_129_RED_FEATHER, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 0.0f, 350.0f, 500.0f, 500.0f, 0.0f, 350.0f, 0.6f, 0.0f},
/*0x10*/{0x0005, ACTOR_46_JIGGY, 1, 0, 0, 0, 0.0f, 0.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.75f, 0.0f}, /*0x10*/ {0x0005, ACTOR_46_JIGGY, 1, 0, 0, 0, 0.0f, 0.0f, 100.0f, 0.0f, 0.0f, 0.0f, 0.75f, 0.0f},
{0x0005, 0x06A, 1, 0, 0, 0, 0.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f}, {0x0005, ACTOR_6A_UNKNOWN, 1, 0, 0, 0, 0.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x0009, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 650.0f, 0.0f, 950.0f, 0.0f, 0.6f, 0.0f}, {0x0009, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 0.0f, 0.0f, 650.0f, 0.0f, 950.0f, 0.0f, 0.6f, 0.0f},
{0x0001, ACTOR_51_MUSIC_NOTE, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 125.0f, 25.0f, 725.0f, 125.0f, 125.0f, 25.0f, 0.6f, 0.0f}, {0x0001, ACTOR_51_MUSIC_NOTE, 1, SFX_21_EGG_BOUNCE_1, 1, 16000, 125.0f, 25.0f, 725.0f, 125.0f, 125.0f, 25.0f, 0.6f, 0.0f},
{0x0001, ACTOR_50_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 18000, 50.0f, 150.0f, 500.0f, 250.0f, 50.0f, 150.0f, 0.6f, 0.0f}, {0x0001, ACTOR_50_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 18000, 50.0f, 150.0f, 500.0f, 250.0f, 50.0f, 150.0f, 0.6f, 0.0f},
{0x0065, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 90.0f, 0.0f, 930.0f, 0.0f, 100.0f, 0.0f, 0.7f, 0.0f}, {0x0065, ACTOR_46_JIGGY, 1, SFX_3E9_UNKNOWN, 1, 16000, 90.0f, 0.0f, 930.0f, 0.0f, 100.0f, 0.0f, 0.7f, 0.0f},
{0x0021, ACTOR_50_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 18000, 0.0f, 0.0f, 750.0f, 250.0f, 0.0f, 0.0f, 0.6f, 0.0f}, {0x0021, ACTOR_50_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 18000, 0.0f, 0.0f, 750.0f, 250.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x0021, ACTOR_50_HONEYCOMB, 2, SFX_3E9_UNKNOWN, 1, 18000, 50.0f, 150.0f, 500.0f, 250.0f, 50.0f, 150.0f, 0.6f, 0.0f}, {0x0021, ACTOR_50_HONEYCOMB, 2, SFX_3E9_UNKNOWN, 1, 18000, 50.0f, 150.0f, 500.0f, 250.0f, 50.0f, 150.0f, 0.6f, 0.0f},
{0x0021, ACTOR_50_HONEYCOMB, 3, SFX_3E9_UNKNOWN, 1, 18000, 50.0f, 150.0f, 500.0f, 250.0f, 50.0f, 150.0f, 0.6f, 0.0f}, {0x0021, ACTOR_50_HONEYCOMB, 3, SFX_3E9_UNKNOWN, 1, 18000, 50.0f, 150.0f, 500.0f, 250.0f, 50.0f, 150.0f, 0.6f, 0.0f},
{0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 250.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f}, {0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 250.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 350.0f, 0.0f, 350.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f}, {0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 350.0f, 0.0f, 350.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 450.0f, 0.0f, 400.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f}, {0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 450.0f, 0.0f, 400.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 550.0f, 0.0f, 450.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f}, {0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 550.0f, 0.0f, 450.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 650.0f, 0.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f}, {0x00A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 650.0f, 0.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x0021, ACTOR_46_JIGGY, 1, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, {0x0021, ACTOR_46_JIGGY, 1, 0, 0, 0, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
/* SM QUARRIES & VEGGIES*/ {0x0025, ACTOR_47_EMPTY_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 18000, 0.0f, 0.0f, 750.0f, 500.0f, 0.0f, 0.0f, 0.6f, 0.0f}, /*SM QUARRIES & VEGGIES*/ {0x0025, ACTOR_47_EMPTY_HONEYCOMB, 1, SFX_3E9_UNKNOWN, 1, 18000, 0.0f, 0.0f, 750.0f, 500.0f, 0.0f, 0.0f, 0.6f, 0.0f},
{0x0129, 0x352, 1, SFX_3F2_UNKNOWN, 1, 16000, 0.0f, 0.0f, 2500.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.0f}, {0x0129, ACTOR_352_UNKOWN, 1, SFX_3F2_UNKNOWN, 1, 16000, 0.0f, 0.0f, 2500.0f, 0.0f, 0.0f, 0.0f, 0.4f, 0.0f},
{0x0081, ACTOR_3A0_ICECUBE_B, 1, SFX_116_DEAF_RUSTLING, 1, 32000, 220.0f, 100.0f, 350.0f, 200.0f, 220.0f, 100.0f, 0.6f, 0.0f}, {0x0081, ACTOR_3A0_ICECUBE_B, 1, SFX_116_DEAF_RUSTLING, 1, 32000, 220.0f, 100.0f, 350.0f, 200.0f, 220.0f, 100.0f, 0.6f, 0.0f},
{0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 250.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, {0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 250.0f, 0.0f, 200.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
{0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 350.0f, 0.0f, 350.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, {0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 350.0f, 0.0f, 350.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
{0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 450.0f, 0.0f, 400.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, {0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 450.0f, 0.0f, 400.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
{0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 550.0f, 0.0f, 450.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}, {0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 550.0f, 0.0f, 450.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f},
{0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 650.0f, 0.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f} {0x02A1, ACTOR_50_HONEYCOMB, 1, SFX_8_BANJO_LANDING_04, 1, 20000, 650.0f, 0.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}
}; };
/* .bss */ /* .bss */
s32 D_8037DDB0; s32 gBundle_sfxCooldown;
f32 D_8037DDB4; f32 gBundle_yaw;
f32 D_8037DDB8; f32 gBundle_randomVelocity;
/* .public */ /* .public */
Actor *func_802C937C(s32 arg0, f32 position[3]); Actor *bundle_spawn_f32(s32 arg0, f32 position[3]);
/* .code */ /* .code */
void func_802C8F40(void){ void bundle_reset(void) {
D_8037DDB0 = 0; gBundle_sfxCooldown = 0;
D_8037DDB4 = 0.0f; gBundle_yaw = 0.0f;
D_8037DDB8 = 1.0f; gBundle_randomVelocity = 1.0f;
} }
void func_802C8F68(void){} void bundle_free(void) {}
void func_802C8F70(f32 arg0){ void bundle_setYaw(f32 yaw) {
D_8037DDB4 = arg0; gBundle_yaw = yaw;
} }
void func_802C8F7C(f32 arg0){ void bundle_setRandomVelocity(f32 velocity) {
D_8037DDB8 = arg0; gBundle_randomVelocity = velocity;
} }
Actor *func_802C8F88(s32 arg0, s32 arg1[3]){ Actor *bundle_spawn_s32(s32 index, s32 position[3]) {
f32 sp1C[3]; f32 pos_float[3];
TUPLE_COPY(sp1C, arg1) TUPLE_COPY(pos_float, position)
return func_802C937C(arg0, sp1C); return bundle_spawn_f32(index, pos_float);
} }
Actor *func_802C8FE4(s32 index, f32 position[3], Actor *arg2) { Actor *__bundle_spawnWithFirstActor(s32 index, f32 position[3], Actor *firstActor) {
static f32 D_80366C4C = 400.0f; static f32 D_80366C4C = 400.0f;
struct41FB0s *sp74 = D_80366460 + index; BundleInfo *bundle_info; //s2
Actor *actor = NULL; //s3 Actor *actor = NULL; //s3
s32 i; s32 i;
struct41FB0s_1 *s0; Bundle *bundle;
bundle_info = gBundle_array + index;
actor = NULL;
for (i = 0; i < bundle_info->count; i++) {//L802C90B0
gBundle_yaw += 360.0 / bundle_info->count;
while (360.0 <= gBundle_yaw) {
gBundle_yaw -= 360.0;
}
for (i = 0; i < sp74->count; i++) {//L802C90B0
D_8037DDB4 += 360.0 / sp74->count;
while (360.0 <= D_8037DDB4) { D_8037DDB4 -= 360.0; }
//L802C9114 //L802C9114
actor = (i == 0 && firstActor) ? firstActor : actor_spawnWithYaw_f32(bundle_info->actor_id, position, 0);
actor->is_bundle = TRUE;
bundle = (Bundle *) &actor->unkBC;
bundle->index = index;
bundle->state = BUNDLE_STATE_1_MOVING;
bundle->unk6 = 1;
ml_vec3f_copy(bundle->position, actor->position);
ml_vec3f_copy(actor->position, bundle->position);
actor = (i == 0 && arg2) ? arg2 : spawn_actor_f32(sp74->actor_id, position, 0); if (gBundle_randomVelocity != 1.0f) {
actor->unk10_0 = 1; bundle->velocity[0] = bundle_info->velocity_x * gBundle_randomVelocity;
bundle->velocity[1] = bundle_info->velocity_y + randf2(0.0f, bundle_info->randomVelocity_y);
s0 = (struct41FB0s_1 *) &actor->unkBC; bundle->velocity[2] = bundle_info->velocity_z * gBundle_randomVelocity;
s0->unk0 = index; gBundle_randomVelocity = 1.0f;
s0->unk2F = 1;
s0->unk6 = 1;
ml_vec3f_copy(s0->unk8, actor->position);
ml_vec3f_copy(actor->position, s0->unk8);
if (D_8037DDB8 != 1.0f) {
s0->unk14[0] = sp74->unk14 * D_8037DDB8;
s0->unk14[1] = sp74->unk1C + randf2(0.0f, sp74->unk20);
s0->unk14[2] = sp74->unk24 * D_8037DDB8;
D_8037DDB8 = 1.0f;
} }
else {//L802C91CC else {//L802C91CC
s0->unk14[0] = sp74->unk14 + randf2(0.0f, sp74->unk18); bundle->velocity[0] = bundle_info->velocity_x + randf2(0.0f, bundle_info->randomVelocity_x);
s0->unk14[1] = sp74->unk1C + randf2(0.0f, sp74->unk20); bundle->velocity[1] = bundle_info->velocity_y + randf2(0.0f, bundle_info->randomVelocity_y);
s0->unk14[2] = sp74->unk24 + randf2(0.0f, sp74->unk28); bundle->velocity[2] = bundle_info->velocity_z + randf2(0.0f, bundle_info->randomVelocity_z);
}//L802C9210 }//L802C9210
ml_vec3f_yaw_rotate_copy(s0->unk14, s0->unk14, D_8037DDB4); ml_vec3f_yaw_rotate_copy(bundle->velocity, bundle->velocity, gBundle_yaw);
s0->unk24 = D_80366C4C *= -1; bundle->yaw_speed = D_80366C4C *= -1;
actor->yaw = s0->unk20 = (sp74->unk0 & 0x20) ? sp74->unk30 : randf2(0.0f, 360.0f); actor->yaw = bundle->yaw = (bundle_info->flags & 0x20) ? bundle_info->yaw : randf2(0.0f, 360.0f);
s0->unk28 = 0.0f; bundle->elapsed_time = 0.0f;
s0->unk2C = 0; bundle->unk2C = 0;
s0->unk2D = 1; bundle->unk2D = 1;
s0->unk4 = sp74->unk0; bundle->flags = bundle_info->flags;
s0->unk2E = (sp74->unk0 & 0x1) ? (0.5 < randf()) : 0; bundle->unk2E = (bundle_info->flags & 0x1) ? (0.5 < randf()) : 0;
if (sp74->unk0 & 0x200) { if (bundle_info->flags & 0x200) {
actor->unk5C = s0->unk8[1]; actor->unk5C = bundle->position[1];
} }
}//L802C92E8 }//L802C92E8
return actor; return actor;
} }
Actor *func_802C9334(s32 arg0, Actor * arg1){ Actor *__bundle_spawnFromFirstActor(s32 index, Actor *actor) {
D_80366460[arg0].unk30 = arg1->yaw; gBundle_array[index].yaw = actor->yaw;
return func_802C8FE4(arg0, arg1->position, arg1); return __bundle_spawnWithFirstActor(index, actor->position, actor);
} }
Actor *func_802C937C(s32 arg0, f32 position[3]){ Actor *bundle_spawn_f32(s32 index, f32 position[3]) {
return func_802C8FE4(arg0, position, NULL); return __bundle_spawnWithFirstActor(index, position, NULL);
} }
bool func_802C939C(Actor *actor, f32 arg1[3], f32 arg2[3], f32 arg3[3], bool arg4) { bool func_802C939C(Actor *actor, f32 arg1[3], f32 arg2[3], f32 arg3[3], bool arg4) {
struct41FB0s_1 *sp64 = (struct41FB0s_1 *)&actor->unkBC; Bundle *bundle = (Bundle *)&actor->unkBC;
f32 sp60; f32 sp60;
bool var_v1; bool var_v1;
f32 sp50[3]; f32 sp50[3];
@@ -210,7 +220,7 @@ bool func_802C939C(Actor *actor, f32 arg1[3], f32 arg2[3], f32 arg3[3], bool arg
s32 sp3C; s32 sp3C;
if (sp64->unk4 & 0x80) { if (bundle->flags & 0x80) {
if (actor->unk10_25 != 0) { if (actor->unk10_25 != 0) {
if (func_80307258(arg2, actor->unk10_25 - 1, actor->unk10_18 - 1) == -1) { if (func_80307258(arg2, actor->unk10_25 - 1, actor->unk10_18 - 1) == -1) {
ml_vec3f_diff_copy(arg3, arg2, arg1); ml_vec3f_diff_copy(arg3, arg2, arg1);
@@ -256,126 +266,144 @@ bool func_802C939C(Actor *actor, f32 arg1[3], f32 arg2[3], f32 arg3[3], bool arg
} }
} }
} }
if (var_v1 && sp64->unk2D && (actor->marker->modelId == ASSET_363_MODEL_HONEYCOMB)) { if (var_v1 && bundle->unk2D && (actor->marker->modelId == ASSET_363_MODEL_HONEYCOMB)) {
ml_vec3f_scale_copy(sp44, arg3, sp60 / (f32) (1 << sp64->unk6)); ml_vec3f_scale_copy(sp44, arg3, sp60 / (f32) (1 << bundle->unk6));
var_v1 = TRUE; var_v1 = TRUE;
arg2[0] += sp44[0]; arg2[0] += sp44[0];
arg2[1] += sp44[1]; arg2[1] += sp44[1];
arg2[2] += sp44[2]; arg2[2] += sp44[2];
if (actor->marker->modelId != ASSET_363_MODEL_HONEYCOMB) { if (actor->marker->modelId != ASSET_363_MODEL_HONEYCOMB) {
sp64->unk6++; bundle->unk6++;
} }
if (sp64->unk6 == 5) { if (bundle->unk6 == 5) {
sp64->unk2D = FALSE; bundle->unk2D = FALSE;
} else { } else {
var_v1 = FALSE; var_v1 = FALSE;
} }
} else { } else {
sp64->unk2D = FALSE; bundle->unk2D = FALSE;
} }
arg1[1] -= sp60; arg1[1] -= sp60;
arg2[1] -= sp60; arg2[1] -= sp60;
return var_v1; return var_v1;
} }
void func_802C96E4(Actor *actor) { void bundle_update(Actor *actor) {
f32 sp6C; f32 tick;
struct41FB0s_1 *sp68; Bundle *bundle;
struct41FB0s *sp64; BundleInfo *bundle_info;
f32 sp58[3]; f32 previous_position[3];
f32 sp4C[3]; f32 sp4C[3];
f32 sp40[3]; f32 sp40[3];
s32 pad; s32 pad;
s32 pad2; s32 pad2;
f32 var_f0; f32 speed;
sp6C = time_getDelta(); tick = time_getDelta();
sp68 = (struct41FB0s_1 *)&actor->unkBC; bundle = (Bundle *) &actor->unkBC;
sp64 = &D_80366460[sp68->unk0]; bundle_info = &gBundle_array[bundle->index];
if (D_8037DDB0 > 0) D_8037DDB0--;
if (gBundle_sfxCooldown > 0) {
switch (sp68->unk2F) { gBundle_sfxCooldown--;
case 3: }
switch (bundle->state) {
case BUNDLE_STATE_3_IDLE:
break; break;
case 1:
sp68->unk28 += sp6C; case BUNDLE_STATE_1_MOVING:
ml_vec3f_copy(sp58, sp68->unk8); bundle->elapsed_time += tick;
ml_vec3f_scale_copy(sp4C, sp68->unk14, sp6C); ml_vec3f_copy(previous_position, bundle->position);
sp68->unk8[0] += sp4C[0]; ml_vec3f_scale_copy(sp4C, bundle->velocity, tick);
sp68->unk8[1] += sp4C[1]; bundle->position[0] += sp4C[0];
sp68->unk8[2] += sp4C[2]; bundle->position[1] += sp4C[1];
if (1.2 < sp68->unk28) { bundle->position[2] += sp4C[2];
sp68->unk2C = 1;
if (1.2 < bundle->elapsed_time) {
bundle->unk2C = 1;
} }
if (!((sp64->unk0 & 0x40) && (sp68->unk28 < 1.2))
&& ( (func_802C939C(actor, sp58, sp68->unk8, sp40, sp64->unk0 & 8)) if (!((bundle_info->flags & 0x40) && (bundle->elapsed_time < 1.2))
|| ((sp64->unk0 & 0x200) && (sp68->unk14[1] < -((sp64->unk20 / 2) + sp64->unk1C))) && ((func_802C939C(actor, previous_position, bundle->position, sp40, bundle_info->flags & 8))
) || ((bundle_info->flags & 0x200) && (bundle->velocity[1] < -((bundle_info->randomVelocity_y / 2) + bundle_info->velocity_y))))
) { ) {
if (sp64->unk0 & 0x204) { if (bundle_info->flags & 0x204) {
sp40[0] = 0.0f; sp40[0] = 0.0f;
sp40[1] = 1.0f; sp40[1] = 1.0f;
sp40[2] = 0.0f; sp40[2] = 0.0f;
} }
ml_vec3f_scale(sp68->unk14, -1.0f);
var_f0 = ((sp68->unk14[0] * sp40[0]) + (sp68->unk14[1] * sp40[1]) + (sp68->unk14[2] * sp40[2])); ml_vec3f_scale(bundle->velocity, -1.0f);
ml_vec3f_scale(sp40, 2*var_f0); speed = ((bundle->velocity[0] * sp40[0]) + (bundle->velocity[1] * sp40[1]) + (bundle->velocity[2] * sp40[2]));
ml_vec3f_diff_copy(sp68->unk14, sp40, sp68->unk14); ml_vec3f_scale(sp40, 2 * speed);
if (D_8037DDB0 == 0) { ml_vec3f_diff_copy(bundle->velocity, sp40, bundle->velocity);
if (sp64->unkC != 0) {
func_8030E878(sp64->unkC, (f32)sp64->unkE, sp64->unk10, sp68->unk8, 300.0f, 3000.0f); if (gBundle_sfxCooldown == 0) {
if (bundle_info->sfx_id != 0) {
func_8030E878(bundle_info->sfx_id, (f32) bundle_info->sfx_volume, bundle_info->sfx_sampleRate, bundle->position, 300.0f, 3000.0f);
} }
D_8037DDB0 = sp64->count * 8; gBundle_sfxCooldown = bundle_info->count * 8;
} }
ml_vec3f_scale(sp68->unk14, sp64->unk2C);
var_f0 = gu_sqrtf((sp68->unk14[0]*sp68->unk14[0]) + (sp68->unk14[1]*sp68->unk14[1]) + (sp68->unk14[2]*sp68->unk14[2])); ml_vec3f_scale(bundle->velocity, bundle_info->bounce_factor);
if (((var_f0 < 200.0f) && (sp40[1] > 0.75)) || (var_f0 < 10.0f)) { speed = gu_sqrtf((bundle->velocity[0] * bundle->velocity[0]) + (bundle->velocity[1] * bundle->velocity[1]) + (bundle->velocity[2] * bundle->velocity[2]));
sp68->unk2F = 2;
sp68->unk2C = 1; if (((speed < 200.0f) && (sp40[1] > 0.75)) || (speed < 10.0f)) {
if (sp64->unk0 & 0x10) { bundle->state = BUNDLE_STATE_2_YAWING;
bundle->unk2C = 1;
if (bundle_info->flags & 0x10) {
actor->marker->propPtr->unk8_3 = TRUE; actor->marker->propPtr->unk8_3 = TRUE;
} }
} }
else{ else {
} }
if (sp64->unk0 & 0x200) {
sp68->unk8[1] = actor->unk5C; if (bundle_info->flags & 0x200) {
} bundle->position[1] = actor->unk5C;
} else {
if (sp64->unk0 & 0x100) {
sp68->unk14[1] -= 4000.0 * sp6C;
} else {
sp68->unk14[1] -= 1500.0 * sp6C;
} }
} }
ml_vec3f_copy(actor->position, sp68->unk8); else {
if (bundle_info->flags & 0x100) {
bundle->velocity[1] -= 4000.0 * tick;
}
else {
bundle->velocity[1] -= 1500.0 * tick;
}
}
ml_vec3f_copy(actor->position, bundle->position);
break; break;
case 2: case BUNDLE_STATE_2_YAWING:
if (sp64->unk0 & 2) { if (bundle_info->flags & 2) {
sp68->unk20 += (sp68->unk24 * sp6C); bundle->yaw += (bundle->yaw_speed * tick);
while (sp68->unk20 >= 360.0f) { sp68->unk20 -= 360.0f; } while (bundle->yaw >= 360.0f) { bundle->yaw -= 360.0f; }
while (sp68->unk20 < 0.0f) { sp68->unk20 += 360.0f; } while (bundle->yaw < 0.0f) { bundle->yaw += 360.0f; }
actor->yaw = sp68->unk20;
actor->yaw = bundle->yaw;
} }
var_f0 = (sp68->unk24 >= 0.0f) ? sp68->unk24 : -sp68->unk24;
if (var_f0 < 0.1) { speed = (bundle->yaw_speed >= 0.0f) ? bundle->yaw_speed : -bundle->yaw_speed;
sp68->unk2F = 3U;
if (speed < 0.1) {
bundle->state = BUNDLE_STATE_3_IDLE;
} }
break; break;
} }
if (actor->position[1] < -5000.0f) { if (actor->position[1] < -5000.0f) {
marker_despawn(actor->marker); marker_despawn(actor->marker);
} }
} }
f32 *func_802C9C0C(Actor *actor){ f32 *bundle_getVelocity(Actor *actor){
struct41FB0s_1 *ptr = (struct41FB0s_1 *)&actor->unkBC; Bundle *ptr = (Bundle *)&actor->unkBC;
return ptr->unk14; return ptr->velocity;
} }
bool func_802C9C14(Actor *actor){ bool func_802C9C14(Actor *actor){
struct41FB0s_1 *ptr = (struct41FB0s_1 *)&actor->unkBC; Bundle *ptr = (Bundle *)&actor->unkBC;
return ptr->unk2C < 1U; return ptr->unk2C < 1U;
} }

2
src/core2/code_4C020.c
View File

@@ -746,7 +746,7 @@ void func_802D4D3C(enum actor_e arg0, enum actor_e arg1) {
func_8030E6D4(SFX_1B_EXPLOSION_1); func_8030E6D4(SFX_1B_EXPLOSION_1);
} }
else{ else{
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM,
reinterpret_cast(s32, sp5C[0]), reinterpret_cast(s32, sp5C[0]),
reinterpret_cast(s32, sp5C[1]), reinterpret_cast(s32, sp5C[1]),
reinterpret_cast(s32, sp5C[2]) reinterpret_cast(s32, sp5C[2])

2
src/core2/code_51950.c
View File

@@ -81,7 +81,7 @@ void func_802D8B20(enum actor_e actor_id){
player_getPosition(plyr_pos); player_getPosition(plyr_pos);
temp2 = player_getYaw(); temp2 = player_getYaw();
temp_v0 = (randf() > 0.5) ? 0x1E : -0x1E; temp_v0 = (randf() > 0.5) ? 0x1E : -0x1E;
feather = spawn_actor_f32(actor_id, plyr_pos, (s32) (temp2 + temp_v0)); feather = actor_spawnWithYaw_f32(actor_id, plyr_pos, (s32) (temp2 + temp_v0));
func_8032AA58(feather, 0.45f); func_8032AA58(feather, 0.45f);
feather->actor_specific_1_f = 22.0f; feather->actor_specific_1_f = 22.0f;
feather->unk1C[1] = 48.0f; feather->unk1C[1] = 48.0f;

2
src/core2/code_55390.c
View File

@@ -75,7 +75,7 @@ void func_802DC45C(Actor *this){
void func_802DC4C4(void) { void func_802DC4C4(void) {
Actor *actor; Actor *actor;
if (D_8037DE40 == 0) { if (D_8037DE40 == 0) {
actor = spawn_actor_f32(ACTOR_1DB_GAME_OVER, D_80368040, 0); actor = actor_spawnWithYaw_f32(ACTOR_1DB_GAME_OVER, D_80368040, 0);
D_8037DE40 = actor->marker; D_8037DE40 = actor->marker;
func_8025A58C(0, 5000); func_8025A58C(0, 5000);
func_8025AB00(); func_8025AB00();

2
src/core2/code_556C0.c
View File

@@ -37,7 +37,7 @@ void func_802DC67C(Actor *this){
void func_802DC6E4(void) { void func_802DC6E4(void) {
Actor *actor; Actor *actor;
if (D_8037DE50 == 0) { if (D_8037DE50 == 0) {
actor = spawn_actor_f32(0x19C, D_80368070, 0); actor = actor_spawnWithYaw_f32(0x19C, D_80368070, 0);
D_8037DE50 = actor->marker; D_8037DE50 = actor->marker;
func_8025A58C(0, 5000); func_8025A58C(0, 5000);
func_8025AB00(); func_8025AB00();

2
src/core2/code_55850.c
View File

@@ -70,7 +70,7 @@ void func_802DC900(Actor *this){
void func_802DC960(void) { void func_802DC960(void) {
Actor *actor; Actor *actor;
if (D_8037DE60 == 0) { if (D_8037DE60 == 0) {
actor = spawn_actor_f32(0x1DC, D_803680A0, 0); actor = actor_spawnWithYaw_f32(0x1DC, D_803680A0, 0);
D_8037DE60 = actor->marker; D_8037DE60 = actor->marker;
} }
} }

2
src/core2/code_57C70.c
View File

@@ -156,7 +156,7 @@ void func_802DEE1C(Actor *this) {
void func_802DF04C(void){ void func_802DF04C(void){
Actor *this; Actor *this;
if(D_8037DFE0 == NULL){ if(D_8037DFE0 == NULL){
this = spawn_actor_f32(0x19B, D_80368330, 0); this = actor_spawnWithYaw_f32(0x19B, D_80368330, 0);
D_8037DFE0 = this->marker; D_8037DFE0 = this->marker;
} }
} }

2
src/core2/code_581D0.c
View File

@@ -41,7 +41,7 @@ Actor *func_802DF160(Gfx **gfx, Mtx **mtx, Vtx **vtx) {
void func_802DF270(void){ void func_802DF270(void){
Actor *this; Actor *this;
if(D_8037E000 == NULL){ if(D_8037E000 == NULL){
this = spawn_actor_f32(0x2B5, D_80368360, 0); this = actor_spawnWithYaw_f32(0x2B5, D_80368360, 0);
D_8037E000 = this->marker; D_8037E000 = this->marker;
} }
} }

4
src/core2/code_6B30.c
View File

@@ -4,7 +4,7 @@
#include "core2/ba/carry.h" #include "core2/ba/carry.h"
#include "core2/ba/physics.h" #include "core2/ba/physics.h"
extern Actor *spawn_actor_f32(enum actor_e, f32[3], s32); extern Actor *actor_spawnWithYaw_f32(enum actor_e, f32[3], s32);
/* .bss */ /* .bss */
u8 D_8037BFA0; u8 D_8037BFA0;
@@ -116,7 +116,7 @@ void func_8028DE0C(enum actor_e actor_id){
f32 sp20[3]; f32 sp20[3];
baModel_getPosition(sp20); baModel_getPosition(sp20);
actor = spawn_actor_f32(actor_id, sp20, (s32) yaw_get()); actor = actor_spawnWithYaw_f32(actor_id, sp20, (s32) yaw_get());
actor->unk138_22 = TRUE; actor->unk138_22 = TRUE;
bacarry_set_marker(actor->marker); bacarry_set_marker(actor->marker);
bs_setState(BS_3A_CARRY_IDLE); bs_setState(BS_3A_CARRY_IDLE);

4
src/core2/code_7AF80.c
View File

@@ -1238,7 +1238,7 @@ NodeProp *func_80305510(s32 arg0) {
} }
Actor * func_803055E0(enum actor_e arg0, s32 arg1[3], s32 arg2, s32 arg3, s32 arg4){ Actor * func_803055E0(enum actor_e arg0, s32 arg1[3], s32 arg2, s32 arg3, s32 arg4){
Actor *actor = spawn_actor(arg0, arg1, arg2); Actor *actor = __actor_spawnWithYaw_s32(arg0, arg1, arg2);
NodeProp *tmp; NodeProp *tmp;
s32 sp34[3]; s32 sp34[3];
f32 sp28[3]; f32 sp28[3];
@@ -1263,7 +1263,7 @@ Actor * func_803055E0(enum actor_e arg0, s32 arg1[3], s32 arg2, s32 arg3, s32 ar
return actor; return actor;
} }
Actor *spawn_actor(enum actor_e arg0, s32 pos[3], s32 rot) { Actor *__actor_spawnWithYaw_s32(enum actor_e arg0, s32 pos[3], s32 rot) {
s32 i; s32 i;
arg0 = (!dummy_func_80320248()) ? (ACTOR_4_BIGBUTT) : (arg0); arg0 = (!dummy_func_80320248()) ? (ACTOR_4_BIGBUTT) : (arg0);

44
src/core2/code_9E370.c
View File

@@ -17,10 +17,10 @@ extern void func_802EE6CC(f32[3], s32[4], s32[4], s32, f32, f32, s32, s32, s32);
extern void func_8033A244(f32); extern void func_8033A244(f32);
f32 func_80257204(f32, f32, f32, f32); f32 func_80257204(f32, f32, f32, f32);
extern Actor *func_802C4260(enum actor_e actor_id, s32 x, s32 y, s32 z, s32 yaw); extern Actor *spawnQueue_bundleWithYaw_f32(s32 actor_id, s32 x, s32 y, s32 z, s32 yaw);
f32 func_8033229C(ActorMarker *); f32 func_8033229C(ActorMarker *);
f32 player_getYaw(void); f32 player_getYaw(void);
extern void func_802C9334(s32, Actor *); extern void __bundle_spawnFromFirstActor(s32, Actor *);
extern void func_8032B3A0(Actor *, ActorMarker *); extern void func_8032B3A0(Actor *, ActorMarker *);
extern void func_8032EE0C(GenFunction_2, s32); extern void func_8032EE0C(GenFunction_2, s32);
extern void func_8032EE20(void); extern void func_8032EE20(void);
@@ -589,9 +589,9 @@ void func_803268B4(void) {
if ((actor_info->shadow_scale != 0.0f) && actor->unk124_6 && marker->unk14_21) { if ((actor_info->shadow_scale != 0.0f) && actor->unk124_6 && marker->unk14_21) {
func_802D7124(actor, actor_info->shadow_scale); func_802D7124(actor, actor_info->shadow_scale);
} }
if (actor->unk10_0) { if (actor->is_bundle) {
actor = &suBaddieActorArray->data[temp_v1]; actor = &suBaddieActorArray->data[temp_v1];
func_802C96E4(actor); bundle_update(actor);
} }
} }
} }
@@ -838,7 +838,7 @@ Actor *actor_new(s32 position[3], s32 yaw, ActorInfo* actorInfo, u32 flags){
suLastBaddie->initialized = FALSE; suLastBaddie->initialized = FALSE;
suLastBaddie->volatile_initialized = FALSE; suLastBaddie->volatile_initialized = FALSE;
suLastBaddie->lifetime_value = 0.0f; suLastBaddie->lifetime_value = 0.0f;
suLastBaddie->unk10_0 = 0; suLastBaddie->is_bundle = FALSE;
suLastBaddie->unk104 = NULL; suLastBaddie->unk104 = NULL;
suLastBaddie->unk100 = NULL; suLastBaddie->unk100 = NULL;
suLastBaddie->unk158[0] = NULL; suLastBaddie->unk158[0] = NULL;
@@ -1057,11 +1057,11 @@ static void __actor_free(ActorMarker *arg0, Actor *arg1){
marker_free(arg0); marker_free(arg0);
} }
Actor *func_8032811C(enum actor_e id, s32 (* pos)[3], s32 rot){ Actor *actor_spawnWithYaw_s32(enum actor_e id, s32 (* pos)[3], s32 rot){
return spawn_actor(id, pos, rot); return __actor_spawnWithYaw_s32(id, pos, rot);
} }
Actor *spawn_actor_f32(enum actor_e id, f32 pos[3], s32 rot){ Actor *actor_spawnWithYaw_f32(enum actor_e id, f32 pos[3], s32 rot){
s32 pos_float[3]; s32 pos_float[3];
int i; int i;
@@ -1069,7 +1069,7 @@ Actor *spawn_actor_f32(enum actor_e id, f32 pos[3], s32 rot){
pos_float[i] = pos[i]; pos_float[i] = pos[i];
} }
spawn_actor(id, &pos_float, rot); __actor_spawnWithYaw_s32(id, &pos_float, rot);
} }
Actor * spawn_child_actor(enum actor_e id, Actor ** parent){ Actor * spawn_child_actor(enum actor_e id, Actor ** parent){
@@ -1079,7 +1079,7 @@ Actor * spawn_child_actor(enum actor_e id, Actor ** parent){
sp1C[0] = (*parent)->position_x; sp1C[0] = (*parent)->position_x;
sp1C[1] = (*parent)->position_y; sp1C[1] = (*parent)->position_y;
sp1C[2] = (*parent)->position_z; sp1C[2] = (*parent)->position_z;
child = spawn_actor(id, sp1C, (*parent)->yaw); child = __actor_spawnWithYaw_s32(id, sp1C, (*parent)->yaw);
*parent = marker_getActor(sp28); *parent = marker_getActor(sp28);
return child; return child;
} }
@@ -1097,13 +1097,15 @@ Actor *func_80328230(enum actor_e id, f32 pos[3], f32 rot[3]){
return actor; return actor;
} }
Actor *func_803282AC(enum actor_e id, s16 (* pos)[3], s32 yaw){ Actor *actor_spawnWithYaw_s16(enum actor_e id, s16 (* pos)[3], s32 yaw){
s32 sp24[3]; s32 sp24[3];
int i; int i;
for(i = 0; i< 3; i++){ for(i = 0; i< 3; i++){
sp24[i] = (*pos)[i]; sp24[i] = (*pos)[i];
} }
return spawn_actor(id, &sp24, yaw);
return __actor_spawnWithYaw_s32(id, &sp24, yaw);
} }
void marker_despawn(ActorMarker *marker){ void marker_despawn(ActorMarker *marker){
@@ -1858,7 +1860,7 @@ void func_8032A09C(s32 arg0, ActorListSaveState *arg1) {
sp50[1] = (s32) var_s0->position[1]; sp50[1] = (s32) var_s0->position[1];
sp50[2] = (s32) var_s0->position[2]; sp50[2] = (s32) var_s0->position[2];
pad = var_s0->yaw; pad = var_s0->yaw;
temp_v0_6 = func_8032811C(var_s0->modelCacheIndex, (sp50), pad); temp_v0_6 = actor_spawnWithYaw_s32(var_s0->modelCacheIndex, (sp50), pad);
actor_copy(var_s0, temp_v0_6); actor_copy(var_s0, temp_v0_6);
func_80329B68(temp_v0_6); func_80329B68(temp_v0_6);
func_803299B4(temp_v0_6); func_803299B4(temp_v0_6);
@@ -2182,12 +2184,12 @@ void func_8032B258(Actor *this, enum collision_e arg1) {
func_8034A174( this->marker->unk44, 0x20, sp38); func_8034A174( this->marker->unk44, 0x20, sp38);
} }
if (((s32)this->marker->unk44 < 0) && ((sp38[0] != 0.0f) || (sp38[1] != 0.0f) || (sp38[2] != 0.0f))) { if (((s32)this->marker->unk44 < 0) && ((sp38[0] != 0.0f) || (sp38[1] != 0.0f) || (sp38[2] != 0.0f))) {
__spawnQueue_add_5((GenFunction_5)func_802C4260, this->unk138_27 + 0x15, reinterpret_cast(s32,sp38[0]), reinterpret_cast(s32,sp38[1]), reinterpret_cast(s32,sp38[2]), reinterpret_cast(s32,sp44)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, this->unk138_27 + 0x15, reinterpret_cast(s32,sp38[0]), reinterpret_cast(s32,sp38[1]), reinterpret_cast(s32,sp38[2]), reinterpret_cast(s32,sp44));
return; return;
} }
else{ else{
sp34 = this->position[1] + 50.0f; sp34 = this->position[1] + 50.0f;
__spawnQueue_add_5((GenFunction_5)func_802C4260, this->unk138_27 + 0x15, reinterpret_cast(s32,this->position[0]), reinterpret_cast(s32,sp34), reinterpret_cast(s32,this->position[2]), reinterpret_cast(s32,sp44)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, this->unk138_27 + 0x15, reinterpret_cast(s32,this->position[0]), reinterpret_cast(s32,sp34), reinterpret_cast(s32,this->position[2]), reinterpret_cast(s32,sp44));
} }
} }
} }
@@ -2268,13 +2270,13 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) {
} }
} }
if (sp6C != 0) { if (sp6C != 0) {
func_802C8F70(func_80257204(arg0->propPtr->x, arg0->propPtr->z, arg1->propPtr->x, arg1->propPtr->z) + 90.0f); bundle_setYaw(func_80257204(arg0->propPtr->x, arg0->propPtr->z, arg1->propPtr->x, arg1->propPtr->z) + 90.0f);
D_8036E564 = sp6C; D_8036E564 = sp6C;
if (this->unk138_25) { if (this->unk138_25) {
func_802C9334(sp6C + 0x21, this); __bundle_spawnFromFirstActor(sp6C + 0x21, this);
} else { } else {
if ((this->marker->id < 0x1A1) || (this->marker->id >= 0x1A5)) { if ((this->marker->id < 0x1A1) || (this->marker->id >= 0x1A5)) {
func_802C9334(sp6C + 0x18, this); __bundle_spawnFromFirstActor(sp6C + 0x18, this);
} }
} }
} }
@@ -2303,15 +2305,15 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) {
} }
func_8032EE0C(func_8032B38C, this); func_8032EE0C(func_8032B38C, this);
if (((s32)arg0->unk44 < 0) && ((sp50[0] != 0.0f) || (sp50[1] != 0.0f) || (sp50[2] != 0.0f))) { if (((s32)arg0->unk44 < 0) && ((sp50[0] != 0.0f) || (sp50[1] != 0.0f) || (sp50[2] != 0.0f))) {
__spawnQueue_add_5((GenFunction_5)func_802C4260, sp70 + 0x15, reinterpret_cast(s32, sp50[0]), reinterpret_cast(s32, sp50[1]), reinterpret_cast(s32, sp50[2]), reinterpret_cast(s32, player_yaw)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, sp70 + 0x15, reinterpret_cast(s32, sp50[0]), reinterpret_cast(s32, sp50[1]), reinterpret_cast(s32, sp50[2]), reinterpret_cast(s32, player_yaw));
} else if (this->unk16C_3 && func_803048E0(sp3C, &sp4C, &sp48, 3, (s32) (func_8033229C(arg0) * 4.0f))) { } else if (this->unk16C_3 && func_803048E0(sp3C, &sp4C, &sp48, 3, (s32) (func_8033229C(arg0) * 4.0f))) {
sp50[0] = (f32) sp48->x; sp50[0] = (f32) sp48->x;
sp50[1] = (f32) sp48->y; sp50[1] = (f32) sp48->y;
sp50[2] = (f32) sp48->z; sp50[2] = (f32) sp48->z;
__spawnQueue_add_5((GenFunction_5)func_802C4260, sp70 + 0x15, reinterpret_cast(s32, sp50[0]), reinterpret_cast(s32, sp50[1]), reinterpret_cast(s32, sp50[2]), reinterpret_cast(s32, player_yaw)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, sp70 + 0x15, reinterpret_cast(s32, sp50[0]), reinterpret_cast(s32, sp50[1]), reinterpret_cast(s32, sp50[2]), reinterpret_cast(s32, player_yaw));
} else { } else {
sp38 = this->position[1] + func_8033229C(arg0); sp38 = this->position[1] + func_8033229C(arg0);
__spawnQueue_add_5((GenFunction_5)func_802C4260, sp70 + 0x15, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, sp38), reinterpret_cast(s32, this->position[2]), reinterpret_cast(s32, player_yaw)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, sp70 + 0x15, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, sp38), reinterpret_cast(s32, this->position[2]), reinterpret_cast(s32, player_yaw));
} }
func_8032EE20(); func_8032EE20();
} }

4
src/core2/code_AD5B0.c
View File

@@ -142,7 +142,7 @@ void func_80334910(void) {
spawnQueue_free(); spawnQueue_free();
func_802F53D0(); func_802F53D0();
func_802FAC3C(); func_802FAC3C();
func_802C8F68(); bundle_free();
func_8033E184(); func_8033E184();
func_8033FA24(); func_8033FA24();
func_80344C80(); func_80344C80();
@@ -254,7 +254,7 @@ void func_80334B20(enum map_e arg0, s32 arg1, s32 arg2) {
func_80322F9C(); func_80322F9C();
func_80323120(); func_80323120();
func_803223AC(); func_803223AC();
func_802C8F40(); bundle_reset();
func_8034F774(); func_8034F774();
func_80350174(); func_80350174();
gcparade_init(); gcparade_init();

2
src/core2/code_C0B80.c
View File

@@ -6,7 +6,7 @@ extern void func_80329904(ActorMarker *, s32, f32 *);
void func_80347B10(Struct81s *arg0){ void func_80347B10(Struct81s *arg0){
Actor *actor; Actor *actor;
actor = func_802C937C(0x10, arg0->position); actor = bundle_spawn_f32(0x10, arg0->position);
actor->unk54 = 3.0f; actor->unk54 = 3.0f;
func_803333DC(arg0, actor); func_803333DC(arg0, actor);
} }

2
src/core2/code_C0CF0.c
View File

@@ -8,7 +8,7 @@ extern void func_80329904(ActorMarker *, s32, f32 *);
/* .code */ /* .code */
void func_80347C80(Struct81s *arg0){ void func_80347C80(Struct81s *arg0){
Actor *actor; Actor *actor;
actor = spawn_actor_f32(ACTOR_46_JIGGY, arg0->position, 0); actor = actor_spawnWithYaw_f32(ACTOR_46_JIGGY, arg0->position, 0);
actor->unk54 = 3.0f; actor->unk54 = 3.0f;
func_803333DC(arg0, actor); func_803333DC(arg0, actor);
} }

2
src/core2/code_C0E60.c
View File

@@ -73,7 +73,7 @@ s32 spriteRender1PrimMode;
/* .code */ /* .code */
void func_80347DF0(Struct81s *arg0){ void func_80347DF0(Struct81s *arg0){
Actor *actor; Actor *actor;
actor = func_802C937C(arg0->actor_id, arg0->position); actor = bundle_spawn_f32(arg0->actor_id, arg0->position);
actor->unk54 = 3.0f; actor->unk54 = 3.0f;
func_803333DC(arg0, actor); func_803333DC(arg0, actor);
} }

2
src/core2/code_CD6E0.c
View File

@@ -566,7 +566,7 @@ void func_80355B00(void) {
projectile_indx = func_8033E8D0(); projectile_indx = func_8033E8D0();
pad40 = func_8033E864(); pad40 = func_8033E864();
sp38 = marker_getActor(pad40); sp38 = marker_getActor(pad40);
sp34 = func_802C9C0C(sp38); sp34 = bundle_getVelocity(sp38);
projectile_addRoll(projectile_indx, 7.0f); projectile_addRoll(projectile_indx, 7.0f);
sp28[0] = sp38->position[0]; sp28[0] = sp38->position[0];
sp28[1] = sp38->position[1]; sp28[1] = sp38->position[1];

2
src/core2/code_D5D10.c
View File

@@ -73,7 +73,7 @@ void chskeleton_despawn(ActorMarker *marker, s32 arg1) {
func_802DAD8C(partEmitMgr_newEmitter(2), this, ASSET_4CD_MODEL_LIMBO_ARM); func_802DAD8C(partEmitMgr_newEmitter(2), this, ASSET_4CD_MODEL_LIMBO_ARM);
func_8035CCA0(partEmitMgr_newEmitter(4), this, ASSET_4D0_MODEL_LIMBO_BONE); func_8035CCA0(partEmitMgr_newEmitter(4), this, ASSET_4D0_MODEL_LIMBO_BONE);
FUNC_8030E8B4(SFX_119_FISH_DEATH, 1.0f, 32000, this->position, 1250, 2500); FUNC_8030E8B4(SFX_119_FISH_DEATH, 1.0f, 32000, this->position, 1250, 2500);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
marker_despawn(marker); marker_despawn(marker);
} }

6
src/core2/code_D6180.c
View File

@@ -71,7 +71,7 @@ void func_8035D1F0(ActorMarker *arg0, s32 arg1) {
func_802DAD8C(partEmitMgr_newEmitter(2), this, ASSET_4C8_MODEL_MUMMUM_ARM); func_802DAD8C(partEmitMgr_newEmitter(2), this, ASSET_4C8_MODEL_MUMMUM_ARM);
func_8035D110(partEmitMgr_newEmitter(1), this, ASSET_4CB_MODEL_MUMMUM_BODY); func_8035D110(partEmitMgr_newEmitter(1), this, ASSET_4CB_MODEL_MUMMUM_BODY);
FUNC_8030E8B4(SFX_119_FISH_DEATH, 0.8f, 32000, this->position, 1250, 2500); FUNC_8030E8B4(SFX_119_FISH_DEATH, 0.8f, 32000, this->position, 1250, 2500);
__spawnQueue_add_4((GenFunction_4) func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2])); __spawnQueue_add_4((GenFunction_4) spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
marker_despawn(arg0); marker_despawn(arg0);
} }
@@ -133,7 +133,7 @@ void func_8035D490(ActorMarker *marker){
if (map_get() == MAP_13_GV_MEMORY_GAME) { if (map_get() == MAP_13_GV_MEMORY_GAME) {
sp1C = marker_getActor(marker); sp1C = marker_getActor(marker);
if (func_80329530(sp1C, 250) != 0) { if (func_80329530(sp1C, 250) != 0) {
func_802C9334(0x1C, sp1C); __bundle_spawnFromFirstActor(0x1C, sp1C);
func_8035D2C0(marker, 0); func_8035D2C0(marker, 0);
} }
} }
@@ -146,7 +146,7 @@ void func_8035D4F0(ActorMarker *marker, s32 arg1){
actor = marker_getActor(marker); actor = marker_getActor(marker);
if(actor->state != 9){ if(actor->state != 9){
if(func_8033F3E8(mapModel_getModel(0), actor->position, 0x190, 0x1A0) == arg1){ if(func_8033F3E8(mapModel_getModel(0), actor->position, 0x190, 0x1A0) == arg1){
func_802C9334(0x1C, actor); __bundle_spawnFromFirstActor(0x1C, actor);
func_8035D2C0(marker, 0); func_8035D2C0(marker, 0);
} }
} }

2
src/core2/code_EF50.c
View File

@@ -67,7 +67,7 @@ enum bs_e func_80295EE0(enum bs_e arg0){
} }
else{ else{
ml_vec3f_to_vec3h(sp20, D_8037C3E0.unk8); ml_vec3f_to_vec3h(sp20, D_8037C3E0.unk8);
sp1C = func_803282AC(ACTOR_5A_JIGSAW_DANCE, sp20, 0); sp1C = actor_spawnWithYaw_s16(ACTOR_5A_JIGSAW_DANCE, sp20, 0);
chJigsawDance_setState(sp1C, 3); chJigsawDance_setState(sp1C, 3);
bsjig_setJiggyMarkerPtr(sp1C->marker); bsjig_setJiggyMarkerPtr(sp1C->marker);
sp1C->unk38_31 = D_8037C3E0.unk18; sp1C->unk38_31 = D_8037C3E0.unk18;

55
src/core2/spawnqueue.c
View File

@@ -534,66 +534,65 @@ void __spawnQueue_add_5(void (* arg0)(void), s32 arg1, s32 arg2, s32 arg3, s32 a
} }
} }
Actor *func_802C4140(enum actor_e actor_id, s32 x, s32 y, s32 z){ Actor *spawnQueue_actor_f32(enum actor_e actor_id, s32 x, s32 y, s32 z) {
f32 position[3]; f32 position[3];
position[0] = reinterpret_cast(f32, x); position[0] = reinterpret_cast(f32, x);
position[1] = reinterpret_cast(f32, y); position[1] = reinterpret_cast(f32, y);
position[2] = reinterpret_cast(f32, z); position[2] = reinterpret_cast(f32, z);
return spawn_actor_f32(reinterpret_cast(enum actor_e, actor_id), position, 0); return actor_spawnWithYaw_f32(reinterpret_cast(enum actor_e, actor_id), position, 0);
} }
Actor *spawnQueue_actor_s16(enum actor_e actor_id, s32 x, s32 y, s32 z) {
Actor *func_802C418C(enum actor_e actor_id, s32 x, s32 y, s32 z){
s16 position[3]; s16 position[3];
position[0] = reinterpret_cast(s16, x); position[0] = reinterpret_cast(s16, x);
position[1] = reinterpret_cast(s16, y); position[1] = reinterpret_cast(s16, y);
position[2] = reinterpret_cast(s16, z); position[2] = reinterpret_cast(s16, z);
return func_803282AC(reinterpret_cast(enum actor_e, actor_id), position, 0); return actor_spawnWithYaw_s16(reinterpret_cast(enum actor_e, actor_id), position, 0);
} }
Actor *func_802C41D8(enum actor_e actor_id, s32 x, s32 y, s32 z){ Actor *spawnQueue_actor_s32(enum actor_e actor_id, s32 x, s32 y, s32 z) {
s32 position[3]; s32 position[3];
position[0] = reinterpret_cast(s32, x); position[0] = reinterpret_cast(s32, x);
position[1] = reinterpret_cast(s32, y); position[1] = reinterpret_cast(s32, y);
position[2] = reinterpret_cast(s32, z); position[2] = reinterpret_cast(s32, z);
return func_8032811C(reinterpret_cast(enum actor_e, actor_id), position, 0); return actor_spawnWithYaw_s32(reinterpret_cast(enum actor_e, actor_id), position, 0);
} }
Actor *func_802C4218(enum actor_e actor_id, s32 x, s32 y, s32 z){ Actor *spawnQueue_bundle_f32(s32 index, s32 x, s32 y, s32 z) {
f32 position[3]; f32 position[3];
position[0] = reinterpret_cast(f32, x); position[0] = reinterpret_cast(f32, x);
position[1] = reinterpret_cast(f32, y); position[1] = reinterpret_cast(f32, y);
position[2] = reinterpret_cast(f32, z); position[2] = reinterpret_cast(f32, z);
return func_802C937C(reinterpret_cast(enum actor_e, actor_id), position); return bundle_spawn_f32(reinterpret_cast(s32, index), position);
} }
Actor *func_802C4260(enum actor_e actor_id, s32 x, s32 y, s32 z, s32 yaw){ Actor *spawnQueue_bundleWithYaw_f32(s32 index, s32 x, s32 y, s32 z, s32 yaw) {
f32 position[3]; f32 position[3];
position[0] = reinterpret_cast(f32, x); position[0] = reinterpret_cast(f32, x);
position[1] = reinterpret_cast(f32, y); position[1] = reinterpret_cast(f32, y);
position[2] = reinterpret_cast(f32, z); position[2] = reinterpret_cast(f32, z);
func_802C8F70(reinterpret_cast(f32, yaw)); bundle_setYaw(reinterpret_cast(f32, yaw));
return func_802C937C(reinterpret_cast(enum actor_e, actor_id), position); return bundle_spawn_f32(reinterpret_cast(s32, index), position);
} }
Actor *func_802C42B4(s32 arg0, s32 arg1, s32 arg2, s32 arg3){ Actor *spawnQueue_bundle_s32(s32 index, s32 x, s32 y, s32 z) {
s32 sp1C[3]; s32 position[3];
sp1C[0] = reinterpret_cast(s32, arg1); position[0] = reinterpret_cast(s32, x);
sp1C[1] = reinterpret_cast(s32, arg2); position[1] = reinterpret_cast(s32, y);
sp1C[2] = reinterpret_cast(s32, arg3); position[2] = reinterpret_cast(s32, z);
return func_802C8F88(reinterpret_cast(s32, arg0), sp1C); return bundle_spawn_s32(reinterpret_cast(s32, index), position);
} }
Actor * func_802C42F0(s32 arg0, s32 arg1, s32 arg2, s32 arg3){ Actor *spawnQueue_bundle_s32_2(s32 index, s32 x, s32 y, s32 z) {
s32 sp1C[3]; s32 position[3];
sp1C[0] = arg1; position[0] = x;
sp1C[1] = arg2; position[1] = y;
sp1C[2] = arg3; position[2] = z;
return func_802C8F88(arg0, sp1C); return bundle_spawn_s32(index, position);
} }
void spawnQueue_defrag(FunctionQueue *arg0){ void spawnQueue_defrag(FunctionQueue *arg0) {
if((arg0 = spawnQueue) != NULL) if ((arg0 = spawnQueue) != NULL) {
spawnQueue = (FunctionQueue *)defrag(); spawnQueue = (FunctionQueue *) defrag();
}
} }

2
src/fight/chbossjinjobase.c
View File

@@ -136,7 +136,7 @@ void chBossJinjoBase_update(Actor *this) {
this->velocity_y = 100.0f; this->velocity_y = 100.0f;
func_802BB3DC(0, 8.0f, 0.92f); func_802BB3DC(0, 8.0f, 0.92f);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x3ad, *(s32*)&this->unk1C[0], *(s32*)&this->unk1C[1], *(s32*)&this->unk1C[2]); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x3ad, *(s32*)&this->unk1C[0], *(s32*)&this->unk1C[1], *(s32*)&this->unk1C[2]);
chBossJinjoBase_emitSmoke(this->unk1C, 0x10); chBossJinjoBase_emitSmoke(this->unk1C, 0x10);
SPAWNQUEUE_ADD_1(chbossjinjobase_spawnStoneJinjo, this->marker); SPAWNQUEUE_ADD_1(chbossjinjobase_spawnStoneJinjo, this->marker);
} }

26
src/fight/chfinalboss.c
View File

@@ -11,7 +11,7 @@ extern void func_80320ED8(ActorMarker *, f32, s32);
void func_80387110(ActorMarker *, f32[3], f32, s32); void func_80387110(ActorMarker *, f32[3], f32, s32);
void func_8038856C(Actor *actor, f32 *arg1); void func_8038856C(Actor *actor, f32 *arg1);
void chfinalboss_update(Actor *this); void chfinalboss_update(Actor *this);
void func_802C8F70(f32); void bundle_setYaw(f32);
s32 func_803297C8(Actor*, f32*); s32 func_803297C8(Actor*, f32*);
Actor *func_8032813C(); Actor *func_8032813C();
void fight_func_803900DC(ActorMarker *, f32 *, f32, f32); void fight_func_803900DC(ActorMarker *, f32 *, f32, f32);
@@ -434,8 +434,8 @@ void __chfinalboss_dropHealth(ActorMarker *arg0) {
Actor *actor; Actor *actor;
actor = marker_getActor(arg0); actor = marker_getActor(arg0);
func_802C8F70(func_803297C8(actor, D_803916F4)); bundle_setYaw(func_803297C8(actor, D_803916F4));
func_802C937C(0x14, actor->position); bundle_spawn_f32(0x14, actor->position);
} }
void chfinalboss_despawnFlightPad(void) { void chfinalboss_despawnFlightPad(void) {
@@ -447,7 +447,7 @@ void chfinalboss_spawnFlightPad(s32 arg0) {
s16 *temp_v1; s16 *temp_v1;
Actor *flight_pad; Actor *flight_pad;
flight_pad = spawn_actor_f32(ACTOR_39F_FIGHT_FLIGHT_PAD, D_80391700, D_8039170C); flight_pad = actor_spawnWithYaw_f32(ACTOR_39F_FIGHT_FLIGHT_PAD, D_80391700, D_8039170C);
flight_pad->alpha_124_19 = 0; flight_pad->alpha_124_19 = 0;
flight_pad->unk38_31 = 6; flight_pad->unk38_31 = 6;
__chFinalBossFlightPadMarker = flight_pad->marker; __chFinalBossFlightPadMarker = flight_pad->marker;
@@ -456,7 +456,7 @@ void chfinalboss_spawnFlightPad(s32 arg0) {
void func_80386EC0(s32 arg0) { void func_80386EC0(s32 arg0) {
ActorMarker *marker; ActorMarker *marker;
marker = spawn_actor_f32(0x38A, D_80392758, 0)->marker; marker = actor_spawnWithYaw_f32(0x38A, D_80392758, 0)->marker;
func_8030E878(SFX_147_GRUNTY_SPELL_ATTACK_2, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f); func_8030E878(SFX_147_GRUNTY_SPELL_ATTACK_2, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
fight_func_803900DC(marker, D_80392758, D_80392768[1], D_80392768[2]); fight_func_803900DC(marker, D_80392758, D_80392768[1], D_80392768[2]);
} }
@@ -474,7 +474,7 @@ void func_80386F5C(ActorMarker * arg0, f32 arg1[3], f32 arg2, f32 arg3) {
void func_80386FD8(s32 arg0) { void func_80386FD8(s32 arg0) {
ActorMarker *marker; ActorMarker *marker;
marker = spawn_actor_f32(0x389, D_80392758, 0)->marker; marker = actor_spawnWithYaw_f32(0x389, D_80392758, 0)->marker;
func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f); func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778); fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778);
} }
@@ -482,7 +482,7 @@ void func_80386FD8(s32 arg0) {
void func_80387074(s32 arg0) { void func_80387074(s32 arg0) {
ActorMarker *marker; ActorMarker *marker;
marker = spawn_actor_f32(0x3AA, D_80392758, 0)->marker; marker = actor_spawnWithYaw_f32(0x3AA, D_80392758, 0)->marker;
func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f); func_8030E878(SFX_146_GRUNTY_SPELL_ATTACK_1, randf2(0.95f, 1.05f), 32000, D_80392758, 5000.0f, 12000.0f);
fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778); fight_func_8038FB84(marker, D_80392758, D_80392768, D_80392778);
} }
@@ -1270,28 +1270,28 @@ void __chfinalboss_spawnStatue(enum bossjinjo_e statue_id) {
switch (statue_id) { switch (statue_id) {
case BOSSJINJO_ORANGE: case BOSSJINJO_ORANGE:
sp1C = spawn_actor_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391768, 135); sp1C = actor_spawnWithYaw_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391768, 135);
__chFinalBossJinjoStatueMarker[0] = sp1C->marker; __chFinalBossJinjoStatueMarker[0] = sp1C->marker;
break; break;
case BOSSJINJO_GREEN: case BOSSJINJO_GREEN:
sp1C = spawn_actor_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391774, 45); sp1C = actor_spawnWithYaw_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391774, 45);
__chFinalBossJinjoStatueMarker[1] = sp1C->marker; __chFinalBossJinjoStatueMarker[1] = sp1C->marker;
break; break;
case BOSSJINJO_PINK: case BOSSJINJO_PINK:
sp1C = spawn_actor_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391780, 315); sp1C = actor_spawnWithYaw_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_80391780, 315);
__chFinalBossJinjoStatueMarker[2] = sp1C->marker; __chFinalBossJinjoStatueMarker[2] = sp1C->marker;
break; break;
case BOSSJINJO_YELLOW: case BOSSJINJO_YELLOW:
sp1C = spawn_actor_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_8039178C, 225); sp1C = actor_spawnWithYaw_f32(ACTOR_3A2_JINJO_STATUE_BASE, D_8039178C, 225);
__chFinalBossJinjoStatueMarker[3] = sp1C->marker; __chFinalBossJinjoStatueMarker[3] = sp1C->marker;
break; break;
case BOSSJINJO_JINJONATOR: case BOSSJINJO_JINJONATOR:
*D_80392750_ptr = ((local->mirror_phase5) ? 0.0f : 180.0f); *D_80392750_ptr = ((local->mirror_phase5) ? 0.0f : 180.0f);
sp1C = spawn_actor_f32(ACTOR_3A9_JINJONATOR_STATUE_BASE, D_80391798, (s32)*D_80392750_ptr); sp1C = actor_spawnWithYaw_f32(ACTOR_3A9_JINJONATOR_STATUE_BASE, D_80391798, (s32)*D_80392750_ptr);
break; break;
} }
sp1C->lifetime_value = (statue_id == BOSSJINJO_JINJONATOR) ? 5.25f : 1.54f; sp1C->lifetime_value = (statue_id == BOSSJINJO_JINJONATOR) ? 5.25f : 1.54f;
@@ -1524,7 +1524,7 @@ void chfinalboss_phase4_setState(Actor *this, s32 arg1) {
case 32: case 32:
func_8030E878(SFX_131_GRUNTY_WEEEGH, randf2(0.95f, 1.05f), 32000, this->position, 5000.0f, 12000.0f); func_8030E878(SFX_131_GRUNTY_WEEEGH, randf2(0.95f, 1.05f), 32000, this->position, 5000.0f, 12000.0f);
func_802C9334(0x24, this); __bundle_spawnFromFirstActor(0x24, this);
return; return;
case 33: case 33:
FUNC_8030E624(SFX_131_GRUNTY_WEEEGH, 1.0f, 32000); FUNC_8030E624(SFX_131_GRUNTY_WEEEGH, 1.0f, 32000);

2
src/fight/chjinjonatorbase.c
View File

@@ -98,7 +98,7 @@ void func_8038E260(ActorMarker *arg0) {
Actor *sp24 = marker_getActor(arg0); Actor *sp24 = marker_getActor(arg0);
func_802BB3DC(0, 18.0f, 0.92f); func_802BB3DC(0, 18.0f, 0.92f);
__spawnQueue_add_4((GenFunction_4) func_802C4140, 0x3AD, *(u32 *)(&sp24->unk1C_x), *(u32 *)(&sp24->unk1C_y), *(u32 *)(&sp24->unk1C_z)); __spawnQueue_add_4((GenFunction_4) spawnQueue_actor_f32, 0x3AD, *(u32 *)(&sp24->unk1C_x), *(u32 *)(&sp24->unk1C_y), *(u32 *)(&sp24->unk1C_z));
func_8038E03C(sp24->unk1C, 0x10); func_8038E03C(sp24->unk1C, 0x10);
} }

6
src/lair/code_0.c
View File

@@ -799,7 +799,7 @@ void func_80387E94(s32 arg0)
marker = reinterpret_cast(ActorMarker *, arg0); marker = reinterpret_cast(ActorMarker *, arg0);
actor1 = marker_getActor(marker); actor1 = marker_getActor(marker);
actorNew = spawn_actor_f32(0x25A, actor1->position, actor1->yaw); actorNew = actor_spawnWithYaw_f32(0x25A, actor1->position, actor1->yaw);
// Grab the same pointer again for good measure :^) // Grab the same pointer again for good measure :^)
actor2 = marker_getActor(marker); actor2 = marker_getActor(marker);
@@ -821,7 +821,7 @@ void func_80387F1C(void)
{ {
jiggy_spawn(JIGGY_35_LAIR_CC_WITCH_SWITCH, tmp); jiggy_spawn(JIGGY_35_LAIR_CC_WITCH_SWITCH, tmp);
// FIXME: macro? // FIXME: macro?
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, *(s32 *)&tmp[0], *(s32 *)&tmp[1], *(s32 *)&tmp[2]); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, *(s32 *)&tmp[0], *(s32 *)&tmp[1], *(s32 *)&tmp[2]);
} }
} }
@@ -1544,7 +1544,7 @@ void func_803897D4(s32 arg0)
marker1 = reinterpret_cast(ActorMarker *, arg0); marker1 = reinterpret_cast(ActorMarker *, arg0);
actor1 = marker_getActor(marker1); actor1 = marker_getActor(marker1);
actor1 = spawn_actor_f32(0x258, actor1->position, actor1->yaw); actor1 = actor_spawnWithYaw_f32(0x258, actor1->position, actor1->yaw);
// Grab the same pointer again for good measure // Grab the same pointer again for good measure
actor2 = marker_getActor(marker1); actor2 = marker_getActor(marker1);

2
src/lair/code_86F0.c
View File

@@ -437,7 +437,7 @@ void lair_func_8038F924(Actor *this) {
return; return;
} }
if (!fileProgressFlag_get(FILEPROG_54_CCW_PUZZLE_PODIUM_ACTIVE)) { if (!fileProgressFlag_get(FILEPROG_54_CCW_PUZZLE_PODIUM_ACTIVE)) {
func_802C9334(0x20, this); __bundle_spawnFromFirstActor(0x20, this);
func_80324CFC(0.0f, COMUSIC_43_ENTER_LEVEL_GLITTER, 0x7FFF); func_80324CFC(0.0f, COMUSIC_43_ENTER_LEVEL_GLITTER, 0x7FFF);
func_80324D2C(2.1f, COMUSIC_43_ENTER_LEVEL_GLITTER); func_80324D2C(2.1f, COMUSIC_43_ENTER_LEVEL_GLITTER);
func_8030E6D4(SFX_113_PAD_APPEARS); func_8030E6D4(SFX_113_PAD_APPEARS);

2
src/lair/code_A4A0.c
View File

@@ -54,7 +54,7 @@ void func_80390890(ActorMarker *marker, ActorMarker *other_marker) {
subaddie_set_state_with_direction(this, 5, 0.0f, 1); subaddie_set_state_with_direction(this, 5, 0.0f, 1);
actor_playAnimationOnce(this); actor_playAnimationOnce(this);
func_8030E878(SFX_C2_GRUBLIN_EGH, local->unkC_27*0.1 + 0.8, 32000, this->position, 1250.0f, 2500.0f); func_8030E878(SFX_C2_GRUBLIN_EGH, local->unkC_27*0.1 + 0.8, 32000, this->position, 1250.0f, 2500.0f);
__spawnQueue_add_4((GenFunction_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2])); __spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
actor_collisionOff(this); actor_collisionOff(this);
this->has_met_before = TRUE; this->has_met_before = TRUE;
} }