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

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

@@ -9,7 +9,7 @@
extern void func_803012F8(void);
extern f32 ml_distanceSquared_vec3f(f32 arg0[3], f32 arg1[3]);
extern void __baMarker_8028BA00(s32);
extern void func_802C418C(void);
extern void spawnQueue_actor_s16(void);
extern void func_802A6388(f32);
extern f32 chwadingboots_802D6E4C(Actor *);
extern void set_turbo_duration(f32);
@@ -160,7 +160,7 @@ void __baMarker_8028B9A8(s32 arg0){
tmp_v0 = cubeList_findNodePropByActorId(0x1F6, 0);
nodeprop_getPosition_s32(tmp_v0, &ideal_yaw);
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);
}
@@ -263,7 +263,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
if(actor->despawn_flag)
return;
if(actor->unk10_0 && func_802C9C14(actor))
if(actor->is_bundle && func_802C9C14(actor))
return;
}//L8028BD1C
@@ -575,7 +575,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
case 0x54: //L8028C820
func_8025A6EC(COMUSIC_19_LOW_PITCH_FLUTES, 28000);
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);
break;
@@ -748,7 +748,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
miscFlag_set(MISC_FLAG_E_TOUCHING_WADING_BOOTS);
func_802A6388(chwadingboots_802D6E4C(actor));
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);
break;
@@ -772,7 +772,7 @@ void __baMarker_resolveCollision(Prop *other_prop){
miscFlag_set(MISC_FLAG_10_TOUCHING_TURBO_TRAINERS);
set_turbo_duration(chtrainers_getDuration(actor));
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);
break;

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

@@ -145,7 +145,7 @@ void baModel_reset(void){
if(!func_8028ADB4())
baModel_updateModel();
player_getPosition(plyr_pos);
__spawnQueue_add_4((GenFunction_4)func_802C4140,
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32,
ACTOR_17_PLAYER_SHADOW,
reinterpret_cast(s32, plyr_pos[0]),
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[1] = (s32) D_8037DE10[1];
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){
marker_getActor(marker)->unk104 = sp3C->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);
this->collidable = FALSE;
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)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_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_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;
func_803115C4(ASSET_D96_DIALOG_BEEHIVE_MEET);
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){
Actor *actor;
if(chBottlesBonusMarker == NULL){
actor = spawn_actor_f32(0x1E0, D_803682C4, 0);
actor = actor_spawnWithYaw_f32(0x1E0, D_803682C4, 0);
chBottlesBonusMarker = actor->marker;
chBottlesBonusCursor_spawn();
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){
Actor *this = spawn_actor_f32(0x2B4, D_80368400, 0);
Actor *this = actor_spawnWithYaw_f32(0x2B4, D_80368400, 0);
chBottlesBonusCursorMarker = this->marker;
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;
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);
__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;
marker->collidable = FALSE;
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;
this = marker_getActor(marker);
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;
}

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[1] = reinterpret_cast(f32, arg1);
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){

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]))
extern void func_802D729C(Actor *, 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);
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[1] += 100.0f;
for(i = 0; i < 2; i++){//L8035A7FC
func_802C8F70((i & 1)? actor->yaw : actor->yaw + 180.0f);
other = func_802C937C(0x21, sp54);
bundle_setYaw((i & 1)? actor->yaw : actor->yaw + 180.0f);
other = bundle_spawn_f32(0x21, sp54);
other->unkF4_8 = 1; //don't spawn more
other->scale = randf2(0.5f, 0.6f)*actor->scale;
actor->yaw = randi2(0, 359);

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

@@ -13,7 +13,7 @@ typedef struct chjiggy_s{
u32 index;
} 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);
Actor *chjiggy_draw(ActorMarker *this, Gfx **gdl, Mtx **mptr, Vtx **arg3);
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){
__spawnQueue_add_4((GenFunction_4)func_802C41D8, 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_4C_STEAM, x, y, z);
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_s32, ACTOR_14F_DESTROYED_JIGGY, x, y, z);
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) {
Actor *actor;
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;
}
}

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

