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

Document bundles

Browse Source
This commit is contained in:
Owlenuff
2024-10-03 23:45:50 +02:00
parent ea4b9ab1a6
commit 7a65ed96b3
17 changed files with 162 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/enums.h
View File

@@ -2119,6 +2119,48 @@ enum actor_e
ACTOR_3CA_ROCK_TRAPPING_GRUNTY = 0x3CA ACTOR_3CA_ROCK_TRAPPING_GRUNTY = 0x3CA
}; };
enum bundle_e {
BUNDLE_0_MM_HUT_MUSIC_NOTE,
BUNDLE_1_MM_HUT_BLUE_EGG,
BUNDLE_2_MM_HUT_GRUBLIN,
BUNDLE_3_MM_HUT_JINJO_GREEN,
BUNDLE_4_MM_HUT_JIGGY,
BUNDLE_5__HONEYCOMB,
BUNDLE_6_MM_HUT_EXTRA_LIFE,
BUNDLE_7__JIGGY,
BUNDLE_8__JIGGY,
BUNDLE_9__JIGGY,
BUNDLE_A_BGS_HUT_SHOCKSPRING_PAD,
BUNDLE_B_BGS_HUT_MUSIC_NOTE,
BUNDLE_C_BGS_HUT_JIGGY,
BUNDLE_D__EMPTY_HONEYCOMB,
BUNDLE_E_YUMYUM_BLUE_EGG,
BUNDLE_F_YUMYUM_RED_FEATHER,
BUNDLE_10__JIGGY,
BUNDLE_11__UNKNOWN,
BUNDLE_12__JIGGY,
BUNDLE_13__MUSIC_NOTE,
BUNDLE_14__HONEYCOMB,
BUNDLE_15__JIGGY,
BUNDLE_16__HONEYCOMB,
BUNDLE_17__HONEYCOMB,
BUNDLE_18__HONEYCOMB,
BUNDLE_19__HONEYCOMB,
BUNDLE_1A__HONEYCOMB,
BUNDLE_1B__HONEYCOMB,
BUNDLE_1C__HONEYCOMB,
BUNDLE_1D__HONEYCOMB,
BUNDLE_1E__JIGGY,
BUNDLE_1F_SM_EMPTY_HONEYCOMB,
BUNDLE_20__UNKOWN,
BUNDLE_21__ICECUBE_B,
BUNDLE_22__HONEYCOMB,
BUNDLE_23__HONEYCOMB,
BUNDLE_24__HONEYCOMB,
BUNDLE_25__HONEYCOMB,
BUNDLE_26__HONEYCOMB
};
enum bs_e enum bs_e
{ {
BS_0_NONE = 0, BS_0_NONE = 0,

23
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 spawnQueue_bundle_f32(u32,f32,f32,f32); Actor *spawnQueue_bundle_f32(u32,f32,f32,f32);
void subaddie_set_state(Actor *, u32); void subaddie_set_state(Actor *, u32);
/* local declarations */ /* local declarations */
@@ -24,7 +24,14 @@ ActorAnimationInfo D_80390B30[4] = {
{ASSET_4E_ANIM_MUDHUT_SMASH, 1000000.0f} {ASSET_4E_ANIM_MUDHUT_SMASH, 1000000.0f}
}; };
u32 D_80390B50[6] = {0xA, 0xA, 0xB, 0xA, 0xA, 0xC}; enum bundle_e D_80390B50[6] = {
BUNDLE_A_BGS_HUT_SHOCKSPRING_PAD,
BUNDLE_A_BGS_HUT_SHOCKSPRING_PAD,
BUNDLE_B_BGS_HUT_MUSIC_NOTE,
BUNDLE_A_BGS_HUT_SHOCKSPRING_PAD,
BUNDLE_A_BGS_HUT_SHOCKSPRING_PAD,
BUNDLE_C_BGS_HUT_JIGGY
};
ActorInfo D_80390B68 = {MARKER_D5_BGS_MUD_HUT, ACTOR_C_MUD_HUT, ASSET_7D8_MODEL_MM_HUT_TOP, 0x01, D_80390B30, ActorInfo D_80390B68 = {MARKER_D5_BGS_MUD_HUT, ACTOR_C_MUD_HUT, ASSET_7D8_MODEL_MM_HUT_TOP, 0x01, D_80390B30,
chmudhut_update, func_80326224, chmudhut_draw, chmudhut_update, func_80326224, chmudhut_draw,
@@ -104,13 +111,11 @@ void chmudhut_update(Actor *this){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000); func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
} }
__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){
__spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, D_80390B50[tmp], if (tmp < 5) {
reinterpret_cast(s32, diffPos[0]), __spawnQueue_add_4((GenFunction_4) spawnQueue_bundle_f32, D_80390B50[tmp], reinterpret_cast(s32, diffPos[0]), reinterpret_cast(s32, diffPos[1]), reinterpret_cast(s32, diffPos[2]));
reinterpret_cast(s32, diffPos[1]), }
reinterpret_cast(s32, diffPos[2]) else {
);
} else {
jiggy_spawn(JIGGY_23_BGS_HUTS, diffPos); jiggy_spawn(JIGGY_23_BGS_HUTS, diffPos);
} }
} }

