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_0.c
+++ b/src/lair/code_0.c
@@ -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;