@@ -5,7 +5,7 @@
#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);
Actor *chOverlayNoController_draw(ActorMarker *marker, Gfx **gfx, Mtx **mtx, Vtx **vtx);
@@ -76,7 +76,7 @@ void chOverlayNoController_update(Actor *this) {
void __chOverlayNoController_spawn(void){
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 actor_predrawMethod(Actor *);
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);
@@ -88,7 +88,7 @@ void chOverlayPressStart_update(Actor *this){
void __chOverlayPressStart_spawn(void){
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){
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) {

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;
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[1] = reinterpret_cast(f32, arg1);
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){
f32 plyr_pos[3];
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) {

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]);
typedef struct {
s16 unk0;
s16 flags;
// u8 pad2[0x2];
s32 actor_id;
s32 count;
s16 unkC;
s16 unkE;
s16 unk10;
s16 sfx_id;
s16 sfx_volume;
s16 sfx_sampleRate;
// u8 pad12[0x2];
f32 unk14;
f32 unk18;
f32 unk1C;
f32 unk20;
f32 unk24;
f32 unk28;
f32 unk2C;
f32 unk30;
} struct41FB0s;
f32 velocity_x;
f32 randomVelocity_x;
f32 velocity_y;
f32 randomVelocity_y;
f32 velocity_z;
f32 randomVelocity_z;
f32 bounce_factor;
f32 yaw;
} BundleInfo;
typedef struct {
s32 unk0;
s16 unk4;
s32 index;
s16 flags;
s16 unk6;
f32 unk8[3];
f32 unk14[3];
f32 unk20;
f32 unk24;
f32 unk28;
f32 position[3];
f32 velocity[3];
f32 yaw;
f32 yaw_speed;
f32 elapsed_time;
u8 unk2C;
u8 unk2D;
u8 unk2E;
u8 unk2F;
} struct41FB0s_1;
u8 state;
} Bundle;
/* .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_1_MM_HUT_EGGS,
CORE2_41FB0_2_MM_HUT_GRUBLIN,
@@ -60,148 +66,152 @@ enum core2_41FB0_e{
CORE2_41FB0_E_YUMYUM_EGG = 0xe,
CORE2_41FB0_F_YUMYUM_RED_FEATHER
};
// #define 41FB0_FLAG_SET_YAW 0x0020
struct41FB0s D_80366460[] = {
/*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 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 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},
/*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},
{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},
/*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 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},
/*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},
/*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},
{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_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},
{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, 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, 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, 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},
{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},
{0x0129, 0x352, 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},
{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, 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, 650.0f, 0.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}
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 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 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},
{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},
{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},
{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 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},
{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 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},
{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},
{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},
{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, 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},
{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, 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, 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},
/*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, 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},
{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, 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, 650.0f, 0.0f, 500.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f}
};
/* .bss */
s32 D_8037DDB0;
f32 D_8037DDB4;
f32 D_8037DDB8;
s32 gBundle_sfxCooldown;
f32 gBundle_yaw;
f32 gBundle_randomVelocity;
/* .public */
Actor *func_802C937C(s32 arg0, f32 position[3]);
Actor *bundle_spawn_f32(s32 arg0, f32 position[3]);
/* .code */
void func_802C8F40(void){
D_8037DDB0 = 0;
D_8037DDB4 = 0.0f;
D_8037DDB8 = 1.0f;
void bundle_reset(void) {
gBundle_sfxCooldown = 0;
gBundle_yaw = 0.0f;
gBundle_randomVelocity = 1.0f;
}
void func_802C8F68(void){}
void bundle_free(void) {}
void func_802C8F70(f32 arg0){
D_8037DDB4 = arg0;
void bundle_setYaw(f32 yaw) {
gBundle_yaw = yaw;
}
void func_802C8F7C(f32 arg0){
D_8037DDB8 = arg0;
void bundle_setRandomVelocity(f32 velocity) {
gBundle_randomVelocity = velocity;
}
Actor *func_802C8F88(s32 arg0, s32 arg1[3]){
f32 sp1C[3];
Actor *bundle_spawn_s32(s32 index, s32 position[3]) {
f32 pos_float[3];
TUPLE_COPY(sp1C, arg1)
return func_802C937C(arg0, sp1C);
TUPLE_COPY(pos_float, position)
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;
struct41FB0s *sp74 = D_80366460 + index;
BundleInfo *bundle_info; //s2
Actor *actor = NULL; //s3
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
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);
actor->unk10_0 = 1;
s0 = (struct41FB0s_1 *) &actor->unkBC;
s0->unk0 = index;
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;
if (gBundle_randomVelocity != 1.0f) {
bundle->velocity[0] = bundle_info->velocity_x * gBundle_randomVelocity;
bundle->velocity[1] = bundle_info->velocity_y + randf2(0.0f, bundle_info->randomVelocity_y);
bundle->velocity[2] = bundle_info->velocity_z * gBundle_randomVelocity;
gBundle_randomVelocity = 1.0f;
}
else {//L802C91CC
s0->unk14[0] = sp74->unk14 + randf2(0.0f, sp74->unk18);
s0->unk14[1] = sp74->unk1C + randf2(0.0f, sp74->unk20);
s0->unk14[2] = sp74->unk24 + randf2(0.0f, sp74->unk28);
bundle->velocity[0] = bundle_info->velocity_x + randf2(0.0f, bundle_info->randomVelocity_x);
bundle->velocity[1] = bundle_info->velocity_y + randf2(0.0f, bundle_info->randomVelocity_y);
bundle->velocity[2] = bundle_info->velocity_z + randf2(0.0f, bundle_info->randomVelocity_z);
}//L802C9210
ml_vec3f_yaw_rotate_copy(s0->unk14, s0->unk14, D_8037DDB4);
s0->unk24 = D_80366C4C *= -1;
actor->yaw = s0->unk20 = (sp74->unk0 & 0x20) ? sp74->unk30 : randf2(0.0f, 360.0f);
s0->unk28 = 0.0f;
s0->unk2C = 0;
s0->unk2D = 1;
s0->unk4 = sp74->unk0;
s0->unk2E = (sp74->unk0 & 0x1) ? (0.5 < randf()) : 0;
ml_vec3f_yaw_rotate_copy(bundle->velocity, bundle->velocity, gBundle_yaw);
bundle->yaw_speed = D_80366C4C *= -1;
actor->yaw = bundle->yaw = (bundle_info->flags & 0x20) ? bundle_info->yaw : randf2(0.0f, 360.0f);
bundle->elapsed_time = 0.0f;
bundle->unk2C = 0;
bundle->unk2D = 1;
bundle->flags = bundle_info->flags;
bundle->unk2E = (bundle_info->flags & 0x1) ? (0.5 < randf()) : 0;
if (sp74->unk0 & 0x200) {
actor->unk5C = s0->unk8[1];
if (bundle_info->flags & 0x200) {
actor->unk5C = bundle->position[1];
}
}//L802C92E8
return actor;
}
Actor *func_802C9334(s32 arg0, Actor * arg1){
D_80366460[arg0].unk30 = arg1->yaw;
return func_802C8FE4(arg0, arg1->position, arg1);
Actor *__bundle_spawnFromFirstActor(s32 index, Actor *actor) {
gBundle_array[index].yaw = actor->yaw;
return __bundle_spawnWithFirstActor(index, actor->position, actor);
}
Actor *func_802C937C(s32 arg0, f32 position[3]){
return func_802C8FE4(arg0, position, NULL);
Actor *bundle_spawn_f32(s32 index, f32 position[3]) {
return __bundle_spawnWithFirstActor(index, position, NULL);
}
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;
bool var_v1;
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;
if (sp64->unk4 & 0x80) {
if (bundle->flags & 0x80) {
if (actor->unk10_25 != 0) {
if (func_80307258(arg2, actor->unk10_25 - 1, actor->unk10_18 - 1) == -1) {
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)) {
ml_vec3f_scale_copy(sp44, arg3, sp60 / (f32) (1 << sp64->unk6));
if (var_v1 && bundle->unk2D && (actor->marker->modelId == ASSET_363_MODEL_HONEYCOMB)) {
ml_vec3f_scale_copy(sp44, arg3, sp60 / (f32) (1 << bundle->unk6));
var_v1 = TRUE;
arg2[0] += sp44[0];
arg2[1] += sp44[1];
arg2[2] += sp44[2];
if (actor->marker->modelId != ASSET_363_MODEL_HONEYCOMB) {
sp64->unk6++;
bundle->unk6++;
}
if (sp64->unk6 == 5) {
sp64->unk2D = FALSE;
if (bundle->unk6 == 5) {
bundle->unk2D = FALSE;
} else {
var_v1 = FALSE;
}
} else {
sp64->unk2D = FALSE;
bundle->unk2D = FALSE;
}
arg1[1] -= sp60;
arg2[1] -= sp60;
return var_v1;
}
void func_802C96E4(Actor *actor) {
f32 sp6C;
struct41FB0s_1 *sp68;
struct41FB0s *sp64;
f32 sp58[3];
void bundle_update(Actor *actor) {
f32 tick;
Bundle *bundle;
BundleInfo *bundle_info;
f32 previous_position[3];
f32 sp4C[3];
f32 sp40[3];
s32 pad;
s32 pad2;
f32 var_f0;
f32 speed;
sp6C = time_getDelta();
sp68 = (struct41FB0s_1 *)&actor->unkBC;
sp64 = &D_80366460[sp68->unk0];
if (D_8037DDB0 > 0) D_8037DDB0--;
switch (sp68->unk2F) {
case 3:
tick = time_getDelta();
bundle = (Bundle *) &actor->unkBC;
bundle_info = &gBundle_array[bundle->index];
if (gBundle_sfxCooldown > 0) {
gBundle_sfxCooldown--;
}
switch (bundle->state) {
case BUNDLE_STATE_3_IDLE:
break;
case 1:
sp68->unk28 += sp6C;
ml_vec3f_copy(sp58, sp68->unk8);
ml_vec3f_scale_copy(sp4C, sp68->unk14, sp6C);
sp68->unk8[0] += sp4C[0];
sp68->unk8[1] += sp4C[1];
sp68->unk8[2] += sp4C[2];
if (1.2 < sp68->unk28) {
sp68->unk2C = 1;
case BUNDLE_STATE_1_MOVING:
bundle->elapsed_time += tick;
ml_vec3f_copy(previous_position, bundle->position);
ml_vec3f_scale_copy(sp4C, bundle->velocity, tick);
bundle->position[0] += sp4C[0];
bundle->position[1] += sp4C[1];
bundle->position[2] += sp4C[2];
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))
|| ((sp64->unk0 & 0x200) && (sp68->unk14[1] < -((sp64->unk20 / 2) + sp64->unk1C)))
)
if (!((bundle_info->flags & 0x40) && (bundle->elapsed_time < 1.2))
&& ((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[1] = 1.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(sp40, 2*var_f0);
ml_vec3f_diff_copy(sp68->unk14, sp40, sp68->unk14);
if (D_8037DDB0 == 0) {
if (sp64->unkC != 0) {
func_8030E878(sp64->unkC, (f32)sp64->unkE, sp64->unk10, sp68->unk8, 300.0f, 3000.0f);
ml_vec3f_scale(bundle->velocity, -1.0f);
speed = ((bundle->velocity[0] * sp40[0]) + (bundle->velocity[1] * sp40[1]) + (bundle->velocity[2] * sp40[2]));
ml_vec3f_scale(sp40, 2 * speed);
ml_vec3f_diff_copy(bundle->velocity, sp40, bundle->velocity);
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]));
if (((var_f0 < 200.0f) && (sp40[1] > 0.75)) || (var_f0 < 10.0f)) {
sp68->unk2F = 2;
sp68->unk2C = 1;
if (sp64->unk0 & 0x10) {
ml_vec3f_scale(bundle->velocity, bundle_info->bounce_factor);
speed = gu_sqrtf((bundle->velocity[0] * bundle->velocity[0]) + (bundle->velocity[1] * bundle->velocity[1]) + (bundle->velocity[2] * bundle->velocity[2]));
if (((speed < 200.0f) && (sp40[1] > 0.75)) || (speed < 10.0f)) {
bundle->state = BUNDLE_STATE_2_YAWING;
bundle->unk2C = 1;
if (bundle_info->flags & 0x10) {
actor->marker->propPtr->unk8_3 = TRUE;
}
}
else{
else {
}
if (sp64->unk0 & 0x200) {
sp68->unk8[1] = actor->unk5C;
}
} else {
if (sp64->unk0 & 0x100) {
sp68->unk14[1] -= 4000.0 * sp6C;
} else {
sp68->unk14[1] -= 1500.0 * sp6C;
if (bundle_info->flags & 0x200) {
bundle->position[1] = actor->unk5C;
}
}
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;
case 2:
if (sp64->unk0 & 2) {
sp68->unk20 += (sp68->unk24 * sp6C);
while (sp68->unk20 >= 360.0f) { sp68->unk20 -= 360.0f; }
while (sp68->unk20 < 0.0f) { sp68->unk20 += 360.0f; }
actor->yaw = sp68->unk20;
case BUNDLE_STATE_2_YAWING:
if (bundle_info->flags & 2) {
bundle->yaw += (bundle->yaw_speed * tick);
while (bundle->yaw >= 360.0f) { bundle->yaw -= 360.0f; }
while (bundle->yaw < 0.0f) { bundle->yaw += 360.0f; }
actor->yaw = bundle->yaw;
}
var_f0 = (sp68->unk24 >= 0.0f) ? sp68->unk24 : -sp68->unk24;
if (var_f0 < 0.1) {
sp68->unk2F = 3U;
speed = (bundle->yaw_speed >= 0.0f) ? bundle->yaw_speed : -bundle->yaw_speed;
if (speed < 0.1) {
bundle->state = BUNDLE_STATE_3_IDLE;
}
break;
}
if (actor->position[1] < -5000.0f) {
marker_despawn(actor->marker);
}
}
f32 *func_802C9C0C(Actor *actor){
struct41FB0s_1 *ptr = (struct41FB0s_1 *)&actor->unkBC;
return ptr->unk14;
f32 *bundle_getVelocity(Actor *actor){
Bundle *ptr = (Bundle *)&actor->unkBC;
return ptr->velocity;
}
bool func_802C9C14(Actor *actor){
struct41FB0s_1 *ptr = (struct41FB0s_1 *)&actor->unkBC;
Bundle *ptr = (Bundle *)&actor->unkBC;
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);
}
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[1]),
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);
temp2 = player_getYaw();
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);
feather->actor_specific_1_f = 22.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) {
Actor *actor;
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;
func_8025A58C(0, 5000);
func_8025AB00();

2
src/core2/code_556C0.c
View File

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

2
src/core2/code_55850.c
View File

@@ -70,7 +70,7 @@ void func_802DC900(Actor *this){
void func_802DC960(void) {
Actor *actor;
if (D_8037DE60 == 0) {
actor = spawn_actor_f32(0x1DC, D_803680A0, 0);
actor = actor_spawnWithYaw_f32(0x1DC, D_803680A0, 0);
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){
Actor *this;
if(D_8037DFE0 == NULL){
this = spawn_actor_f32(0x19B, D_80368330, 0);
this = actor_spawnWithYaw_f32(0x19B, D_80368330, 0);
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){
Actor *this;
if(D_8037E000 == NULL){
this = spawn_actor_f32(0x2B5, D_80368360, 0);
this = actor_spawnWithYaw_f32(0x2B5, D_80368360, 0);
D_8037E000 = this->marker;
}
}

4
src/core2/code_6B30.c
View File

@@ -4,7 +4,7 @@
#include "core2/ba/carry.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 */
u8 D_8037BFA0;
@@ -116,7 +116,7 @@ void func_8028DE0C(enum actor_e actor_id){
f32 sp20[3];
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;
bacarry_set_marker(actor->marker);
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 *actor = spawn_actor(arg0, arg1, arg2);
Actor *actor = __actor_spawnWithYaw_s32(arg0, arg1, arg2);
NodeProp *tmp;
s32 sp34[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;
}
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;
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);
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 player_getYaw(void);
extern void func_802C9334(s32, Actor *);
extern void __bundle_spawnFromFirstActor(s32, Actor *);
extern void func_8032B3A0(Actor *, ActorMarker *);
extern void func_8032EE0C(GenFunction_2, s32);
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) {
func_802D7124(actor, actor_info->shadow_scale);
}
if (actor->unk10_0) {
if (actor->is_bundle) {
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->volatile_initialized = FALSE;
suLastBaddie->lifetime_value = 0.0f;
suLastBaddie->unk10_0 = 0;
suLastBaddie->is_bundle = FALSE;
suLastBaddie->unk104 = NULL;
suLastBaddie->unk100 = NULL;
suLastBaddie->unk158[0] = NULL;
@@ -1057,11 +1057,11 @@ static void __actor_free(ActorMarker *arg0, Actor *arg1){
marker_free(arg0);
}
Actor *func_8032811C(enum actor_e id, s32 (* pos)[3], s32 rot){
return spawn_actor(id, pos, rot);
Actor *actor_spawnWithYaw_s32(enum actor_e id, s32 (* pos)[3], s32 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];
int i;
@@ -1069,7 +1069,7 @@ Actor *spawn_actor_f32(enum actor_e id, f32 pos[3], s32 rot){
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){
@@ -1079,7 +1079,7 @@ Actor * spawn_child_actor(enum actor_e id, Actor ** parent){
sp1C[0] = (*parent)->position_x;
sp1C[1] = (*parent)->position_y;
sp1C[2] = (*parent)->position_z;
child = spawn_actor(id, sp1C, (*parent)->yaw);
child = __actor_spawnWithYaw_s32(id, sp1C, (*parent)->yaw);
*parent = marker_getActor(sp28);
return child;
}
@@ -1097,13 +1097,15 @@ Actor *func_80328230(enum actor_e id, f32 pos[3], f32 rot[3]){
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];
int i;
for(i = 0; i< 3; i++){
sp24[i] = (*pos)[i];
}
return spawn_actor(id, &sp24, yaw);
return __actor_spawnWithYaw_s32(id, &sp24, yaw);
}
void marker_despawn(ActorMarker *marker){
@@ -1858,7 +1860,7 @@ void func_8032A09C(s32 arg0, ActorListSaveState *arg1) {
sp50[1] = (s32) var_s0->position[1];
sp50[2] = (s32) var_s0->position[2];
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);
func_80329B68(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);
}
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;
}
else{
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) {
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;
if (this->unk138_25) {
func_802C9334(sp6C + 0x21, this);
__bundle_spawnFromFirstActor(sp6C + 0x21, this);
} else {
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);
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))) {
sp50[0] = (f32) sp48->x;
sp50[1] = (f32) sp48->y;
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 {
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();
}

4
src/core2/code_AD5B0.c
View File

@@ -142,7 +142,7 @@ void func_80334910(void) {
spawnQueue_free();
func_802F53D0();
func_802FAC3C();
func_802C8F68();
bundle_free();
func_8033E184();
func_8033FA24();
func_80344C80();
@@ -254,7 +254,7 @@ void func_80334B20(enum map_e arg0, s32 arg1, s32 arg2) {
func_80322F9C();
func_80323120();
func_803223AC();
func_802C8F40();
bundle_reset();
func_8034F774();
func_80350174();
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){
Actor *actor;
actor = func_802C937C(0x10, arg0->position);
actor = bundle_spawn_f32(0x10, arg0->position);
actor->unk54 = 3.0f;
func_803333DC(arg0, actor);
}

2
src/core2/code_C0CF0.c
View File

@@ -8,7 +8,7 @@ extern void func_80329904(ActorMarker *, s32, f32 *);
/* .code */
void func_80347C80(Struct81s *arg0){
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;
func_803333DC(arg0, actor);
}

2
src/core2/code_C0E60.c
View File

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

2
src/core2/code_CD6E0.c
View File

@@ -566,7 +566,7 @@ void func_80355B00(void) {
projectile_indx = func_8033E8D0();
pad40 = func_8033E864();
sp38 = marker_getActor(pad40);
sp34 = func_802C9C0C(sp38);
sp34 = bundle_getVelocity(sp38);
projectile_addRoll(projectile_indx, 7.0f);
sp28[0] = sp38->position[0];
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_8035CCA0(partEmitMgr_newEmitter(4), this, ASSET_4D0_MODEL_LIMBO_BONE);
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);
}

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_8035D110(partEmitMgr_newEmitter(1), this, ASSET_4CB_MODEL_MUMMUM_BODY);
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);
}
@@ -133,7 +133,7 @@ void func_8035D490(ActorMarker *marker){
if (map_get() == MAP_13_GV_MEMORY_GAME) {
sp1C = marker_getActor(marker);
if (func_80329530(sp1C, 250) != 0) {
func_802C9334(0x1C, sp1C);
__bundle_spawnFromFirstActor(0x1C, sp1C);
func_8035D2C0(marker, 0);
}
}
@@ -146,7 +146,7 @@ void func_8035D4F0(ActorMarker *marker, s32 arg1){
actor = marker_getActor(marker);
if(actor->state != 9){
if(func_8033F3E8(mapModel_getModel(0), actor->position, 0x190, 0x1A0) == arg1){
func_802C9334(0x1C, actor);
__bundle_spawnFromFirstActor(0x1C, actor);
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{
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);
bsjig_setJiggyMarkerPtr(sp1C->marker);
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];
position[0] = reinterpret_cast(f32, x);
position[1] = reinterpret_cast(f32, y);
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 *func_802C418C(enum actor_e actor_id, s32 x, s32 y, s32 z){
Actor *spawnQueue_actor_s16(enum actor_e actor_id, s32 x, s32 y, s32 z) {
s16 position[3];
position[0] = reinterpret_cast(s16, x);
position[1] = reinterpret_cast(s16, y);
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];
position[0] = reinterpret_cast(s32, x);
position[1] = reinterpret_cast(s32, y);
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];
position[0] = reinterpret_cast(f32, x);
position[1] = reinterpret_cast(f32, y);
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];
position[0] = reinterpret_cast(f32, x);
position[1] = reinterpret_cast(f32, y);
position[2] = reinterpret_cast(f32, z);
func_802C8F70(reinterpret_cast(f32, yaw));
return func_802C937C(reinterpret_cast(enum actor_e, actor_id), position);
bundle_setYaw(reinterpret_cast(f32, yaw));
return bundle_spawn_f32(reinterpret_cast(s32, index), position);
}
Actor *func_802C42B4(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
s32 sp1C[3];
sp1C[0] = reinterpret_cast(s32, arg1);
sp1C[1] = reinterpret_cast(s32, arg2);
sp1C[2] = reinterpret_cast(s32, arg3);
return func_802C8F88(reinterpret_cast(s32, arg0), sp1C);
Actor *spawnQueue_bundle_s32(s32 index, s32 x, s32 y, s32 z) {
s32 position[3];
position[0] = reinterpret_cast(s32, x);
position[1] = reinterpret_cast(s32, y);
position[2] = reinterpret_cast(s32, z);
return bundle_spawn_s32(reinterpret_cast(s32, index), position);
}
Actor * func_802C42F0(s32 arg0, s32 arg1, s32 arg2, s32 arg3){
s32 sp1C[3];
sp1C[0] = arg1;
sp1C[1] = arg2;
sp1C[2] = arg3;
return func_802C8F88(arg0, sp1C);
Actor *spawnQueue_bundle_s32_2(s32 index, s32 x, s32 y, s32 z) {
s32 position[3];
position[0] = x;
position[1] = y;
position[2] = z;
return bundle_spawn_s32(index, position);
}
void spawnQueue_defrag(FunctionQueue *arg0){
if((arg0 = spawnQueue) != NULL)
spawnQueue = (FunctionQueue *)defrag();
void spawnQueue_defrag(FunctionQueue *arg0) {
if ((arg0 = spawnQueue) != NULL) {
spawnQueue = (FunctionQueue *) defrag();
}
}