2
src/BGS/code_3420.c
View File

@@ -301,7 +301,7 @@ void func_80389F08(ActorMarker *marker) {
if (var_s2 < 3) { if (var_s2 < 3) {
bundle_setYaw(vile->yaw + (f32) (i * 30)); bundle_setYaw(vile->yaw + (f32) (i * 30));
bundle_setRandomVelocity(2.0f); bundle_setRandomVelocity(2.0f);
bundle_spawn_f32(6, vile->position); bundle_spawn_f32(BUNDLE_6_MM_HUT_EXTRA_LIFE, vile->position);
var_s2 += 1; var_s2 += 1;
} else { } else {
item_inc(ITEM_16_LIFE); item_inc(ITEM_16_LIFE);

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

@@ -24,7 +24,7 @@ void __chGobi3_spawnHoneyComb(Actor *this){
TUPLE_ASSIGN(sp18, -6885.0f, 2383.0f, 1335.0f); TUPLE_ASSIGN(sp18, -6885.0f, 2383.0f, 1335.0f);
bundle_setYaw(this->yaw); bundle_setYaw(this->yaw);
func_802CA1CC(HONEYCOMB_C_GV_GOBI_3); func_802CA1CC(HONEYCOMB_C_GV_GOBI_3);
bundle_spawn_f32(0xd, sp18); bundle_spawn_f32(BUNDLE_D__EMPTY_HONEYCOMB, 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){

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

@@ -8,7 +8,7 @@
/* extern function declarations */ /* extern function declarations */
void bundle_setYaw(f32); void bundle_setYaw(f32);
void spawnQueue_bundle_f32(s32, s32, s32, s32); Actor *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 **);
@@ -50,7 +50,15 @@ void __chhut_spawnExplosion(ActorMarker *this) {
} }
void chhut_update(Actor *this) { void chhut_update(Actor *this) {
static s32 D_803898D8[6] = {0, 1, 2, 3, 6, 4}; static enum bundle_e D_803898D8[6] = {
BUNDLE_0_MM_HUT_MUSIC_NOTE,
BUNDLE_1_MM_HUT_BLUE_EGG,
BUNDLE_2_MM_HUT_GRUBLIN,
BUNDLE_3_MM_HUT_JINJO_GREEN,
BUNDLE_6_MM_HUT_EXTRA_LIFE,
BUNDLE_4_MM_HUT_JIGGY
};
f32 diff_pos[3]; f32 diff_pos[3];
f32 plyr_pos[3]; f32 plyr_pos[3];
@@ -87,7 +95,7 @@ void chhut_update(Actor *this) {
bundle_setYaw(this->yaw); bundle_setYaw(this->yaw);
if (mm_hut_smash_count < 5) { if (mm_hut_smash_count < 5) {
__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])); __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);

2
src/RBB/code_9670.c
View File

@@ -20,7 +20,7 @@ u8 D_803912B0;
void RBB_func_8038FA60(ActorMarker *marker){ void RBB_func_8038FA60(ActorMarker *marker){
Actor *actor = marker_getActor(marker); Actor *actor = marker_getActor(marker);
bundle_setYaw(actor->yaw); bundle_setYaw(actor->yaw);
bundle_spawn_f32(6, &actor->position); bundle_spawn_f32(BUNDLE_6_MM_HUT_EXTRA_LIFE, &actor->position);
} }
void func_8038FA9C(Actor *this, s32 arg1){ void func_8038FA9C(Actor *this, s32 arg1){

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

@@ -200,11 +200,13 @@ void func_80387C28(Actor * this){
sp30[1] += 50.0f; sp30[1] += 50.0f;
func_80387910(partEmitMgr_newEmitter(8), sp30, 8); func_80387910(partEmitMgr_newEmitter(8), sp30, 8);
}//L80387D18 }//L80387D18
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)spawnQueue_bundle_f32, 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, BUNDLE_1F_SM_EMPTY_HONEYCOMB, 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);
if(local->unkC != 3){ if(local->unkC != 3){

7
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 spawnQueue_bundle_f32(s32, f32, f32, f32); Actor *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);
@@ -111,10 +111,11 @@ void SM_func_80386D68(Actor *this){
func_80386B04(partEmitMgr_newEmitter(0xA), this->position, 0xA, this->scale); func_80386B04(partEmitMgr_newEmitter(0xA), this->position, 0xA, this->scale);
func_80386C2C(partEmitMgr_newEmitter(0x10), this->position, 0x10, this->scale); func_80386C2C(partEmitMgr_newEmitter(0x10), this->position, 0x10, this->scale);
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)spawnQueue_bundle_f32, 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, BUNDLE_1F_SM_EMPTY_HONEYCOMB, 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);
} }

16
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 spawnQueue_bundle_f32(s32, s32, s32, s32); extern Actor *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);
@@ -232,12 +232,12 @@ void __chClam_takeDamage(ActorMarker *this_marker, ActorMarker *other_marker){
marker_despawn(this->marker); marker_despawn(this->marker);
} }
void __chClam_playerDropsItem(s32 index, enum item_e item_id){ void __chClam_playerDropsItem(enum bundle_e bundle_id, enum item_e item_id){
f32 position[3]; f32 position[3];
player_getPosition(position); player_getPosition(position);
bundle_setYaw(randf2(0.0f, 359.0f)); bundle_setYaw(randf2(0.0f, 359.0f));
__spawnQueue_add_4((GenFunction_4)spawnQueue_bundle_f32, index, reinterpret_cast(s32, position[0]), reinterpret_cast(s32, position[1]), reinterpret_cast(s32, position[2])); __spawnQueue_add_4((GenFunction_4) spawnQueue_bundle_f32, bundle_id, reinterpret_cast(s32, position[0]), reinterpret_cast(s32, position[1]), reinterpret_cast(s32, position[2]));
item_dec(item_id); item_dec(item_id);
} }
@@ -249,11 +249,13 @@ void __chClam_attackOther(ActorMarker *this_marker, ActorMarker *other_marker){
mapSpecificFlags_set(5, TRUE); mapSpecificFlags_set(5, TRUE);
} }
if(item_getCount(ITEM_D_EGGS) != 0) if (item_getCount(ITEM_D_EGGS) != 0) {
__chClam_playerDropsItem(0xe, ITEM_D_EGGS); __chClam_playerDropsItem(BUNDLE_E_YUMYUM_BLUE_EGG, ITEM_D_EGGS);
}
if(item_getCount(ITEM_F_RED_FEATHER) != 0) if (item_getCount(ITEM_F_RED_FEATHER) != 0) {
__chClam_playerDropsItem(0xf, ITEM_F_RED_FEATHER); __chClam_playerDropsItem(BUNDLE_F_YUMYUM_RED_FEATHER, ITEM_F_RED_FEATHER);
}
} }
void chClam_update(Actor *this){ void chClam_update(Actor *this){

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

@@ -202,7 +202,7 @@ void __chicecube_spawnHalfCubes(ActorMarker *marker){
sp54[1] += 100.0f; sp54[1] += 100.0f;
for(i = 0; i < 2; i++){//L8035A7FC for(i = 0; i < 2; i++){//L8035A7FC
bundle_setYaw((i & 1)? actor->yaw : actor->yaw + 180.0f); bundle_setYaw((i & 1)? actor->yaw : actor->yaw + 180.0f);
other = bundle_spawn_f32(0x21, sp54); other = bundle_spawn_f32(BUNDLE_21__ICECUBE_B, 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);

118
src/core2/code_41FB0.c
View File

@@ -50,65 +50,47 @@ enum bundle_state_e {
BUNDLE_STATE_3_IDLE 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,
CORE2_41FB0_3_MM_HUT_JINJO,
CORE2_41FB0_4_MM_HUT_JIGGY,
CORE2_41FB0_6_MM_HUT_EXTRA_LIFE = 0x6,
CORE2_41FB0_A_BGS_HUT_JUMP_PAD = 0xA,
CORE2_41FB0_B_BGS_HUT_NOTES,
CORE2_41FB0_C_BGS_HUT_JIGGY,
CORE2_41FB0_E_YUMYUM_EGG = 0xe,
CORE2_41FB0_F_YUMYUM_RED_FEATHER
};
// #define 41FB0_FLAG_SET_YAW 0x0020 // #define 41FB0_FLAG_SET_YAW 0x0020
BundleInfo gBundle_array[] = { 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}, {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}, {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}, {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}, {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}, {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}, {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}, {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}, {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}, {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}, {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}, {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_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}, {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}, {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}, {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 */
@@ -117,7 +99,7 @@ f32 gBundle_yaw;
f32 gBundle_randomVelocity; f32 gBundle_randomVelocity;
/* .public */ /* .public */
Actor *bundle_spawn_f32(s32 arg0, f32 position[3]); Actor *bundle_spawn_f32(enum bundle_e bundle_id, f32 position[3]);
/* .code */ /* .code */
void bundle_reset(void) { void bundle_reset(void) {
@@ -136,14 +118,14 @@ void bundle_setRandomVelocity(f32 velocity) {
gBundle_randomVelocity = velocity; gBundle_randomVelocity = velocity;
} }
Actor *bundle_spawn_s32(s32 index, s32 position[3]) { Actor *bundle_spawn_s32(enum bundle_e bundle_id, s32 position[3]) {
f32 pos_float[3]; f32 pos_float[3];
TUPLE_COPY(pos_float, position) TUPLE_COPY(pos_float, position)
return bundle_spawn_f32(index, pos_float); return bundle_spawn_f32(bundle_id, pos_float);
} }
Actor *__bundle_spawnWithFirstActor(s32 index, f32 position[3], Actor *firstActor) { Actor *__bundle_spawnWithFirstActor(enum bundle_e bundle_id, f32 position[3], Actor *firstActor) {
static f32 D_80366C4C = 400.0f; static f32 D_80366C4C = 400.0f;
BundleInfo *bundle_info; //s2 BundleInfo *bundle_info; //s2
Actor *actor = NULL; //s3 Actor *actor = NULL; //s3
@@ -151,7 +133,7 @@ Actor *__bundle_spawnWithFirstActor(s32 index, f32 position[3], Actor *firstActo
s32 i; s32 i;
Bundle *bundle; Bundle *bundle;
bundle_info = gBundle_array + index; bundle_info = gBundle_array + bundle_id;
actor = NULL; actor = NULL;
for (i = 0; i < bundle_info->count; i++) {//L802C90B0 for (i = 0; i < bundle_info->count; i++) {//L802C90B0
@@ -166,7 +148,7 @@ Actor *__bundle_spawnWithFirstActor(s32 index, f32 position[3], Actor *firstActo
actor->is_bundle = TRUE; actor->is_bundle = TRUE;
bundle = (Bundle *) &actor->unkBC; bundle = (Bundle *) &actor->unkBC;
bundle->index = index; bundle->index = bundle_id;
bundle->state = BUNDLE_STATE_1_MOVING; bundle->state = BUNDLE_STATE_1_MOVING;
bundle->unk6 = 1; bundle->unk6 = 1;
ml_vec3f_copy(bundle->position, actor->position); ml_vec3f_copy(bundle->position, actor->position);
@@ -201,13 +183,13 @@ Actor *__bundle_spawnWithFirstActor(s32 index, f32 position[3], Actor *firstActo
return actor; return actor;
} }
Actor *__bundle_spawnFromFirstActor(s32 index, Actor *actor) { Actor *__bundle_spawnFromFirstActor(enum bundle_e bundle_id, Actor *actor) {
gBundle_array[index].yaw = actor->yaw; gBundle_array[bundle_id].yaw = actor->yaw;
return __bundle_spawnWithFirstActor(index, actor->position, actor); return __bundle_spawnWithFirstActor(bundle_id, actor->position, actor);
} }
Actor *bundle_spawn_f32(s32 index, f32 position[3]) { Actor *bundle_spawn_f32(enum bundle_e bundle_id, f32 position[3]) {
return __bundle_spawnWithFirstActor(index, position, NULL); return __bundle_spawnWithFirstActor(bundle_id, 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) {

16
src/core2/code_9E370.c
View File

@@ -17,7 +17,7 @@ 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 *spawnQueue_bundleWithYaw_f32(s32 actor_id, s32 x, s32 y, s32 z, s32 yaw); extern Actor *spawnQueue_bundleWithYaw_f32(enum bundle_e bundle_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 __bundle_spawnFromFirstActor(s32, Actor *); extern void __bundle_spawnFromFirstActor(s32, Actor *);
@@ -2184,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)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)); __spawnQueue_add_5((GenFunction_5) spawnQueue_bundleWithYaw_f32, this->unk138_27 + BUNDLE_15__JIGGY, 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)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)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, this->unk138_27 + BUNDLE_15__JIGGY, reinterpret_cast(s32,this->position[0]), reinterpret_cast(s32,sp34), reinterpret_cast(s32,this->position[2]), reinterpret_cast(s32,sp44));
} }
} }
} }
@@ -2273,10 +2273,10 @@ void func_8032B5C0(ActorMarker *arg0, ActorMarker *arg1, struct5Cs *arg2) {
bundle_setYaw(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) {
__bundle_spawnFromFirstActor(sp6C + 0x21, this); __bundle_spawnFromFirstActor(sp6C + BUNDLE_21__ICECUBE_B, this);
} else { } else {
if ((this->marker->id < 0x1A1) || (this->marker->id >= 0x1A5)) { if ((this->marker->id < 0x1A1) || (this->marker->id >= 0x1A5)) {
__bundle_spawnFromFirstActor(sp6C + 0x18, this); __bundle_spawnFromFirstActor(sp6C + BUNDLE_18__HONEYCOMB, this);
} }
} }
} }
@@ -2305,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)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)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, sp70 + BUNDLE_15__JIGGY, 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)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)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, sp70 + BUNDLE_15__JIGGY, 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)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)); __spawnQueue_add_5((GenFunction_5)spawnQueue_bundleWithYaw_f32, sp70 + BUNDLE_15__JIGGY, 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();
} }

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 = bundle_spawn_f32(0x10, arg0->position); actor = bundle_spawn_f32(BUNDLE_10__JIGGY, arg0->position);
actor->unk54 = 3.0f; actor->unk54 = 3.0f;
func_803333DC(arg0, actor); func_803333DC(arg0, actor);
} }

