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

6
src/GV/ch/ancientone.c
View File

@@ -89,7 +89,7 @@ void func_803867F4(void){
func_802BAFE4(4);
if(nodeProp_findPositionFromActorId(0x148, sp24)){
jiggy_spawn(JIGGY_46_GV_ANCIENT_ONES, sp24);
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, sp24[0]), reinterpret_cast(s32, sp24[1]), reinterpret_cast(s32, sp24[2]));
}
}
@@ -183,10 +183,10 @@ void chAncientOne_update(Actor *this){
this->position_z += (sp38 & 2) ? 0xC : -0xC;
if(this->unkF4_8 != 1){
if(sp38 == 6){
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x4C, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x4C, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
}
if(sp38 == 4 && this->position_y < LOCAL_CH_ANCIENT_ONE(this)->unk1C - 600.0f){
__spawnQueue_add_4((GenFunction_4)func_802C4140, 0x11f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
__spawnQueue_add_4((GenFunction_4)spawnQueue_actor_f32, 0x11f, reinterpret_cast(s32, this->position_x), reinterpret_cast(s32, sp34), reinterpret_cast(s32, this->position_z));
}//L80386D80
}
if(LOCAL_CH_ANCIENT_ONE(this)->unk1C <= this->position_y){

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

@@ -22,9 +22,9 @@ void __chGobi3_spawnHoneyComb(Actor *this){
s32 pad24;
f32 sp18[3];
TUPLE_ASSIGN(sp18, -6885.0f, 2383.0f, 1335.0f);
func_802C8F70(this->yaw);
bundle_setYaw(this->yaw);
func_802CA1CC(HONEYCOMB_C_GV_GOBI_3);
func_802C937C(0xd, sp18);
bundle_spawn_f32(0xd, sp18);
}
void __chGobi3_runaway(ActorMarker *caller, enum asset_e text_id, s32 arg2){