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
src/SM/ch/vegetables.c
View File

@@ -6,7 +6,7 @@
//external
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 subaddie_set_state_with_direction(Actor *, s32, f32, s32);
@@ -203,7 +203,7 @@ void func_80387C28(Actor * this){
if(this->unk38_31){
this->position_y += 100.0f;
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
timed_mapSpecificFlags_setTrue(1.5f, 7);
actor_collisionOff(this);

4
src/SM/code_5B0.c
View File

@@ -5,7 +5,7 @@
#include "prop.h"
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_80386A00(Actor *this);
@@ -113,7 +113,7 @@ void SM_func_80386D68(Actor *this){
if(this->unk100 && func_803870E8(this->unk100)){
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);
}