7
src/core2/code_D6180.c
View File

@@ -132,8 +132,9 @@ 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) {
__bundle_spawnFromFirstActor(0x1C, sp1C); __bundle_spawnFromFirstActor(BUNDLE_1C__HONEYCOMB, sp1C);
func_8035D2C0(marker, 0); func_8035D2C0(marker, 0);
} }
} }
@@ -145,8 +146,8 @@ void func_8035D4F0(ActorMarker *marker, s32 arg1){
if(map_get() == MAP_13_GV_MEMORY_GAME){ if(map_get() == MAP_13_GV_MEMORY_GAME){
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) {
__bundle_spawnFromFirstActor(0x1C, actor); __bundle_spawnFromFirstActor(BUNDLE_1C__HONEYCOMB, actor);
func_8035D2C0(marker, 0); func_8035D2C0(marker, 0);
} }
} }

16
src/core2/spawnqueue.c
View File

@@ -558,37 +558,37 @@ Actor *spawnQueue_actor_s32(enum actor_e actor_id, s32 x, s32 y, s32 z) {
return actor_spawnWithYaw_s32(reinterpret_cast(enum actor_e, actor_id), position, 0); return actor_spawnWithYaw_s32(reinterpret_cast(enum actor_e, actor_id), position, 0);
} }
Actor *spawnQueue_bundle_f32(s32 index, s32 x, s32 y, s32 z) { Actor *spawnQueue_bundle_f32(enum bundle_e bundle_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 bundle_spawn_f32(reinterpret_cast(s32, index), position); return bundle_spawn_f32(reinterpret_cast(s32, bundle_id), position);
} }
Actor *spawnQueue_bundleWithYaw_f32(s32 index, s32 x, s32 y, s32 z, s32 yaw) { Actor *spawnQueue_bundleWithYaw_f32(enum bundle_e bundle_id, 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);
bundle_setYaw(reinterpret_cast(f32, yaw)); bundle_setYaw(reinterpret_cast(f32, yaw));
return bundle_spawn_f32(reinterpret_cast(s32, index), position); return bundle_spawn_f32(reinterpret_cast(s32, bundle_id), position);
} }
Actor *spawnQueue_bundle_s32(s32 index, s32 x, s32 y, s32 z) { Actor *spawnQueue_bundle_s32(enum bundle_e bundle_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 bundle_spawn_s32(reinterpret_cast(s32, index), position); return bundle_spawn_s32(reinterpret_cast(s32, bundle_id), position);
} }
Actor *spawnQueue_bundle_s32_2(s32 index, s32 x, s32 y, s32 z) { Actor *spawnQueue_bundle_s32_2(enum bundle_e bundle_id, s32 x, s32 y, s32 z) {
s32 position[3]; s32 position[3];
position[0] = x; position[0] = x;
position[1] = y; position[1] = y;
position[2] = z; position[2] = z;
return bundle_spawn_s32(index, position); return bundle_spawn_s32(bundle_id, position);
} }
void spawnQueue_defrag(FunctionQueue *arg0) { void spawnQueue_defrag(FunctionQueue *arg0) {

4
src/fight/chfinalboss.c
View File

@@ -435,7 +435,7 @@ void __chfinalboss_dropHealth(ActorMarker *arg0) {
actor = marker_getActor(arg0); actor = marker_getActor(arg0);
bundle_setYaw(func_803297C8(actor, D_803916F4)); bundle_setYaw(func_803297C8(actor, D_803916F4));
bundle_spawn_f32(0x14, actor->position); bundle_spawn_f32(BUNDLE_14__HONEYCOMB, actor->position);
} }
void chfinalboss_despawnFlightPad(void) { void chfinalboss_despawnFlightPad(void) {
@@ -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);
__bundle_spawnFromFirstActor(0x24, this); __bundle_spawnFromFirstActor(BUNDLE_24__HONEYCOMB, 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/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)) {
__bundle_spawnFromFirstActor(0x20, this); __bundle_spawnFromFirstActor(BUNDLE_20__UNKOWN, 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);