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

Merge branch 'document_bundles' into 'master'

Browse Source 
Document bundles

See merge request banjo.decomp/banjo-kazooie!94
This commit is contained in:
Banjo Kazooie
2024-10-08 06:12:58 +00:00
parent d72dc07c32 7a65ed96b3
commit 06204d3b68
17 changed files with 162 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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);
void spawnQueue_bundle_f32(u32,f32,f32,f32);
Actor *spawnQueue_bundle_f32(u32,f32,f32,f32);
void subaddie_set_state(Actor *, u32);
/* local declarations */
@@ -24,7 +24,14 @@ ActorAnimationInfo D_80390B30[4] = {
{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,
chmudhut_update, actor_update_func_80326224, chmudhut_draw,
@@ -104,13 +111,11 @@ void chmudhut_update(Actor *this){
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 28000);
}
__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],
reinterpret_cast(s32, diffPos[0]),
reinterpret_cast(s32, diffPos[1]),
reinterpret_cast(s32, diffPos[2])
);
} else {
if (tmp < 5) {
__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]));
}
else {
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) {
bundle_setYaw(vile->yaw + (f32) (i * 30));
bundle_setRandomVelocity(2.0f);
bundle_spawn_f32(6, vile->position);
bundle_spawn_f32(BUNDLE_6_MM_HUT_EXTRA_LIFE, vile->position);
var_s2 += 1;
} else {
item_inc(ITEM_16_LIFE);