Merge branch 'mr-origin-86'

2024-10-08 01:58:19 -05:00
parent 06204d3b68 7f41a49ef8
commit 680cf7a950
34 changed files with 568 additions and 508 deletions
--- a/src/lair/code_C6C0.c
+++ b/src/lair/code_C6C0.c
@@ -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;