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

Merge branch 'mr-origin-86'

Browse Source
This commit is contained in:
banjo.decomp
2024-10-08 01:58:19 -05:00
parent 06204d3b68 7f41a49ef8
commit 680cf7a950
34 changed files with 568 additions and 508 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lair/ch/cauldron.c
View File

@@ -357,7 +357,7 @@ void chWarpCauldron_update(Actor *this) {
volatileFlag_set(VOLATILE_FLAG_1E, 0);
func_802D677C(0);
func_8028FCAC();
nodeprop_getPosition(func_80304C38(D_80393620[this->unkF4_8 - 1].unk6, this), sp54);
nodeprop_getPosition(nodeprop_findByActorIdAndActorPosition(D_80393620[this->unkF4_8 - 1].unk6, this), sp54);
if (this->unkF4_8 == 7) {
func_8028F66C(BS_INTR_36_DINGPOT);
func_802BAFE4(0x82);

2
src/lair/code_0.c
View File

@@ -978,7 +978,7 @@ void func_80388450(Actor *actor1, Actor *actor2)
{
f32 vec1[3];
f32 vec2[3];
void *actor3 = func_80304C38(0x22A, actor1);
void *actor3 = nodeprop_findByActorIdAndActorPosition(0x22A, actor1);
s32 val = func_80304DA8(actor3);
actor2->yaw = val;

2
src/lair/code_C6C0.c
View File

@@ -35,7 +35,7 @@ void func_80392B6C(Actor *this) {
marker_despawn(this->marker);
return;
}
phi_a0 = func_80304C38(0x3BE, this);
phi_a0 = nodeprop_findByActorIdAndActorPosition(0x3BE, this);
if (this == NULL) {
this->unk1C[0] = -1300.0f;
this->unk1C[1] = 250.0f;