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

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

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

7
src/SM/code_5B0.c
View File

@@ -5,7 +5,7 @@
#include "prop.h"
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_80386A00(Actor *this);
@@ -111,10 +111,11 @@ void SM_func_80386D68(Actor *this){
func_80386B04(partEmitMgr_newEmitter(0xA), this->position, 0xA, 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);
__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);
}